Open Build Service

Changes of Revision 4

php8.changes Changed

@@ -1,4 +1,747 @@
 -------------------------------------------------------------------
+Fri May  9 16:34:09 UTC 2025 - Arjen de Korte <suse+build@de-korte.org>
+
+- version update to 8.3.21
+    Core:
+        Fixed bug GH-18304 (Changing the properties of a DateInterval through dynamic properties triggers a SegFault).
+        Fix some leaks in php_scandir.
+    Filter:
+        Fixed bug GH-18309 (ipv6 filter integer overflow).
+    GD:
+        Fixed imagecrop() overflow with rect argument with x/width y/heigh usage in gdImageCrop().
+        Fixed GH-18243 imagettftext() overflow/underflow on font size value.
+    Intl:
+        Fix reference support for intltz_get_offset().
+    LDAP:
+        Fixed bug GH-17776 (LDAP_OPT_X_TLS_* options can't be overridden).
+        Fix NULL deref on high modification key.
+    libxml:
+        Fixed custom external entity loader returning an invalid resource leading to a confusing TypeError message.
+    OpenSSL:
+        Fix memory leak in openssl_sign() when passing invalid algorithm.
+        Fix potential leaks when writing to BIO fails.
+    PDO Firebird:
+        Fixed GH-18276 - persistent connection - "zend_mm_heap corrupted" with setAttribute() (SakiTakamachi).
+    SPL:
+        Fixed bug GH-18322 (SplObjectStorage debug handler mismanages memory).
+    Standard:
+        Fixed bug GH-18145 (php8ts crashes in php_clear_stat_cache()).
+        Fixed bug GH-18209 (Use-after-free in extract() with EXTR_REFS).
+        Fixed bug GH-18212 (fseek with SEEK_CUR whence value and negative offset leads to negative stream position).
+        Fix resource leak in iptcembed() on error.
+    Zip:
+        Fix uouv when handling empty options in ZipArchive::addGlob().
+        Fix memory leak when handling a too long path in ZipArchive::addGlob().
+
+-------------------------------------------------------------------
+Fri Apr 11 06:02:11 UTC 2025 - pgajdos@suse.com
+
+- version update to 8.3.20
+    Core:
+        Fixed bug GH-17961 (use-after-free during dl()'ed module class destruction).
+        Fixed bug GH-15367 (dl() of module with aliased class crashes in shutdown).
+        Fixed bug GH-13193 again (Significant performance degradation in 'foreach').
+    DOM:
+        Fix weird unpack behaviour in DOM.
+        Fix xinclude destruction of live attributes.
+    Embed:
+        Fixed bug GH-8533 (Unable to link dynamic libphp on Mac).
+    Fuzzer:
+        Fixed bug GH-18081 (Memory leaks in error paths of fuzzer SAPI).
+    GD:
+        Fixed bug GH-17984 (calls with arguments as array with references).
+    Intl:
+        Fix locale_compose and locale_lookup to work with their array argument with values as references.
+        Fix dateformat_format when the time is an array of references.
+        Fix UConverter::transcode with substitutes as references.
+    Mbstring:
+        Fixed bug GH-17989 (mb_output_handler crash with unset http_output_conv_mimetypes).
+    Opcache:
+        Fixed bug GH-18112 (NULL access with preloading and INI option).
+        Fixed bug GH-18107 (Opcache CFG jmp optimization with try-finally breaks the exception table).
+    PDO:
+        Fix memory leak when destroying PDORow.
+    SOAP:
+        Fixed bug #66049 (Typemap can break parsing in parse_packet_soap leading to a segfault) .
+    SPL:
+        Fixed bug GH-18018 (RC1 data returned from offsetGet causes UAF in ArrayObject).
+    Treewide:
+        Fixed bug GH-17736 (Assertion failure zend_reference_destroy()).
+    Windows:
+        Fixed bug GH-17836 (zend_vm_gen.php shouldn't break on Windows line endings).
+
+-------------------------------------------------------------------
+Fri Mar 14 06:10:13 UTC 2025 - pgajdos@suse.com
+
+- version update to 8.3.19
+    BCMath:
+        Fixed bug GH-17398 (bcmul memory leak).
+    Core:
+        Fixed bug GH-17623 (Broken stack overflow detection for variable compilation).
+        Fixed bug GH-17618 (UnhandledMatchError does not take zend.exception_ignore_args=1 into account).
+        Fix fallback paths in fast_long_{add,sub}_function.
+        Fixed bug GH-17718 (Calling static methods on an interface that has `__callStatic` is allowed).
+        Fixed bug GH-17797 (zend_test_compile_string crash on invalid script path).
+        Fixed GHSA-rwp7-7vc6-8477 (Reference counting in php_request_shutdown causes Use-After-Free). (CVE-2024-11235)
+    DOM:
+        Fixed bug GH-17847 (xinclude destroys live node).
+    FFI:
+        Fix FFI Parsing of Pointer Declaration Lists.
+    FPM:
+        Fixed bug GH-17643 (FPM with httpd ProxyPass encoded PATH_INFO env).
+    GD:
+        Fixed bug GH-17772 (imagepalettetotruecolor crash with memory_limit=2M).
+    LDAP:
+        Fixed bug GH-17704 (ldap_search fails when $attributes contains a non-packed array with numerical keys).
+    LibXML:
+        Fixed GHSA-wg4p-4hqh-c3g9 (Reocurrence of #72714).
+        Fixed GHSA-p3x9-6h7p-cgfc (libxml streams use wrong `content-type` header when requesting a redirected resource). (CVE-2025-1219)
+    MBString:
+        Fixed bug GH-17503 (Undefined float conversion in mb_convert_variables).
+    Opcache:
+        Fixed bug GH-17654 (Multiple classes using same trait causes function JIT crash).
+        Fixed bug GH-17577 (JIT packed type guard crash).
+        Fixed bug GH-17899 (zend_test_compile_string with invalid path when opcache is enabled).
+        Fixed bug GH-17868 (Cannot allocate memory with tracing JIT).
+    PDO_SQLite:
+        Fixed GH-17837 ()::getColumnMeta() on unexecuted statement segfaults).
+        Fix cycle leak in sqlite3 setAuthorizer().
+    Phar:
+        Fixed bug GH-17808: PharFileInfo refcount bug.
+    PHPDBG:
+        Partially fixed bug GH-17387 (Trivial crash in phpdbg lexer).
+        Fix memory leak in phpdbg calling registered function.
+    Reflection:
+        Fixed bug GH-15902 (Core dumped in ext/reflection/php_reflection.c).
+    Standard:
+        Fixed bug #72666 (stat cache clearing inconsistent between file:// paths and plain paths).
+    Streams:
+        Fixed bug GH-17650 (realloc with size 0 in user_filters.c).
+        Fix memory leak on overflow in _php_stream_scandir().
+        Fixed GHSA-hgf5-96fm-v528 (Stream HTTP wrapper header check might omit basic auth header). (CVE-2025-1736)
+        Fixed GHSA-52jp-hrpf-2jff (Stream HTTP wrapper truncate redirect location to 1024 bytes). (CVE-2025-1861)
+        Fixed GHSA-pcmh-g36c-qc44 (Streams HTTP wrapper does not fail for headers without colon). (CVE-2025-1734)
+        Fixed GHSA-v8xr-gpvj-cx9g (Header parser of `http` stream wrapper does not handle folded headers). (CVE-2025-1217)
+    Windows:
+        Fixed phpize for Windows 11 (24H2).
+        Fixed GH-17855 (CURL_STATICLIB flag set even if linked with shared lib).
+    Zlib:
+        Fixed bug GH-17745 (zlib extension incorrectly handles object arguments).
+        Fix memory leak when encoding check fails.
+        Fix zlib support for large files.
+- fixes: CVE-2025-1217 bsc#1239664
+         CVE-2024-11235 bsc#1239666
+         CVE-2025-1734 bsc#1239668
+         CVE-2025-1861 bsc#1239669
+         CVE-2025-1736 bsc#1239670
+         CVE-2025-1219 bsc#1239667
+
+-------------------------------------------------------------------
+Fri Feb 14 07:11:17 UTC 2025 - pgajdos@suse.com
+
+- version update to 8.3.17
+    Core:
+        Fixed bug GH-16892 (ini_parse_quantity() fails to parse inputs starting with 0x0b).
+        Fixed bug GH-16886 (ini_parse_quantity() fails to emit warning for 0x+0).
+        Fixed bug GH-17214 (Relax final+private warning for trait methods with inherited final).
+        Fixed NULL arithmetic during system program execution on Windows.
+        Fixed potential OOB when checking for trailing spaces on Windows.
+        Fixed bug GH-17408 (Assertion failure Zend/zend_exceptions.c).
+        Fix may_have_extra_named_args flag for ZEND_AST_UNPACK.
+        Fix NULL arithmetic in System V shared memory emulation for Windows.
+    DOM:
+        Fixed bug GH-17500 (Segfault with requesting nodeName on nameless doctype).
+    Enchant:
+        Fix crashes in enchant when passing null bytes.
+    FTP:
+        Fixed bug GH-16800 (ftp functions can abort with EINTR).
+    GD:
+        Fixed bug GH-17349 (Tiled truecolor filling looses single color transparency).
+        Fixed bug GH-17373 (imagefttext() ignores clipping rect for palette images).
+        Ported fix for libgd 223 (gdImageRotateGeneric() does not properly interpolate).
+    Intl:
+        Fixed bug GH-11874 (intl causing segfault in docker images).
+        Fixed bug GH-17469 (UConverter::transcode always emit E_WARNING on invalid encoding).
+    Opcache:
+        Fixed bug GH-17307 (Internal closure causes JIT failure).
+        Fixed bug GH-17564 (Potential UB when reading from / writing to struct padding).
+    PDO:
+        Fixed a memory leak when the GC is used to free a PDOStatment.
+        Fixed a crash in the PDO Firebird Statement destructor.
+        Fixed UAFs when changing default fetch class ctor args.
+    Phar:
+        Fixed bug GH-17518 (offset overflow phar extractTo()).
+    PHPDBG:
+        Fix crashes in function registration + test.
+    Session:
+        Fix type confusion with session SID constant.
+        Fixed bug GH-17541 (ext/session NULL pointer dereferencement during ID reset).
+    SimpleXML:
+        Fixed bug GH-17409 (Assertion failure Zend/zend_hash.c:1730).
+    SNMP:
+        Fixed bug GH-17330 (SNMP::setSecurity segfault on closed session).
+    SPL:
+        Fixed bug GH-17463 (crash on SplTempFileObject::ftruncate with negative value).
+    Zip:
+        Fixed bug GH-17139 (Fix zip_entry_name() crash on invalid entry).
+
+-------------------------------------------------------------------
+Fri Feb  7 09:29:53 UTC 2025 - pgajdos@suse.com
+
+- obsolete also apache2-mod_php7 bsc#1236850
+
+-------------------------------------------------------------------
+Fri Jan 17 07:28:45 UTC 2025 - pgajdos@suse.com
+
+- version update to 8.3.16
+    Core:
+        Fixed bug GH-17106 (ZEND_MATCH_ERROR misoptimization).
+        Fixed bug GH-17162 (zend_array_try_init() with dtor can cause engine UAF).
+        Fixed bug GH-17101 (AST->string does not reproduce constructor property promotion correctly).
+        Fixed bug GH-17211 (observer segfault on function loaded with dl()).
+        Fixed bug GH-17216 (Trampoline crash on error).
+    Date:
+        Fixed bug GH-14709 DatePeriod::__construct() overflow on recurrences.
+    DBA:
+        Skip test if inifile is disabled.
+    DOM:
+        Fixed bug GH-17224 (UAF in importNode).
+    Embed:
+        Make build command for program using embed portable.
+    FFI:
+        Fixed bug #79075 (FFI header parser chokes on comments).
+        Fix memory leak on ZEND_FFI_TYPE_CHAR conversion failure.
+        Fixed bug GH-16013 and bug #80857 (Big endian issues).
+    Filter:
+        Fixed bug GH-16944 (Fix filtering special IPv4 and IPv6 ranges, by using information from RFC 6890).
+    FPM:
+        Fixed bug GH-13437 (FPM: ERROR: scoreboard: failed to lock (already locked)).
+        Fixed bug GH-17112 (Macro redefinitions).
+        Fixed bug GH-17208 (bug64539-status-json-encoding.phpt fail on 32-bits).
+    GD:
+        Fixed bug GH-16255 (Unexpected nan value in ext/gd/libgd/gd_filter.c).
+        Ported fix for libgd bug 276 (Sometimes pixels are missing when storing images as BMPs).
+    Gettext:
+        Fixed bug GH-17202 (Segmentation fault ext/gettext/gettext.c bindtextdomain()).
+    Iconv:
+        Fixed bug GH-17047 (UAF on iconv filter failure).
+    LDAP:
+        Fixed bug GH-17280 (ldap_search() fails when $attributes array has holes).
+    LibXML:
+        Fixed bug GH-17223 (Memory leak in libxml encoding handling).
+    MBString:
+        Fixed bug GH-17112 (Macro redefinitions).
+    Opcache:
+        opcache_get_configuration() properly reports jit_prof_threshold.
+        Fixed bug GH-17246 (GC during SCCP causes segfault).
+    PCNTL:
+        Fix memory leak in cleanup code of pcntl_exec() when a non stringable value is encountered past the first entry.
+    PgSql:
+        Fixed bug GH-17158 (pg_fetch_result Shows Incorrect ArgumentCountError Message when Called With 1 Argument).
+        Fixed further ArgumentCountError for calls with flexible number of arguments.
+    Phar:
+        Fixed bug GH-17137 (Segmentation fault ext/phar/phar.c).
+    SimpleXML:
+        Fixed bug GH-17040 (SimpleXML's unset can break DOM objects).
+        Fixed bug GH-17153 (SimpleXML crash when using autovivification on document).
+    Sockets:
+        Fixed bug GH-16276 (socket_strerror overflow handling with INT_MIN).
+        Fixed overflow on SO_LINGER values setting, strengthening values check on SO_SNDTIMEO/SO_RCVTIMEO for socket_set_option().
+    SPL:
+        Fixed bug GH-17225 (NULL deref in spl_directory.c).
+    Streams:
+        Fixed bug GH-17037 (UAF in user filter when adding existing filter name due to incorrect error handling).
+        Fixed bug GH-16810 (overflow on fopen HTTP wrapper timeout value).
+        Fixed bug GH-17067 (glob:// wrapper doesn't cater to CWD for ZTS builds).
+    Windows:
+        Hardened proc_open() against cmd.exe hijacking.
+    XML:
+        Fixed bug GH-1718 (unreachable program point in zend_hash).
+- modified patches
+  % php-build-reproducible-phar.patch (refreshed)
+
+-------------------------------------------------------------------
+Fri Jan 10 12:12:50 UTC 2025 - pgajdos@suse.com
+
+- obsolete php7 to smooth the migration bsc#1234788
+
+-------------------------------------------------------------------
+Fri Dec 20 07:42:37 UTC 2024 - pgajdos@suse.com
+
+- version update to 8.3.15
+    Calendar:
+        Fixed jdtogregorian overflow.
+        Fixed cal_to_jd julian_days argument overflow.
+    COM:
+        Fixed bug GH-16991 (Getting typeinfo of non DISPATCH variant segfaults).
+    Core:
+        Fail early in *nix configuration build script.
+        Fixed bug GH-16727 (Opcache bad signal 139 crash in ZTS bookworm (frankenphp)).
+        Fixed bug GH-16799 (Assertion failure at Zend/zend_vm_execute.h:7469).
+        Fixed bug GH-16630 (UAF in lexer with encoding translation and heredocs).
+        Fix is_zend_ptr() huge block comparison.
+        Fixed potential OOB read in zend_dirname() on Windows.
+    Curl:
+        Fixed bug GH-16802 (open_basedir bypass using curl extension).
+        Fix various memory leaks in curl mime handling.
+    DOM:
+        Fixed bug GH-16777 (Calling the constructor again on a DOM object after it is in a document causes UAF).
+        Fixed bug GH-16906 (Reloading document can cause UAF in iterator).
+    FPM:
+        Fixed GH-16432 (PHP-FPM 8.2 SIGSEGV in fpm_get_status).
+    GD:
+        Fixed GH-16776 (imagecreatefromstring overflow).
+    GMP:
+        Fixed bug GH-16890 (array_sum() with GMP can loose precision (LLP64)).
+    Hash:
+        Fixed GH-16711: Segfault in mhash().
+    Opcache:
+        Fixed bug GH-16770 (Tracing JIT type mismatch when returning UNDEF).
+        Fixed bug GH-16851 (JIT_G(enabled) not set correctly on other threads).
+        Fixed bug GH-16902 (Set of opcache tests fail zts+aarch64).
+    OpenSSL:
+        Prevent unexpected array entry conversion when reading key.
+        Fix various memory leaks related to openssl exports.
+        Fix memory leak in php_openssl_pkey_from_zval().
+    PDO:
+        Fixed memory leak of `setFetchMode()`.
+    Phar:
+        Fixed bug GH-16695 (phar:// tar parser and zero-length file header blocks).
+    PHPDBG:
+        Fixed bug GH-15208 (Segfault with breakpoint map and phpdbg_clear()).
+    SAPI:
+        Fixed bug GH-16998 (UBSAN warning in rfc1867).
+    SimpleXML:
+        Fixed bug GH-16808 (Segmentation fault in RecursiveIteratorIterator ->current() with a xml element input).
+    SOAP:
+        Fix make check being invoked in ext/soap.
+    Standard:
+        Fixed bug GH-16905 (Internal iterator functions can't handle UNDEF properties).
+        Fixed bug GH-16957 (Assertion failure in array_shift with self-referencing array).
+    Streams:
+        Fixed network connect poll interuption handling.
+    Windows:
+        Fixed bug GH-16849 (Error dialog causes process to hang).
+- modified patches
+  % php-ar-flags.patch (refreshed)
+  % php-build-reproducible-phar.patch (refreshed)
+  % php-date-regenerate-lexers.patch (refreshed)
+  % php-systzdata-v24.patch (refreshed)
+
+-------------------------------------------------------------------
+Thu Nov 21 07:15:54 UTC 2024 - pgajdos@suse.com
+
+- version update to 8.3.14 bsc#1233644 bsc#1233651 bsc#1233703 bsc#1233702 bsc#1233705
+    CLI:
+        Fixed bug GH-16373 (Shebang is not skipped for router script in cli-server started through shebang).
+        Fixed bug GHSA-4w77-75f9-2c8w (Heap-Use-After-Free in sapi_read_post_data Processing in CLI SAPI Interface).
+    COM:
+        Fixed out of bound writes to SafeArray data.
+    Core:
+        Fixed bug GH-16168 (php 8.1 and earlier crash immediately when compiled with Xcode 16 clang on macOS 15).
+        Fixed bug GH-16371 (Assertion failure in Zend/zend_weakrefs.c:646).
+        Fixed bug GH-16515 (Incorrect propagation of ZEND_ACC_RETURN_REFERENCE for call trampoline).
+        Fixed bug GH-16509 (Incorrect line number in function redeclaration error).
+        Fixed bug GH-16508 (Incorrect line number in inheritance errors of delayed early bound classes).
+        Fixed bug GH-16648 (Use-after-free during array sorting).
+    Curl:
+        Fixed bug GH-16302 (CurlMultiHandle holds a reference to CurlHandle if curl_multi_add_handle fails).
+    Date:
+        Fixed bug GH-16454 (Unhandled INF in date_sunset() with tiny $utcOffset).
+        Fixed bug GH-14732 (date_sun_info() fails for non-finite values).
+    DBA:
+        Fixed bug GH-16390 (dba_open() can segfault for "pathless" streams).
+    DOM:
+        Fixed bug GH-16316 (DOMXPath breaks when not initialized properly).
+        Add missing hierarchy checks to replaceChild.
+        Fixed bug GH-16336 (Attribute intern document mismanagement).
+        Fixed bug GH-16338 (Null-dereference in ext/dom/node.c).
+        Fixed bug GH-16473 (dom_import_simplexml stub is wrong).
+        Fixed bug GH-16533 (Segfault when adding attribute to parent that is not an element).
+        Fixed bug GH-16535 (UAF when using document as a child).
+        Fixed bug GH-16593 (Assertion failure in DOM->replaceChild).
+        Fixed bug GH-16595 (Another UAF in DOM -> cloneNode).
+    EXIF:
+        Fixed bug GH-16409 (Segfault in exif_thumbnail when not dealing with a real file).
+    FFI:
+        Fixed bug GH-16397 (Segmentation fault when comparing FFI object).
+    Filter:
+        Fixed bug GH-16523 (FILTER_FLAG_HOSTNAME accepts ending hyphen).
+    FPM:
+        Fixed bug GH-16628 (FPM logs are getting corrupted with this log statement).
+    GD:
+        Fixed bug GH-16334 (imageaffine overflow on matrix elements).
+        Fixed bug GH-16427 (Unchecked libavif return values).
+        Fixed bug GH-16559 (UBSan abort in ext/gd/libgd/gd_interpolation.c:1007).
+    GMP:
+        Fixed floating point exception bug with gmp_pow when using large exposant values. (David Carlier).
+        Fixed bug GH-16411 (gmp_export() can cause overflow).
+        Fixed bug GH-16501 (gmp_random_bits() can cause overflow).
+        Fixed gmp_pow() overflow bug with large base/exponents.
+        Fixed segfaults and other issues related to operator overloading with GMP objects.
+    LDAP:
+        Fixed bug GHSA-g665-fm4p-vhff (OOB access in ldap_escape). (CVE-2024-8932)
+    MBstring:
+        Fixed bug GH-16361 (mb_substr overflow on start/length arguments).
+    MySQLnd:
+        Fixed bug GHSA-h35g-vwh6-m678 (Leak partial content of the heap through heap buffer over-read). (CVE-2024-8929)
+    Opcache:
+        Fixed bug GH-16408 (Array to string conversion warning emitted in optimizer).
+    OpenSSL:
+        Fixed bug GH-16357 (openssl may modify member types of certificate arrays).
+        Fixed bug GH-16433 (Large values for openssl_csr_sign() $days overflow).
+        Fix various memory leaks on error conditions in openssl_x509_parse().
+    PDO DBLIB:
+        Fixed bug GHSA-5hqh-c84r-qjcv (Integer overflow in the dblib quoter causing OOB writes). (CVE-2024-11236)
+    PDO Firebird:
+        Fixed bug GHSA-5hqh-c84r-qjcv (Integer overflow in the firebird quoter causing OOB writes). (CVE-2024-11236)
+    PDO ODBC:
+        Fixed bug GH-16450 (PDO_ODBC can inject garbage into field values).
+    Phar:
+        Fixed bug GH-16406 (Assertion failure in ext/phar/phar.c:2808).
+    PHPDBG:
+        Fixed bug GH-16174 (Empty string is an invalid expression for ev).
+    Reflection:
+        Fixed bug GH-16601 (Memory leak in Reflection constructors).
+    Session:
+        Fixed bug GH-16385 (Unexpected null returned by session_set_cookie_params).
+        Fixed bug GH-16290 (overflow on cookie_lifetime ini value).
+    SOAP:
+        Fixed bug GH-16318 (Recursive array segfaults soap encoding).
+        Fixed bug GH-16429 (Segmentation fault access null pointer in SoapClient).
+    Sockets:
+        Fixed bug with overflow socket_recvfrom $length argument.
+    SPL:
+        Fixed bug GH-16337 (Use-after-free in SplHeap).
+        Fixed bug GH-16464 (Use-after-free in SplDoublyLinkedList::offsetSet()).
+        Fixed bug GH-16479 (Use-after-free in SplObjectStorage::setInfo()).
+        Fixed bug GH-16478 (Use-after-free in SplFixedArray::unset()).
+        Fixed bug GH-16588 (UAF in Observer->serialize).
+        Fix GH-16477 (Segmentation fault when calling __debugInfo() after failed SplFileObject::__constructor).
+        Fixed bug GH-16589 (UAF in SplDoublyLinked->serialize()).
+        Fixed bug GH-14687 (segfault on SplObjectIterator instance).
+        Fixed bug GH-16604 (Memory leaks in SPL constructors).
+        Fixed bug GH-16646 (UAF in ArrayObject::unset() and ArrayObject::exchangeArray()).
+    Standard:
+        Fixed bug GH-16293 (Failed assertion when throwing in assert() callback with bail enabled).
+    Streams:
+        Fixed bug GHSA-c5f2-jwm7-mmq2 (Configuring a proxy in a stream context might allow for CRLF injection in URIs). (CVE-2024-11234)
+        Fixed bug GHSA-r977-prxv-hc43 (Single byte overread with convert.quoted-printable-decode filter). (CVE-2024-11233)
+    SysVMsg:
+        Fixed bug GH-16592 (msg_send() crashes when a type does not properly serialized).
+    SysVShm:
+        Fixed bug GH-16591 (Assertion error in shm_put_var).
+    XMLReader:
+        Fixed bug GH-16292 (Segmentation fault in ext/xmlreader/php_xmlreader.c).
+    Zlib:
+        Fixed bug GH-16326 (Memory management is broken for bad dictionaries.) (cmb)
+
+-------------------------------------------------------------------
+Thu Oct 24 18:44:22 UTC 2024 - pgajdos@suse.com
+
+- version update to 8.3.13
+    Calendar:
+        Fixed GH-16240: jdtounix overflow on argument value.
+        Fixed GH-16241: easter_days/easter_date overflow on year argument.
+        Fixed GH-16263: jddayofweek overflow.
+        Fixed GH-16234: jewishtojd overflow.
+    CLI:
+        Fixed bug GH-16137: duplicate http headers when set several times by the client.
+    Core:
+        Fixed bug GH-16054 (Segmentation fault when resizing hash table iterator list while adding).
+        Fixed bug GH-15905 (Assertion failure for TRACK_VARS_SERVER).
+        Fixed bug GH-15907 (Failed assertion when promoting Serialize deprecation to exception).
+        Fixed bug GH-15851 (Segfault when printing backtrace during cleanup of nested generator frame).
+        Fixed bug GH-15866 (Core dumped in Zend/zend_generators.c).
+        Fixed bug GH-16188 (Assertion failure in Zend/zend_exceptions.c).
+        Fixed bug GH-16233 (Observer segfault when calling user function in internal function via trampoline).
+    DOM:
+        Fixed bug GH-16039 (Segmentation fault (access null pointer) in ext/dom/parentnode/tree.c).
+        Fixed bug GH-16149 (Null pointer dereference in DOMElement->getAttributeNames()).
+        Fixed bug GH-16151 (Assertion failure in ext/dom/parentnode/tree.c).
+        Fixed bug GH-16150 (Use after free in php_dom.c).
+        Fixed bug GH-16152 (Memory leak in DOMProcessingInstruction/DOMDocument).
+    JSON:
+        Fixed bug GH-15168 (stack overflow in json_encode()).
+    GD:
+        Fixed bug GH-16232 (bitshift overflow on wbmp file content reading / fix backport from upstream).
+        Fixed bug GH-12264 (overflow/underflow on imagerotate degrees value) (David Carlier)
+        Fixed bug GH-16274 (imagescale underflow on RBG channels / fix backport from upstream).
+    LDAP:
+        Fixed bug GH-16032 (Various NULL pointer dereferencements in ldap_modify_batch()).
+        Fixed bug GH-16101 (Segfault in ldap_list(), ldap_read(), and ldap_search() when LDAPs array is not a list).
+        Fix GH-16132 (php_ldap_do_modify() attempts to free pointer not allocated by ZMM.).
+        Fix GH-16136 (Memory leak in php_ldap_do_modify() when entry is not a proper dictionary).
+    MBString:
+        Fixed bug GH-16261 (Reference invariant broken in mb_convert_variables()).
+    OpenSSL:
+        Fixed stub for openssl_csr_new.
+    PCRE:
+        Fixed bug GH-16189 (underflow on offset argument).
+        Fixed bug GH-16184 (UBSan address overflowed in ext/pcre/php_pcre.c).
+    PHPDBG:
+        Fixed bug GH-15901 (phpdbg: Assertion failure on i funcs).
+        Fixed bug GH-16181 (phpdbg: exit in exception handler reports fatal error).
+    Reflection:
+        Fixed bug GH-16187 (Assertion failure in ext/reflection/php_reflection.c).
+    SAPI:
+        Fixed bug GH-15395 (php-fpm: zend_mm_heap corrupted with cgi-fcgi request).
+    SimpleXML:
+        Fixed bug GH-15837 (Segmentation fault in ext/simplexml/simplexml.c).
+    Sockets:
+        Fixed bug GH-16267 (socket_strerror overflow on errno argument).
+    SOAP:
+        Fixed bug #73182 (PHP SOAPClient does not support stream context HTTP headers in array form).
+        Fixed bug #62900 (Wrong namespace on xsd import error message).
+        Fixed bug GH-15711 (SoapClient can't convert BackedEnum to scalar value).
+        Fixed bug GH-16237 (Segmentation fault when cloning SoapServer).
+        Fix Soap leaking http_msg on error.
+        Fixed bug GH-16256 (Assertion failure in ext/soap/php_encoding.c:460).
+        Fixed bug GH-16259 (Soap segfault when classmap instantiation fails).
+    SPL:
+        Fixed bug GH-15918 (Assertion failure in ext/spl/spl_fixedarray.c).
+    Standard:
+        Fixed bug GH-16053 (Assertion failure in Zend/zend_hash.c).
+        Fixed bug GH-15169 (stack overflow when var serialization in ext/standard/var).
+    Streams:
+        Fixed bugs GH-15908 and GH-15026 (leak / assertion failure in streams.c).
+        Fixed bug GH-15980 (Signed integer overflow in main/streams/streams.c).
+    TSRM:
+        Prevent closing of unrelated handles.
+
+-------------------------------------------------------------------
+Sat Sep 28 07:07:17 UTC 2024 - Thorsten Kukuk <kukuk@suse.com>
+
+- Add /srv/www directories to filelist bsc#1231027 
+
+-------------------------------------------------------------------
+Thu Sep 26 19:44:41 UTC 2024 - Arjen de Korte <suse+build@de-korte.org>
+
+- version update to 8.3.12 bsc#1231358, bsc#1231382, bsc#1231360
+    CGI:
+        Fixed bug GHSA-p99j-rfp4-xqvq (Bypass of CVE-2024-4577, Parameter Injection Vulnerability). (CVE-2024-8926)
+        Fixed bug GHSA-94p6-54jq-9mwp (cgi.force_redirect configuration is bypassable due to the environment variable collision). (CVE-2024-8927)
+    Core:
+        Fixed bug GH-15408 (MSan false-positve on zend_max_execution_timer).
+        Fixed bug GH-15515 (Configure error grep illegal option q).
+        Fixed bug GH-15514 (Configure error: genif.sh: syntax error).
+        Fixed bug GH-15565 (--disable-ipv6 during compilation produces error EAI_SYSTEM not found).
+        Fixed bug GH-15587 (CRC32 API build error on arm 32-bit).
+        Fixed bug GH-15330 (Do not scan generator frames more than once).
+        Fixed uninitialized lineno in constant AST of internal enums.
+    Curl:
+        Fixed bug GH-15547 (curl_multi_select overflow on timeout argument).
+    DOM:
+        Fixed bug GH-15551 (Segmentation fault (access null pointer) in ext/dom/xml_common.h).
+        Fixed bug GH-15654 (Signed integer overflow in ext/dom/nodelist.c).
+    Fileinfo:
+        Fixed bug GH-15752 (Incorrect error message for finfo_file with an empty filename argument).
+    FPM:
+        Fixed bug GHSA-865w-9rf3-2wh5 (Logs from childrens may be altered). (CVE-2024-9026)
+    MySQLnd:
+        Fixed bug GH-15432 (Heap corruption when querying a vector).
+    Opcache:
+        Fixed bug GH-15661 (Access null pointer in Zend/Optimizer/zend_inference.c).
+        Fixed bug GH-15658 (Segmentation fault in Zend/zend_vm_execute.h).
+    SAPI:
+        Fixed bug GHSA-9pqp-7h25-4f32 (Erroneous parsing of multipart form data). (CVE-2024-8925)
+    Standard:
+        Fixed bug GH-15552 (Signed integer overflow in ext/standard/scanf.c).
+    Streams:
+        Fixed bug GH-15628 (php_stream_memory_get_buffer() not zero-terminated).
+
+-------------------------------------------------------------------
+Fri Aug 30 07:19:33 UTC 2024 - pgajdos@suse.com
+
+- version update to 8.3.11
+    Core:
+        Fixed bug GH-15020 (Memory leak in Zend/Optimizer/escape_analysis.c).
+        Fixed bug GH-15023 (Memory leak in Zend/zend_ini.c).
+        Fixed bug GH-13330 (Append -Wno-implicit-fallthrough flag conditionally).
+        Fix uninitialized memory in network.c.
+        Fixed bug GH-15108 (Segfault when destroying generator during shutdown).
+        Fixed bug GH-15275 (Crash during GC of suspended generator delegate).
+    Curl:
+        Fixed case when curl_error returns an empty string.
+    DOM:
+        Fix UAF when removing doctype and using foreach iteration.
+    FFI:
+        Fixed bug GH-14286 (ffi enum type (when enum has no name) make memory leak).
+    Hash:
+        Fix crash when converting array data for array in shm in xxh3.
+    Intl:
+        Fixed bug GH-15087 (IntlChar::foldCase()'s $option is not optional).
+    Opcache:
+        Fixed bug GH-13817 (Segmentation fault for enabled observers after pass 4).
+        Fixed bug GH-13775 (Memory leak possibly related to opcache SHM placement).
+    Output:
+        Fixed bug GH-15179 (Segmentation fault (null pointer dereference) in ext/standard/url_scanner_ex.re).
+    PDO_Firebird:
+        Fix bogus fallthrough path in firebird_handle_get_attribute().
+    PHPDBG:
+        Fixed bug GH-13199 (EOF emits redundant prompt in phpdbg local console mode with libedit/readline).
+        Fixed bug GH-15268 (heap buffer overflow in phpdbg (zend_hash_num_elements() Zend/zend_hash.h)).
+        Fixed bug GH-15210 use-after-free on watchpoint allocations.
+    Soap:
+        Fixed bug #55639 (Digest autentication dont work).
+        Fix SoapFault property destruction.
+        Fixed bug GH-15252 (SOAP XML broken since PHP 8.3.9 when using classmap constructor option).
+    Standard:
+        Fix passing non-finite timeout values in stream functions.
+        Fixed GH-14780 p(f)sockopen timeout overflow.
+    Streams:
+        Fixed bug GH-15028 (Memory leak in ext/phar/stream.c).
+        Fixed bug GH-15034 (Integer overflow on stream_notification_callback byte_max parameter with files bigger than 2GB).
+        Reverted fix for GH-14930 (Custom stream wrapper dir_readdir output truncated to 255 characters).
+    Tidy:
+        Fix memory leaks in ext/tidy basedir restriction code.
+
+-------------------------------------------------------------------
+Fri Aug 16 18:01:11 UTC 2024 - Arjen de Korte <suse+build@de-korte.org>
+
+- version update to 8.3.10
+    Core:
+        Fixed bug GH-13922 (Fixed support for systems with sysconf(_SC_GETPW_R_SIZE_MAX) == -1).
+        Fixed bug GH-14626 (Fix is_zend_ptr() for huge blocks).
+        Fixed bug GH-14590 (Memory leak in FPM test gh13563-conf-bool-env.phpt.
+        Fixed OSS-Fuzz #69765.
+        Fixed bug GH-14741 (Segmentation fault in Zend/zend_types.h).
+        Fixed bug GH-14969 (Use-after-free in property coercion with __toString()).
+    Dom:
+        Fixed bug GH-14702 (DOMDocument::xinclude() crash).
+    Fileinfo:
+        Fixed bug GH-14888 (README.REDIST.BINS refers to non-existing LICENSE).
+    Gd:
+        ext/gd/tests/gh10614.phpt: skip if no PNG support.
+        restored warning instead of fata error.
+    LibXML:
+        Fixed bug GH-14563 (Build failure with libxml2 v2.13.0).
+    Opcache:
+        Fixed bug GH-14550 (No warning message when Zend DTrace is enabled that opcache.jit is implictly disabled).
+    Output:
+        Fixed bug GH-14808 (Unexpected null pointer in Zend/zend_string.h with empty output buffer).
+    PDO:
+        Fixed bug GH-14712 (Crash with PDORow access to null property).
+    Phar:
+        Fixed bug GH-14603 (null string from zip entry).
+    PHPDBG:
+        Fixed bug GH-14596 (crashes with ASAN and ZEND_RC_DEBUG=1).
+        Fixed bug GH-14553 (echo output trimmed at NULL byte).
+    Shmop:
+        Fixed bug GH-14537 (shmop Windows 11 crashes the process).
+    SPL:
+        Fixed bug GH-14639 (Member access within null pointer in ext/spl/spl_observer.c).
+    Standard:
+        Fixed bug GH-14775 (range function overflow with negative step argument).
+        Fix 32-bit wordwrap test failures.
+        Fixed bug GH-14774 (time_sleep_until overflow).
+    Streams:
+        Fixed bug GH-14930 (Custom stream wrapper dir_readdir output truncated to 255 characters in PHP 8.3).
+    Tidy:
+        Fix memory leak in tidy_repair_file().
+    Treewide:
+        Fix compatibility with libxml2 2.13.2.
+    XML:
+        Move away from to-be-deprecated libxml fields.
+        Fixed bug GH-14834 (Error installing PHP when --with-pear is used).
+
+-------------------------------------------------------------------
+Sun Jul  7 19:56:45 UTC 2024 - pgajdos@suse.com
+
+- version update to 8.3.9
+    Core:
+        Fixed bug GH-14315 (Incompatible pointer type warnings).
+        Fixed bug GH-12814 (max_execution_time reached too early on MacOS 14 when running on Apple Silicon).
+        Fixed bug GH-14387 (Crash when stack walking in destructor of yielded from values during Generator->throw()).
+        Fixed bug GH-14456 (Attempting to initialize class with private constructor calls destructor).
+        Fixed bug GH-14510 (memleak due to missing pthread_attr_destroy()-call).
+        Fixed bug GH-14549 (Incompatible function pointer type for fclose).
+    BCMatch:
+        Fixed bug (bcpowmod() with mod = -1 returns 1 when it must be 0).
+    Curl:
+        Fixed bug GH-14307 (Test curl_basic_024 fails with curl 8.8.0).
+    DOM:
+        Fixed bug GH-14343 (Memory leak in xml and dom).
+    FPM:
+        Fixed bug GH-14037 (PHP-FPM ping.path and ping.response config vars are ignored in status pool).
+    GD:
+        Fix parameter numbers for imagecolorset().
+    Intl:
+        Fix reference handling in SpoofChecker.
+    MySQLnd:
+        Partially fix bug GH-10599 (Apache crash on Windows when using a self-referencing anonymous function inside a class with an active mysqli connection).
+    Opcache:
+        Fixed bug GH-14267 (opcache.jit=off does not allow enabling JIT at runtime).
+        Fixed TLS access in JIT on FreeBSD/amd64.
+        Fixed bug GH-11188 (Error when building TSRM in ARM64).
+    PDO ODBC:
+        Fixed bug GH-14367 (incompatible SDWORD type with iODBC).
+    PHPDBG:
+        Fixed bug GH-13681 (segfault on watchpoint addition failure).
+    Soap:
+        Fixed bug #47925 (PHPClient can't decompress response).
+        Fix missing error restore code.
+        Fix memory leak if calling SoapServer::setObject() twice.
+        Fix memory leak if calling SoapServer::setClass() twice.
+        Fix reading zlib ini settings in ext-soap.
+        Fix memory leaks with string function name lookups.
+        Fixed bug #69280 (SoapClient classmap doesn't support fully qualified class name).
+        Fixed bug #76232 (SoapClient Cookie Header Semicolon).
+        Fixed memory leaks when calling SoapFault::__construct() twice.
+    Sodium:
+        Fix memory leaks in ext/sodium on failure of some functions.
+    SPL:
+        Fixed bug GH-14290 (Member access within null pointer in extension spl).
+    Standard:
+        Fixed bug GH-14483 (Fixed off-by-one error in checking length of abstract namespace Unix sockets).
+    Streams:
+        Fixed bug GH-11078 (PHP Fatal error triggers pointer being freed was not allocated and malloc: double free for ptr errors).
+
+-------------------------------------------------------------------
+Thu Jun 20 09:35:17 UTC 2024 - pgajdos@suse.com
+
+- drop unmaintained apache-rex usage
+
+-------------------------------------------------------------------
+Fri Jun  7 07:02:10 UTC 2024 - pgajdos@suse.com
+
+- version update to 8.3.8 bsc#1226073
+    CGI:
+        Fixed buffer limit on Windows, replacing read call usage by _read.
+        Fixed bug GHSA-3qgc-jrrr-25jv (Bypass of CVE-2012-1823, Argument Injection in PHP-CGI). (CVE-2024-4577)
+    CLI:
+        Fixed bug GH-14189 (PHP Interactive shell input state incorrectly handles quoted heredoc literals.).
+    Core:
+        Fixed bug GH-13970 (Incorrect validation of #Attribute flags type for non-compile-time expressions).
+    DOM:
+        Fix crashes when entity declaration is removed while still having entity references.
+        Fix references not handled correctly in C14N.
+        Fix crash when calling childNodes next() when iterator is exhausted.
+        Fix crash in ParentNode::append() when dealing with a fragment containing text nodes.
+    Filter:
+        Fixed bug GHSA-w8qr-v226-r27w (Filter bypass in filter_var FILTER_VALIDATE_URL). (CVE-2024-5458)
+    FPM:
+        Fix bug GH-14175 (Show decimal number instead of scientific notation in systemd status).
+    Hash:
+        ext/hash: Swap the checking order of `__has_builtin` and `__GNUC__` (Saki Takamachi)
+    Intl:
+        Fixed build regression on systems without C++17 compilers.
+    MySQLnd:
+        Fix bug GH-14255 (mysqli_fetch_assoc reports error from nested query).
+    Opcache:
+        Fixed bug GH-14109 (Fix accidental persisting of internal class constant in shm).
+    OpenSSL:
+        The openssl_private_decrypt function in PHP and Marvin attack.
+    Standard:
+        Fixed bug GHSA-9fcc-425m-g385 (Bypass of CVE-2024-1874). (CVE-2024-5585)
+    XML:
+        Fixed bug GH-14124 (Segmentation fault with XML extension under certain memory limit).
+    XMLReader:
+        Fixed bug GH-14183 (XMLReader::open() can't be overridden).
+- modified patches
+  % php-build-reproducible-phar.patch (refreshed)
+
+-------------------------------------------------------------------
 Tue Jun  4 08:38:33 UTC 2024 - Angelo Grossini <angelo@intercom.it>
 
 - use correct php_vhng_branch version 8.3
@@ -62,7 +805,7 @@
 -------------------------------------------------------------------
 Fri Apr 12 07:37:23 UTC 2024 - pgajdos@suse.com
 
-- version update to 8.3.6
+- version update to 8.3.6 bsc#1222857 bsc#1222858
     Core:
         Fixed GH-13569 (GC buffer unnecessarily grows up to GC_MAX_BUF_SIZE when scanning WeakMaps).
         Fixed bug GH-13612 (Corrupted memory in destructor with weak references).

php8.spec Changed

@@ -1,7 +1,7 @@
 #
 # spec file for package php8
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -58,7 +58,7 @@
 %bcond_without	sodium
 
 Name:           %{pprefix}%{php_name}%{psuffix}
-Version:        8.3.7
+Version:        8.3.21
 Release:        0
 Summary:        Interpreter for the PHP scripting language version 8
 License:        MIT AND PHP-3.01
@@ -163,11 +163,9 @@
 BuildRequires:  pkgconfig(libargon2)
 %endif
 %if "%{flavor}" == "test"
-BuildRequires:  apache-rex
 BuildRequires:  mod_php_any = %{version}
 BuildRequires:  php-cli = %{version}
 BuildRequires:  php-fpm = %{version}
-%apache_rex_deps
 %endif
 
 %if "%{flavor}" == ""
@@ -219,8 +217,10 @@
 Provides:       php-xml(vhng) = %{php_vhng_branch}
 Provides:       zend = %{zendver}
 # conflicts other php major versions with and should replace it
-Conflicts:      php < %{version}
-Conflicts:      php72
+Obsoletes:      php < %{version}
+Obsoletes:      php7
+Obsoletes:      php72
+Obsoletes:      php74
 # mcrypt was removed in php 7.2
 Obsoletes:      php7-mcrypt
 # json is now integral part of core, cannot be disabled
@@ -246,6 +246,7 @@
 Provides:       php-sapi = %{version}
 Provides:       php-sapi(vhng) = %{php_vhng_branch}
 Conflicts:      php-cli < %{version}
+Obsoletes:      php7-cli
 
 %description cli
 PHP is a server-side HTML embedded scripting language designed
@@ -270,8 +271,8 @@
 Requires:       pkgconfig(libxml-2.0) >= 2.9.0
 Provides:       php-devel = %{version}
 Provides:       php-devel(vhng) = %{php_vhng_branch}
-Provides:       php-devel(vhng) = %{php_vhng_branch}
 Conflicts:      php-devel < %{version}
+Obsoletes:      php7-devel
 
 %description devel
 PHP is a server-side HTML embedded scripting language designed
@@ -302,6 +303,7 @@
 Provides:       mod_php_any = %{version}
 Provides:       php-sapi = %{version}
 Provides:       php-sapi(vhng) = %{php_vhng_branch}
+Obsoletes:      apache2-mod_php7
 Obsoletes:      mod_php_any < %{version}
 
 %description
@@ -327,6 +329,7 @@
 Provides:       php-sapi = %{version}
 Provides:       php-sapi(vhng) = %{php_vhng_branch}
 Conflicts:      php-fastcgi < %{version}
+Obsoletes:      php7-fastcgi
 
 %description
 PHP is a server-side, cross-platform HTML embedded scripting language.
@@ -349,6 +352,8 @@
 Provides:       php-sapi = %{version}
 Provides:       php-sapi(vhng) = %{php_vhng_branch}
 Conflicts:      php-fpm < %{version}
+Obsoletes:      php7-fpm
+
 %{?systemd_ordering}
 
 %description
@@ -401,6 +406,7 @@
 Provides:       php-bcmath = %{version}
 Provides:       php-bcmath(vhng) = %{php_vhng_branch}
 Obsoletes:      php-bcmath < %{version}
+Obsoletes:      php7-bcmath
 
 %description bcmath
 Binary Calculator which supports numbers of any size and precision,
@@ -413,6 +419,7 @@
 Provides:       php-bz2 = %{version}
 Provides:       php-bz2(vhng) = %{php_vhng_branch}
 Obsoletes:      php-bz2 < %{version}
+Obsoletes:      php7-bz2
 
 %description bz2
 PHP functions to read and write bzip2 (.bz2) compressed files.
@@ -424,6 +431,7 @@
 Provides:       php-calendar = %{version}
 Provides:       php-calendar(vhng) = %{php_vhng_branch}
 Obsoletes:      php-calendar < %{version}
+Obsoletes:      php7-calendar
 
 %description calendar
 PHP functions for converting between different calendar formats.
@@ -435,6 +443,7 @@
 Provides:       php-ctype = %{version}
 Provides:       php-ctype(vhng) = %{php_vhng_branch}
 Obsoletes:      php-ctype < %{version}
+Obsoletes:      php7-ctype
 
 %description ctype
 PHP functions for checking whether a character or string falls into a
@@ -447,6 +456,7 @@
 Provides:       php-curl = %{version}
 Provides:       php-curl(vhng) = %{php_vhng_branch}
 Obsoletes:      php-curl < %{version}
+Obsoletes:      php7-curl
 
 %description curl
 PHP interface to libcurl that allows you to connect to and communicate
@@ -460,6 +470,7 @@
 Provides:       php-dba = %{version}
 Provides:       php-dba(vhng) = %{php_vhng_branch}
 Obsoletes:      php-dba < %{version}
+Obsoletes:      php7-dba
 
 %description dba
 This is a general abstraction layer for several file-based databases.
@@ -488,6 +499,7 @@
 Provides:       php-dom = %{version}
 Provides:       php-dom(vhng) = %{php_vhng_branch}
 Obsoletes:      php-dom < %{version}
+Obsoletes:      php7-dom
 
 %description dom
 This module adds Document Object Model (DOM) support.
@@ -501,6 +513,7 @@
 Obsoletes:      php-enchant < %{version}
 # Obsolete pspell plugin as enchant is favored solution (goodbye aspell)
 Obsoletes:      php7-pspell
+Obsoletes:      php7-enchant
 
 %description enchant
 Enchant is the PHP binding for the Enchant library. Enchant steps in
@@ -517,6 +530,7 @@
 Provides:       php-exif = %{version}
 Provides:       php-exif(vhng) = %{php_vhng_branch}
 Obsoletes:      php-exif < %{version}
+Obsoletes:      php7-exif
 
 %description exif
 PHP functions for extracting EXIF (Exchangable Image File Format;
@@ -529,6 +543,7 @@
 Requires:       php = %{version}
 Provides:       php-ffi = %{version}
 Provides:       php-ffi(vhng) = %{php_vhng_branch}
+Obsoletes:      php7-ffi
 
 %description ffi
 This extension allows the loading of shared libraries (.DLL or .so),
@@ -543,6 +558,7 @@
 Provides:       php-fileinfo = %{version}
 Provides:       php-fileinfo(vhng) = %{php_vhng_branch}
 Obsoletes:      php-fileinfo < %{version}
+Obsoletes:      php7-fileinfo
 
 %description fileinfo
 The functions in this module try to guess the content type and
@@ -557,6 +573,7 @@
 Provides:       php-ftp = %{version}
 Provides:       php-ftp(vhng) = %{php_vhng_branch}
 Obsoletes:      php-ftp < %{version}
+Obsoletes:      php7-ftp
 
 %description ftp
 PHP functions for access to file servers speaking the File Transfer
@@ -569,6 +586,7 @@
 Provides:       php-gd = %{version}
 Provides:       php-gd(vhng) = %{php_vhng_branch}
 Obsoletes:      php-gd < %{version}
+Obsoletes:      php7-gd
 
 %description gd
 PHP functions to create and manipulate image files in a variety of
@@ -582,6 +600,7 @@
 Provides:       php-gettext = %{version}
 Provides:       php-gettext(vhng) = %{php_vhng_branch}
 Obsoletes:      php-gettext < %{version}
+Obsoletes:      php7-gettext
 
 %description gettext
 PHP functions that implement a Native Language Support (NLS) API which
@@ -594,6 +613,7 @@
 Provides:       php-gmp = %{version}
 Provides:       php-gmp(vhng) = %{php_vhng_branch}
 Obsoletes:      php-gmp < %{version}
+Obsoletes:      php7-gmp
 
 %description gmp
 PHP functions for work with arbitrary-length integers using the GNU MP
@@ -606,6 +626,7 @@
 Provides:       php-iconv = %{version}
 Provides:       php-iconv(vhng) = %{php_vhng_branch}
 Obsoletes:      php-iconv < %{version}
+Obsoletes:      php7-iconv
 
 %description iconv
 This module contains an interface to iconv character set conversion
@@ -621,6 +642,7 @@
 Provides:       php-intl = %{version}
 Provides:       php-intl(vhng) = %{php_vhng_branch}
 Obsoletes:      php-intl < %{version}
+Obsoletes:      php7-intl
 
 %description intl
 The internationalization (intl) extension is a wrapper for the ICU
@@ -635,6 +657,7 @@
 Provides:       php-ldap = %{version}
 Provides:       php-ldap(vhng) = %{php_vhng_branch}
 Obsoletes:      php-ldap < %{version}
+Obsoletes:      php7-ldap
 
 %description ldap
 PHP interface to the Lightweight Directory Access Protocol (LDAP).
@@ -646,6 +669,7 @@
 Provides:       php-mbstring = %{version}
 Provides:       php-mbstring(vhng) = %{php_vhng_branch}
 Obsoletes:      php-mbstring < %{version}
+Obsoletes:      php7-mbstring
 
 %description mbstring
 mbstring provides multibyte specific string functions that help
@@ -667,6 +691,7 @@
 Provides:       php-pdo_mysql(vhng) = %{php_vhng_branch}
 Provides:       php_any_db = %{version}
 Obsoletes:      php-mysql < %{version}
+Obsoletes:      php7-mysql
 
 %description mysql
 PHP functions for access to MySQL database servers.
@@ -681,6 +706,7 @@
 Provides:       php-firebird(vhng) = %{php_vhng_branch}
 Provides:       php_any_db = %{version}
 Obsoletes:      php-firebird < %{version}
+Obsoletes:      php7-firebird
 
 %description firebird
 PHP functions for access to firebird database servers.
@@ -696,6 +722,7 @@
 Provides:       php-pdo_odbc = %{version}
 Provides:       php-pdo_odbc(vhng) = %{php_vhng_branch}
 Obsoletes:      php-odbc < %{version}
+Obsoletes:      php7-odbc
 
 %description odbc
 This module adds Open Database Connectivity (ODBC) support.
@@ -707,6 +734,7 @@
 Provides:       php-opcache = %{version}
 Provides:       php-opcache(vhng) = %{php_vhng_branch}
 Obsoletes:      php-opcache < %{version}
+Obsoletes:      php7-opcache
 
 %description opcache
 OPcache improves PHP performance by storing precompiled script
@@ -720,6 +748,7 @@
 Provides:       php-openssl = %{version}
 Provides:       php-openssl(vhng) = %{php_vhng_branch}
 Obsoletes:      php-openssl < %{version}
+Obsoletes:      php7-openssl
 
 %description openssl
 This extension binds functions of OpenSSL library for symmetric and
@@ -734,6 +763,7 @@
 Provides:       php-pcntl = %{version}
 Provides:       php-pcntl(vhng) = %{php_vhng_branch}
 Obsoletes:      php-pcntl < %{version}
+Obsoletes:      php7-pcntl
 
 %description pcntl
 Process Control support in PHP implements the Unix style of process
@@ -748,6 +778,7 @@
 Provides:       php-phar = %{version}
 Provides:       php-phar(vhng) = %{php_vhng_branch}
 Conflicts:      php-phar < %{version}
+Obsoletes:      php7-phar
 
 %description phar
 The phar extension provides a way to put entire PHP applications into
@@ -767,6 +798,7 @@
 Provides:       php-pdo = %{version}
 Provides:       php-pdo(vhng) = %{php_vhng_branch}
 Obsoletes:      php-pdo < %{version}
+Obsoletes:      php7-pdo
 
 %description pdo
 The PHP Data Objects (PDO) extension defines an interface for
@@ -791,6 +823,7 @@
 Provides:       php-pgsql(vhng) = %{php_vhng_branch}
 Provides:       php_any_db = %{version}
 Obsoletes:      php-pgsql < %{version}
+Obsoletes:      php7-pgsql
 
 %description pgsql
 PHP functions for access to PostgreSQL database servers. It includes
@@ -803,6 +836,7 @@
 Provides:       php-posix = %{version}
 Provides:       php-posix(vhng) = %{php_vhng_branch}
 Obsoletes:      php-posix < %{version}
+Obsoletes:      php7-posix
 
 %description posix
 This module contains an interface to those functions defined in the
@@ -816,6 +850,7 @@
 Provides:       php-readline = %{version}
 Provides:       php-readline(vhng) = %{php_vhng_branch}
 Obsoletes:      php-readline < %{version}
+Obsoletes:      php7-readline
 
 %description readline
 PHP interface to libedit, which provides editable command line as well
@@ -828,6 +863,7 @@
 Provides:       php-shmop = %{version}
 Provides:       php-shmop(vhng) = %{php_vhng_branch}
 Obsoletes:      php-shmop < %{version}
+Obsoletes:      php7-shmop
 
 %description shmop
 An extension created as an alternative to the sysvmsg module.
@@ -839,6 +875,7 @@
 Provides:       php-snmp = %{version}
 Provides:       php-snmp(vhng) = %{php_vhng_branch}
 Obsoletes:      php-snmp < %{version}
+Obsoletes:      php7-snmp
 
 %description snmp
 The SNMP extension provides a toolset for managing remote devices via
@@ -856,6 +893,7 @@
 Provides:       php-soap = %{version}
 Provides:       php-soap(vhng) = %{php_vhng_branch}
 Obsoletes:      php-soap < %{version}
+Obsoletes:      php7-soap
 
 %description soap
 This module provides SOAP support.
@@ -870,6 +908,7 @@
 Provides:       php-sockets = %{version}
 Provides:       php-sockets(vhng) = %{php_vhng_branch}
 Obsoletes:      php-sockets < %{version}
+Obsoletes:      php7-sockets
 
 %description sockets
 The socket extension implements a low-level interface to the socket
@@ -884,6 +923,7 @@
 Provides:       php-sodium = %{version}
 Provides:       php-sodium(vhng) = %{php_vhng_branch}
 Obsoletes:      php-sodium < %{version}
+Obsoletes:      php7-sodium
 
 %description sodium
 PHP binding to libsodium software library for encryption, decryption,
@@ -900,6 +940,7 @@
 Provides:       php-sqlite = %{version}
 Provides:       php-sqlite(vhng) = %{php_vhng_branch}
 Obsoletes:      php-sqlite < %{version}
+Obsoletes:      php7-sqlite
 
 %description sqlite
 This is an extension for the SQLite Embeddable SQL Database Engine.
@@ -923,6 +964,7 @@
 Provides:       php-sysvmsg = %{version}
 Provides:       php-sysvmsg(vhng) = %{php_vhng_branch}
 Obsoletes:      php-sysvmsg < %{version}
+Obsoletes:      php7-sysvmsg
 
 %description sysvmsg
 This module provides System V Message Queue support.
@@ -934,6 +976,7 @@
 Provides:       php-sysvsem = %{version}
 Provides:       php-sysvsem(vhng) = %{php_vhng_branch}
 Obsoletes:      php-sysvsem < %{version}
+Obsoletes:      php7-sysvsem
 
 %description sysvsem
 PHP interface for System V semaphores.
@@ -945,6 +988,7 @@
 Provides:       php-sysvshm = %{version}
 Provides:       php-sysvshm(vhng) = %{php_vhng_branch}
 Obsoletes:      php-sysvshm < %{version}
+Obsoletes:      php7-sysvshm
 
 %description sysvshm
 PHP interface for System V shared memory.
@@ -956,6 +1000,7 @@
 Provides:       php-tidy = %{version}
 Provides:       php-tidy(vhng) = %{php_vhng_branch}
 Obsoletes:      php-tidy < %{version}
+Obsoletes:      php7-tidy
 
 %description tidy
 Tidy is an extension based on Libtidy (http://tidy.sourceforge.net) and allows
@@ -970,6 +1015,7 @@
 Provides:       php-tokenizer = %{version}
 Provides:       php-tokenizer(vhng) = %{php_vhng_branch}
 Obsoletes:      php-tokenizer < %{version}
+Obsoletes:      php7-tokenizer
 
 %description tokenizer
 The tokenizer functions provide an interface to the PHP tokenizer
@@ -985,6 +1031,7 @@
 Provides:       php-xsl = %{version}
 Provides:       php-xsl(vhng) = %{php_vhng_branch}
 Obsoletes:      php-xsl < %{version}
+Obsoletes:      php7-xsl
 
 %description xsl
 PHP's XSL extension implements the XSL (Extensible Stylesheet
@@ -999,6 +1046,7 @@
 Provides:       php-xmlreader = %{version}
 Provides:       php-xmlreader(vhng) = %{php_vhng_branch}
 Obsoletes:      php-xmlreader < %{version}
+Obsoletes:      php7-xmlreader
 
 %description xmlreader
 The XMLReader extension is an XML Pull parser. The reader acts as a
@@ -1012,6 +1060,7 @@
 Provides:       php-xmlwriter = %{version}
 Provides:       php-xmlwriter(vhng) = %{php_vhng_branch}
 Obsoletes:      php-xmlwriter < %{version}
+Obsoletes:      php7-xmlwriter
 
 %description xmlwriter
 XMLWriter wraps the libxml xmlWriter API. Represents a writer that
@@ -1025,6 +1074,7 @@
 Provides:       php-zip = %{version}
 Provides:       php-zip(vhng) = %{php_vhng_branch}
 Obsoletes:      php-zip < %{version}
+Obsoletes:      php7-zip
 
 %description zip
 This extension allows to transparently read or write ZIP compressed
@@ -1037,6 +1087,7 @@
 Provides:       php-zlib = %{version}
 Provides:       php-zlib(vhng) = %{php_vhng_branch}
 Obsoletes:      php-zlib < %{version}
+Obsoletes:      php7-zlib
 
 %description zlib
 This module enables to transparently read and write gzip (.gz)
@@ -1295,13 +1346,13 @@
     --disable-cgi
 %endif
 
+%if "%{flavor}" == "test"
 %check
 %if %{with asan}
 # no need for ASAN build
 exit 0
 %endif
 
-%if "%{flavor}" == "test"
 # Run tests, using the CLI SAPI
 export NO_INTERACTION=1 REPORT_EXIT_STATUS=1 LANG=POSIX LC_ALL=POSIX
 unset TZ
@@ -1315,9 +1366,6 @@
 done
 set -x
 unset NO_INTERACTION REPORT_EXIT_STATUS
-# Apache HTTPD runnable examples test
-%apache_rex_check -m libs mod_php-basic
-%apache_rex_check -m libs -b sapi/fpm mod_proxy_fcgi-php-fpm mod_proxy_fcgi-php-fpm-auth-RewriteRule mod_proxy_fcgi-php-fpm-CGIPassAuth
 exit 0
 %endif
 
@@ -1541,6 +1589,8 @@
 %dir %{php_sysconf}/fastcgi
 %{_bindir}/php-cgi
 %{_mandir}/man1/php-cgi.1%{?ext_man}
+%dir %{apache_serverroot}
+%dir %{apache_serverroot}/cgi-bin
 %{apache_serverroot}/cgi-bin/php
 %endif

php-ar-flags.patch Changed

php-build-reproducible-phar.patch Changed

@@ -16,11 +16,11 @@
  ext/phar/zip.c           |  2 +-
  6 files changed, 18 insertions(+), 5 deletions(-)
 
-Index: php-8.3.3/ext/phar/phar.c
+Index: php-8.3.16/ext/phar/phar.c
 ===================================================================
---- php-8.3.3.orig/ext/phar/phar.c
-+++ php-8.3.3/ext/phar/phar.c
-@@ -2993,7 +2993,7 @@ int phar_flush(phar_archive_data *phar,
+--- php-8.3.16.orig/ext/phar/phar.c
++++ php-8.3.16/ext/phar/phar.c
+@@ -2997,7 +2997,7 @@ int phar_flush(phar_archive_data *phar,
  			4: metadata-len
  			+: metadata
  		*/
@@ -29,10 +29,10 @@
  		phar_set_32(entry_buffer, entry->uncompressed_filesize);
  		phar_set_32(entry_buffer+4, mytime);
  		phar_set_32(entry_buffer+8, entry->compressed_filesize);
-Index: php-8.3.3/ext/phar/phar_internal.h
+Index: php-8.3.16/ext/phar/phar_internal.h
 ===================================================================
---- php-8.3.3.orig/ext/phar/phar_internal.h
-+++ php-8.3.3/ext/phar/phar_internal.h
+--- php-8.3.16.orig/ext/phar/phar_internal.h
++++ php-8.3.16/ext/phar/phar_internal.h
 @@ -427,6 +427,21 @@ static inline enum phar_fp_type phar_get
  	return PHAR_G(cached_fp)entry->phar->phar_pos.manifestentry->manifest_pos.fp_type;
  }
@@ -55,10 +55,10 @@
  static inline zend_off_t phar_get_fp_offset(phar_entry_info *entry)
  {
  	if (!entry->is_persistent) {
-Index: php-8.3.3/ext/phar/stream.c
+Index: php-8.3.16/ext/phar/stream.c
 ===================================================================
---- php-8.3.3.orig/ext/phar/stream.c
-+++ php-8.3.3/ext/phar/stream.c
+--- php-8.3.16.orig/ext/phar/stream.c
++++ php-8.3.16/ext/phar/stream.c
 @@ -474,7 +474,7 @@ static int phar_stream_flush(php_stream
  	phar_entry_data *data = (phar_entry_data *) stream->abstract;
  
@@ -68,11 +68,11 @@
  		ret = phar_flush(data->phar, 0, 0, 0, &error);
  		if (error) {
  			php_stream_wrapper_log_error(stream->wrapper, REPORT_ERRORS, "%s", error);
-Index: php-8.3.3/ext/phar/tar.c
+Index: php-8.3.16/ext/phar/tar.c
 ===================================================================
---- php-8.3.3.orig/ext/phar/tar.c
-+++ php-8.3.3/ext/phar/tar.c
-@@ -965,7 +965,7 @@ int phar_tar_flush(phar_archive_data *ph
+--- php-8.3.16.orig/ext/phar/tar.c
++++ php-8.3.16/ext/phar/tar.c
+@@ -969,7 +969,7 @@ int phar_tar_flush(phar_archive_data *ph
  	char halt_stub = "__HALT_COMPILER();";
  
  	entry.flags = PHAR_ENT_PERM_DEF_FILE;
@@ -81,10 +81,10 @@
  	entry.is_modified = 1;
  	entry.is_crc_checked = 1;
  	entry.is_tar = 1;
-Index: php-8.3.3/ext/phar/util.c
+Index: php-8.3.16/ext/phar/util.c
 ===================================================================
---- php-8.3.3.orig/ext/phar/util.c
-+++ php-8.3.3/ext/phar/util.c
+--- php-8.3.16.orig/ext/phar/util.c
++++ php-8.3.16/ext/phar/util.c
 @@ -584,7 +584,7 @@ phar_entry_data *phar_get_or_create_entr
  
  	phar_add_virtual_dirs(phar, path, path_len);
@@ -94,10 +94,10 @@
  	etemp.is_crc_checked = 1;
  	etemp.phar = phar;
  	etemp.filename = estrndup(path, path_len);
-Index: php-8.3.3/ext/phar/zip.c
+Index: php-8.3.16/ext/phar/zip.c
 ===================================================================
---- php-8.3.3.orig/ext/phar/zip.c
-+++ php-8.3.3/ext/phar/zip.c
+--- php-8.3.16.orig/ext/phar/zip.c
++++ php-8.3.16/ext/phar/zip.c
 @@ -1236,7 +1236,7 @@ int phar_zip_flush(phar_archive_data *ph
  
  	pass.error = &temperr;

php-date-regenerate-lexers.patch Changed

@@ -1,8 +1,8 @@
-Index: php-8.2.7/ext/date/config0.m4
+Index: php-8.3.15/ext/date/config0.m4
 ===================================================================
---- php-8.2.7.orig/ext/date/config0.m4
-+++ php-8.2.7/ext/date/config0.m4
-@@ -23,6 +23,8 @@ timelib_sources="lib/astro.c lib/dow.c l
+--- php-8.3.15.orig/ext/date/config0.m4
++++ php-8.3.15/ext/date/config0.m4
+@@ -27,6 +27,8 @@ timelib_sources="lib/astro.c lib/dow.c l
  
  PHP_NEW_EXTENSION(date, php_date.c $timelib_sources, no,, $PHP_DATE_CFLAGS)
  
@@ -11,10 +11,10 @@
  PHP_ADD_BUILD_DIR($ext_builddir/lib, 1)
  PHP_ADD_INCLUDE($ext_builddir/lib)
  PHP_ADD_INCLUDE($ext_srcdir/lib)
-Index: php-8.2.7/ext/date/Makefile.frag
+Index: php-8.3.15/ext/date/Makefile.frag
 ===================================================================
 --- /dev/null
-+++ php-8.2.7/ext/date/Makefile.frag
++++ php-8.3.15/ext/date/Makefile.frag
 @@ -0,0 +1,6 @@
 +$(srcdir)/lib/parse_date.c: $(srcdir)/lib/parse_date.re
 +	@(cd $(top_srcdir); $(RE2C) $(RE2C_FLAGS) -b --no-generation-date -o ext/date/lib/parse_date.c ext/date/lib/parse_date.re)

php-systzdata-v24.patch Changed

@@ -36,10 +36,10 @@
 r1: initial revision
 
 
-diff --git a/ext/date/config0.m4 b/ext/date/config0.m4
-index 6b803bf33e..53c3cdb3f4 100644
---- a/ext/date/config0.m4
-+++ b/ext/date/config0.m4
+Index: php-8.3.15/ext/date/config0.m4
+===================================================================
+--- php-8.3.15.orig/ext/date/config0.m4
++++ php-8.3.15/ext/date/config0.m4
 @@ -4,6 +4,19 @@ AC_CHECK_HEADERS(io.h)
  dnl Check for strtoll, atoll
  AC_CHECK_FUNCS(strtoll atoll)
@@ -57,13 +57,13 @@
 +   fi
 +fi
 +
- PHP_DATE_CFLAGS="-Wno-implicit-fallthrough -I@ext_builddir@/lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 -DHAVE_TIMELIB_CONFIG_H=1"
- timelib_sources="lib/astro.c lib/dow.c lib/parse_date.c lib/parse_tz.c lib/parse_posix.c
-                  lib/timelib.c lib/tm2unixtime.c lib/unixtime2tm.c lib/parse_iso_intervals.c lib/interval.c"
-diff --git a/ext/date/lib/parse_tz.c b/ext/date/lib/parse_tz.c
-index c7f93580d7..ec196a98b6 100644
---- a/ext/date/lib/parse_tz.c
-+++ b/ext/date/lib/parse_tz.c
+ AX_CHECK_COMPILE_FLAG(-Wno-implicit-fallthrough,
+   PHP_DATE_CFLAGS="$PHP_DATE_CFLAGS -Wno-implicit-fallthrough",,
+   -Werror)
+Index: php-8.3.15/ext/date/lib/parse_tz.c
+===================================================================
+--- php-8.3.15.orig/ext/date/lib/parse_tz.c
++++ php-8.3.15/ext/date/lib/parse_tz.c
 @@ -26,9 +26,33 @@
  #include "timelib.h"
  #include "timelib_private.h"
@@ -98,7 +98,7 @@
  
  #if (defined(__APPLE__) || defined(__APPLE_CC__)) && (defined(__BIG_ENDIAN__) || defined(__LITTLE_ENDIAN__))
  # if defined(__LITTLE_ENDIAN__)
-@@ -95,6 +119,11 @@ static int read_php_preamble(const unsigned char **tzf, timelib_tzinfo *tz)
+@@ -95,6 +119,11 @@ static int read_php_preamble(const unsig
  {
  	uint32_t version;
  
@@ -110,7 +110,7 @@
  	/* read ID */
  	version = (*tzf)3 - '0';
  	*tzf += 4;
-@@ -577,7 +606,475 @@ void timelib_dump_tzinfo(timelib_tzinfo *tz)
+@@ -577,7 +606,475 @@ void timelib_dump_tzinfo(timelib_tzinfo
  	}
  }
  
@@ -178,7 +178,7 @@
 +
 +    /* Annoying encoding used by zone.tab has no decimal point, so use
 +     * the length to determine the format:
-+     * 
++     *
 +     * 4 = DDMM
 +     * 5 = DDDMM
 +     * 6 = DDMMSS
@@ -245,10 +245,10 @@
 +
 +        if (*p == '#' || *p == '\0' || *p == '\n')
 +            continue;
-+        
++
 +        if (!isalpha(p0) || !isalpha(p1) || p2 != '\t')
 +            continue;
-+        
++
 +        /* code => AA */
 +        code = p;
 +        p2 = 0;
@@ -282,7 +282,7 @@
 +
 +        if (*p == '\n' || *p == '\t')
 +            *p = '\0';
-+        
++
 +        hash = tz_hash(name);
 +        i = malloc(sizeof *i);
 +        memcpy(i->code, code, 2);
@@ -302,7 +302,7 @@
 +
 +/* Return location info from hash table, using given timezone name.
 + * Returns NULL if the name could not be found. */
-+const struct location_info *find_zone_info(struct location_info **li, 
++const struct location_info *find_zone_info(struct location_info **li,
 +                                           const char *name)
 +{
 +    uint32_t hash = tz_hash(name);
@@ -318,7 +318,7 @@
 +    }
 +
 +    return NULL;
-+}    
++}
 +
 +/* Filter out some non-tzdata files and the posix/right databases, if
 + * present. */
@@ -393,7 +393,7 @@
 +	dirstack = malloc(dirstack_size * sizeof *dirstack);
 +	dirstack_top = 1;
 +	dirstack0 = strdup("");
-+	
++
 +	/* Index array. */
 +	index_size = 64;
 +	db_index = malloc(index_size * sizeof *db_index);
@@ -414,22 +414,22 @@
 +			struct stat st;
 +			const char *leaf = entscount - 1->d_name;
 +
-+			snprintf(name, sizeof name, ZONEINFO_PREFIX "/%s/%s", 
++			snprintf(name, sizeof name, ZONEINFO_PREFIX "/%s/%s",
 +				 top, leaf);
-+			
++
 +			if (strlen(name) && stat(name, &st) == 0) {
 +				/* Name, relative to the zoneinfo prefix. */
 +				const char *root = top;
 +
 +				if (root0 == '/') root++;
 +
-+				snprintf(name, sizeof name, "%s%s%s", root, 
++				snprintf(name, sizeof name, "%s%s%s", root,
 +					 *root ? "/": "", leaf);
 +
 +				if (S_ISDIR(st.st_mode)) {
 +					if (dirstack_top == dirstack_size) {
 +						dirstack_size *= 2;
-+						dirstack = realloc(dirstack, 
++						dirstack = realloc(dirstack,
 +								   dirstack_size * sizeof *dirstack);
 +					}
 +					dirstackdirstack_top++ = strdup(name);
@@ -447,7 +447,7 @@
 +
 +			free(ents--count);
 +		}
-+		
++
 +		if (count != -1) free(ents);
 +		free(top);
 +	} while (dirstack_top);
@@ -472,7 +472,7 @@
 +{
 +        size_t n;
 +        char *data, *p;
-+        
++
 +        data = malloc(3 * sysdb->index_size + sizeof(FAKE_HEADER) - 1);
 +
 +        p = mempcpy(data, FAKE_HEADER, sizeof(FAKE_HEADER) - 1);
@@ -505,7 +505,7 @@
 +                        ent->pos = 0;
 +                }
 +        }
-+        
++
 +        sysdb->data = (unsigned char *)data;
 +}
 +
@@ -554,7 +554,7 @@
 +	struct stat st;
 +	char *p;
 +	int fd;
-+	
++
 +	if (timezone0 == '\0' || strstr(timezone, "..") != NULL) {
 +		return NULL;
 +	}
@@ -577,7 +577,7 @@
 +	*length = st.st_size;
 +	p = mmap(NULL, st.st_size, PROT_READ, MAP_SHARED, fd, 0);
 +	close(fd);
-+	
++
 +	return p != MAP_FAILED ? p : NULL;
 +}
 +
@@ -587,7 +587,7 @@
  {
  	int left = 0, right = tzdb->index_size - 1;
  
-@@ -603,9 +1100,49 @@ static int seek_to_tz_position(const unsigned char **tzf, const char *timezone,
+@@ -603,9 +1100,49 @@ static int seek_to_tz_position(const uns
  	return 0;
  }
  
@@ -637,7 +637,7 @@
  }
  
  const timelib_tzdb_index_entry *timelib_timezone_identifiers_list(const timelib_tzdb *tzdb, int *count)
-@@ -617,7 +1154,32 @@ const timelib_tzdb_index_entry *timelib_timezone_identifiers_list(const timelib_
+@@ -617,7 +1154,32 @@ const timelib_tzdb_index_entry *timelib_
  int timelib_timezone_id_is_valid(const char *timezone, const timelib_tzdb *tzdb)
  {
  	const unsigned char *tzf;
@@ -671,7 +671,7 @@
  }
  
  static int skip_64bit_preamble(const unsigned char **tzf, timelib_tzinfo *tz)
-@@ -662,6 +1224,8 @@ static timelib_tzinfo* timelib_tzinfo_ctor(const char *name)
+@@ -662,6 +1224,8 @@ static timelib_tzinfo* timelib_tzinfo_ct
  timelib_tzinfo *timelib_parse_tzfile(const char *timezone, const timelib_tzdb *tzdb, int *error_code)
  {
  	const unsigned char *tzf;
@@ -680,7 +680,7 @@
  	timelib_tzinfo *tmp;
  	int version;
  	int transitions_result, types_result;
-@@ -669,7 +1233,7 @@ timelib_tzinfo *timelib_parse_tzfile(const char *timezone, const timelib_tzdb *t
+@@ -669,7 +1233,7 @@ timelib_tzinfo *timelib_parse_tzfile(con
  
  	*error_code = TIMELIB_ERROR_NO_ERROR;
  
@@ -689,7 +689,7 @@
  		tmp = timelib_tzinfo_ctor(timezone);
  
  		version = read_preamble(&tzf, tmp, &type);
-@@ -712,11 +1276,38 @@ timelib_tzinfo *timelib_parse_tzfile(const char *timezone, const timelib_tzdb *t
+@@ -712,11 +1276,38 @@ timelib_tzinfo *timelib_parse_tzfile(con
  			return NULL;
  		}
  
@@ -728,11 +728,11 @@
  	} else {
  		*error_code = TIMELIB_ERROR_NO_SUCH_TIMEZONE;
  		tmp = NULL;
-diff --git a/ext/date/php_date.c b/ext/date/php_date.c
-index 48c82bf7ec..443299c089 100644
---- a/ext/date/php_date.c
-+++ b/ext/date/php_date.c
-@@ -490,7 +490,11 @@ PHP_MINFO_FUNCTION(date)
+Index: php-8.3.15/ext/date/php_date.c
+===================================================================
+--- php-8.3.15.orig/ext/date/php_date.c
++++ php-8.3.15/ext/date/php_date.c
+@@ -491,7 +491,11 @@ PHP_MINFO_FUNCTION(date)
  	php_info_print_table_row(2, "date/time support", "enabled");
  	php_info_print_table_row(2, "timelib version", TIMELIB_ASCII_VERSION);
  	php_info_print_table_row(2, "\"Olson\" Timezone Database Version", tzdb->version);

_link Changed

php-8.3.21.tar.xz.asc Added

php-8.3.7.tar.xz/.circleci/config.yml -> php-8.3.21.tar.xz/.circleci/config.yml Changed

php-8.3.7.tar.xz/.github/CODEOWNERS -> php-8.3.21.tar.xz/.github/CODEOWNERS Changed

@@ -5,40 +5,59 @@
 # the problem area and could aid in deciding whether a pull request is ready
 # for merging.
 #
+# When changing this file, please make sure to commit the changes to the
+# earliest supported PHP branch (PHP-X.Y) and not only to the master branch.
+# GitHub reads the CODEOWNERS file from the pull request's targeted branch.
+# Commit changes here similar to bug fixes:
+# https://github.com/php/php-src/blob/master/CONTRIBUTING.md#pull-requests
+#
 # For more information, see the GitHub CODEOWNERS documentation:
 # https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners
 
-/.github @iluuu1994 @TimWolla
+/.github @TimWolla
 /build/gen_stub.php @kocsismate
-/ext/bcmath @Girgias
+/ext/bcmath @Girgias @nielsdos @SakiTakamachi
 /ext/curl @adoy
 /ext/date @derickr
 /ext/dba @Girgias
 /ext/dom @nielsdos
 /ext/ffi @dstogov
+/ext/gd @devnexen
 /ext/gettext @devnexen
 /ext/gmp @Girgias
 /ext/imap @Girgias
 /ext/intl @devnexen
 /ext/json @bukka
 /ext/libxml @nielsdos
-/ext/mbstring @alexdowad
+/ext/mbstring @alexdowad @youkidearitai
+/ext/mysqli @bukka @kamil-tekiela
+/ext/mysqlnd @bukka @kamil-tekiela @SakiTakamachi
 /ext/odbc @NattyNarwhal
-/ext/opcache @dstogov @iluuu1994
+/ext/opcache @dstogov
 /ext/openssl @bukka
-/ext/pdo_odbc @NattyNarwhal
-/ext/pdo_pgsql @devnexen
+/ext/pcntl @devnexen
+/ext/pdo @SakiTakamachi
+/ext/pdo_dblib @SakiTakamachi
+/ext/pdo_firebird @SakiTakamachi
+/ext/pdo_mysql @kamil-tekiela @SakiTakamachi
+/ext/pdo_odbc @NattyNarwhal @SakiTakamachi
+/ext/pdo_pgsql @devnexen @SakiTakamachi
+/ext/pdo_sqlite @SakiTakamachi
 /ext/pgsql @devnexen
 /ext/random @TimWolla @zeriyoshi
+/ext/reflection @DanielEScherzer
 /ext/session @Girgias
+/ext/simplexml @nielsdos
+/ext/soap @nielsdos
 /ext/sockets @devnexen
 /ext/spl @Girgias
 /ext/standard @bukka
+/ext/xml @nielsdos
 /ext/xmlreader @nielsdos
+/ext/xmlwriter @nielsdos
 /ext/xsl @nielsdos
 /main @bukka
 /sapi/fpm @bukka
-/Zend @iluuu1994
 /Zend/Optimizer @dstogov
 /Zend/zend.* @dstogov
 /Zend/zend_alloc.* @dstogov

php-8.3.7.tar.xz/.github/actions/apt-x64/action.yml -> php-8.3.21.tar.xz/.github/actions/apt-x64/action.yml Changed

php-8.3.7.tar.xz/.github/actions/brew/action.yml -> php-8.3.21.tar.xz/.github/actions/brew/action.yml Changed

php-8.3.7.tar.xz/.github/actions/build-libmysqlclient/action.yml -> php-8.3.21.tar.xz/.github/actions/build-libmysqlclient/action.yml Changed

php-8.3.21.tar.xz/.github/actions/configure-gentoo Added

php-8.3.21.tar.xz/.github/actions/configure-gentoo/action.yml Added

@@ -0,0 +1,81 @@
+name: ./configure
+inputs:
+  configurationParameters:
+    default: ''
+    required: false
+  skipSlow:
+    default: false
+    required: false
+runs:
+  using: composite
+  steps:
+    - shell: bash
+      run: |
+        set -x
+        ./buildconf --force
+        ./configure \
+          --enable-option-checking=fatal \
+          --prefix=/usr \
+          --with-libdir=lib64 \
+          --enable-phpdbg \
+          --enable-fpm \
+          --with-pdo-mysql=mysqlnd \
+          --with-mysqli=mysqlnd \
+          ${{ inputs.skipSlow == 'false' && '--with-pgsql' || '' }} \
+          ${{ inputs.skipSlow == 'false' && '--with-pdo-pgsql' || '' }} \
+          ${{ inputs.skipSlow == 'false' && '--with-pdo-sqlite' || '' }} \
+          --enable-intl \
+          --without-pear \
+          --enable-gd \
+          --with-jpeg \
+          --with-webp \
+          --with-freetype \
+          --with-xpm \
+          --enable-exif \
+          --with-zip \
+          --with-zlib \
+          --enable-soap \
+          --enable-xmlreader \
+          --with-xsl \
+          ${{ inputs.skipSlow == 'false' && '--with-tidy' || '' }} \
+          --enable-sysvsem \
+          --enable-sysvshm \
+          --enable-shmop \
+          --enable-pcntl \
+          --with-readline \
+          --enable-mbstring \
+          --with-iconv \
+          --with-curl \
+          --with-gettext \
+          --enable-sockets \
+          --with-bz2 \
+          --with-openssl \
+          --with-gmp \
+          --enable-bcmath \
+          --enable-calendar \
+          --enable-ftp \
+          ${{ inputs.skipSlow == 'false' && '--with-enchant=/usr' || '' }} \
+          --enable-sysvmsg \
+          --with-ffi \
+          --enable-zend-test \
+          ${{ inputs.skipSlow == 'false' && '--enable-dl-test=shared' || '' }} \
+          ${{ inputs.skipSlow == 'false' && '--with-ldap' || '' }} \
+          ${{ inputs.skipSlow == 'false' && '--with-ldap-sasl' || '' }} \
+          --with-password-argon2 \
+          --with-mhash \
+          --with-sodium \
+          --enable-dba \
+          --with-cdb \
+          --enable-flatfile \
+          --enable-inifile \
+          --with-tcadb \
+          --with-lmdb \
+          --with-qdbm \
+          ${{ inputs.skipSlow == 'false' && '--with-snmp' || '' }} \
+          ${{ inputs.skipSlow == 'false' && '--with-unixODBC' || '' }} \
+          ${{ inputs.skipSlow == 'false' && '--with-pdo-odbc=unixODBC,/usr' || '' }} \
+          --with-config-file-path=/etc \
+          --with-config-file-scan-dir=/etc/php.d \
+          ${{ inputs.skipSlow == 'false' && '--with-pdo-dblib' || '' }} \
+          --enable-werror \
+          ${{ inputs.configurationParameters }} || cat config.log

php-8.3.7.tar.xz/.github/actions/configure-macos/action.yml -> php-8.3.21.tar.xz/.github/actions/configure-macos/action.yml Changed

php-8.3.7.tar.xz/.github/actions/configure-x64/action.yml -> php-8.3.21.tar.xz/.github/actions/configure-x64/action.yml Changed

php-8.3.21.tar.xz/.github/actions/freebsd Added

php-8.3.21.tar.xz/.github/actions/freebsd/action.yml Added

@@ -0,0 +1,104 @@
+name: FreeBSD
+runs:
+  using: composite
+  steps:
+    - name: FreeBSD
+      uses: vmactions/freebsd-vm@v1
+      with:
+        release: '13.3'
+        usesh: true
+        copyback: false
+        # Temporarily disable sqlite, as FreeBSD ships it with disabled double quotes. We'll need to fix our tests.
+        # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=269889
+        prepare: |
+          cd $GITHUB_WORKSPACE
+
+          kldload accf_http
+          pkg install -y \
+            autoconf \
+            bison \
+            gmake \
+            re2c \
+            icu \
+            libiconv \
+            png \
+            freetype2 \
+            enchant2 \
+            bzip2 \
+            t1lib \
+            gmp \
+            tidyp \
+            libsodium \
+            libzip \
+            libxml2 \
+            libxslt \
+            openssl \
+            oniguruma \
+            pkgconf \
+            webp \
+            libavif \
+            `#sqlite3` \
+            curl
+
+          ./buildconf -f
+          ./configure \
+            --prefix=/usr/local \
+            --enable-debug \
+            --enable-option-checking=fatal \
+            --enable-fpm \
+            `#--with-pdo-sqlite` \
+            --without-sqlite3 \
+            --without-pdo-sqlite \
+            --without-pear \
+            --with-bz2 \
+            --with-avif \
+            --with-jpeg \
+            --with-webp \
+            --with-freetype \
+            --enable-gd \
+            --enable-exif \
+            --with-zip \
+            --with-zlib \
+            --enable-soap \
+            --enable-xmlreader \
+            --with-xsl \
+            --with-libxml \
+            --enable-shmop \
+            --enable-pcntl \
+            --enable-mbstring \
+            --with-curl \
+            --enable-sockets \
+            --with-openssl \
+            --with-iconv=/usr/local \
+            --enable-bcmath \
+            --enable-calendar \
+            --enable-ftp \
+            --with-ffi \
+            --enable-zend-test \
+            --enable-dl-test=shared \
+            --enable-intl \
+            --with-mhash \
+            --with-sodium \
+            --with-config-file-path=/etc \
+            --with-config-file-scan-dir=/etc/php.d
+          gmake -j2
+          mkdir /etc/php.d
+          gmake install > /dev/null
+          echo opcache.enable_cli=1 > /etc/php.d/opcache.ini
+          echo opcache.protect_memory=1 >> /etc/php.d/opcache.ini
+          echo opcache.preload_user=root >> /etc/php.d/opcache.ini
+        run: |
+          cd $GITHUB_WORKSPACE
+
+          export SKIP_IO_CAPTURE_TESTS=1
+          export CI_NO_IPV6=1
+          export STACK_LIMIT_DEFAULTS_CHECK=1
+          sapi/cli/php run-tests.php \
+            -P -q -j2 \
+            -g FAIL,BORK,LEAK,XLEAK \
+            --no-progress \
+            --offline \
+            --show-diff \
+            --show-slow 1000 \
+            --set-timeout 120 \
+            -d zend_extension=opcache.so

php-8.3.7.tar.xz/.github/actions/setup-mssql/action.yml -> php-8.3.21.tar.xz/.github/actions/setup-mssql/action.yml Changed

php-8.3.7.tar.xz/.github/actions/setup-oracle/action.yml -> php-8.3.21.tar.xz/.github/actions/setup-oracle/action.yml Changed

@@ -13,10 +13,10 @@
           -d gvenzl/oracle-xe:slim
 
         mkdir /opt/oracle
-        wget -nv https://download.oracle.com/otn_software/linux/instantclient/instantclient-basiclite-linuxx64.zip
-        unzip instantclient-basiclite-linuxx64.zip && rm instantclient-basiclite-linuxx64.zip
-        wget -nv https://download.oracle.com/otn_software/linux/instantclient/instantclient-sdk-linuxx64.zip
-        unzip instantclient-sdk-linuxx64.zip && rm instantclient-sdk-linuxx64.zip
+        wget -nv https://download.oracle.com/otn_software/linux/instantclient/2114000/instantclient-basiclite-linux.x64-21.14.0.0.0dbru.zip
+        unzip instantclient-basiclite-linux.x64-21.14.0.0.0dbru.zip && rm instantclient-basiclite-linux.x64-21.14.0.0.0dbru.zip
+        wget -nv https://download.oracle.com/otn_software/linux/instantclient/2114000/instantclient-sdk-linux.x64-21.14.0.0.0dbru.zip
+        unzip instantclient-sdk-linux.x64-21.14.0.0.0dbru.zip && rm instantclient-sdk-linux.x64-21.14.0.0.0dbru.zip
         mv instantclient_*_* /opt/oracle/instantclient
         # interferes with libldap2 headers
         rm /opt/oracle/instantclient/sdk/include/ldap.h

php-8.3.7.tar.xz/.github/actions/setup-windows/action.yml -> php-8.3.21.tar.xz/.github/actions/setup-windows/action.yml Changed

php-8.3.7.tar.xz/.github/actions/setup-x64/action.yml -> php-8.3.21.tar.xz/.github/actions/setup-x64/action.yml Changed

@@ -6,16 +6,12 @@
       run: |
         set -x
 
-        sudo service mysql start
         sudo service slapd start
-        mysql -uroot -proot -e "CREATE DATABASE IF NOT EXISTS test"
-        # Ensure local_infile tests can run.
-        mysql -uroot -proot -e "SET GLOBAL local_infile = true"
-        docker exec sql1 /opt/mssql-tools/bin/sqlcmd -S 127.0.0.1 -U SA -P "<YourStrong@Passw0rd>" -Q "create login pdo_test with password='password', check_policy=off; create user pdo_test for login pdo_test; grant alter, control to pdo_test;"
-        docker exec sql1 /opt/mssql-tools/bin/sqlcmd -S 127.0.0.1 -U SA -P "<YourStrong@Passw0rd>" -Q "create login odbc_test with password='password', check_policy=off; create user odbc_test for login odbc_test; grant alter, control, delete to odbc_test;"
-        docker exec sql1 /opt/mssql-tools/bin/sqlcmd -S 127.0.0.1 -U SA -P "<YourStrong@Passw0rd>" -Q "ALTER SERVER ROLE sysadmin ADD MEMBER odbc_test;"
-        docker exec sql1 /opt/mssql-tools/bin/sqlcmd -S 127.0.0.1 -U SA -P "<YourStrong@Passw0rd>" -Q "CREATE DATABASE odbc;"
-        docker exec sql1 /opt/mssql-tools/bin/sqlcmd -S 127.0.0.1 -U SA -P "<YourStrong@Passw0rd>" -Q "CREATE DATABASE pdo_odbc;"
+        docker exec sql1 /opt/mssql-tools18/bin/sqlcmd -S 127.0.0.1 -U SA -C -P "<YourStrong@Passw0rd>" -Q "create login pdo_test with password='password', check_policy=off; create user pdo_test for login pdo_test; grant alter, control to pdo_test;"
+        docker exec sql1 /opt/mssql-tools18/bin/sqlcmd -S 127.0.0.1 -U SA -C -P "<YourStrong@Passw0rd>" -Q "create login odbc_test with password='password', check_policy=off; create user odbc_test for login odbc_test; grant alter, control, delete to odbc_test;"
+        docker exec sql1 /opt/mssql-tools18/bin/sqlcmd -S 127.0.0.1 -U SA -C -P "<YourStrong@Passw0rd>" -Q "ALTER SERVER ROLE sysadmin ADD MEMBER odbc_test;"
+        docker exec sql1 /opt/mssql-tools18/bin/sqlcmd -S 127.0.0.1 -U SA -C -P "<YourStrong@Passw0rd>" -Q "CREATE DATABASE odbc;"
+        docker exec sql1 /opt/mssql-tools18/bin/sqlcmd -S 127.0.0.1 -U SA -C -P "<YourStrong@Passw0rd>" -Q "CREATE DATABASE pdo_odbc;"
         sudo locale-gen de_DE
 
         ./.github/scripts/setup-slapd.sh

php-8.3.21.tar.xz/.github/actions/test-gentoo Added

php-8.3.21.tar.xz/.github/actions/test-gentoo/action.yml Added

@@ -0,0 +1,34 @@
+name: Test
+inputs:
+  runTestsParameters:
+    default: ''
+    required: false
+runs:
+  using: composite
+  steps:
+    - shell: bash
+      run: |
+        set -x
+        # XXX: Set up other database tests?
+        # XXX: These tests are not running containerized
+        export MYSQL_TEST_USER=ci
+        export MYSQL_TEST_PASSWD=ci
+        if  -z "$PDO_MYSQL_TEST_DSN" ; then
+          export PDO_MYSQL_TEST_DSN="mysql:host=localhost;dbname=test"
+        fi
+        export PDO_MYSQL_TEST_USER=ci
+        export PDO_MYSQL_TEST_PASS=ci
+        export PGSQL_TEST_CONNSTR="host=localhost dbname=test port=5432 user=ci password=ci"
+        if  -z "$PDO_PGSQL_TEST_DSN" ; then
+          export PDO_PGSQL_TEST_DSN="pgsql:host=localhost port=5432 dbname=test user=ci password=ci"
+        fi
+        # Slow tests criteron is doubled because this runner isn't as fast as others
+        export SKIP_IO_CAPTURE_TESTS=1
+        export STACK_LIMIT_DEFAULTS_CHECK=1
+        sapi/cli/php run-tests.php -P -q ${{ inputs.runTestsParameters }} \
+          -j$(nproc) \
+          -g FAIL,BORK,LEAK,XLEAK \
+          --no-progress \
+          --show-diff \
+          --show-slow 2000 \
+          --set-timeout 120

php-8.3.7.tar.xz/.github/actions/test-linux/action.yml -> php-8.3.21.tar.xz/.github/actions/test-linux/action.yml Changed

@@ -1,8 +1,5 @@
 name: Test
 inputs:
-  testArtifacts:
-    default: null
-    required: false
   runTestsParameters:
     default: ''
     required: false
@@ -43,7 +40,6 @@
         export ODBC_TEST_DSN="Driver={ODBC Driver 17 for SQL Server};Server=127.0.0.1;Database=odbc;uid=$ODBC_TEST_USER;pwd=$ODBC_TEST_PASS"
         export PDO_ODBC_TEST_DSN="odbc:Driver={ODBC Driver 17 for SQL Server};Server=127.0.0.1;Database=pdo_odbc;uid=$ODBC_TEST_USER;pwd=$ODBC_TEST_PASS"
         export SKIP_IO_CAPTURE_TESTS=1
-        export TEST_PHP_JUNIT=junit.out.xml
         export STACK_LIMIT_DEFAULTS_CHECK=1
         sapi/cli/php run-tests.php -P -q ${{ inputs.runTestsParameters }} \
           -d opcache.jit=${{ inputs.jitType }} \
@@ -55,9 +51,3 @@
           --show-diff \
           --show-slow 1000 \
           --set-timeout 120
-    - uses: actions/upload-artifact@v4
-      if: always() && inputs.testArtifacts != null
-      with:
-        name: ${{ github.job }}_${{ inputs.testArtifacts }}
-        path: ${{ github.workspace }}/junit.out.xml
-        retention-days: 5

php-8.3.7.tar.xz/.github/actions/test-macos/action.yml -> php-8.3.21.tar.xz/.github/actions/test-macos/action.yml Changed

php-8.3.7.tar.xz/.github/actions/verify-generated-files/action.yml -> php-8.3.21.tar.xz/.github/actions/verify-generated-files/action.yml Changed

php-8.3.7.tar.xz/.github/labeler.yml -> php-8.3.21.tar.xz/.github/labeler.yml Changed

@@ -247,3 +247,80 @@
 
 "SAPI: phpdbg":
 - sapi/phpdbg/**/*
+
+"ABI break":
+- 'TSRM/*.h'
+- 'Zend/*.h'
+- 'Zend/Optimizer/zend_call_graph.h'
+- 'Zend/Optimizer/zend_cfg.h'
+- 'Zend/Optimizer/zend_dump.h'
+- 'Zend/Optimizer/zend_func_info.h'
+- 'Zend/Optimizer/zend_inference.h'
+- 'Zend/Optimizer/zend_optimizer.h'
+- 'Zend/Optimizer/zend_ssa.h'
+- 'ext/date/lib/timelib.h'
+- 'ext/date/lib/timelib_config.h'
+- 'ext/date/php_date.h'
+- 'ext/filter/php_filter.h'
+- 'ext/hash/php_hash.h'
+- 'ext/hash/php_hash_adler32.h'
+- 'ext/hash/php_hash_crc32.h'
+- 'ext/hash/php_hash_gost.h'
+- 'ext/hash/php_hash_haval.h'
+- 'ext/hash/php_hash_md.h'
+- 'ext/hash/php_hash_murmur.h'
+- 'ext/hash/php_hash_ripemd.h'
+- 'ext/hash/php_hash_sha.h'
+- 'ext/hash/php_hash_sha3.h'
+- 'ext/hash/php_hash_snefru.h'
+- 'ext/hash/php_hash_tiger.h'
+- 'ext/hash/php_hash_whirlpool.h'
+- 'ext/hash/php_hash_xxhash.h'
+- 'ext/json/php_json.h'
+- 'ext/json/php_json_parser.h'
+- 'ext/json/php_json_scanner.h'
+- 'ext/mbstring/libmbfl/config.h'
+- 'ext/mbstring/libmbfl/mbfl/eaw_table.h'
+- 'ext/mbstring/libmbfl/mbfl/mbfilter.h'
+- 'ext/mbstring/libmbfl/mbfl/mbfilter_8bit.h'
+- 'ext/mbstring/libmbfl/mbfl/mbfilter_pass.h'
+- 'ext/mbstring/libmbfl/mbfl/mbfilter_wchar.h'
+- 'ext/mbstring/libmbfl/mbfl/mbfl_consts.h'
+- 'ext/mbstring/libmbfl/mbfl/mbfl_convert.h'
+- 'ext/mbstring/libmbfl/mbfl/mbfl_defs.h'
+- 'ext/mbstring/libmbfl/mbfl/mbfl_encoding.h'
+- 'ext/mbstring/libmbfl/mbfl/mbfl_filter_output.h'
+- 'ext/mbstring/libmbfl/mbfl/mbfl_language.h'
+- 'ext/mbstring/libmbfl/mbfl/mbfl_memory_device.h'
+- 'ext/mbstring/libmbfl/mbfl/mbfl_string.h'
+- 'ext/mbstring/mbstring.h'
+- 'ext/mysqli/php_mysqli_structs.h'
+- 'ext/mysqlnd/*.h'
+- 'ext/pcre/pcre2lib/*.h'
+- 'ext/pcre/php_pcre.h'
+- 'ext/pdo/php_pdo.h'
+- 'ext/pdo/php_pdo_driver.h'
+- 'ext/pdo/php_pdo_error.h'
+- 'ext/random/php_random.h'
+- 'ext/session/mod_files.h'
+- 'ext/session/mod_mm.h'
+- 'ext/session/mod_user.h'
+- 'ext/session/php_session.h'
+- 'ext/sockets/php_sockets.h'
+- 'ext/sockets/windows_common.h'
+- 'ext/spl/php_spl.h'
+- 'ext/spl/spl_array.h'
+- 'ext/spl/spl_directory.h'
+- 'ext/spl/spl_dllist.h'
+- 'ext/spl/spl_engine.h'
+- 'ext/spl/spl_exceptions.h'
+- 'ext/spl/spl_fixedarray.h'
+- 'ext/spl/spl_functions.h'
+- 'ext/spl/spl_heap.h'
+- 'ext/spl/spl_iterators.h'
+- 'ext/spl/spl_observer.h'
+- 'ext/standard/*.h'
+- 'main/*.h'
+- 'main/streams/*.h'
+- 'sapi/embed/php_embed.h'
+- 'win32/*.h'

php-8.3.7.tar.xz/.github/nightly_matrix.php -> php-8.3.21.tar.xz/.github/nightly_matrix.php Changed

@@ -1,23 +1,17 @@
 <?php
 
-const BRANCHES = 'master', 'PHP-8.3', 'PHP-8.2', 'PHP-8.1', 'PHP-8.0';
+const BRANCHES = 
+    'ref' => 'master', 'version' => 8, 5,
+    'ref' => 'PHP-8.4', 'version' => 8, 4,
+    'ref' => 'PHP-8.3', 'version' => 8, 3,
+    'ref' => 'PHP-8.2', 'version' => 8, 2,
+    'ref' => 'PHP-8.1', 'version' => 8, 1,
+;
 
 function get_branch_commit_cache_file_path(): string {
     return dirname(__DIR__) . '/branch-commit-cache.json';
 }
 
-function get_branch_matrix(array $branches) {
-    $result = array_map(function ($branch) {
-        $branch_key = strtoupper(str_replace('.', '', $branch));
-        return 
-            'name' => $branch_key,
-            'ref' => $branch,
-        ;
-    }, $branches);
-
-    return $result;
-}
-
 function get_branches() {
     $branch_commit_cache_file = get_branch_commit_cache_file_path();
     $branch_commit_map = ;
@@ -27,93 +21,45 @@
 
     $changed_branches = ;
     foreach (BRANCHES as $branch) {
-        $previous_commit_hash = $branch_commit_map$branch ?? null;
-        $current_commit_hash = trim(shell_exec('git rev-parse origin/' . $branch));
+        $previous_commit_hash = $branch_commit_map$branch'ref' ?? null;
+        $current_commit_hash = trim(shell_exec('git rev-parse origin/' . $branch'ref'));
 
         if ($previous_commit_hash !== $current_commit_hash) {
             $changed_branches = $branch;
         }
 
-        $branch_commit_map$branch = $current_commit_hash;
+        $branch_commit_map$branch'ref' = $current_commit_hash;
     }
 
     file_put_contents($branch_commit_cache_file, json_encode($branch_commit_map));
 
-    return get_branch_matrix($changed_branches);
+    return $changed_branches;
 }
 
-function get_matrix_include(array $branches) {
-    $jobs = ;
-    foreach ($branches as $branch) {
-        $jobs = 
-            'name' => '_ASAN_UBSAN',
-            'branch' => $branch,
-            'debug' => true,
-            'zts' => true,
-            'configuration_parameters' => "CFLAGS='-fsanitize=undefined,address -DZEND_TRACK_ARENA_ALLOC' LDFLAGS='-fsanitize=undefined,address'",
-            'run_tests_parameters' => '--asan',
-            'test_function_jit' => false,
-            'asan' => true,
-        ;
-        if ($branch'ref' !== 'PHP-8.0') {
-            $jobs = 
-                'name' => '_REPEAT',
-                'branch' => $branch,
-                'debug' => true,
-                'zts' => false,
-                'run_tests_parameters' => '--repeat 2',
-                'timeout_minutes' => 360,
-                'test_function_jit' => true,
-                'asan' => false,
-            ;
-            $jobs = 
-                'name' => '_VARIATION',
-                'branch' => $branch,
-                'debug' => true,
-                'zts' => true,
-                'configuration_parameters' => "CFLAGS='-DZEND_RC_DEBUG=1 -DPROFITABILITY_CHECKS=0 -DZEND_VERIFY_FUNC_INFO=1'",
-                'run_tests_parameters' => '-d zend_test.observer.enabled=1 -d zend_test.observer.show_output=0',
-                'timeout_minutes' => 360,
-                'test_function_jit' => true,
-                'asan' => false,
-            ;
-        }
-    }
-    return $jobs;
-}
-
-function get_windows_matrix_include(array $branches) {
-    $jobs = ;
-    foreach ($branches as $branch) {
-        $jobs = 
-            'branch' => $branch,
-            'x64' => true,
-            'zts' => true,
-            'opcache' => true,
-        ;
-        $jobs = 
-            'branch' => $branch,
-            'x64' => false,
-            'zts' => false,
-            'opcache' => false,
-        ;
-    }
-    return $jobs;
+function get_current_version(): array {
+    $file = dirname(__DIR__) . '/main/php_version.h';
+    $content = file_get_contents($file);
+    preg_match('(^#define PHP_MAJOR_VERSION (?<num>\d+)$)m', $content, $matches);
+    $major = (int) $matches'num';
+    preg_match('(^#define PHP_MINOR_VERSION (?<num>\d+)$)m', $content, $matches);
+    $minor = (int) $matches'num';
+    return $major, $minor;
 }
 
 $trigger = $argv1 ?? 'schedule';
 $attempt = (int) ($argv2 ?? 1);
-$discard_cache = ($trigger === 'schedule' && $attempt !== 1) || $trigger === 'workflow_dispatch';
+$monday = date('w', time()) === '1';
+$discard_cache = $monday
+    || ($trigger === 'schedule' && $attempt !== 1)
+    || $trigger === 'workflow_dispatch';
 if ($discard_cache) {
     @unlink(get_branch_commit_cache_file_path());
 }
-
-$branches = get_branches();
-$matrix_include = get_matrix_include($branches);
-$windows_matrix_include = get_windows_matrix_include($branches);
+$branch = $argv3 ?? 'master';
+$branches = $branch === 'master'
+    ? get_branches()
+    : 'ref' => $branch, 'version' => get_current_version();
 
 $f = fopen(getenv('GITHUB_OUTPUT'), 'a');
 fwrite($f, 'branches=' . json_encode($branches, JSON_UNESCAPED_SLASHES) . "\n");
-fwrite($f, 'matrix-include=' . json_encode($matrix_include, JSON_UNESCAPED_SLASHES) . "\n");
-fwrite($f, 'windows-matrix-include=' . json_encode($windows_matrix_include, JSON_UNESCAPED_SLASHES) . "\n");
 fclose($f);

php-8.3.7.tar.xz/.github/scripts/windows/build_task.bat -> php-8.3.21.tar.xz/.github/scripts/windows/build_task.bat Changed

php-8.3.7.tar.xz/.github/scripts/windows/test_task.bat -> php-8.3.21.tar.xz/.github/scripts/windows/test_task.bat Changed

@@ -52,7 +52,12 @@
 set PDOTEST_DSN=odbc:%ODBC_TEST_DSN%
 
 rem setup Firebird related exts
-curl -sLo Firebird.zip https://github.com/FirebirdSQL/firebird/releases/download/v3.0.9/Firebird-3.0.9.33560-0_x64.zip
+if "%PLATFORM%" == "x64" (
+	set PHP_FIREBIRD_DOWNLOAD_URL=https://github.com/FirebirdSQL/firebird/releases/download/v3.0.9/Firebird-3.0.9.33560-0_x64.zip
+) else (
+	set PHP_FIREBIRD_DOWNLOAD_URL=https://github.com/FirebirdSQL/firebird/releases/download/v3.0.9/Firebird-3.0.9.33560-0_Win32.zip
+)
+curl -sLo Firebird.zip %PHP_FIREBIRD_DOWNLOAD_URL%
 7z x -oC:\Firebird Firebird.zip
 set PDO_FIREBIRD_TEST_DATABASE=C:\test.fdb
 set PDO_FIREBIRD_TEST_DSN=firebird:dbname=%PDO_FIREBIRD_TEST_DATABASE%
@@ -98,14 +103,14 @@
 if %errorlevel% neq 0 exit /b 3
 echo Fetching enchant dicts
 pushd %~d0\usr\local\share\enchant\hunspell
-powershell -Command wget http://windows.php.net/downloads/qa/appveyor/ext/enchant/dict.zip -OutFile dict.zip
+powershell -Command wget https://downloads.php.net/~windows/qa/appveyor/ext/enchant/dict.zip -OutFile dict.zip
 unzip dict.zip
 del /q dict.zip
 popd
 
 rem prepare for snmp
 set MIBDIRS=%DEPS_DIR%\share\mibs
-start %DEPS_DIR%\bin\snmpd.exe -C -c %APPVEYOR_BUILD_FOLDER%\ext\snmp\tests\snmpd.conf -Ln
+start %DEPS_DIR%\bin\snmpd.exe -C -c %GITHUB_WORKSPACE%\ext\snmp\tests\snmpd.conf -Ln
 
 set PHP_BUILD_DIR=%PHP_BUILD_OBJ_DIR%\Release
 if "%THREAD_SAFE%" equ "1" set PHP_BUILD_DIR=%PHP_BUILD_DIR%_TS
@@ -121,8 +126,9 @@
 echo extension_dir=%PHP_BUILD_DIR% > %PHP_BUILD_DIR%\php.ini
 echo opcache.file_cache=%PHP_BUILD_DIR%\test_file_cache >> %PHP_BUILD_DIR%\php.ini
 if "%OPCACHE%" equ "1" echo zend_extension=php_opcache.dll >> %PHP_BUILD_DIR%\php.ini
-rem work-around for some spawned PHP processes requiring OpenSSL
+rem work-around for some spawned PHP processes requiring OpenSSL and sockets
 echo extension=php_openssl.dll >> %PHP_BUILD_DIR%\php.ini
+echo extension=php_sockets.dll >> %PHP_BUILD_DIR%\php.ini
 
 rem remove ext dlls for which tests are not supported
 for %%i in (ldap oci8_12c pdo_oci) do (
@@ -131,9 +137,9 @@
 
 set TEST_PHPDBG_EXECUTABLE=%PHP_BUILD_DIR%\phpdbg.exe
 
-mkdir c:\tests_tmp
+copy /-y %DEPS_DIR%\bin\*.dll %PHP_BUILD_DIR%\*
 
-set TEST_PHP_JUNIT=c:\junit.out.xml
+mkdir c:\tests_tmp
 
 nmake test TESTS="%OPCACHE_OPTS% -g FAIL,BORK,LEAK,XLEAK --no-progress -q --offline --show-diff --show-slow 1000 --set-timeout 120 --temp-source c:\tests_tmp --temp-target c:\tests_tmp --bless %PARALLEL%"

php-8.3.7.tar.xz/.github/workflows/labeler.yml -> php-8.3.21.tar.xz/.github/workflows/labeler.yml Changed

php-8.3.7.tar.xz/.github/workflows/nightly.yml -> php-8.3.21.tar.xz/.github/workflows/nightly.yml Changed

@@ -1,87 +1,208 @@
-name: Nightly
+name: Test suite
 on:
-  schedule:
-   - cron: "0 1 * * *"
-  workflow_dispatch: ~
+  workflow_call:
+    inputs:
+      asan_ubuntu_version:
+        required: true
+        type: string
+      branch:
+        required: true
+        type: string
+      community_verify_type_inference:
+        required: true
+        type: boolean
+      libmysqlclient_with_mysqli:
+        required: true
+        type: boolean
+      run_alpine:
+        required: true
+        type: boolean
+      run_linux_ppc64:
+        required: true
+        type: boolean
+      run_macos_arm64:
+        required: true
+        type: boolean
+      ubuntu_version:
+        required: true
+        type: string
+      windows_version:
+        required: true
+        type: string
+      skip_symfony:
+        required: true
+        type: boolean
+      skip_wordpress:
+        required: true
+        type: boolean
 permissions:
   contents: read
 jobs:
-  GENERATE_MATRIX:
-    name: Generate Matrix
-    if: github.repository_owner == 'php' || github.event_name == 'workflow_dispatch'
-    runs-on: ubuntu-latest
-    outputs:
-      branches: ${{ steps.set-matrix.outputs.branches }}
-      matrix-include: ${{ steps.set-matrix.outputs.matrix-include }}
-      windows-matrix-include: ${{ steps.set-matrix.outputs.windows-matrix-include }}
+  LINUX_PPC64:
+    if: inputs.run_linux_ppc64
+    name: LINUX_PPC64_ASAN_UBSAN_DEBUG_ZTS
+    # This runs on a self-hosted runner; see https://wiki.php.net/systems/ci
+    runs-on: self-hosted, gentoo, ppc64
+    steps:
+      - name: git checkout
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.branch }}
+      - name: System info
+        run: |
+          echo "::group::Show host CPU info"
+          lscpu
+          echo "::endgroup::"
+          echo "::group::Show installed packages"
+          cat /var/lib/portage/world
+          echo "::endgroup::"
+      - name: ./configure
+        uses: ./.github/actions/configure-gentoo
+        with:
+          configurationParameters: >-
+            CFLAGS="-fsanitize=undefined,address -fno-sanitize=function -DZEND_TRACK_ARENA_ALLOC"
+            LDFLAGS="-fsanitize=undefined,address -fno-sanitize=function"
+            CC=clang-17
+            CXX=clang++-17
+            --enable-debug
+            --enable-zts
+          skipSlow: false # FIXME: This should likely include slow extensions
+      - name: make
+        run: make -j$(/usr/bin/nproc) >/dev/null
+      # Skip an install action for now
+      - name: Tests
+        uses: ./.github/actions/test-gentoo
+        # There is no PPC JIT, so rip this out
+        with:
+          runTestsParameters: >-
+            --asan -x
+  ALPINE:
+    if: inputs.run_alpine
+    name: ALPINE_X64_ASAN_UBSAN_DEBUG_ZTS
+    runs-on: ubuntu-22.04
+    container:
+      image: 'alpine:3.20.1'
     steps:
-      - uses: actions/checkout@v4
-        with:
-          # Set fetch-depth to 0 to clone the full repository
-          # including all branches. This is required to find
-          # the correct commit hashes.
-          fetch-depth: 0
-      - name: Grab the commit mapping
-        uses: actions/cache@v3
-        with:
-          path: branch-commit-cache.json
-          # The cache key needs to change every time for the
-          # cache to be updated after this job finishes.
-          key: nightly-${{ github.run_id }}-${{ github.run_attempt }}
-          restore-keys: |
-            nightly-
-      - name: Generate Matrix
-        id: set-matrix
-        run: php .github/nightly_matrix.php "${{ github.event_name }}" "${{ github.run_attempt }}"
+      - name: git checkout
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.branch }}
+      - name: apk
+        uses: ./.github/actions/apk
+      - name: LLVM 17 (ASAN-only)
+        # libclang_rt.asan-x86_64.a is provided by compiler-rt, and only for clang17:
+        # https://pkgs.alpinelinux.org/contents?file=libclang_rt.asan-x86_64.a&path=&name=&branch=v3.20
+        run: |
+          apk add clang17 compiler-rt
+      - name: System info
+        run: |
+          echo "::group::Show host CPU info"
+          lscpu
+          echo "::endgroup::"
+          echo "::group::Show installed package versions"
+          apk list
+          echo "::endgroup::"
+      - name: ./configure
+        uses: ./.github/actions/configure-alpine
+        with:
+          configurationParameters: >-
+            CFLAGS="-fsanitize=undefined,address -fno-sanitize=function -DZEND_TRACK_ARENA_ALLOC"
+            LDFLAGS="-fsanitize=undefined,address -fno-sanitize=function"
+            CC=clang-17
+            CXX=clang++-17
+            --enable-debug
+            --enable-zts
+          skipSlow: true # FIXME: This should likely include slow extensions
+      - name: make
+        run: make -j$(/usr/bin/nproc) >/dev/null
+      - name: make install
+        uses: ./.github/actions/install-alpine
+      - name: Test Tracing JIT
+        uses: ./.github/actions/test-alpine
+        with:
+          jitType: tracing
+          runTestsParameters: >-
+            --asan -x
+            -d zend_extension=opcache.so
+            -d opcache.enable_cli=1
       - name: Notify Slack
         if: failure()
         uses: ./.github/actions/notify-slack
         with:
           token: ${{ secrets.ACTION_MONITORING_SLACK }}
+
   LINUX_X64:
-    needs: GENERATE_MATRIX
-    if: ${{ needs.GENERATE_MATRIX.outputs.branches != '' }}
     services:
+      mysql:
+        image: mysql:8.3
+        ports:
+          - 3306:3306
+        env:
+          MYSQL_DATABASE: test
+          MYSQL_ROOT_PASSWORD: root
       postgres:
         image: postgres
         env:
           POSTGRES_USER: postgres
           POSTGRES_PASSWORD: postgres
           POSTGRES_DB: test
+      firebird:
+        image: jacobalberty/firebird
+        ports:
+          - 3050:3050
+        env:
+          ISC_PASSWORD: test
+          FIREBIRD_DATABASE: test.fdb
+          FIREBIRD_USER: test
+          FIREBIRD_PASSWORD: test
     strategy:
       fail-fast: false
       matrix:
-        branch: ${{ fromJson(needs.GENERATE_MATRIX.outputs.branches) }}
         configuration_parameters: ''
         debug: true, false
         name: ''
         run_tests_parameters: ''
         test_function_jit: true
         zts: true, false
-        include: ${{ fromJson(needs.GENERATE_MATRIX.outputs.matrix-include) }}
-    name: "${{ matrix.branch.name }}_LINUX_X64${{ matrix.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}"
-    runs-on: ubuntu-${{ (matrix.branch.ref == 'PHP-8.3' || matrix.branch.ref == 'master') && '22.04' || '20.04' }}
+        include:
+          - name: _ASAN_UBSAN
+            debug: true
+            zts: true
+            configuration_parameters: >-
+              CFLAGS="-fsanitize=undefined,address -DZEND_TRACK_ARENA_ALLOC"
+              LDFLAGS="-fsanitize=undefined,address"
+            run_tests_parameters: '--asan'
+            test_function_jit: false
+            asan: true
+          - name: _REPEAT
+            debug: true
+            zts: false
+            run_tests_parameters: --repeat 2
+            timeout_minutes: 360
+            test_function_jit: true
+            asan: false
+          - name: _VARIATION
+            debug: true
+            zts: true
+            configuration_parameters: >-
+              CFLAGS="-DZEND_RC_DEBUG=1 -DPROFITABILITY_CHECKS=0 -DZEND_VERIFY_FUNC_INFO=1 -DZEND_VERIFY_TYPE_INFERENCE"
+            run_tests_parameters: -d zend_test.observer.enabled=1 -d zend_test.observer.show_output=0
+            timeout_minutes: 360
+            test_function_jit: true
+            asan: false
+    name: "LINUX_X64${{ matrix.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}"
+    runs-on: ubuntu-${{ matrix.asan && inputs.asan_ubuntu_version || inputs.ubuntu_version }}
     steps:
-      # https://stackoverflow.com/a/76921482/1320374
-      - name: Increase swapfile
-        if: matrix.asan
-        run: |
-          sudo swapoff -a
-          sudo fallocate -l 8G /swapfile
-          sudo chmod 600 /swapfile
-          sudo mkswap /swapfile
-          sudo swapon /swapfile
-          sudo swapon --show
       - name: git checkout
         uses: actions/checkout@v4
         with:
-          ref: ${{ matrix.branch.ref }}
+          ref: ${{ inputs.branch }}
       - name: Create MSSQL container
         uses: ./.github/actions/setup-mssql
-      - name: Create Oracle container
-        uses: ./.github/actions/setup-oracle
       - name: apt
         uses: ./.github/actions/apt-x64
+        with:
+          asan: ${{ matrix.asan && 'true' || 'false' }}
       - name: System info
         run: |
           echo "::group::Show host CPU info"
@@ -97,6 +218,7 @@
             ${{ matrix.configuration_parameters }}
             --${{ matrix.debug && 'enable' || 'disable' }}-debug
             --${{ matrix.zts && 'enable' || 'disable' }}-zts
+          asan: ${{ matrix.asan && 'true' || 'false' }}
       - name: make
         run: make -j$(/usr/bin/nproc) >/dev/null
       - name: make install
@@ -106,14 +228,12 @@
       - name: Test
         uses: ./.github/actions/test-linux
         with:
-          testArtifacts: ${{ matrix.branch.name }}_${{ matrix.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}
           runTestsParameters: >-
             ${{ matrix.run_tests_parameters }}
           idleCpu: ${{ matrix.asan && 'true' || 'false' }}
       - name: Test Tracing JIT
         uses: ./.github/actions/test-linux
         with:
-          testArtifacts: ${{ matrix.branch.name }}_${{ matrix.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }} Tracing JIT
           jitType: tracing
           runTestsParameters: >-
             ${{ matrix.run_tests_parameters }}
@@ -122,7 +242,6 @@
       - name: Test OpCache
         uses: ./.github/actions/test-linux
         with:
-          testArtifacts: ${{ matrix.branch.name }}_${{ matrix.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }} OpCache
           runTestsParameters: >-
             ${{ matrix.run_tests_parameters }}
             -d zend_extension=opcache.so
@@ -133,7 +252,6 @@
         if: matrix.test_function_jit
         uses: ./.github/actions/test-linux
         with:
-          testArtifacts: ${{ matrix.branch.name }}_${{ matrix.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }} Function JIT
           jitType: function
           runTestsParameters: >-
             ${{ matrix.run_tests_parameters }}
@@ -147,31 +265,39 @@
         with:
           token: ${{ secrets.ACTION_MONITORING_SLACK }}
   LINUX_X32:
-    needs: GENERATE_MATRIX
-    if: ${{ needs.GENERATE_MATRIX.outputs.branches != '' }}
     strategy:
       fail-fast: false
       matrix:
-        branch: ${{ fromJson(needs.GENERATE_MATRIX.outputs.branches) }}
         debug: true, false
         zts: true, false
-    name: "${{ matrix.branch.name }}_LINUX_X32_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}"
+    name: "LINUX_X32_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}"
     runs-on: ubuntu-latest
     container:
-      image: ubuntu:${{ (matrix.branch.ref == 'PHP-8.3' || matrix.branch.ref == 'master') && '22.04' || '20.04' }}
+      image: ubuntu:${{ inputs.ubuntu_version }}
+    env:
+      PDO_FIREBIRD_TEST_DSN: firebird:dbname=firebird:test.fdb
     services:
       mysql:
-        image: mysql:8
+        image: mysql:8.3
         ports:
           - 3306:3306
         env:
           MYSQL_DATABASE: test
           MYSQL_ROOT_PASSWORD: root
+      firebird:
+        image: jacobalberty/firebird
+        ports:
+          - 3050:3050
+        env:
+          ISC_PASSWORD: test
+          FIREBIRD_DATABASE: test.fdb
+          FIREBIRD_USER: test
+          FIREBIRD_PASSWORD: test
     steps:
       - name: git checkout
         uses: actions/checkout@v4
         with:
-          ref: ${{ matrix.branch.ref }}
+          ref: ${{ inputs.branch }}
       - name: apt
         uses: ./.github/actions/apt-x32
       - name: System info
@@ -226,21 +352,21 @@
         with:
           token: ${{ secrets.ACTION_MONITORING_SLACK }}
   MACOS:
-    needs: GENERATE_MATRIX
-    if: ${{ needs.GENERATE_MATRIX.outputs.branches != '' }}
     strategy:
       fail-fast: false
       matrix:
-        branch: ${{ fromJson(needs.GENERATE_MATRIX.outputs.branches) }}
         debug: true, false
         zts: true, false
-    name: "${{ matrix.branch.name }}_MACOS_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}"
-    runs-on: macos-12
+        os: '13', '14'
+        exclude:
+          - os: ${{ !inputs.run_macos_arm64 && '14' || '*never*' }}
+    name: "MACOS_${{ matrix.os == '13' && 'X64' || 'ARM64' }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}"
+    runs-on: macos-${{ matrix.os }}
     steps:
       - name: git checkout
         uses: actions/checkout@v4
         with:
-          ref: ${{ matrix.branch.ref }}
+          ref: ${{ inputs.branch }}
       - name: brew
         uses: ./.github/actions/brew
       - name: ./configure
@@ -251,40 +377,34 @@
             --${{ matrix.zts && 'enable' || 'disable' }}-zts
       - name: make
         run: |-
-          export PATH="/usr/local/opt/bison/bin:$PATH"
+          export PATH="$(brew --prefix)/opt/bison/bin:$PATH"
           make -j$(sysctl -n hw.logicalcpu) >/dev/null
       - name: make install
         run: sudo make install
       - name: Test
         uses: ./.github/actions/test-macos
-        with:
-          testArtifacts: ${{ matrix.branch.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}
       - name: Test Tracing JIT
+        if: matrix.os != '14' || !matrix.zts
         uses: ./.github/actions/test-macos
         with:
-          testArtifacts: ${{ matrix.branch.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }} Tracing JIT
           jitType: tracing
           runTestsParameters: >-
             -d zend_extension=opcache.so
             -d opcache.enable_cli=1
-            -d opcache.protect_memory=1
       - name: Test OpCache
         uses: ./.github/actions/test-macos
         with:
-          testArtifacts: ${{ matrix.branch.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }} OpCache
           runTestsParameters: >-
             -d zend_extension=opcache.so
             -d opcache.enable_cli=1
-            -d opcache.protect_memory=1
       - name: Test Function JIT
+        if: matrix.os != '14' || !matrix.zts
         uses: ./.github/actions/test-macos
         with:
-          testArtifacts: ${{ matrix.branch.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }} Function JIT
           jitType: function
           runTestsParameters: >-
             -d zend_extension=opcache.so
             -d opcache.enable_cli=1
-            -d opcache.protect_memory=1
       - name: Verify generated files are up to date
         uses: ./.github/actions/verify-generated-files
       - name: Notify Slack
@@ -293,18 +413,36 @@
         with:
           token: ${{ secrets.ACTION_MONITORING_SLACK }}
   COVERAGE_DEBUG_NTS:
-    if: github.repository_owner == 'php' || github.event_name == 'workflow_dispatch'
+    if: inputs.branch == 'master'
     services:
+      mysql:
+        image: mysql:8.3
+        ports:
+          - 3306:3306
+        env:
+          MYSQL_DATABASE: test
+          MYSQL_ROOT_PASSWORD: root
       postgres:
         image: postgres
         env:
           POSTGRES_USER: postgres
           POSTGRES_PASSWORD: postgres
           POSTGRES_DB: test
+      firebird:
+        image: jacobalberty/firebird
+        ports:
+          - 3050:3050
+        env:
+          ISC_PASSWORD: test
+          FIREBIRD_DATABASE: test.fdb
+          FIREBIRD_USER: test
+          FIREBIRD_PASSWORD: test
     runs-on: ubuntu-22.04
     steps:
       - name: git checkout
         uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.branch }}
       - name: Create MSSQL container
         uses: ./.github/actions/setup-mssql
       - name: apt
@@ -325,27 +463,32 @@
       - name: Test OpCache
         uses: ./.github/actions/test-linux
         with:
+          jitType: tracing
           runTestsParameters: >-
             -d zend_extension=opcache.so
             -d opcache.enable_cli=1
-      - name: Upload Test Coverage to Codecov.io
-        if: always()
-        run: bash <(curl -s https://codecov.io/bash)
+      - uses: codecov/codecov-action@v4
+        if: ${{ !cancelled() }}
+        with:
+          fail_ci_if_error: true
+          token: ${{ secrets.CODECOV_TOKEN }}
+          verbose: true
       - name: Notify Slack
         if: failure()
         uses: ./.github/actions/notify-slack
         with:
           token: ${{ secrets.ACTION_MONITORING_SLACK }}
   COMMUNITY:
-    needs: GENERATE_MATRIX
-    if: ${{ needs.GENERATE_MATRIX.outputs.branches != '' }}
     strategy:
       fail-fast: false
       matrix:
-        branch: ${{ fromJson(needs.GENERATE_MATRIX.outputs.branches) }}
-    name: "${{ matrix.branch.name }}_COMMUNITY"
-    runs-on: ubuntu-${{ (matrix.branch.ref == 'PHP-8.3' || matrix.branch.ref == 'master') && '22.04' || '20.04' }}
+        type: 'asan', 'verify_type_inference'
+        exclude:
+          - type: ${{ !inputs.community_verify_type_inference && 'verify_type_inference' || '*never*' }}
+    name: "COMMUNITY_${{ matrix.type }}"
+    runs-on: ubuntu-${{ inputs.ubuntu_version }}
     env:
+      ASAN_OPTIONS: exitcode=139
       UBSAN_OPTIONS: print_stacktrace=1
       USE_ZEND_ALLOC: 0
       USE_TRACKED_ALLOC: 1
@@ -353,17 +496,17 @@
       - name: git checkout
         uses: actions/checkout@v4
         with:
-          ref: ${{ matrix.branch.ref }}
+          ref: ${{ inputs.branch }}
       - name: apt
         uses: ./.github/actions/apt-x64
       - name: ./configure
         uses: ./.github/actions/configure-x64
         with:
+          # CFLAGS removes O2, so we have to add it again...
           configurationParameters: >-
-            --enable-debug
             --enable-zts
-            CFLAGS='-fsanitize=undefined,address -fno-sanitize-recover -DZEND_TRACK_ARENA_ALLOC'
-            LDFLAGS='-fsanitize=undefined,address'
+            ${{ matrix.type == 'asan' && '--enable-debug CFLAGS="-fsanitize=undefined,address -fno-sanitize-recover -DZEND_TRACK_ARENA_ALLOC" LDFLAGS="-fsanitize=undefined,address"' || '' }}
+            ${{ matrix.type == 'verify_type_inference' && 'CFLAGS="-DZEND_VERIFY_TYPE_INFERENCE -O2"' || '' }}
       - name: make
         run: make -j$(/usr/bin/nproc) >/dev/null
       - name: make install
@@ -373,14 +516,32 @@
           sudo service mysql start
           mysql -uroot -proot -e "CREATE DATABASE IF NOT EXISTS test"
           mysql -uroot -proot -e "SET GLOBAL local_infile = true"
-      - name: Enable Opcache and JIT
+      - name: Enable Opcache
         run: |
+          echo memory_limit=-1 >> /etc/php.d/opcache.ini
           echo zend_extension=opcache.so > /etc/php.d/opcache.ini
           echo opcache.enable_cli=1 >> /etc/php.d/opcache.ini
+          echo opcache.enable=1 >> /etc/php.d/opcache.ini
           echo opcache.protect_memory=1 >> /etc/php.d/opcache.ini
+          echo opcache.memory_consumption=256M >> /etc/php.d/opcache.ini
+          echo opcache.file_update_protection=0 >> /etc/php.d/opcache.ini
+          echo opcache.interned_strings_buffer=64 >> /etc/php.d/opcache.ini
+          echo opcache.max_accelerated_files=100000 >> /etc/php.d/opcache.ini
+      - name: Enable JIT
+        if: matrix.type != 'verify_type_inference'
+        run: |
+          echo opcache.jit=tracing >> /etc/php.d/opcache.ini
           echo opcache.jit_buffer_size=1G >> /etc/php.d/opcache.ini
+          echo opcache.jit_max_root_traces=100000 >> /etc/php.d/opcache.ini
+          echo opcache.jit_max_side_traces=100000 >> /etc/php.d/opcache.ini
+          echo opcache.jit_max_exit_counters=100000 >> /etc/php.d/opcache.ini
+          echo opcache.jit_hot_loop=1 >> /etc/php.d/opcache.ini
+          echo opcache.jit_hot_func=1 >> /etc/php.d/opcache.ini
+          echo opcache.jit_hot_return=1 >> /etc/php.d/opcache.ini
+          echo opcache.jit_hot_side_exit=1 >> /etc/php.d/opcache.ini
+          php -v
       - name: Test AMPHP
-        if: matrix.branch.ref != 'PHP-8.0'
+        if: ${{ !cancelled() }}
         run: |
           repositories="amp cache dns file http parallel parser pipeline process serialization socket sync websocket-client websocket-server"
           X=0
@@ -390,7 +551,6 @@
             cd "amphp-$repository"
             git rev-parse HEAD
             php /usr/bin/composer install --no-progress --ignore-platform-reqs
-            export ASAN_OPTIONS=exitcode=139
             vendor/bin/phpunit || EXIT_CODE=$?
             if  ${EXIT_CODE:-0} -gt 128 ; then
               X=1;
@@ -399,21 +559,20 @@
           done
           exit $X
       - name: Test Laravel
-        if: matrix.branch.ref != 'PHP-8.0'
+        if: ${{ !cancelled() }}
         run: |
-          git clone https://github.com/laravel/framework.git --branch=master --depth=1
+          git clone https://github.com/laravel/framework.git --depth=1
           cd framework
           git rev-parse HEAD
           php /usr/bin/composer install --no-progress --ignore-platform-reqs
           # Hack to disable a test that hangs
           php -r '$c = file_get_contents("tests/Filesystem/FilesystemTest.php"); $c = str_replace("public function testSharedGet()", "#\\PHPUnit\\Framework\\Attributes\\Group('"'"'skip'"'"')\n    public function testSharedGet()", $c); file_put_contents("tests/Filesystem/FilesystemTest.php", $c);'
-          export ASAN_OPTIONS=exitcode=139
           php vendor/bin/phpunit --exclude-group skip || EXIT_CODE=$?
           if  ${EXIT_CODE:-0} -gt 128 ; then
             exit 1
           fi
       - name: Test ReactPHP
-        if: matrix.branch.ref != 'PHP-8.0'
+        if: ${{ !cancelled() }}
         run: |
           repositories="async cache child-process datagram dns event-loop promise promise-stream promise-timer stream"
           X=0
@@ -423,7 +582,6 @@
             cd "reactphp-$repository"
             git rev-parse HEAD
             php /usr/bin/composer install --no-progress --ignore-platform-reqs
-            export ASAN_OPTIONS=exitcode=139
             vendor/bin/phpunit || EXIT_CODE=$?
             if  $EXIT_CODE:-0} -gt 128 ; then
               X=1;
@@ -432,19 +590,18 @@
           done
           exit $X
       - name: Test Revolt PHP
-        if: matrix.branch.ref != 'PHP-8.0'
+        if: ${{ !cancelled() }}
         run: |
           git clone https://github.com/revoltphp/event-loop.git --depth=1
           cd event-loop
           git rev-parse HEAD
           php /usr/bin/composer install --no-progress --ignore-platform-reqs
-          export ASAN_OPTIONS=exitcode=139
           vendor/bin/phpunit || EXIT_CODE=$?
           if  ${EXIT_CODE:-0} -gt 128 ; then
             exit 1
           fi
       - name: Test Symfony
-        if: matrix.branch.ref != 'PHP-8.0'
+        if: ${{ !cancelled() && !inputs.skip_symfony }}
         run: |
           git clone https://github.com/symfony/symfony.git --depth=1
           cd symfony
@@ -454,8 +611,7 @@
           # Test causes a heap-buffer-overflow but I cannot reproduce it locally...
           php -r '$c = file_get_contents("src/Symfony/Component/HtmlSanitizer/Tests/HtmlSanitizerCustomTest.php"); $c = str_replace("public function testSanitizeDeepNestedString()", "/** @group skip */\n    public function testSanitizeDeepNestedString()", $c); file_put_contents("src/Symfony/Component/HtmlSanitizer/Tests/HtmlSanitizerCustomTest.php", $c);'
           # Buggy FFI test in Symfony, see https://github.com/symfony/symfony/issues/47668
-          php -r '$c = file_get_contents("src/Symfony/Component/VarDumper/Tests/Caster/FFICasterTest.php"); $c = str_replace("*/\n    public function testCastNonTrailingCharPointer()", "* @group skip\n     */\n    public function testCastNonTrailingCharPointer()", $c); file_put_contents("src/Symfony/Component/VarDumper/Tests/Caster/FFICasterTest.php", $c);'
-          export ASAN_OPTIONS=exitcode=139
+          php -r '$c = file_get_contents("src/Symfony/Component/VarDumper/Tests/Caster/FFICasterTest.php"); $c = str_replace("public function testCastNonTrailingCharPointer()", "/** @group skip */\n    public function testCastNonTrailingCharPointer()", $c); file_put_contents("src/Symfony/Component/VarDumper/Tests/Caster/FFICasterTest.php", $c);'
           export SYMFONY_DEPRECATIONS_HELPER=maxtotal=999
           X=0
           for component in $(find src/Symfony -mindepth 2 -type f -name phpunit.xml.dist -printf '%h\n'); do
@@ -466,19 +622,18 @@
           done
           exit $X
       - name: Test PHPUnit
-        if: always()
+        if: ${{ !cancelled() }}
         run: |
           git clone https://github.com/sebastianbergmann/phpunit.git --branch=main --depth=1
           cd phpunit
           git rev-parse HEAD
-          export ASAN_OPTIONS=exitcode=139
           php /usr/bin/composer install --no-progress --ignore-platform-reqs
           php ./phpunit || EXIT_CODE=$?
           if  ${EXIT_CODE:-0} -gt 128 ; then
             exit 1
           fi
       - name: 'Symfony Preloading'
-        if: matrix.branch.ref != 'PHP-8.0'
+        if: ${{ !cancelled() && !inputs.skip_symfony }}
         run: |
           php /usr/bin/composer create-project symfony/symfony-demo symfony_demo --no-progress --ignore-platform-reqs
           cd symfony_demo
@@ -486,12 +641,11 @@
           sed -i 's/PHP_SAPI/"cli-server"/g' var/cache/dev/App_KernelDevDebugContainer.preload.php
           php -d opcache.preload=var/cache/dev/App_KernelDevDebugContainer.preload.php public/index.php
       - name: Test Wordpress
-        if: always()
+        if: ${{ !cancelled() && !inputs.skip_wordpress }}
         run: |
           git clone https://github.com/WordPress/wordpress-develop.git wordpress --depth=1
           cd wordpress
           git rev-parse HEAD
-          export ASAN_OPTIONS=exitcode=139
           php /usr/bin/composer install --no-progress --ignore-platform-reqs
           cp wp-tests-config-sample.php wp-tests-config.php
           sed -i 's/youremptytestdbnamehere/test/g' wp-tests-config.php
@@ -507,30 +661,38 @@
         with:
           token: ${{ secrets.ACTION_MONITORING_SLACK }}
   OPCACHE_VARIATION:
-    needs: GENERATE_MATRIX
-    if: ${{ needs.GENERATE_MATRIX.outputs.branches != '' }}
     services:
+      mysql:
+        image: mysql:8.3
+        ports:
+          - 3306:3306
+        env:
+          MYSQL_DATABASE: test
+          MYSQL_ROOT_PASSWORD: root
       postgres:
         image: postgres
         env:
           POSTGRES_USER: postgres
           POSTGRES_PASSWORD: postgres
           POSTGRES_DB: test
-    strategy:
-      fail-fast: false
-      matrix:
-        branch: ${{ fromJson(needs.GENERATE_MATRIX.outputs.branches) }}
-    name: "${{ matrix.branch.name }}_OPCACHE_VARIATION"
-    runs-on: ubuntu-${{ (matrix.branch.ref == 'PHP-8.3' || matrix.branch.ref == 'master') && '22.04' || '20.04' }}
+      firebird:
+        image: jacobalberty/firebird
+        ports:
+          - 3050:3050
+        env:
+          ISC_PASSWORD: test
+          FIREBIRD_DATABASE: test.fdb
+          FIREBIRD_USER: test
+          FIREBIRD_PASSWORD: test
+    name: OPCACHE_VARIATION
+    runs-on: ubuntu-${{ inputs.ubuntu_version }}
     steps:
       - name: git checkout
         uses: actions/checkout@v4
         with:
-          ref: ${{ matrix.branch.ref }}
+          ref: ${{ inputs.branch }}
       - name: Create MSSQL container
         uses: ./.github/actions/setup-mssql
-      - name: Create Oracle container
-        uses: ./.github/actions/setup-oracle
       - name: apt
         uses: ./.github/actions/apt-x64
       - name: ./configure
@@ -590,19 +752,13 @@
         with:
           token: ${{ secrets.ACTION_MONITORING_SLACK }}
   MSAN:
-    needs: GENERATE_MATRIX
-    if: ${{ needs.GENERATE_MATRIX.outputs.branches != '' }}
-    strategy:
-      fail-fast: false
-      matrix:
-        branch: ${{ fromJson(needs.GENERATE_MATRIX.outputs.branches) }}
-    name: "${{ matrix.branch.name }}_MSAN"
-    runs-on: ubuntu-${{ (matrix.branch.ref == 'PHP-8.3' || matrix.branch.ref == 'master') && '22.04' || '20.04' }}
+    name: MSAN
+    runs-on: ubuntu-${{ inputs.ubuntu_version }}
     steps:
       - name: git checkout
         uses: actions/checkout@v4
         with:
-          ref: ${{ matrix.branch.ref }}
+          ref: ${{ inputs.branch }}
       - name: apt
         uses: ./.github/actions/apt-x64
       - name: ./configure
@@ -650,7 +806,7 @@
             --enable-memory-sanitizer \
             --with-config-file-path=/etc \
             --with-config-file-scan-dir=/etc/php.d \
-            ${{ matrix.branch.ref != 'PHP-8.0' && '--enable-dl-test=shared' || '' }}
+            --enable-dl-test=shared
       - name: make
         run: make -j$(/usr/bin/nproc) >/dev/null
       - name: make install
@@ -688,21 +844,13 @@
         with:
           token: ${{ secrets.ACTION_MONITORING_SLACK }}
   LIBMYSQLCLIENT:
-    needs: GENERATE_MATRIX
-    if: ${{ needs.GENERATE_MATRIX.outputs.branches != '' }}
-    strategy:
-      fail-fast: false
-      matrix:
-        branch: ${{ fromJson(needs.GENERATE_MATRIX.outputs.branches) }}
-        exclude:
-          - branch: { name: 'PHP-80', ref: 'PHP-8.0' }
-    name: "${{ matrix.branch.name }}_LIBMYSQLCLIENT"
-    runs-on: ubuntu-${{ (matrix.branch.ref == 'PHP-8.3' || matrix.branch.ref == 'master') && '22.04' || '20.04' }}
+    name: LIBMYSQLCLIENT
+    runs-on: ubuntu-${{ inputs.ubuntu_version }}
     steps:
       - name: git checkout
         uses: actions/checkout@v4
         with:
-          ref: ${{ matrix.branch.ref }}
+          ref: ${{ inputs.branch }}
       - name: apt
         run: |
           sudo apt-get update -y | true
@@ -713,33 +861,28 @@
           mysql -uroot -proot -e "CREATE DATABASE IF NOT EXISTS test"
           # Ensure local_infile tests can run.
           mysql -uroot -proot -e "SET GLOBAL local_infile = true"
-      # Does not support caching_sha2_auth :(
-      # - name: Build mysql-5.6
-      #  uses: ./.github/actions/build-libmysqlclient
-      #  with:
-      #    libmysql: mysql-5.6.49-linux-glibc2.12-x86_64.tar.gz
-      # - name: Test mysql-5.6
-      #   uses: ./.github/actions/test-libmysqlclient
-      - name: Build mysql-5.7
+      - name: Build mysql-8.0
         uses: ./.github/actions/build-libmysqlclient
         with:
-          libmysql: mysql-5.7.44-linux-glibc2.12-x86_64.tar.gz
-          withMysqli: ${{ matrix.branch.ref == 'PHP-8.1' }}
-      - name: Test mysql-5.7
+          configurationParameters: ${{ !inputs.libmysqlclient_with_mysqli && '--enable-werror' || '' }}
+          libmysql: mysql-8.0.37-linux-glibc2.28-x86_64.tar.xz
+          withMysqli: ${{ inputs.libmysqlclient_with_mysqli }}
+      - name: Test mysql-8.0
         uses: ./.github/actions/test-libmysqlclient
         with:
-          withMysqli: ${{ matrix.branch.ref == 'PHP-8.1' }}
-      - name: Build mysql-8.0
+          withMysqli: ${{ inputs.libmysqlclient_with_mysqli }}
+      - name: Build mysql-8.4
+        if: ${{ !inputs.libmysqlclient_with_mysqli }}
         uses: ./.github/actions/build-libmysqlclient
         with:
-          # FIXME: There are new warnings
-          # configurationParameters: --enable-werror
-          libmysql: mysql-8.0.33-linux-glibc2.12-x86_64.tar.xz
-          withMysqli: ${{ matrix.branch.ref == 'PHP-8.1' }}
-      - name: Test mysql-8.0
+          configurationParameters: ${{ !inputs.libmysqlclient_with_mysqli && '--enable-werror' || '' }}
+          libmysql: mysql-8.4.0-linux-glibc2.28-x86_64.tar.xz
+          withMysqli: ${{ inputs.libmysqlclient_with_mysqli }}
+      - name: Test mysql-8.4
+        if: ${{ !inputs.libmysqlclient_with_mysqli }}
         uses: ./.github/actions/test-libmysqlclient
         with:
-          withMysqli: ${{ matrix.branch.ref == 'PHP-8.1' }}
+          withMysqli: ${{ inputs.libmysqlclient_with_mysqli }}
       - name: Verify generated files are up to date
         uses: ./.github/actions/verify-generated-files
       - name: Notify Slack
@@ -748,7 +891,7 @@
         with:
           token: ${{ secrets.ACTION_MONITORING_SLACK }}
   PECL:
-    if: github.repository_owner == 'php' || github.event_name == 'workflow_dispatch'
+    if: inputs.branch == 'master'
     runs-on: ubuntu-22.04
     env:
       CC: ccache gcc
@@ -758,6 +901,7 @@
         uses: actions/checkout@v4
         with:
           path: php
+          ref: ${{ inputs.branch }}
       - name: git checkout apcu
         uses: actions/checkout@v4
         with:
@@ -779,6 +923,7 @@
           repository: phpredis/phpredis
           path: redis
       - name: git checkout xdebug
+        if: false
         uses: actions/checkout@v4
         with:
           repository: xdebug/xdebug
@@ -801,6 +946,7 @@
         with:
           key: "${{github.job}}-${{hashFiles('php/main/php_version.h')}}"
           append-timestamp: false
+          save: ${{ github.event_name != 'pull_request' }}
       - name: build PHP
         run: |
           cd php
@@ -839,6 +985,7 @@
           ./configure --prefix=/opt/php --with-php-config=/opt/php/bin/php-config
           make -j$(/usr/bin/nproc)
       - name: build xdebug
+        if: false
         run: |
           cd xdebug
           /opt/php/bin/phpize
@@ -856,35 +1003,58 @@
         with:
           token: ${{ secrets.ACTION_MONITORING_SLACK }}
   WINDOWS:
-    needs: GENERATE_MATRIX
-    if: ${{ needs.GENERATE_MATRIX.outputs.branches != '' }}
     strategy:
       fail-fast: false
       matrix:
-        include: ${{ fromJson(needs.GENERATE_MATRIX.outputs.windows-matrix-include) }}
-    name: "${{ matrix.branch.name }}_WINDOWS_${{ matrix.x64 && 'X64' || 'X86' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}"
-    runs-on: windows-2019
+        include:
+          - x64: true
+            zts: true
+            opcache: true
+            asan: false
+          - x64: false
+            zts: false
+            opcache: false
+            asan: false
+          - x64: true
+            zts: true
+            opcache: true
+            asan: true
+            branch: 'master'
+            timeout: 120
+    name: "WINDOWS_${{ matrix.x64 && 'X64' || 'X86' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}${{ matrix.asan && '_ASAN' || ''}}"
+    runs-on: windows-${{ inputs.windows_version }}
     env:
       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.2.0
-      PHP_BUILD_CRT: vs16
+      PHP_BUILD_SDK_BRANCH: php-sdk-2.3.0
+      PHP_BUILD_CRT: ${{ inputs.windows_version == '2022' && 'vs17' || 'vs16' }}
       PLATFORM: ${{ matrix.x64 && 'x64' || 'x86' }}
       THREAD_SAFE: "${{ matrix.zts && '1' || '0' }}"
       INTRINSICS: "${{ matrix.zts && 'AVX2' || '' }}"
       PARALLEL: -j2
       OPCACHE: "${{ matrix.opcache && '1' || '0' }}"
+      ASAN: "${{ matrix.asan && '1' || '0' }}"
     steps:
       - name: git config
         run: git config --global core.autocrlf false && git config --global core.eol lf
       - name: git checkout
         uses: actions/checkout@v4
         with:
-          ref: ${{ matrix.branch.ref }}
+          ref: ${{ inputs.branch }}
       - name: Setup
         uses: ./.github/actions/setup-windows
       - name: Build
         run: .github/scripts/windows/build.bat
       - name: Test
         run: .github/scripts/windows/test.bat
+  FREEBSD:
+    name: FREEBSD
+    runs-on: ubuntu-latest
+    steps:
+      - name: git checkout
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.branch }}
+      - name: FreeBSD
+        uses: ./.github/actions/freebsd

php-8.3.7.tar.xz/.github/workflows/push.yml -> php-8.3.21.tar.xz/.github/workflows/push.yml Changed

@@ -35,6 +35,7 @@
       - .circleci/**
     branches:
       - '**'
+  workflow_dispatch: ~
 permissions:
   contents: read
 concurrency:
@@ -48,7 +49,7 @@
     if: github.repository == 'php/php-src' || github.event_name == 'pull_request'
     services:
       mysql:
-        image: mysql:8
+        image: mysql:8.3
         ports:
           - 3306:3306
         env:
@@ -73,9 +74,7 @@
             zts: true
             asan: true
     name: "LINUX_X64_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}${{ matrix.asan && '_ASAN' || '' }}"
-    runs-on: ubuntu-${{ !matrix.asan && '22' || '20' }}.04
-    container:
-      image: ${{ matrix.asan && 'ubuntu:23.04' || null }}
+    runs-on: ubuntu-${{ !matrix.asan && '22' || '24' }}.04
     steps:
       - name: git checkout
         uses: actions/checkout@v4
@@ -105,13 +104,14 @@
           # job id, not the job name)
           key: "LINUX_X64_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}${{ matrix.asan && '_ASAN' || '' }}-${{hashFiles('main/php_version.h')}}"
           append-timestamp: false
+          save: ${{ github.event_name != 'pull_request' }}
       - name: ./configure
         uses: ./.github/actions/configure-x64
         with:
           configurationParameters: >-
             --${{ matrix.debug && 'enable' || 'disable' }}-debug
             --${{ matrix.zts && 'enable' || 'disable' }}-zts
-            ${{ matrix.asan && 'CFLAGS="-fsanitize=undefined,address -DZEND_TRACK_ARENA_ALLOC" LDFLAGS="-fsanitize=undefined,address" CC=clang CXX=clang++ --disable-opcache-jit' || '' }}
+            ${{ matrix.asan && 'CFLAGS="-fsanitize=undefined,address -fno-sanitize=function -DZEND_TRACK_ARENA_ALLOC" LDFLAGS="-fsanitize=undefined,address -fno-sanitize=function" CC=clang CXX=clang++ --disable-opcache-jit' || '' }}
           skipSlow: ${{ matrix.asan }}
       - name: make
         run: make -j$(/usr/bin/nproc) >/dev/null
@@ -123,12 +123,9 @@
       - name: Test
         if: matrix.asan == false
         uses: ./.github/actions/test-linux
-        with:
-          testArtifacts: ${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}
       - name: Test ${{ matrix.asan && 'OpCache' || 'Tracing JIT' }}
         uses: ./.github/actions/test-linux
         with:
-          testArtifacts: ${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}${{ matrix.asan && '_ASAN' || '' }}_${{ matrix.asan && 'OpCache' || 'Tracing JIT' }}
           jitType: ${{ matrix.asan && 'disable' || 'tracing' }}
           runTestsParameters: >-
             -d zend_extension=opcache.so
@@ -137,9 +134,54 @@
       - name: Verify generated files are up to date
         if: ${{ !matrix.asan }}
         uses: ./.github/actions/verify-generated-files
+  LINUX_X32:
+    if: github.repository == 'php/php-src' || github.event_name == 'pull_request'
+    name: LINUX_X32_DEBUG_ZTS
+    runs-on: ubuntu-latest
+    container:
+      image: ubuntu:22.04
+    env:
+      MYSQL_TEST_HOST: mysql
+      PDO_MYSQL_TEST_DSN: mysql:host=mysql;dbname=test
+      PDO_MYSQL_TEST_HOST: mysql
+    services:
+      mysql:
+        image: mysql:8.3
+        ports:
+          - 3306:3306
+        env:
+          MYSQL_DATABASE: test
+          MYSQL_ROOT_PASSWORD: root
+    steps:
+      - name: git checkout
+        uses: actions/checkout@v4
+      - name: apt
+        uses: ./.github/actions/apt-x32
+      - name: ccache
+        uses: hendrikmuhs/ccache-action@v1.2
+        with:
+          key: "${{github.job}}-${{hashFiles('main/php_version.h')}}"
+          append-timestamp: false
+      - name: ./configure
+        uses: ./.github/actions/configure-x32
+        with:
+          configurationParameters: >-
+            --enable-debug
+            --enable-zts
+      - name: make
+        run: make -j$(/usr/bin/nproc) >/dev/null
+      - name: make install
+        uses: ./.github/actions/install-linux-x32
+      - name: Test Tracing JIT
+        uses: ./.github/actions/test-linux
+        with:
+          jitType: tracing
+          runTestsParameters: >-
+            -d zend_extension=opcache.so
+            -d opcache.enable_cli=1
   MACOS_DEBUG_NTS:
     if: github.repository == 'php/php-src' || github.event_name == 'pull_request'
-    runs-on: macos-12
+    runs-on: macos-13
     steps:
       - name: git checkout
         uses: actions/checkout@v4
@@ -150,6 +192,7 @@
         with:
           key: "${{github.job}}-${{hashFiles('main/php_version.h')}}"
           append-timestamp: false
+          save: ${{ github.event_name != 'pull_request' }}
       - name: ./configure
         uses: ./.github/actions/configure-macos
         with:
@@ -163,7 +206,6 @@
       - name: Test Tracing JIT
         uses: ./.github/actions/test-macos
         with:
-          testArtifacts: ${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }} Tracing JIT
           jitType: tracing
           runTestsParameters: >-
             -d zend_extension=opcache.so
@@ -179,7 +221,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.2.0
+      PHP_BUILD_SDK_BRANCH: php-sdk-2.3.0
       PHP_BUILD_CRT: vs16
       PLATFORM: x64
       THREAD_SAFE: "1"
@@ -223,6 +265,7 @@
         with:
           key: "${{github.job}}-${{hashFiles('main/php_version.h')}}"
           append-timestamp: false
+          save: ${{ github.event_name != 'pull_request' }}
       - name: ./configure
         run: |
           set -x
@@ -293,3 +336,12 @@
             ${{ github.sha }} \
             $(git merge-base ${{ github.event.pull_request.base.sha }} ${{ github.sha }}) \
             > $GITHUB_STEP_SUMMARY
+  FREEBSD:
+    if: github.repository == 'php/php-src' || github.event_name == 'pull_request'
+    name: FREEBSD
+    runs-on: ubuntu-latest
+    steps:
+      - name: git checkout
+        uses: actions/checkout@v4
+      - name: FreeBSD
+        uses: ./.github/actions/freebsd

php-8.3.21.tar.xz/.github/workflows/root.yml Added

@@ -0,0 +1,64 @@
+name: Nightly
+on:
+  schedule:
+   - cron: "0 1 * * *"
+  workflow_dispatch: ~
+permissions:
+  contents: read
+jobs:
+  GENERATE_MATRIX:
+    name: Generate Matrix
+    if: github.repository == 'php/php-src' || github.event_name == 'workflow_dispatch'
+    runs-on: ubuntu-latest
+    outputs:
+      branches: ${{ steps.set-matrix.outputs.branches }}
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          # Set fetch-depth to 0 to clone the full repository
+          # including all branches. This is required to find
+          # the correct commit hashes.
+          fetch-depth: 0
+      - name: Grab the commit mapping
+        uses: actions/cache@v4
+        with:
+          path: branch-commit-cache.json
+          # The cache key needs to change every time for the
+          # cache to be updated after this job finishes.
+          key: nightly-${{ github.run_id }}-${{ github.run_attempt }}
+          restore-keys: |
+            nightly-
+      - name: Generate Matrix
+        id: set-matrix
+        run: php .github/nightly_matrix.php "${{ github.event_name }}" "${{ github.run_attempt }}" "${{ github.head_ref || github.ref_name }}"
+      - name: Notify Slack
+        if: failure()
+        uses: ./.github/actions/notify-slack
+        with:
+          token: ${{ secrets.ACTION_MONITORING_SLACK }}
+  NIGHTLY:
+    needs: GENERATE_MATRIX
+    name: ${{ matrix.branch.ref }}
+    if: ${{ needs.GENERATE_MATRIX.outputs.branches != '' }}
+    uses: ./.github/workflows/nightly.yml
+    strategy:
+      fail-fast: false
+      matrix:
+        branch: ${{ fromJson(needs.GENERATE_MATRIX.outputs.branches) }}
+    with:
+      asan_ubuntu_version: ${{
+        (((matrix.branch.version0 == 8 && matrix.branch.version1 >= 5) || matrix.branch.version0 >= 9) && '24.04')
+        || '22.04' }}
+      branch: ${{ matrix.branch.ref }}
+      community_verify_type_inference: ${{ (matrix.branch.version0 == 8 && matrix.branch.version1 >= 4) || matrix.branch.version0 >= 9 }}
+      libmysqlclient_with_mysqli: ${{ (matrix.branch.version0 == 8 && matrix.branch.version1 == 1) }}
+      run_alpine: ${{ (matrix.branch.version0 == 8 && matrix.branch.version1 >= 4) || matrix.branch.version0 >= 9 }}
+      run_linux_ppc64: ${{ (matrix.branch.version0 == 8 && matrix.branch.version1 >= 4) || matrix.branch.version0 >= 9 }}
+      run_macos_arm64: ${{ (matrix.branch.version0 == 8 && matrix.branch.version1 >= 4) || matrix.branch.version0 >= 9 }}
+      ubuntu_version: ${{
+        (((matrix.branch.version0 == 8 && matrix.branch.version1 >= 5) || matrix.branch.version0 >= 9) && '24.04')
+        || '22.04' }}
+      windows_version: ${{ ((matrix.branch.version0 == 8 && matrix.branch.version1 >= 4) || matrix.branch.version0 >= 9) && '2022' || '2019' }}
+      skip_symfony: ${{ matrix.branch.version0 == 8 && matrix.branch.version1 == 1 }}
+      skip_wordpress: ${{ matrix.branch.version0 == 8 && matrix.branch.version1 == 1 }}
+    secrets: inherit

php-8.3.21.tar.xz/.github/workflows/windows-builds.yml Added

php-8.3.7.tar.xz/.gitignore -> php-8.3.21.tar.xz/.gitignore Changed

@@ -29,6 +29,9 @@
 # Libtool library files generated during build process
 *.la
 
+# Mac shared library files generated during build process
+*.dylib
+
 # Directories created by Libtool for storing generated library files
 .libs/
 
@@ -177,6 +180,9 @@
 /ext/*/configure.ac
 /ext/*/run-tests.php
 
+# Generated by ./configure if libc might be musl
+/ext/gettext/tests/locale/en_US
+
 # ------------------------------------------------------------------------------
 # Generated by Windows build system
 # ------------------------------------------------------------------------------
@@ -289,6 +295,11 @@
 /.ccache/
 
 # ------------------------------------------------------------------------------
+# Additional test build files
+# ------------------------------------------------------------------------------
+/ext/standard/tests/helpers/bad_cmd.exe
+
+# ------------------------------------------------------------------------------
 # Special cases to invert previous ignore patterns
 # ------------------------------------------------------------------------------
 !/ext/bcmath/libbcmath/src/config.h

php-8.3.7.tar.xz/EXTENSIONS -> php-8.3.21.tar.xz/EXTENSIONS Changed

php-8.3.7.tar.xz/NEWS -> php-8.3.21.tar.xz/NEWS Changed

@@ -1,5 +1,1161 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+08 May 2025, PHP 8.3.21
+
+- Core:
+  . Fixed bug GH-18304 (Changing the properties of a DateInterval through
+    dynamic properties triggers a SegFault). (nielsdos)
+  . Fix some leaks in php_scandir. (nielsdos)
+
+- Filter:
+  . Fixed bug GH-18309 (ipv6 filter integer overflow). (nielsdos)
+
+- GD:
+  . Fixed imagecrop() overflow with rect argument with x/width y/heigh usage
+    in gdImageCrop(). (David Carlier)
+  . Fixed GH-18243 imagettftext() overflow/underflow on font size value.
+    (David Carlier)
+
+- Intl:
+  . Fix reference support for intltz_get_offset(). (nielsdos)
+
+- LDAP:
+  . Fixed bug GH-17776 (LDAP_OPT_X_TLS_* options can't be overridden). (Remi)
+  . Fix NULL deref on high modification key. (nielsdos)
+
+- libxml:
+  . Fixed custom external entity loader returning an invalid resource leading
+    to a confusing TypeError message. (Girgias)
+
+- OpenSSL:
+  . Fix memory leak in openssl_sign() when passing invalid algorithm.
+    (nielsdos)
+  . Fix potential leaks when writing to BIO fails. (nielsdos)
+
+- PDO Firebird:
+  . Fixed GH-18276 - persistent connection - "zend_mm_heap corrupted"
+    with setAttribute() (SakiTakamachi).
+
+- SPL:
+  . Fixed bug GH-18322 (SplObjectStorage debug handler mismanages memory).
+    (nielsdos)
+
+- Standard:
+  . Fixed bug GH-18145 (php8ts crashes in php_clear_stat_cache()).
+    (Jakub Zelenka)
+  . Fixed bug GH-18209 (Use-after-free in extract() with EXTR_REFS). (ilutov)
+  . Fixed bug GH-18212 (fseek with SEEK_CUR whence value and negative offset
+    leads to negative stream position). (David Carlier)
+  . Fix resource leak in iptcembed() on error. (nielsdos)
+
+- Zip:
+  . Fix uouv when handling empty options in ZipArchive::addGlob(). (nielsdos)
+  . Fix memory leak when handling a too long path in ZipArchive::addGlob().
+    (nielsdos)
+
+10 Apr 2025, PHP 8.3.20
+
+- Core:
+  . Fixed bug GH-17961 (use-after-free during dl()'ed module class destruction).
+    (Arnaud)
+  . Fixed bug GH-15367 (dl() of module with aliased class crashes in shutdown).
+    (Arnaud)
+  . Fixed bug GH-13193 again (Significant performance degradation in 'foreach').
+    (nielsdos)
+
+- DOM:
+  . Fix weird unpack behaviour in DOM. (nielsdos)
+  . Fix xinclude destruction of live attributes. (nielsdos)
+
+- Embed:
+  . Fixed bug GH-8533 (Unable to link dynamic libphp on Mac). (Kévin Dunglas)
+
+- Fuzzer:
+  . Fixed bug GH-18081 (Memory leaks in error paths of fuzzer SAPI).
+    (Lung-Alexandra)
+
+- GD:
+  . Fixed bug GH-17984 (calls with arguments as array with references).
+    (David Carlier)
+
+- Intl:
+  . Fix locale_compose and locale_lookup to work with their array argument
+    with values as references. (David Carlier)
+  . Fix dateformat_format when the time is an array of references.
+    (David Carlier)
+  . Fix UConverter::transcode with substitutes as references. (David Carlier)
+
+- Mbstring:
+  . Fixed bug GH-17989 (mb_output_handler crash with unset
+    http_output_conv_mimetypes). (nielsdos)
+
+- Opcache:
+  . Fixed bug GH-18112 (NULL access with preloading and INI option). (nielsdos)
+  . Fixed bug GH-18107 (Opcache CFG jmp optimization with try-finally breaks
+    the exception table). (nielsdos)
+
+- PDO:
+  . Fix memory leak when destroying PDORow. (nielsdos)
+
+- SOAP:
+  . Fixed bug #66049 (Typemap can break parsing in parse_packet_soap leading to
+    a segfault) . (Remi)
+
+- SPL:
+  . Fixed bug GH-18018 (RC1 data returned from offsetGet causes UAF in
+    ArrayObject). (nielsdos)
+
+- Treewide:
+  . Fixed bug GH-17736 (Assertion failure zend_reference_destroy()). (nielsdos)
+
+- Windows:
+  . Fixed bug GH-17836 (zend_vm_gen.php shouldn't break on Windows line
+    endings). (DanielEScherzer)
+
+13 Mar 2025, PHP 8.3.19
+
+- BCMath:
+  . Fixed bug GH-17398 (bcmul memory leak). (SakiTakamachi)
+
+- Core:
+  . Fixed bug GH-17623 (Broken stack overflow detection for variable
+    compilation). (ilutov)
+  . Fixed bug GH-17618 (UnhandledMatchError does not take
+    zend.exception_ignore_args=1 into account). (timwolla)
+  . Fix fallback paths in fast_long_{add,sub}_function. (nielsdos)
+  . Fixed bug GH-17718 (Calling static methods on an interface that has
+    `__callStatic` is allowed). (timwolla)
+  . Fixed bug GH-17797 (zend_test_compile_string crash on invalid
+    script path). (David Carlier)
+  . Fixed GHSA-rwp7-7vc6-8477 (Reference counting in php_request_shutdown
+    causes Use-After-Free). (CVE-2024-11235) (ilutov)
+
+- DOM:
+  . Fixed bug GH-17847 (xinclude destroys live node). (nielsdos)
+
+- FFI:
+  . Fix FFI Parsing of Pointer Declaration Lists. (davnotdev)
+
+- FPM:
+  . Fixed bug GH-17643 (FPM with httpd ProxyPass encoded PATH_INFO env).
+    (Jakub Zelenka)
+
+- GD:
+  . Fixed bug GH-17772 (imagepalettetotruecolor crash with memory_limit=2M).
+    (David Carlier)
+
+- LDAP:
+  . Fixed bug GH-17704 (ldap_search fails when $attributes contains a
+    non-packed array with numerical keys). (nielsdos, 7u83)
+
+- LibXML:
+  . Fixed GHSA-wg4p-4hqh-c3g9 (Reocurrence of #72714). (nielsdos)
+  . Fixed GHSA-p3x9-6h7p-cgfc (libxml streams use wrong `content-type` header
+    when requesting a redirected resource). (CVE-2025-1219) (timwolla)
+
+- MBString:
+  . Fixed bug GH-17503 (Undefined float conversion in mb_convert_variables).
+    (cmb)
+
+- Opcache:
+  . Fixed bug GH-17654 (Multiple classes using same trait causes function
+    JIT crash). (nielsdos)
+  . Fixed bug GH-17577 (JIT packed type guard crash). (nielsdos, Dmitry)
+  . Fixed bug GH-17899 (zend_test_compile_string with invalid path
+    when opcache is enabled). (David Carlier)
+  . Fixed bug GH-17868 (Cannot allocate memory with tracing JIT). (nielsdos)
+
+- PDO_SQLite:
+  . Fixed GH-17837 ()::getColumnMeta() on unexecuted statement segfaults).
+    (cmb)
+  . Fix cycle leak in sqlite3 setAuthorizer(). (nielsdos)
+
+- Phar:
+  . Fixed bug GH-17808: PharFileInfo refcount bug. (nielsdos)
+
+- PHPDBG:
+  . Partially fixed bug GH-17387 (Trivial crash in phpdbg lexer). (nielsdos)
+  . Fix memory leak in phpdbg calling registered function. (nielsdos)
+
+- Reflection:
+  . Fixed bug GH-15902 (Core dumped in ext/reflection/php_reflection.c).
+    (DanielEScherzer)
+
+- Sockets:
+  . Fixed bug GH-17921 (socket_read/socket_recv overflow on buffer size).
+    (David Carlier)
+
+- Standard:
+  . Fixed bug #72666 (stat cache clearing inconsistent between file:// paths
+    and plain paths). (Jakub Zelenka)
+
+- Streams:
+  . Fixed bug GH-17650 (realloc with size 0 in user_filters.c). (nielsdos)
+  . Fix memory leak on overflow in _php_stream_scandir(). (nielsdos)
+  . Fixed GHSA-hgf5-96fm-v528 (Stream HTTP wrapper header check might omit
+    basic auth header). (CVE-2025-1736) (Jakub Zelenka)
+  . Fixed GHSA-52jp-hrpf-2jff (Stream HTTP wrapper truncate redirect location
+    to 1024 bytes). (CVE-2025-1861) (Jakub Zelenka)
+  . Fixed GHSA-pcmh-g36c-qc44 (Streams HTTP wrapper does not fail for headers
+    without colon). (CVE-2025-1734) (Jakub Zelenka)
+  . Fixed GHSA-v8xr-gpvj-cx9g (Header parser of `http` stream wrapper does not
+    handle folded headers). (CVE-2025-1217) (Jakub Zelenka)
+
+- Windows:
+  . Fixed phpize for Windows 11 (24H2). (bwoebi)
+  . Fixed GH-17855 (CURL_STATICLIB flag set even if linked with shared lib).
+    (cmb)
+
+- Zlib:
+  . Fixed bug GH-17745 (zlib extension incorrectly handles object arguments).
+    (nielsdos)
+  . Fix memory leak when encoding check fails. (nielsdos)
+  . Fix zlib support for large files. (nielsdos)
+
+13 Feb 2025, PHP 8.3.17
+
+- Core:
+  . Fixed bug GH-16892 (ini_parse_quantity() fails to parse inputs starting
+    with 0x0b). (nielsdos)
+  . Fixed bug GH-16886 (ini_parse_quantity() fails to emit warning for 0x+0).
+    (nielsdos)
+  . Fixed bug GH-17214 (Relax final+private warning for trait methods with
+    inherited final). (ilutov)
+  . Fixed NULL arithmetic during system program execution on Windows. (cmb,
+    nielsdos)
+  . Fixed potential OOB when checking for trailing spaces on Windows. (cmb)
+  . Fixed bug GH-17408 (Assertion failure Zend/zend_exceptions.c).
+    (nielsdos, ilutov)
+  . Fix may_have_extra_named_args flag for ZEND_AST_UNPACK. (nielsdos)
+  . Fix NULL arithmetic in System V shared memory emulation for Windows. (cmb)
+
+- DOM:
+  . Fixed bug GH-17500 (Segfault with requesting nodeName on nameless doctype).
+    (nielsdos)
+
+- Enchant:
+  . Fix crashes in enchant when passing null bytes. (nielsdos)
+
+- FTP:
+  . Fixed bug GH-16800 (ftp functions can abort with EINTR). (nielsdos)
+
+- GD:
+  . Fixed bug GH-17349 (Tiled truecolor filling looses single color
+    transparency). (cmb)
+  . Fixed bug GH-17373 (imagefttext() ignores clipping rect for palette
+    images). (cmb)
+  . Ported fix for libgd 223 (gdImageRotateGeneric() does not properly
+    interpolate). (cmb)
+
+- Intl:
+  . Fixed bug GH-11874 (intl causing segfault in docker images). (nielsdos)
+  . Fixed bug GH-17469 (UConverter::transcode always emit E_WARNING on
+    invalid encoding). (David Carlier)
+
+- Opcache:
+  . Fixed bug GH-17307 (Internal closure causes JIT failure). (nielsdos)
+  . Fixed bug GH-17564 (Potential UB when reading from / writing to struct
+    padding). (ilutov)
+
+- PDO:
+  . Fixed a memory leak when the GC is used to free a PDOStatment. (Girgias)
+  . Fixed a crash in the PDO Firebird Statement destructor. (nielsdos)
+  . Fixed UAFs when changing default fetch class ctor args. (Girgias, nielsdos)
+
+- Phar:
+  . Fixed bug GH-17518 (offset overflow phar extractTo()). (nielsdos)
+
+- PHPDBG:
+  . Fix crashes in function registration + test. (nielsdos, Girgias)
+
+- Session:
+  . Fix type confusion with session SID constant. (nielsdos)
+  . Fixed bug GH-17541 (ext/session NULL pointer dereferencement during
+    ID reset). (Girgias)
+
+- SimpleXML:
+  . Fixed bug GH-17409 (Assertion failure Zend/zend_hash.c:1730). (nielsdos)
+
+- SNMP:
+  . Fixed bug GH-17330 (SNMP::setSecurity segfault on closed session).
+    (David Carlier)
+
+- SPL:
+  . Fixed bug GH-17463 (crash on SplTempFileObject::ftruncate with negative
+    value). (David Carlier)
+
+- Zip:
+  . Fixed bug GH-17139 (Fix zip_entry_name() crash on invalid entry).
+    (nielsdos)
+
+16 Jan 2025, PHP 8.3.16
+
+- Core:
+  . Fixed bug GH-17106 (ZEND_MATCH_ERROR misoptimization). (ilutov)
+  . Fixed bug GH-17162 (zend_array_try_init() with dtor can cause engine UAF).
+    (nielsdos)
+  . Fixed bug GH-17101 (AST->string does not reproduce constructor property
+    promotion correctly). (nielsdos)
+  . Fixed bug GH-17211 (observer segfault on function loaded with dl()).
+    (Arnaud)
+  . Fixed bug GH-17216 (Trampoline crash on error). (nielsdos)
+
+- Date:
+  . Fixed bug GH-14709 DatePeriod::__construct() overflow on recurrences.
+    (David Carlier)
+
+- DBA:
+  . Skip test if inifile is disabled. (orlitzky)
+
+- DOM:
+  . Fixed bug GH-17224 (UAF in importNode). (nielsdos)
+
+- Embed:
+  . Make build command for program using embed portable. (dunglas)
+
+- FFI:
+  . Fixed bug #79075 (FFI header parser chokes on comments). (nielsdos)
+  . Fix memory leak on ZEND_FFI_TYPE_CHAR conversion failure. (nielsdos)
+  . Fixed bug GH-16013 and bug #80857 (Big endian issues). (Dmitry, nielsdos)
+
+- Filter:
+  . Fixed bug GH-16944 (Fix filtering special IPv4 and IPv6 ranges, by using
+    information from RFC 6890). (Derick)
+
+- FPM:
+  . Fixed bug GH-13437 (FPM: ERROR: scoreboard: failed to lock (already
+    locked)). (Jakub Zelenka)
+  . Fixed bug GH-17112 (Macro redefinitions). (cmb, nielsdos)
+  . Fixed bug GH-17208 (bug64539-status-json-encoding.phpt fail on 32-bits).
+    (nielsdos)
+
+- GD:
+  . Fixed bug GH-16255 (Unexpected nan value in ext/gd/libgd/gd_filter.c).
+    (nielsdos, cmb)
+  . Ported fix for libgd bug 276 (Sometimes pixels are missing when storing
+    images as BMPs). (cmb)
+
+- Gettext:
+  . Fixed bug GH-17202 (Segmentation fault ext/gettext/gettext.c
+    bindtextdomain()). (Michael Orlitzky)
+
+- Iconv:
+  . Fixed bug GH-17047 (UAF on iconv filter failure). (nielsdos)
+
+- LDAP:
+  . Fixed bug GH-17280 (ldap_search() fails when $attributes array has holes).
+    (nielsdos)
+
+- LibXML:
+  . Fixed bug GH-17223 (Memory leak in libxml encoding handling). (nielsdos)
+
+- MBString:
+  . Fixed bug GH-17112 (Macro redefinitions). (nielsdos, cmb)
+
+- Opcache:
+  . opcache_get_configuration() properly reports jit_prof_threshold. (cmb)
+  . Fixed bug GH-17246 (GC during SCCP causes segfault). (Dmitry)
+
+- PCNTL:
+  . Fix memory leak in cleanup code of pcntl_exec() when a non stringable
+    value is encountered past the first entry. (Girgias)
+
+- PgSql:
+  . Fixed bug GH-17158 (pg_fetch_result Shows Incorrect ArgumentCountError
+    Message when Called With 1 Argument). (nielsdos)
+  . Fixed further ArgumentCountError for calls with flexible
+    number of arguments. (David Carlier)
+
+- Phar:
+  . Fixed bug GH-17137 (Segmentation fault ext/phar/phar.c). (nielsdos)
+
+- SimpleXML:
+  . Fixed bug GH-17040 (SimpleXML's unset can break DOM objects). (nielsdos)
+  . Fixed bug GH-17153 (SimpleXML crash when using autovivification on
+    document). (nielsdos)
+
+- Sockets:
+  . Fixed bug GH-16276 (socket_strerror overflow handling with INT_MIN).
+    (David Carlier / cmb)
+  . Fixed overflow on SO_LINGER values setting, strengthening values check
+    on SO_SNDTIMEO/SO_RCVTIMEO for socket_set_option().
+    (David Carlier)
+
+- SPL:
+  . Fixed bug GH-17225 (NULL deref in spl_directory.c). (nielsdos)
+
+- Streams:
+  . Fixed bug GH-17037 (UAF in user filter when adding existing filter name due
+    to incorrect error handling). (nielsdos)
+  . Fixed bug GH-16810 (overflow on fopen HTTP wrapper timeout value).
+    (David Carlier)
+  . Fixed bug GH-17067 (glob:// wrapper doesn't cater to CWD for ZTS builds).
+    (cmb)
+
+- Windows:
+  . Hardened proc_open() against cmd.exe hijacking. (cmb)
+
+- XML:
+  . Fixed bug GH-1718 (unreachable program point in zend_hash). (nielsdos)
+
+19 Dec 2024, PHP 8.3.15
+
+- Calendar:
+  . Fixed jdtogregorian overflow. (David Carlier)
+  . Fixed cal_to_jd julian_days argument overflow. (David Carlier)
+
+- COM:
+  . Fixed bug GH-16991 (Getting typeinfo of non DISPATCH variant segfaults).
+    (cmb)
+
+- Core:
+  . Fail early in *nix configuration build script. (hakre)
+  . Fixed bug GH-16727 (Opcache bad signal 139 crash in ZTS bookworm
+    (frankenphp)). (nielsdos)
+  . Fixed bug GH-16799 (Assertion failure at Zend/zend_vm_execute.h:7469).
+    (nielsdos)
+  . Fixed bug GH-16630 (UAF in lexer with encoding translation and heredocs).
+    (nielsdos)
+  . Fix is_zend_ptr() huge block comparison. (nielsdos)
+  . Fixed potential OOB read in zend_dirname() on Windows. (cmb)
+
+- Curl:
+  . Fixed bug GH-16802 (open_basedir bypass using curl extension). (nielsdos)
+  . Fix various memory leaks in curl mime handling. (nielsdos)
+
+- DOM:
+  . Fixed bug GH-16777 (Calling the constructor again on a DOM object after it
+    is in a document causes UAF). (nielsdos)
+  . Fixed bug GH-16906 (Reloading document can cause UAF in iterator).
+    (nielsdos)
+
+- FPM:
+  . Fixed GH-16432 (PHP-FPM 8.2 SIGSEGV in fpm_get_status). (Jakub Zelenka)
+
+- GD:
+  . Fixed GH-16776 (imagecreatefromstring overflow). (David Carlier)
+
+- GMP:
+  . Fixed bug GH-16890 (array_sum() with GMP can loose precision (LLP64)).
+    (cmb)
+
+- Hash:
+  . Fixed GH-16711: Segfault in mhash(). (Girgias)
+
+- Opcache:
+  . Fixed bug GH-16770 (Tracing JIT type mismatch when returning UNDEF).
+    (nielsdos, Dmitry)
+  . Fixed bug GH-16851 (JIT_G(enabled) not set correctly on other threads).
+    (dktapps)
+  . Fixed bug GH-16902 (Set of opcache tests fail zts+aarch64). (nielsdos)
+
+- OpenSSL:
+  . Prevent unexpected array entry conversion when reading key. (nielsdos)
+  . Fix various memory leaks related to openssl exports. (nielsdos)
+  . Fix memory leak in php_openssl_pkey_from_zval(). (nielsdos)
+
+- PDO:
+  . Fixed memory leak of `setFetchMode()`. (SakiTakamachi)
+
+- Phar:
+  . Fixed bug GH-16695 (phar:// tar parser and zero-length file header blocks).
+    (nielsdos, Hans Krentel)
+
+- PHPDBG:
+  . Fixed bug GH-15208 (Segfault with breakpoint map and phpdbg_clear()).
+    (nielsdos)
+
+- SAPI:
+  . Fixed bug GH-16998 (UBSAN warning in rfc1867). (nielsdos)
+
+- SimpleXML:
+  . Fixed bug GH-16808 (Segmentation fault in RecursiveIteratorIterator
+    ->current() with a xml element input). (nielsdos)
+
+- SOAP:
+  . Fix make check being invoked in ext/soap. (Ma27)
+
+- Standard:
+  . Fixed bug GH-16905 (Internal iterator functions can't handle UNDEF
+    properties). (nielsdos)
+  . Fixed bug GH-16957 (Assertion failure in array_shift with
+    self-referencing array). (nielsdos)
+
+- Streams:
+  . Fixed network connect poll interuption handling. (Jakub Zelenka)
+
+- Windows:
+  . Fixed bug GH-16849 (Error dialog causes process to hang). (cmb)
+
+21 Nov 2024, PHP 8.3.14
+
+- CLI:
+  . Fixed bug GH-16373 (Shebang is not skipped for router script in cli-server
+    started through shebang). (ilutov)
+  . Fixed bug GHSA-4w77-75f9-2c8w (Heap-Use-After-Free in sapi_read_post_data
+    Processing in CLI SAPI Interface). (nielsdos)
+
+- COM:
+  . Fixed out of bound writes to SafeArray data. (cmb)
+
+- Core:
+  . Fixed bug GH-16168 (php 8.1 and earlier crash immediately when compiled
+    with Xcode 16 clang on macOS 15). (nielsdos)
+  . Fixed bug GH-16371 (Assertion failure in Zend/zend_weakrefs.c:646). (Arnaud)
+  . Fixed bug GH-16515 (Incorrect propagation of ZEND_ACC_RETURN_REFERENCE for
+    call trampoline). (ilutov)
+  . Fixed bug GH-16509 (Incorrect line number in function redeclaration error).
+    (ilutov)
+  . Fixed bug GH-16508 (Incorrect line number in inheritance errors of delayed
+    early bound classes). (ilutov)
+  . Fixed bug GH-16648 (Use-after-free during array sorting). (ilutov)
+  . Fixed bug GH-15915 (overflow with a high value for precision INI).
+    (David Carlier / cmb)
+
+- Curl:
+  . Fixed bug GH-16302 (CurlMultiHandle holds a reference to CurlHandle if
+    curl_multi_add_handle fails). (timwolla)
+
+- Date:
+  . Fixed bug GH-16454 (Unhandled INF in date_sunset() with tiny $utcOffset).
+    (cmb)
+  . Fixed bug GH-14732 (date_sun_info() fails for non-finite values). (cmb)
+
+- DBA:
+  . Fixed bug GH-16390 (dba_open() can segfault for "pathless" streams). (cmb)
+
+- DOM:
+  . Fixed bug GH-16316 (DOMXPath breaks when not initialized properly).
+    (nielsdos)
+  . Add missing hierarchy checks to replaceChild. (nielsdos)
+  . Fixed bug GH-16336 (Attribute intern document mismanagement). (nielsdos)
+  . Fixed bug GH-16338 (Null-dereference in ext/dom/node.c). (nielsdos)
+  . Fixed bug GH-16473 (dom_import_simplexml stub is wrong). (nielsdos)
+  . Fixed bug GH-16533 (Segfault when adding attribute to parent that is not
+    an element). (nielsdos)
+  . Fixed bug GH-16535 (UAF when using document as a child). (nielsdos)
+  . Fixed bug GH-16593 (Assertion failure in DOM->replaceChild). (nielsdos)
+  . Fixed bug GH-16595 (Another UAF in DOM -> cloneNode). (nielsdos)
+
+- EXIF:
+  . Fixed bug GH-16409 (Segfault in exif_thumbnail when not dealing with a
+    real file). (nielsdos, cmb)
+
+- FFI:
+  . Fixed bug GH-16397 (Segmentation fault when comparing FFI object).
+    (nielsdos)
+
+- Filter:
+  . Fixed bug GH-16523 (FILTER_FLAG_HOSTNAME accepts ending hyphen). (cmb)
+
+- FPM:
+  . Fixed bug GH-16628 (FPM logs are getting corrupted with this log
+    statement). (nielsdos)
+
+- GD:
+  . Fixed bug GH-16334 (imageaffine overflow on matrix elements).
+    (David Carlier)
+  . Fixed bug GH-16427 (Unchecked libavif return values). (cmb)
+  . Fixed bug GH-16559 (UBSan abort in ext/gd/libgd/gd_interpolation.c:1007).
+    (nielsdos)
+
+- GMP:
+  . Fixed floating point exception bug with gmp_pow when using
+    large exposant values. (David Carlier).
+  . Fixed bug GH-16411 (gmp_export() can cause overflow). (cmb)
+  . Fixed bug GH-16501 (gmp_random_bits() can cause overflow).
+    (David Carlier)
+  . Fixed gmp_pow() overflow bug with large base/exponents.
+    (David Carlier)
+  . Fixed segfaults and other issues related to operator overloading with
+    GMP objects. (Girgias)
+
+- LDAP:
+  . Fixed bug GHSA-g665-fm4p-vhff (OOB access in ldap_escape). (CVE-2024-8932)
+    (nielsdos)
+
+- MBstring:
+  . Fixed bug GH-16361 (mb_substr overflow on start/length arguments).
+    (David Carlier)
+
+- MySQLnd:
+  . Fixed bug GHSA-h35g-vwh6-m678 (Leak partial content of the heap through
+    heap buffer over-read). (CVE-2024-8929) (Jakub Zelenka)
+
+- Opcache:
+  . Fixed bug GH-16408 (Array to string conversion warning emitted in
+    optimizer). (ilutov)
+
+- OpenSSL:
+  . Fixed bug GH-16357 (openssl may modify member types of certificate arrays).
+    (cmb)
+  . Fixed bug GH-16433 (Large values for openssl_csr_sign() $days overflow).
+    (cmb)
+  . Fix various memory leaks on error conditions in openssl_x509_parse().
+    (nielsdos)
+
+- PDO DBLIB:
+  . Fixed bug GHSA-5hqh-c84r-qjcv (Integer overflow in the dblib quoter causing
+    OOB writes). (CVE-2024-11236) (nielsdos)
+
+- PDO Firebird:
+  . Fixed bug GHSA-5hqh-c84r-qjcv (Integer overflow in the firebird quoter
+    causing OOB writes). (CVE-2024-11236) (nielsdos)
+
+- PDO ODBC:
+  . Fixed bug GH-16450 (PDO_ODBC can inject garbage into field values). (cmb)
+
+- Phar:
+  . Fixed bug GH-16406 (Assertion failure in ext/phar/phar.c:2808). (nielsdos)
+
+- PHPDBG:
+  . Fixed bug GH-16174 (Empty string is an invalid expression for ev). (cmb)
+
+- Reflection:
+  . Fixed bug GH-16601 (Memory leak in Reflection constructors). (nielsdos)
+
+- Session:
+  . Fixed bug GH-16385 (Unexpected null returned by session_set_cookie_params).
+    (nielsdos)
+  . Fixed bug GH-16290 (overflow on cookie_lifetime ini value).
+    (David Carlier)
+
+- SOAP:
+  . Fixed bug GH-16318 (Recursive array segfaults soap encoding). (nielsdos)
+  . Fixed bug GH-16429 (Segmentation fault access null pointer in SoapClient).
+    (nielsdos)
+
+- Sockets:
+  . Fixed bug with overflow socket_recvfrom $length argument. (David Carlier)
+
+- SPL:
+  . Fixed bug GH-16337 (Use-after-free in SplHeap). (nielsdos)
+  . Fixed bug GH-16464 (Use-after-free in SplDoublyLinkedList::offsetSet()).
+    (ilutov)
+  . Fixed bug GH-16479 (Use-after-free in SplObjectStorage::setInfo()). (ilutov)
+  . Fixed bug GH-16478 (Use-after-free in SplFixedArray::unset()). (ilutov)
+  . Fixed bug GH-16588 (UAF in Observer->serialize). (nielsdos)
+  . Fix GH-16477 (Segmentation fault when calling __debugInfo() after failed
+    SplFileObject::__constructor). (Girgias)
+  . Fixed bug GH-16589 (UAF in SplDoublyLinked->serialize()). (nielsdos)
+  . Fixed bug GH-14687 (segfault on SplObjectIterator instance).
+    (David Carlier)
+  . Fixed bug GH-16604 (Memory leaks in SPL constructors). (nielsdos)
+  . Fixed bug GH-16646 (UAF in ArrayObject::unset() and
+    ArrayObject::exchangeArray()). (ilutov)
+
+- Standard:
+  . Fixed bug GH-16293 (Failed assertion when throwing in assert() callback with
+    bail enabled). (ilutov)
+
+- Streams:
+  . Fixed bug GHSA-c5f2-jwm7-mmq2 (Configuring a proxy in a stream context
+    might allow for CRLF injection in URIs). (CVE-2024-11234) (Jakub Zelenka)
+  . Fixed bug GHSA-r977-prxv-hc43 (Single byte overread with
+    convert.quoted-printable-decode filter). (CVE-2024-11233) (nielsdos)
+
+- SysVMsg:
+  . Fixed bug GH-16592 (msg_send() crashes when a type does not properly
+    serialized). (David Carlier / cmb)
+
+- SysVShm:
+  . Fixed bug GH-16591 (Assertion error in shm_put_var). (nielsdos, cmb)
+
+- XMLReader:
+  . Fixed bug GH-16292 (Segmentation fault in ext/xmlreader/php_xmlreader.c).
+    (nielsdos)
+
+- Zlib:
+  . Fixed bug GH-16326 (Memory management is broken for bad dictionaries.)
+    (cmb)
+
+24 Oct 2024, PHP 8.3.13
+
+- Calendar:
+  . Fixed GH-16240: jdtounix overflow on argument value. (David Carlier)
+  . Fixed GH-16241: easter_days/easter_date overflow on year argument.
+    (David Carlier)
+  . Fixed GH-16263: jddayofweek overflow. (cmb)
+  . Fixed GH-16234: jewishtojd overflow. (nielsdos)
+
+- CLI:
+  . Fixed bug GH-16137: duplicate http headers when set several times by
+    the client. (David Carlier)
+
+- Core:
+  . Fixed bug GH-16054 (Segmentation fault when resizing hash table iterator
+    list while adding). (nielsdos)
+  . Fixed bug GH-15905 (Assertion failure for TRACK_VARS_SERVER). (cmb)
+  . Fixed bug GH-15907 (Failed assertion when promoting Serialize deprecation to
+    exception). (ilutov)
+  . Fixed bug GH-15851 (Segfault when printing backtrace during cleanup of
+    nested generator frame). (ilutov)
+  . Fixed bug GH-15866 (Core dumped in Zend/zend_generators.c). (Arnaud)
+  . Fixed bug GH-16188 (Assertion failure in Zend/zend_exceptions.c). (Arnaud)
+  . Fixed bug GH-16233 (Observer segfault when calling user function in
+    internal function via trampoline). (nielsdos)
+
+- DOM:
+  . Fixed bug GH-16039 (Segmentation fault (access null pointer) in
+    ext/dom/parentnode/tree.c). (nielsdos)
+  . Fixed bug GH-16149 (Null pointer dereference in
+    DOMElement->getAttributeNames()). (nielsdos)
+  . Fixed bug GH-16151 (Assertion failure in ext/dom/parentnode/tree.c).
+    (nielsdos)
+  . Fixed bug GH-16150 (Use after free in php_dom.c). (nielsdos)
+  . Fixed bug GH-16152 (Memory leak in DOMProcessingInstruction/DOMDocument).
+    (nielsdos)
+
+- JSON:
+  . Fixed bug GH-15168 (stack overflow in json_encode()). (nielsdos)
+
+- GD:
+  . Fixed bug GH-16232 (bitshift overflow on wbmp file content reading /
+    fix backport from upstream). (David Carlier)
+  . Fixed bug GH-12264 (overflow/underflow on imagerotate degrees value)
+    (David Carlier)
+  . Fixed bug GH-16274 (imagescale underflow on RBG channels /
+    fix backport from upstream). (David Carlier)
+
+- LDAP:
+  . Fixed bug GH-16032 (Various NULL pointer dereferencements in
+    ldap_modify_batch()). (Girgias)
+  . Fixed bug GH-16101 (Segfault in ldap_list(), ldap_read(), and ldap_search()
+    when LDAPs array is not a list). (Girgias)
+  . Fix GH-16132 (php_ldap_do_modify() attempts to free pointer not allocated
+    by ZMM.). (Girgias)
+  . Fix GH-16136 (Memory leak in php_ldap_do_modify() when entry is not a
+    proper dictionary). (Girgias)
+
+- MBString:
+  . Fixed bug GH-16261 (Reference invariant broken in mb_convert_variables()).
+    (nielsdos)
+
+- OpenSSL:
+  . Fixed stub for openssl_csr_new. (Jakub Zelenka)
+
+- PCRE:
+  . Fixed bug GH-16189 (underflow on offset argument). (David Carlier)
+  . Fixed bug GH-16184 (UBSan address overflowed in ext/pcre/php_pcre.c).
+    (nielsdos)
+
+- PHPDBG:
+  . Fixed bug GH-15901 (phpdbg: Assertion failure on i funcs). (cmb)
+  . Fixed bug GH-16181 (phpdbg: exit in exception handler reports fatal error).
+    (cmb)
+
+- Reflection:
+  . Fixed bug GH-16187 (Assertion failure in ext/reflection/php_reflection.c).
+    (DanielEScherzer)
+
+- SAPI:
+  . Fixed bug GH-15395 (php-fpm: zend_mm_heap corrupted with cgi-fcgi request).
+    (Jakub Zelenka, David Carlier)
+
+- SimpleXML:
+  . Fixed bug GH-15837 (Segmentation fault in ext/simplexml/simplexml.c).
+    (nielsdos)
+
+- Sockets:
+  . Fixed bug GH-16267 (socket_strerror overflow on errno argument).
+    (David Carlier)
+
+- SOAP:
+  . Fixed bug #73182 (PHP SOAPClient does not support stream context HTTP
+    headers in array form). (nielsdos)
+  . Fixed bug #62900 (Wrong namespace on xsd import error message). (nielsdos)
+  . Fixed bug GH-15711 (SoapClient can't convert BackedEnum to scalar value).
+    (nielsdos)
+  . Fixed bug GH-16237 (Segmentation fault when cloning SoapServer). (nielsdos)
+  . Fix Soap leaking http_msg on error. (nielsdos)
+  . Fixed bug GH-16256 (Assertion failure in ext/soap/php_encoding.c:460).
+    (nielsdos)
+  . Fixed bug GH-16259 (Soap segfault when classmap instantiation fails).
+    (nielsdos)
+
+- SPL:
+  . Fixed bug GH-15918 (Assertion failure in ext/spl/spl_fixedarray.c).
+    (nielsdos)
+
+- Standard:
+  . Fixed bug GH-16053 (Assertion failure in Zend/zend_hash.c). (Arnaud)
+  . Fixed bug GH-15169 (stack overflow when var serialization in
+    ext/standard/var). (nielsdos)
+
+- Streams:
+  . Fixed bugs GH-15908 and GH-15026 (leak / assertion failure in streams.c).
+    (nielsdos)
+  . Fixed bug GH-15980 (Signed integer overflow in main/streams/streams.c).
+    (cmb)
+
+- TSRM:
+  . Prevent closing of unrelated handles. (cmb)
+
+- Windows:
+  . Fixed minimal Windows version. (cmb)
+
+26 Sep 2024, PHP 8.3.12
+
+- CGI:
+  . Fixed bug GHSA-p99j-rfp4-xqvq (Bypass of CVE-2024-4577, Parameter Injection
+    Vulnerability). (CVE-2024-8926) (nielsdos)
+  . Fixed bug GHSA-94p6-54jq-9mwp (cgi.force_redirect configuration is
+    bypassable due to the environment variable collision). (CVE-2024-8927)
+    (nielsdos)
+
+- Core:
+  . Fixed bug GH-15408 (MSan false-positve on zend_max_execution_timer).
+    (zeriyoshi)
+  . Fixed bug GH-15515 (Configure error grep illegal option q). (Peter Kokot)
+  . Fixed bug GH-15514 (Configure error: genif.sh: syntax error). (Peter Kokot)
+  . Fixed bug GH-15565 (--disable-ipv6 during compilation produces error
+    EAI_SYSTEM not found). (nielsdos)
+  . Fixed bug GH-15587 (CRC32 API build error on arm 32-bit).
+    (Bernd Kuhls, Thomas Petazzoni)
+  . Fixed bug GH-15330 (Do not scan generator frames more than once). (Arnaud)
+  . Fixed uninitialized lineno in constant AST of internal enums. (ilutov)
+
+- Curl:
+  . FIxed bug GH-15547 (curl_multi_select overflow on timeout argument).
+    (David Carlier)
+
+- DOM:
+  . Fixed bug GH-15551 (Segmentation fault (access null pointer) in
+    ext/dom/xml_common.h). (nielsdos)
+  . Fixed bug GH-15654 (Signed integer overflow in ext/dom/nodelist.c).
+    (nielsdos)
+
+- Fileinfo:
+  . Fixed bug GH-15752 (Incorrect error message for finfo_file
+    with an empty filename argument). (DanielEScherzer)
+
+- FPM:
+  . Fixed bug GHSA-865w-9rf3-2wh5 (Logs from childrens may be altered).
+    (CVE-2024-9026) (Jakub Zelenka)
+
+- MySQLnd:
+  . Fixed bug GH-15432 (Heap corruption when querying a vector). (cmb,
+    Kamil Tekiela)
+
+- Opcache:
+  . Fixed bug GH-15661 (Access null pointer in
+    Zend/Optimizer/zend_inference.c). (nielsdos)
+  . Fixed bug GH-15658 (Segmentation fault in Zend/zend_vm_execute.h).
+    (nielsdos)
+
+- SAPI:
+  . Fixed bug GHSA-9pqp-7h25-4f32 (Erroneous parsing of multipart form data).
+    (CVE-2024-8925) (Arnaud)
+
+- Standard:
+  . Fixed bug GH-15552 (Signed integer overflow in ext/standard/scanf.c). (cmb)
+
+- Streams:
+  . Fixed bug GH-15628 (php_stream_memory_get_buffer() not zero-terminated).
+    (cmb)
+
+29 Aug 2024, PHP 8.3.11
+
+- Core:
+  . Fixed bug GH-15020 (Memory leak in Zend/Optimizer/escape_analysis.c).
+    (nielsdos)
+  . Fixed bug GH-15023 (Memory leak in Zend/zend_ini.c). (nielsdos)
+  . Fixed bug GH-13330 (Append -Wno-implicit-fallthrough flag conditionally).
+    (Peter Kokot)
+  . Fix uninitialized memory in network.c. (nielsdos)
+  . Fixed bug GH-15108 (Segfault when destroying generator during shutdown).
+    (Arnaud)
+  . Fixed bug GH-15275 (Crash during GC of suspended generator delegate).
+    (Arnaud)
+
+- Curl:
+  . Fixed case when curl_error returns an empty string.
+    (David Carlier)
+
+- DOM:
+  . Fix UAF when removing doctype and using foreach iteration. (nielsdos)
+
+- FFI:
+  . Fixed bug GH-14286 (ffi enum type (when enum has no name) make memory
+    leak). (nielsdos, dstogov)
+
+- Hash:
+  . Fix crash when converting array data for array in shm in xxh3. (nielsdos)
+
+- Intl:
+  . Fixed bug GH-15087 (IntlChar::foldCase()'s $option is not optional). (cmb)
+
+- Opcache:
+  . Fixed bug GH-13817 (Segmentation fault for enabled observers after pass 4).
+    (Bob)
+  . Fixed bug GH-13775 (Memory leak possibly related to opcache SHM placement).
+    (Arnaud, nielsdos)
+
+- Output:
+  . Fixed bug GH-15179 (Segmentation fault (null pointer dereference) in
+    ext/standard/url_scanner_ex.re). (nielsdos)
+
+- PDO_Firebird:
+  . Fix bogus fallthrough path in firebird_handle_get_attribute(). (nielsdos)
+
+- PHPDBG:
+  . Fixed bug GH-13199 (EOF emits redundant prompt in phpdbg local console mode
+    with libedit/readline). (Peter Kokot)
+  . Fixed bug GH-15268 (heap buffer overflow in phpdbg
+    (zend_hash_num_elements() Zend/zend_hash.h)). (nielsdos)
+  . Fixed bug GH-15210 use-after-free on watchpoint allocations. (nielsdos)
+
+- Random:
+  . Fixed part of bug GH-15381, checking getrandom availability on solaris.
+    (David Carlier)
+
+- Soap:
+  . Fixed bug #55639 (Digest autentication dont work). (nielsdos)
+  . Fix SoapFault property destruction. (nielsdos)
+  . Fixed bug GH-15252 (SOAP XML broken since PHP 8.3.9 when using classmap
+    constructor option). (nielsdos)
+
+- Standard:
+  . Fix passing non-finite timeout values in stream functions. (nielsdos)
+  . Fixed GH-14780 p(f)sockopen timeout overflow. (David Carlier)
+  . Fixed GH-15653 overflow on fgetcsv length parameter. (David Carlier)
+
+- Streams:
+  . Fixed bug GH-15028 (Memory leak in ext/phar/stream.c). (nielsdos)
+  . Fixed bug GH-15034 (Integer overflow on stream_notification_callback
+    byte_max parameter with files bigger than 2GB). (nielsdos)
+  . Reverted fix for GH-14930 (Custom stream wrapper dir_readdir output
+    truncated to 255 characters). (Jakub Zelenka)
+
+- Tidy:
+  . Fix memory leaks in ext/tidy basedir restriction code. (nielsdos)
+
+01 Aug 2024, PHP 8.3.10
+
+- Core:
+  . Fixed bug GH-13922 (Fixed support for systems with
+    sysconf(_SC_GETPW_R_SIZE_MAX) == -1). (Arnaud)
+  . Fixed bug GH-14626 (Fix is_zend_ptr() for huge blocks). (Arnaud)
+  . Fixed bug GH-14590 (Memory leak in FPM test gh13563-conf-bool-env.phpt.
+    (nielsdos)
+  . Fixed OSS-Fuzz #69765. (nielsdos)
+  . Fixed bug GH-14741 (Segmentation fault in Zend/zend_types.h). (nielsdos)
+  . Fixed bug GH-14969 (Use-after-free in property coercion with __toString()).
+    (ilutov)
+  . Fixed bug GH-14961 (Comment between -> and keyword results in parse error).
+    (ilutov)
+
+- Dom:
+  . Fixed bug GH-14702 (DOMDocument::xinclude() crash). (nielsdos)
+
+- Fileinfo:
+  . Fixed bug GH-14888 (README.REDIST.BINS refers to non-existing LICENSE).
+    (cmb)
+
+- Gd:
+  . ext/gd/tests/gh10614.phpt: skip if no PNG support. (orlitzky)
+  . restored warning instead of fata error. (dryabov)
+
+- LibXML:
+  . Fixed bug GH-14563 (Build failure with libxml2 v2.13.0). (nielsdos)
+
+- Opcache:
+  . Fixed bug GH-14550 (No warning message when Zend DTrace is enabled that
+    opcache.jit is implictly disabled). (nielsdos)
+
+- Output:
+  . Fixed bug GH-14808 (Unexpected null pointer in Zend/zend_string.h with
+    empty output buffer). (nielsdos)
+
+- PDO:
+  . Fixed bug GH-14712 (Crash with PDORow access to null property).
+    (David Carlier)
+
+- Phar:
+  . Fixed bug GH-14603 (null string from zip entry).
+    (David Carlier)
+
+- PHPDBG:
+  . Fixed bug GH-14596 (crashes with ASAN and ZEND_RC_DEBUG=1).
+    (David Carlier)
+  . Fixed bug GH-14553 (echo output trimmed at NULL byte). (nielsdos)
+
+- Shmop:
+  . Fixed bug GH-14537 (shmop Windows 11 crashes the process). (nielsdos)
+
+- SPL:
+  . Fixed bug GH-14639 (Member access within null pointer in
+    ext/spl/spl_observer.c). (nielsdos)
+
+- Standard:
+  . Fixed bug GH-14775 (range function overflow with negative step argument).
+    (David Carlier)
+  . Fix 32-bit wordwrap test failures. (orlitzky)
+  . Fixed bug GH-14774 (time_sleep_until overflow). (David Carlier)
+
+- Streams:
+  . Fixed bug GH-14930 (Custom stream wrapper dir_readdir output truncated to
+    255 characters in PHP 8.3). (Joe Cai)
+
+- Tidy:
+  . Fix memory leak in tidy_repair_file(). (nielsdos)
+
+- Treewide:
+  . Fix compatibility with libxml2 2.13.2. (nielsdos)
+
+- XML:
+  . Move away from to-be-deprecated libxml fields. (nielsdos)
+  . Fixed bug GH-14834 (Error installing PHP when --with-pear is used).
+    (nielsdos)
+
+04 Jul 2024, PHP 8.3.9
+
+- Core:
+  . Fixed bug GH-14315 (Incompatible pointer type warnings). (Peter Kokot)
+  . Fixed bug GH-12814 (max_execution_time reached too early on MacOS 14
+    when running on Apple Silicon). (Manuel Kress)
+  . Fixed bug GH-14387 (Crash when stack walking in destructor of yielded from
+    values during Generator->throw()). (Bob)
+  . Fixed bug GH-14456 (Attempting to initialize class with private constructor
+    calls destructor). (Girgias)
+  . Fixed bug GH-14510 (memleak due to missing pthread_attr_destroy()-call).
+    (Florian Engelhardt)
+  . Fixed bug GH-14549 (Incompatible function pointer type for fclose).
+    (Ryan Carsten Schmidt)
+
+- BCMath:
+  . Fixed bug (bcpowmod() with mod = -1 returns 1 when it must be 0). (Girgias)
+
+- Curl:
+  . Fixed bug GH-14307 (Test curl_basic_024 fails with curl 8.8.0). (nielsdos)
+
+- DOM:
+  . Fixed bug GH-14343 (Memory leak in xml and dom). (nielsdos)
+
+- FPM:
+  . Fixed bug GH-14037 (PHP-FPM ping.path and ping.response config vars are
+    ignored in status pool). (Wilhansen Li, Pierrick Charron)
+
+- GD:
+  . Fix parameter numbers for imagecolorset(). (Giovanni Giacobbi)
+
+- Intl:
+  . Fix reference handling in SpoofChecker. (nielsdos)
+
+- MySQLnd:
+  . Partially fix bug GH-10599 (Apache crash on Windows when using a
+    self-referencing anonymous function inside a class with an active
+    mysqli connection). (nielsdos)
+
+- Opcache:
+  . Fixed bug GH-14267 (opcache.jit=off does not allow enabling JIT at runtime).
+    (ilutov)
+  . Fixed TLS access in JIT on FreeBSD/amd64. (Arnaud)
+  . Fixed bug GH-11188 (Error when building TSRM in ARM64). (nielsdos)
+
+- PDO ODBC:
+  . Fixed bug GH-14367 (incompatible SDWORD type with iODBC). (Calvin Buckley)
+
+- PHPDBG:
+  . Fixed bug GH-13681 (segfault on watchpoint addition failure). (David Carlier)
+
+- Soap:
+  . Fixed bug #47925 (PHPClient can't decompress response). (nielsdos)
+  . Fix missing error restore code. (nielsdos)
+  . Fix memory leak if calling SoapServer::setObject() twice. (nielsdos)
+  . Fix memory leak if calling SoapServer::setClass() twice. (nielsdos)
+  . Fix reading zlib ini settings in ext-soap. (nielsdos)
+  . Fix memory leaks with string function name lookups. (nielsdos)
+  . Fixed bug #69280 (SoapClient classmap doesn't support fully qualified class
+    name). (nielsdos)
+  . Fixed bug #76232 (SoapClient Cookie Header Semicolon). (nielsdos)
+  . Fixed memory leaks when calling SoapFault::__construct() twice. (Girgias)
+
+- Sodium:
+  . Fix memory leaks in ext/sodium on failure of some functions. (nielsdos)
+
+- SPL:
+  . Fixed bug GH-14290 (Member access within null pointer in extension spl).
+    (nielsdos)
+
+- Standard:
+  . Fixed bug GH-14483 (Fixed off-by-one error in checking length of abstract
+    namespace Unix sockets). (Derick)
+
+- Streams:
+  . Fixed bug GH-11078 (PHP Fatal error triggers pointer being freed was not
+    allocated and malloc: double free for ptr errors). (nielsdos)
+
+06 Jun 2024, PHP 8.3.8
+
+- CGI:
+  . Fixed buffer limit on Windows, replacing read call usage by _read.
+    (David Carlier)
+  . Fixed bug GHSA-3qgc-jrrr-25jv (Bypass of CVE-2012-1823, Argument Injection
+    in PHP-CGI). (CVE-2024-4577) (nielsdos)
+
+- CLI:
+  . Fixed bug GH-14189 (PHP Interactive shell input state incorrectly handles
+    quoted heredoc literals.). (nielsdos)
+
+- Core:
+  . Fixed bug GH-13970 (Incorrect validation of #Attribute flags type for
+    non-compile-time expressions). (ilutov)
+
+- DOM:
+  . Fix crashes when entity declaration is removed while still having entity
+    references. (nielsdos)
+  . Fix references not handled correctly in C14N. (nielsdos)
+  . Fix crash when calling childNodes next() when iterator is exhausted.
+    (nielsdos)
+  . Fix crash in ParentNode::append() when dealing with a fragment
+    containing text nodes. (nielsdos)
+
+- Filter:
+  . Fixed bug GHSA-w8qr-v226-r27w (Filter bypass in filter_var FILTER_VALIDATE_URL).
+    (CVE-2024-5458) (nielsdos)
+
+- FPM:
+  . Fix bug GH-14175 (Show decimal number instead of scientific notation in
+    systemd status). (Benjamin Cremer)
+
+- Hash:
+  . ext/hash: Swap the checking order of `__has_builtin` and `__GNUC__`
+    (Saki Takamachi)
+
+- Intl:
+  . Fixed build regression on systems without C++17 compilers. (Calvin Buckley,
+    Peter Kokot)
+
+- MySQLnd:
+  . Fix bug GH-14255 (mysqli_fetch_assoc reports error from
+    nested query). (Kamil Tekiela)
+
+- Opcache:
+  . Fixed bug GH-14109 (Fix accidental persisting of internal class constant in
+    shm). (ilutov)
+
+- OpenSSL:
+  . The openssl_private_decrypt function in PHP, when using PKCS1 padding
+    (OPENSSL_PKCS1_PADDING, which is the default), is vulnerable to the Marvin Attack
+    unless it is used with an OpenSSL version that includes the changes from this pull
+    request: https://github.com/openssl/openssl/pull/13817 (rsa_pkcs1_implicit_rejection).
+    These changes are part of OpenSSL 3.2 and have also been backported to stable
+    versions of various Linux distributions, as well as to the PHP builds provided for
+    Windows since the previous release. All distributors and builders should ensure that
+    this version is used to prevent PHP from being vulnerable. (CVE-2024-2408)
+
+- Standard:
+  . Fixed bug GHSA-9fcc-425m-g385 (Bypass of CVE-2024-1874).
+    (CVE-2024-5585) (nielsdos)
+
+- XML:
+  . Fixed bug GH-14124 (Segmentation fault with XML extension under certain
+    memory limit). (nielsdos)
+
+- XMLReader:
+  . Fixed bug GH-14183 (XMLReader::open() can't be overridden). (nielsdos)
+
 09 May 2024, PHP 8.3.7
 
 - Core:
@@ -84,7 +1240,7 @@
 - Treewide:
   . Fix gcc-14 Wcalloc-transposed-args warnings. (Cristian Rodríguez)
 
-28 Mar 2024, PHP 8.3.5RC1
+11 Apr 2024, PHP 8.3.6
 
 - Core:
   . Fixed GH-13569 (GC buffer unnecessarily grows up to GC_MAX_BUF_SIZE when
@@ -353,7 +1509,7 @@
   . Fixed bug GH-12980 (tidynode.props.attribute is missing
     "Boolean Attributes" and empty attributes). (nielsdos)
 
-07 Dec 2023, PHP 8.3.1RC1
+21 Dec 2023, PHP 8.3.1
 
 - Core:
   . Fixed bug GH-12758 / GH-12768 (Invalid opline in OOM handlers within

php-8.3.7.tar.xz/TSRM/TSRM.c -> php-8.3.21.tar.xz/TSRM/TSRM.c Changed

php-8.3.7.tar.xz/TSRM/TSRM.h -> php-8.3.21.tar.xz/TSRM/TSRM.h Changed

php-8.3.7.tar.xz/TSRM/tsrm_win32.c -> php-8.3.21.tar.xz/TSRM/tsrm_win32.c Changed

@@ -374,14 +374,16 @@
 	process_pair *ptr;
 	process_pair *newptr;
 
-	for (ptr = TWG(process); ptr < (TWG(process) + TWG(process_size)); ptr++) {
-		if (ptr->stream == stream) {
-			break;
+	if (TWG(process) != NULL) {
+		for (ptr = TWG(process); ptr < (TWG(process) + TWG(process_size)); ptr++) {
+			if (ptr->stream == stream) {
+				break;
+			}
 		}
-	}
 
-	if (ptr < (TWG(process) + TWG(process_size))) {
-		return ptr;
+		if (ptr < (TWG(process) + TWG(process_size))) {
+			return ptr;
+		}
 	}
 
 	newptr = (process_pair*)realloc((void*)TWG(process), (TWG(process_size)+1)*sizeof(process_pair));
@@ -400,19 +402,21 @@
 	shm_pair *ptr;
 	shm_pair *newptr;
 
-	for (ptr = TWG(shm); ptr < (TWG(shm) + TWG(shm_size)); ptr++) {
-		if (!ptr->descriptor) {
-			continue;
-		}
-		if (!addr && ptr->descriptor->shm_perm.key == key) {
-			break;
-		} else if (ptr->addr == addr) {
-			break;
+	if (TWG(shm) != NULL) {
+		for (ptr = TWG(shm); ptr < (TWG(shm) + TWG(shm_size)); ptr++) {
+			if (!ptr->descriptor) {
+				continue;
+			}
+			if (!addr && ptr->descriptor->shm_perm.key == key) {
+				break;
+			} else if (ptr->addr == addr) {
+				break;
+			}
 		}
-	}
 
-	if (ptr < (TWG(shm) + TWG(shm_size))) {
-		return ptr;
+		if (ptr < (TWG(shm) + TWG(shm_size))) {
+			return ptr;
+		}
 	}
 
 	newptr = (shm_pair*)realloc((void*)TWG(shm), (TWG(shm_size)+1)*sizeof(shm_pair));
@@ -707,8 +711,10 @@
 	if (NULL != shm->descriptor && (shm->descriptor->shm_perm.key != key || size > shm->descriptor->shm_segsz)) {
 		if (NULL != shm->segment) {
 			CloseHandle(shm->segment);
+			shm->segment = INVALID_HANDLE_VALUE;
 		}
 		UnmapViewOfFile(shm->descriptor);
+		shm->descriptor = NULL;
 		return -1;
 	}
 
@@ -744,8 +750,8 @@
 	shm->descriptor->shm_lpid  = getpid();
 	shm->descriptor->shm_nattch--;
 
-	ret = 1;
-	if (!ret  && shm->descriptor->shm_nattch <= 0) {
+	ret = 0;
+	if (shm->descriptor->shm_nattch <= 0) {
 		ret = UnmapViewOfFile(shm->descriptor) ? 0 : -1;
 		shm->descriptor = NULL;
 	}

php-8.3.7.tar.xz/UPGRADING -> php-8.3.21.tar.xz/UPGRADING Changed

php-8.3.7.tar.xz/Zend/Optimizer/compact_vars.c -> php-8.3.21.tar.xz/Zend/Optimizer/compact_vars.c Changed

php-8.3.7.tar.xz/Zend/Optimizer/escape_analysis.c -> php-8.3.21.tar.xz/Zend/Optimizer/escape_analysis.c Changed

php-8.3.7.tar.xz/Zend/Optimizer/optimize_temp_vars_5.c -> php-8.3.21.tar.xz/Zend/Optimizer/optimize_temp_vars_5.c Changed

php-8.3.7.tar.xz/Zend/Optimizer/pass1.c -> php-8.3.21.tar.xz/Zend/Optimizer/pass1.c Changed

@@ -34,6 +34,12 @@
 #include "zend_execute.h"
 #include "zend_vm.h"
 
+#define TO_STRING_NOWARN(val) do { \
+	if (Z_TYPE_P(val) < IS_ARRAY) { \
+		convert_to_string(val); \
+	} \
+} while (0)
+
 static void replace_by_const_or_qm_assign(zend_op_array *op_array, zend_op *opline, zval *result) {
 	if (opline->op1_type == IS_CONST) {
 		literal_dtor(&ZEND_OP1_LITERAL(opline));
@@ -64,10 +70,10 @@
 		case ZEND_CONCAT:
 		case ZEND_FAST_CONCAT:
 			if (opline->op1_type == IS_CONST && Z_TYPE(ZEND_OP1_LITERAL(opline)) != IS_STRING) {
-				convert_to_string(&ZEND_OP1_LITERAL(opline));
+				TO_STRING_NOWARN(&ZEND_OP1_LITERAL(opline));
 			}
 			if (opline->op2_type == IS_CONST && Z_TYPE(ZEND_OP2_LITERAL(opline)) != IS_STRING) {
-				convert_to_string(&ZEND_OP2_LITERAL(opline));
+				TO_STRING_NOWARN(&ZEND_OP2_LITERAL(opline));
 			}
 			ZEND_FALLTHROUGH;
 		case ZEND_ADD:
@@ -100,7 +106,7 @@
 		case ZEND_ASSIGN_OP:
 			if (opline->extended_value == ZEND_CONCAT && opline->op2_type == IS_CONST
 					&& Z_TYPE(ZEND_OP2_LITERAL(opline)) != IS_STRING) {
-				convert_to_string(&ZEND_OP2_LITERAL(opline));
+				TO_STRING_NOWARN(&ZEND_OP2_LITERAL(opline));
 			}
 			break;

php-8.3.7.tar.xz/Zend/Optimizer/zend_cfg.c -> php-8.3.21.tar.xz/Zend/Optimizer/zend_cfg.c Changed

php-8.3.7.tar.xz/Zend/Optimizer/zend_inference.c -> php-8.3.21.tar.xz/Zend/Optimizer/zend_inference.c Changed

php-8.3.7.tar.xz/Zend/Optimizer/zend_optimizer.c -> php-8.3.21.tar.xz/Zend/Optimizer/zend_optimizer.c Changed

@@ -31,7 +31,6 @@
 #include "zend_inference.h"
 #include "zend_dump.h"
 #include "php.h"
-#include "zend_observer.h"
 
 #ifndef ZEND_OPTIMIZER_MAX_REGISTERED_PASSES
 # define ZEND_OPTIMIZER_MAX_REGISTERED_PASSES 32
@@ -641,6 +640,7 @@
 				case ZEND_SWITCH_LONG:
 				case ZEND_SWITCH_STRING:
 				case ZEND_MATCH:
+				case ZEND_MATCH_ERROR:
 				case ZEND_JMP_NULL: {
 					zend_op *end = op_array->opcodes + op_array->last;
 					while (opline < end) {
@@ -653,6 +653,7 @@
 								&& opline->opcode != ZEND_SWITCH_LONG
 								&& opline->opcode != ZEND_SWITCH_STRING
 								&& opline->opcode != ZEND_MATCH
+								&& opline->opcode != ZEND_MATCH_ERROR
 								&& opline->opcode != ZEND_JMP_NULL
 								&& (opline->opcode != ZEND_FREE
 									|| opline->extended_value != ZEND_FREE_ON_RETURN);
@@ -1102,8 +1103,6 @@
 	}
 #endif
 
-	op_array->T -= ZEND_OBSERVER_ENABLED;
-
 	op_array->fn_flags &= ~ZEND_ACC_DONE_PASS_TWO;
 }
 
@@ -1133,8 +1132,6 @@
 	}
 #endif
 
-	op_array->T += ZEND_OBSERVER_ENABLED; // reserve last temporary for observers if enabled
-
 	opline = op_array->opcodes;
 	end = opline + op_array->last;
 	while (opline < end) {
@@ -1563,12 +1560,6 @@
 			}
 		}
 
-		if (ZEND_OBSERVER_ENABLED) {
-			for (i = 0; i < call_graph.op_arrays_count; i++) {
-				++call_graph.op_arraysi->T; // ensure accurate temporary count for stack size precalculation
-			}
-		}
-
 		if (ZEND_OPTIMIZER_PASS_12 & optimization_level) {
 			for (i = 0; i < call_graph.op_arrays_count; i++) {
 				zend_adjust_fcall_stack_size_graph(call_graph.op_arraysi);
@@ -1584,8 +1575,6 @@
 					zend_recalc_live_ranges(op_array, needs_live_range);
 				}
 			} else {
-				op_array->T -= ZEND_OBSERVER_ENABLED; // redo_pass_two will re-increment it
-
 				zend_redo_pass_two(op_array);
 				if (op_array->live_range) {
 					zend_recalc_live_ranges(op_array, NULL);

php-8.3.7.tar.xz/Zend/tests/attributes/021_attribute_flags_type_is_validated.phpt -> php-8.3.21.tar.xz/Zend/tests/attributes/021_attribute_flags_type_is_validated.phpt Changed

php-8.3.7.tar.xz/Zend/tests/attributes/022_attribute_flags_value_is_validated.phpt -> php-8.3.21.tar.xz/Zend/tests/attributes/022_attribute_flags_value_is_validated.phpt Changed

php-8.3.7.tar.xz/Zend/tests/attributes/023_ast_node_in_validation.phpt -> php-8.3.21.tar.xz/Zend/tests/attributes/023_ast_node_in_validation.phpt Changed

php-8.3.7.tar.xz/Zend/tests/attributes/032_attribute_validation_scope.phpt -> php-8.3.21.tar.xz/Zend/tests/attributes/032_attribute_validation_scope.phpt Changed

php-8.3.21.tar.xz/Zend/tests/attributes/033_attribute_flags_type_is_not_validated_at_comp_time.phpt Added

php-8.3.21.tar.xz/Zend/tests/generators/gh14387.phpt Added

php-8.3.21.tar.xz/Zend/tests/generators/gh15851.phpt Added

php-8.3.7.tar.xz/Zend/tests/gh10014.phpt -> php-8.3.21.tar.xz/Zend/tests/gh10014.phpt Changed

php-8.3.21.tar.xz/Zend/tests/gh14009_001.phpt Added

php-8.3.21.tar.xz/Zend/tests/gh14009_002.phpt Added

php-8.3.21.tar.xz/Zend/tests/gh14009_003.phpt Added

php-8.3.21.tar.xz/Zend/tests/gh14009_004.phpt Added

php-8.3.21.tar.xz/Zend/tests/gh14009_005.phpt Added

php-8.3.21.tar.xz/Zend/tests/gh14456.phpt Added

php-8.3.21.tar.xz/Zend/tests/gh14480.phpt Added

@@ -0,0 +1,60 @@
+--TEST--
+GH-14480: Method visibility issue
+--FILE--
+<?php
+trait PropertyHelperTrait
+{
+    protected function splitPropertyParts(): void
+    {
+	    echo "OK\n";
+    }
+}
+
+trait OrmPropertyHelperTrait
+{
+    abstract protected function splitPropertyParts(): void;
+    
+    protected function addJoinsForNestedProperty(): void
+    {
+        $this->splitPropertyParts();
+    }
+}
+
+trait SearchFilterTrait
+{
+    use PropertyHelperTrait;
+}
+
+abstract class AbstractFilter
+{
+    use OrmPropertyHelperTrait, PropertyHelperTrait;
+    
+    public function apply(): void
+    {
+        $this->filterProperty();
+    }
+    
+    abstract protected function filterProperty(): void;
+}
+
+class SearchFilter extends AbstractFilter
+{
+    use SearchFilterTrait;
+    protected function filterProperty(): void
+    {
+        $this->addJoinsForNestedProperty();
+    }
+}
+
+class FilterExtension
+{
+    public function applyToCollection(): void
+    {
+        (new SearchFilter())->apply();
+    }
+}
+
+(new FilterExtension)->applyToCollection();
+?>
+--EXPECT--
+OK

php-8.3.21.tar.xz/Zend/tests/gh14626.phpt Added

php-8.3.21.tar.xz/Zend/tests/gh14961.phpt Added

php-8.3.21.tar.xz/Zend/tests/gh14969.phpt Added

php-8.3.21.tar.xz/Zend/tests/gh15108-001.phpt Added

php-8.3.21.tar.xz/Zend/tests/gh15108-002.phpt Added

php-8.3.21.tar.xz/Zend/tests/gh15108-003.phpt Added

php-8.3.21.tar.xz/Zend/tests/gh15108-004.phpt Added

php-8.3.21.tar.xz/Zend/tests/gh15108-005.phpt Added

php-8.3.21.tar.xz/Zend/tests/gh15108-006.phpt Added

php-8.3.21.tar.xz/Zend/tests/gh15108-007.phpt Added

php-8.3.21.tar.xz/Zend/tests/gh15275-001.phpt Added

php-8.3.21.tar.xz/Zend/tests/gh15275-002.phpt Added

php-8.3.21.tar.xz/Zend/tests/gh15275-003.phpt Added

php-8.3.21.tar.xz/Zend/tests/gh15275-004.phpt Added

php-8.3.21.tar.xz/Zend/tests/gh15275-005.phpt Added

php-8.3.21.tar.xz/Zend/tests/gh15275-006.phpt Added

php-8.3.21.tar.xz/Zend/tests/gh15330-001.phpt Added

php-8.3.21.tar.xz/Zend/tests/gh15330-002.phpt Added

php-8.3.21.tar.xz/Zend/tests/gh15330-003.phpt Added

@@ -0,0 +1,57 @@
+--TEST--
+GH-15330 003: Do not scan generator frames more than once
+--FILE--
+<?php
+
+class It implements \IteratorAggregate
+{
+    public function getIterator(): \Generator
+    {
+        yield 'foo';
+        Fiber::suspend();
+        var_dump("not executed");
+    }
+}
+
+class Canary {
+    public function __construct(public mixed $value) {}
+    public function __destruct() {
+        var_dump(__METHOD__);
+    }
+}
+
+function f($canary) {
+    var_dump(yield from new It());
+}
+
+$canary = new Canary(null);
+
+$iterable = f($canary);
+
+$fiber = new Fiber(function () use ($iterable, $canary) {
+    var_dump($canary, $iterable->current());
+    $iterable->next();
+    var_dump("not executed");
+});
+
+$canary->value = $fiber;
+
+$fiber->start();
+
+$iterable->current();
+
+$fiber = $iterable = $canary = null;
+
+gc_collect_cycles();
+
+?>
+==DONE==
+--EXPECTF--
+object(Canary)#%d (1) {
+  "value"=>
+  object(Fiber)#%d (0) {
+  }
+}
+string(3) "foo"
+string(18) "Canary::__destruct"
+==DONE==

php-8.3.21.tar.xz/Zend/tests/gh15330-004.phpt Added

php-8.3.21.tar.xz/Zend/tests/gh15330-005.phpt Added

php-8.3.21.tar.xz/Zend/tests/gh15330-006.phpt Added

php-8.3.21.tar.xz/Zend/tests/gh15712.phpt Added

php-8.3.21.tar.xz/Zend/tests/gh15866.phpt Added

php-8.3.21.tar.xz/Zend/tests/gh15907.phpt Added

php-8.3.21.tar.xz/Zend/tests/gh16188.phpt Added

php-8.3.21.tar.xz/Zend/tests/gh16293_001.phpt Added

php-8.3.21.tar.xz/Zend/tests/gh16293_002.phpt Added

php-8.3.21.tar.xz/Zend/tests/gh16371.phpt Added

php-8.3.21.tar.xz/Zend/tests/gh16408.phpt Added

php-8.3.21.tar.xz/Zend/tests/gh16508.phpt Added

php-8.3.21.tar.xz/Zend/tests/gh16509.inc Added

php-8.3.21.tar.xz/Zend/tests/gh16509.phpt Added

php-8.3.21.tar.xz/Zend/tests/gh16515.phpt Added

php-8.3.21.tar.xz/Zend/tests/gh16630.phpt Added

php-8.3.21.tar.xz/Zend/tests/gh16648.phpt Added

php-8.3.21.tar.xz/Zend/tests/gh16799.phpt Added

php-8.3.21.tar.xz/Zend/tests/gh17162.phpt Added

php-8.3.21.tar.xz/Zend/tests/gh17214.phpt Added

php-8.3.21.tar.xz/Zend/tests/gh_17718_001.phpt Added

php-8.3.21.tar.xz/Zend/tests/gh_17718_002.phpt Added

php-8.3.21.tar.xz/Zend/tests/gh_17728.phpt Added

php-8.3.21.tar.xz/Zend/tests/ghsa-rwp7-7vc6-8477_001.phpt Added

php-8.3.21.tar.xz/Zend/tests/ghsa-rwp7-7vc6-8477_002.phpt Added

php-8.3.21.tar.xz/Zend/tests/ghsa-rwp7-7vc6-8477_003.phpt Added

php-8.3.21.tar.xz/Zend/tests/interface_constructor_prototype_001.phpt Added

php-8.3.21.tar.xz/Zend/tests/interface_constructor_prototype_002.phpt Added

php-8.3.21.tar.xz/Zend/tests/match/049.phpt Added

php-8.3.21.tar.xz/Zend/tests/named_params/gh17216.phpt Added

php-8.3.21.tar.xz/Zend/tests/oss-fuzz-69765.phpt Added

php-8.3.7.tar.xz/Zend/tests/stack_limit/stack_limit_001.phpt -> php-8.3.21.tar.xz/Zend/tests/stack_limit/stack_limit_001.phpt Changed

php-8.3.7.tar.xz/Zend/tests/stack_limit/stack_limit_002.phpt -> php-8.3.21.tar.xz/Zend/tests/stack_limit/stack_limit_002.phpt Changed

php-8.3.21.tar.xz/Zend/tests/stack_limit/stack_limit_015.phpt Added

@@ -0,0 +1,71 @@
+--TEST--
+Stack limit 015 - Internal stack limit check in zend_compile_var()
+--CREDITS--
+abdullahasif88
+--SKIPIF--
+<?php
+if (!function_exists('zend_test_zend_call_stack_get')) die("skip zend_test_zend_call_stack_get() is not available");
+?>
+--EXTENSIONS--
+zend_test
+--INI--
+zend.max_allowed_stack_size=128K
+--FILE--
+<?php
+
+$test
+    ->p->p->p->p->p->p->p->p->p->p
+    ->p->p->p->p->p->p->p->p->p->p
+    ->p->p->p->p->p->p->p->p->p->p
+    ->p->p->p->p->p->p->p->p->p->p
+    ->p->p->p->p->p->p->p->p->p->p
+    ->p->p->p->p->p->p->p->p->p->p
+    ->p->p->p->p->p->p->p->p->p->p
+    ->p->p->p->p->p->p->p->p->p->p
+    ->p->p->p->p->p->p->p->p->p->p
+    ->p->p->p->p->p->p->p->p->p->p
+    ->p->p->p->p->p->p->p->p->p->p
+    ->p->p->p->p->p->p->p->p->p->p
+    ->p->p->p->p->p->p->p->p->p->p
+    ->p->p->p->p->p->p->p->p->p->p
+    ->p->p->p->p->p->p->p->p->p->p
+    ->p->p->p->p->p->p->p->p->p->p
+    ->p->p->p->p->p->p->p->p->p->p
+    ->p->p->p->p->p->p->p->p->p->p
+    ->p->p->p->p->p->p->p->p->p->p
+    ->p->p->p->p->p->p->p->p->p->p
+    ->p->p->p->p->p->p->p->p->p->p
+    ->p->p->p->p->p->p->p->p->p->p
+    ->p->p->p->p->p->p->p->p->p->p
+    ->p->p->p->p->p->p->p->p->p->p
+    ->p->p->p->p->p->p->p->p->p->p
+    ->p->p->p->p->p->p->p->p->p->p
+    ->p->p->p->p->p->p->p->p->p->p
+    ->p->p->p->p->p->p->p->p->p->p
+    ->p->p->p->p->p->p->p->p->p->p
+    ->p->p->p->p->p->p->p->p->p->p
+    ->p->p->p->p->p->p->p->p->p->p
+    ->p->p->p->p->p->p->p->p->p->p
+    ->p->p->p->p->p->p->p->p->p->p
+    ->p->p->p->p->p->p->p->p->p->p
+    ->p->p->p->p->p->p->p->p->p->p
+    ->p->p->p->p->p->p->p->p->p->p
+    ->p->p->p->p->p->p->p->p->p->p
+    ->p->p->p->p->p->p->p->p->p->p
+    ->p->p->p->p->p->p->p->p->p->p
+    ->p->p->p->p->p->p->p->p->p->p
+    ->p->p->p->p->p->p->p->p->p->p
+    ->p->p->p->p->p->p->p->p->p->p
+    ->p->p->p->p->p->p->p->p->p->p
+    ->p->p->p->p->p->p->p->p->p->p
+    ->p->p->p->p->p->p->p->p->p->p
+    ->p->p->p->p->p->p->p->p->p->p
+    ->p->p->p->p->p->p->p->p->p->p
+    ->p->p->p->p->p->p->p->p->p->p
+    ->p->p->p->p->p->p->p->p->p->p
+    ->p->p->p->p->p->p->p->p->p->p
+;
+
+?>
+--EXPECTF--
+Fatal error: Maximum call stack size of %d bytes (zend.max_allowed_stack_size - zend.reserved_stack_size) reached during compilation. Try splitting expression in %s on line %d

php-8.3.7.tar.xz/Zend/tests/traits/gh12854.phpt -> php-8.3.21.tar.xz/Zend/tests/traits/gh12854.phpt Changed

php-8.3.21.tar.xz/Zend/tests/zend_ini/gh16886.phpt Added

@@ -0,0 +1,41 @@
+--TEST--
+GH-16886 (ini_parse_quantity() fails to emit warning for 0x+0)
+--FILE--
+<?php
+echo ini_parse_quantity('0x 0'), "\n";
+echo ini_parse_quantity('0x+0'), "\n";
+echo ini_parse_quantity('0x-0'), "\n";
+echo ini_parse_quantity('0b 0'), "\n";
+echo ini_parse_quantity('0b+0'), "\n";
+echo ini_parse_quantity('0b-0'), "\n";
+echo ini_parse_quantity('0o 0'), "\n";
+echo ini_parse_quantity('0o+0'), "\n";
+echo ini_parse_quantity('0o-0'), "\n";
+?>
+--EXPECTF--
+Warning: Invalid quantity "0x 0": no digits after base prefix, interpreting as "0" for backwards compatibility in %s on line %d
+0
+
+Warning: Invalid quantity "0x+0": no digits after base prefix, interpreting as "0" for backwards compatibility in %s on line %d
+0
+
+Warning: Invalid quantity "0x-0": no digits after base prefix, interpreting as "0" for backwards compatibility in %s on line %d
+0
+
+Warning: Invalid quantity "0b 0": no digits after base prefix, interpreting as "0" for backwards compatibility in %s on line %d
+0
+
+Warning: Invalid quantity "0b+0": no digits after base prefix, interpreting as "0" for backwards compatibility in %s on line %d
+0
+
+Warning: Invalid quantity "0b-0": no digits after base prefix, interpreting as "0" for backwards compatibility in %s on line %d
+0
+
+Warning: Invalid quantity "0o 0": no digits after base prefix, interpreting as "0" for backwards compatibility in %s on line %d
+0
+
+Warning: Invalid quantity "0o+0": no digits after base prefix, interpreting as "0" for backwards compatibility in %s on line %d
+0
+
+Warning: Invalid quantity "0o-0": no digits after base prefix, interpreting as "0" for backwards compatibility in %s on line %d
+0

php-8.3.21.tar.xz/Zend/tests/zend_ini/gh16892.phpt Added

php-8.3.7.tar.xz/Zend/zend.c -> php-8.3.21.tar.xz/Zend/zend.c Changed

@@ -703,6 +703,7 @@
 static void compiler_globals_ctor(zend_compiler_globals *compiler_globals) /* {{{ */
 {
 	compiler_globals->compiled_filename = NULL;
+	compiler_globals->zend_lineno = 0;
 
 	compiler_globals->function_table = (HashTable *) malloc(sizeof(HashTable));
 	zend_hash_init(compiler_globals->function_table, 1024, NULL, ZEND_FUNCTION_DTOR, 1);
@@ -789,6 +790,7 @@
 	zend_init_call_trampoline_op();
 	memset(&executor_globals->trampoline, 0, sizeof(zend_op_array));
 	executor_globals->capture_warnings_during_sccp = 0;
+	executor_globals->user_error_handler_error_reporting = 0;
 	ZVAL_UNDEF(&executor_globals->user_error_handler);
 	ZVAL_UNDEF(&executor_globals->user_exception_handler);
 	executor_globals->in_autoload = NULL;
@@ -815,6 +817,8 @@
 	executor_globals->record_errors = false;
 	executor_globals->num_errors = 0;
 	executor_globals->errors = NULL;
+	executor_globals->filename_override = NULL;
+	executor_globals->lineno_override = -1;
 #ifdef ZEND_CHECK_STACK_LIMIT
 	executor_globals->stack_limit = (void*)0;
 	executor_globals->stack_base = (void*)0;

php-8.3.7.tar.xz/Zend/zend.h -> php-8.3.21.tar.xz/Zend/zend.h Changed

php-8.3.7.tar.xz/Zend/zend_API.c -> php-8.3.21.tar.xz/Zend/zend_API.c Changed

@@ -22,6 +22,7 @@
 #include "zend.h"
 #include "zend_execute.h"
 #include "zend_API.h"
+#include "zend_hash.h"
 #include "zend_modules.h"
 #include "zend_extensions.h"
 #include "zend_constants.h"
@@ -2635,8 +2636,8 @@
 
 ZEND_API void zend_check_magic_method_implementation(const zend_class_entry *ce, const zend_function *fptr, zend_string *lcname, int error_type) /* {{{ */
 {
-	if (ZSTR_VAL(fptr->common.function_name)0 != '_'
-	 || ZSTR_VAL(fptr->common.function_name)1 != '_') {
+	if (ZSTR_VAL(lcname)0 != '_'
+	 || ZSTR_VAL(lcname)1 != '_') {
 		return;
 	}
 
@@ -2817,7 +2818,14 @@
 	}
 	internal_function->type = ZEND_INTERNAL_FUNCTION;
 	internal_function->module = EG(current_module);
-	internal_function->T = 0;
+	if (EG(active) && ZEND_OBSERVER_ENABLED) {
+		/* Add an observer temporary to store previous observed frames. This is
+		 * normally handled by zend_observer_post_startup(), except for
+		 * functions registered at runtime (EG(active)). */
+		internal_function->T = 1;
+	} else {
+		internal_function->T = 0;
+	}
 	memset(internal_function->reserved, 0, ZEND_MAX_RESERVED_RESOURCES * sizeof(void*));
 
 	while (ptr->fname) {
@@ -3104,21 +3112,17 @@
 }
 /* }}} */
 
-static int clean_module_class(zval *el, void *arg) /* {{{ */
-{
-	zend_class_entry *ce = (zend_class_entry *)Z_PTR_P(el);
-	int module_number = *(int *)arg;
-	if (ce->type == ZEND_INTERNAL_CLASS && ce->info.internal.module->module_number == module_number) {
-		return ZEND_HASH_APPLY_REMOVE;
-	} else {
-		return ZEND_HASH_APPLY_KEEP;
-	}
-}
-/* }}} */
-
 static void clean_module_classes(int module_number) /* {{{ */
 {
-	zend_hash_apply_with_argument(EG(class_table), clean_module_class, (void *) &module_number);
+	/* Child classes may reuse structures from parent classes, so destroy in reverse order. */
+	Bucket *bucket;
+	ZEND_HASH_REVERSE_FOREACH_BUCKET(EG(class_table), bucket) {
+		zend_class_entry *ce = Z_CE(bucket->val);
+		if (ce->type == ZEND_INTERNAL_CLASS && ce->info.internal.module->module_number == module_number) {
+			zend_hash_del_bucket(EG(class_table), bucket);
+		}
+	} ZEND_HASH_FOREACH_END();
+
 }
 /* }}} */

php-8.3.7.tar.xz/Zend/zend_API.h -> php-8.3.21.tar.xz/Zend/zend_API.h Changed

php-8.3.7.tar.xz/Zend/zend_alloc.c -> php-8.3.21.tar.xz/Zend/zend_alloc.c Changed

php-8.3.7.tar.xz/Zend/zend_ast.c -> php-8.3.21.tar.xz/Zend/zend_ast.c Changed

php-8.3.7.tar.xz/Zend/zend_attributes.c -> php-8.3.21.tar.xz/Zend/zend_attributes.c Changed

@@ -37,30 +37,38 @@
 
 void validate_attribute(zend_attribute *attr, uint32_t target, zend_class_entry *scope)
 {
+}
+
+uint32_t zend_attribute_attribute_get_flags(zend_attribute *attr, zend_class_entry *scope)
+{
 	// TODO: More proper signature validation: Too many args, incorrect arg names.
 	if (attr->argc > 0) {
 		zval flags;
 
-		/* As this is run in the middle of compilation, fetch the attribute value without
-		 * specifying a scope. The class is not fully linked yet, and we may seen an
-		 * inconsistent state. */
-		if (FAILURE == zend_get_attribute_value(&flags, attr, 0, NULL)) {
-			return;
+		if (FAILURE == zend_get_attribute_value(&flags, attr, 0, scope)) {
+			ZEND_ASSERT(EG(exception));
+			return 0;
 		}
 
 		if (Z_TYPE(flags) != IS_LONG) {
-			zend_error_noreturn(E_ERROR,
+			zend_throw_error(NULL,
 				"Attribute::__construct(): Argument #1 ($flags) must be of type int, %s given",
 				zend_zval_value_name(&flags)
 			);
+			zval_ptr_dtor(&flags);
+			return 0;
 		}
 
-		if (Z_LVAL(flags) & ~ZEND_ATTRIBUTE_FLAGS) {
-			zend_error_noreturn(E_ERROR, "Invalid attribute flags specified");
+		uint32_t flags_l = Z_LVAL(flags);
+		if (flags_l & ~ZEND_ATTRIBUTE_FLAGS) {
+			zend_throw_error(NULL, "Invalid attribute flags specified");
+			return 0;
 		}
 
-		zval_ptr_dtor(&flags);
+		return flags_l;
 	}
+
+	return ZEND_ATTRIBUTE_TARGET_ALL;
 }
 
 static void validate_allow_dynamic_properties(

php-8.3.7.tar.xz/Zend/zend_attributes.h -> php-8.3.21.tar.xz/Zend/zend_attributes.h Changed

php-8.3.7.tar.xz/Zend/zend_builtin_functions.c -> php-8.3.21.tar.xz/Zend/zend_builtin_functions.c Changed

php-8.3.7.tar.xz/Zend/zend_call_stack.c -> php-8.3.21.tar.xz/Zend/zend_call_stack.c Changed

php-8.3.7.tar.xz/Zend/zend_closures.c -> php-8.3.21.tar.xz/Zend/zend_closures.c Changed

php-8.3.7.tar.xz/Zend/zend_compile.c -> php-8.3.21.tar.xz/Zend/zend_compile.c Changed

@@ -1202,7 +1202,7 @@
 		zend_error_noreturn(error_level, "Cannot redeclare %s() (previously declared in %s:%d)",
 					op_array ? ZSTR_VAL(op_array->function_name) : ZSTR_VAL(old_function->common.function_name),
 					ZSTR_VAL(old_function->op_array.filename),
-					old_function->op_array.opcodes0.lineno);
+					old_function->op_array.line_start);
 	} else {
 		zend_error_noreturn(error_level, "Cannot redeclare %s()",
 			op_array ? ZSTR_VAL(op_array->function_name) : ZSTR_VAL(old_function->common.function_name));
@@ -2122,7 +2122,7 @@
 	}
 
 	/* Strip trailing slashes */
-	while (end >= path && IS_SLASH_P(end)) {
+	while (end >= path && IS_SLASH_P_EX(end, end == path)) {
 		end--;
 	}
 	if (end < path) {
@@ -2133,7 +2133,7 @@
 	}
 
 	/* Strip filename */
-	while (end >= path && !IS_SLASH_P(end)) {
+	while (end >= path && !IS_SLASH_P_EX(end, end == path)) {
 		end--;
 	}
 	if (end < path) {
@@ -2144,7 +2144,7 @@
 	}
 
 	/* Strip slashes which came before the file name */
-	while (end >= path && IS_SLASH_P(end)) {
+	while (end >= path && IS_SLASH_P_EX(end, end == path)) {
 		end--;
 	}
 	if (end < path) {
@@ -2438,6 +2438,13 @@
 	}
 }
 
+static void zend_assert_not_short_circuited(const zend_ast *ast)
+{
+	if (zend_ast_is_short_circuited(ast)) {
+		zend_error_noreturn(E_COMPILE_ERROR, "Cannot take reference of a nullsafe chain");
+	}
+}
+
 /* Mark nodes that are an inner part of a short-circuiting chain.
  * We should not perform a "commit" on them, as it will be performed by the outer-most node.
  * We do this to avoid passing down an argument in various compile functions. */
@@ -3426,9 +3433,8 @@
 				if (!zend_is_variable_or_call(expr_ast)) {
 					zend_error_noreturn(E_COMPILE_ERROR,
 						"Cannot assign reference to non referenceable value");
-				} else if (zend_ast_is_short_circuited(expr_ast)) {
-					zend_error_noreturn(E_COMPILE_ERROR,
-						"Cannot take reference of a nullsafe chain");
+				} else {
+					zend_assert_not_short_circuited(expr_ast);
 				}
 
 				zend_compile_var(&expr_node, expr_ast, BP_VAR_W, 1);
@@ -3470,9 +3476,7 @@
 		zend_error_noreturn(E_COMPILE_ERROR, "Cannot re-assign $this");
 	}
 	zend_ensure_writable_variable(target_ast);
-	if (zend_ast_is_short_circuited(source_ast)) {
-		zend_error_noreturn(E_COMPILE_ERROR, "Cannot take reference of a nullsafe chain");
-	}
+	zend_assert_not_short_circuited(source_ast);
 	if (is_globals_fetch(source_ast)) {
 		zend_error_noreturn(E_COMPILE_ERROR, "Cannot acquire reference to $GLOBALS");
 	}
@@ -3657,6 +3661,12 @@
 					"Cannot use argument unpacking after named arguments");
 			}
 
+			/* Unpack may contain named arguments. */
+			may_have_undef = 1;
+			if (!fbc || (fbc->common.fn_flags & ZEND_ACC_VARIADIC)) {
+				*may_have_extra_named_args = 1;
+			}
+
 			uses_arg_unpack = 1;
 			fbc = NULL;
 
@@ -3665,11 +3675,6 @@
 			opline->op2.num = arg_count;
 			opline->result.var = EX_NUM_TO_VAR(arg_count - 1);
 
-			/* Unpack may contain named arguments. */
-			may_have_undef = 1;
-			if (!fbc || (fbc->common.fn_flags & ZEND_ACC_VARIADIC)) {
-				*may_have_extra_named_args = 1;
-			}
 			continue;
 		}
 
@@ -5173,10 +5178,7 @@
 		expr_node.op_type = IS_CONST;
 		ZVAL_NULL(&expr_node.u.constant);
 	} else if (by_ref && zend_is_variable(expr_ast)) {
-		if (zend_ast_is_short_circuited(expr_ast)) {
-			zend_error_noreturn(E_COMPILE_ERROR, "Cannot take reference of a nullsafe chain");
-		}
-
+		zend_assert_not_short_circuited(expr_ast);
 		zend_compile_var(&expr_node, expr_ast, BP_VAR_W, 1);
 	} else {
 		zend_compile_expr(&expr_node, expr_ast);
@@ -7683,6 +7685,7 @@
 	} else if (toplevel) {
 		/* Only register the function after a successful compile */
 		if (UNEXPECTED(zend_hash_add_ptr(CG(function_table), lcname, op_array) == NULL)) {
+			CG(zend_lineno) = decl->start_lineno;
 			do_bind_function_error(lcname, op_array, true);
 		}
 	}
@@ -8218,7 +8221,13 @@
 	}
 
 	opline->op1_type = IS_CONST;
-	LITERAL_STR(opline->op1, lcname);
+	/* It's possible that `lcname` is not an interned string because it was not yet in the interned string table.
+	 * However, by this point another thread may have caused `lcname` to be added in the interned string table.
+	 * This will cause `lcname` to get freed once it is found in the interned string table. If we were to use
+	 * LITERAL_STR() here we would not change the `lcname` pointer to the new value, and it would point to the
+	 * now-freed string. This will cause issues when we use `lcname` in the code below. We solve this by using
+	 * zend_add_literal_string() which gives us the new value. */
+	opline->op1.constant = zend_add_literal_string(&lcname);
 
 	if (decl->flags & ZEND_ACC_ANON_CLASS) {
 		opline->opcode = ZEND_DECLARE_ANON_CLASS;
@@ -9512,6 +9521,7 @@
 
 	if (value_ast) {
 		if (returns_by_ref && zend_is_variable(value_ast)) {
+			zend_assert_not_short_circuited(value_ast);
 			zend_compile_var(&value_node, value_ast, BP_VAR_W, 1);
 		} else {
 			zend_compile_expr(&value_node, value_ast);
@@ -10676,6 +10686,8 @@
 
 static zend_op *zend_compile_var(znode *result, zend_ast *ast, uint32_t type, bool by_ref) /* {{{ */
 {
+	zend_check_stack_limit();
+
 	uint32_t checkpoint = zend_short_circuiting_checkpoint();
 	zend_op *opcode = zend_compile_var_inner(result, ast, type, by_ref);
 	zend_short_circuiting_commit(checkpoint, result, ast);
@@ -10684,6 +10696,8 @@
 
 static zend_op *zend_delayed_compile_var(znode *result, zend_ast *ast, uint32_t type, bool by_ref) /* {{{ */
 {
+	zend_check_stack_limit();
+
 	switch (ast->kind) {
 		case ZEND_AST_VAR:
 			return zend_compile_simple_var(result, ast, type, 1);

php-8.3.7.tar.xz/Zend/zend_enum.c -> php-8.3.21.tar.xz/Zend/zend_enum.c Changed

@@ -286,7 +286,7 @@
 	} ZEND_HASH_FOREACH_END();
 }
 
-ZEND_API zend_result zend_enum_get_case_by_value(zend_object **result, zend_class_entry *ce, zend_long long_key, zend_string *string_key, bool try)
+ZEND_API zend_result zend_enum_get_case_by_value(zend_object **result, zend_class_entry *ce, zend_long long_key, zend_string *string_key, bool try_from)
 {
 	if (ce->type == ZEND_USER_CLASS && !(ce->ce_flags & ZEND_ACC_CONSTANTS_UPDATED)) {
 		if (zend_update_class_constants(ce) == FAILURE) {
@@ -310,7 +310,7 @@
 
 	if (case_name_zv == NULL) {
 not_found:
-		if (try) {
+		if (try_from) {
 			*result = NULL;
 			return SUCCESS;
 		}
@@ -340,7 +340,7 @@
 	return SUCCESS;
 }
 
-static void zend_enum_from_base(INTERNAL_FUNCTION_PARAMETERS, bool try)
+static void zend_enum_from_base(INTERNAL_FUNCTION_PARAMETERS, bool try_from)
 {
 	zend_class_entry *ce = execute_data->func->common.scope;
 	bool release_string = false;
@@ -375,12 +375,12 @@
 	}
 
 	zend_object *case_obj;
-	if (zend_enum_get_case_by_value(&case_obj, ce, long_key, string_key, try) == FAILURE) {
+	if (zend_enum_get_case_by_value(&case_obj, ce, long_key, string_key, try_from) == FAILURE) {
 		goto throw;
 	}
 
 	if (case_obj == NULL) {
-		ZEND_ASSERT(try);
+		ZEND_ASSERT(try_from);
 		goto return_null;
 	}
 
@@ -541,12 +541,14 @@
 	ast->child0->attr = 0;
 	ZEND_ASSERT(ZSTR_IS_INTERNED(class_name));
 	ZVAL_STR(zend_ast_get_zval(ast->child0), class_name);
+	Z_LINENO_P(zend_ast_get_zval(ast->child0)) = 0;
 
 	ast->child1 = (zend_ast *) p; p += sizeof(zend_ast_zval);
 	ast->child1->kind = ZEND_AST_ZVAL;
 	ast->child1->attr = 0;
 	ZEND_ASSERT(ZSTR_IS_INTERNED(case_name));
 	ZVAL_STR(zend_ast_get_zval(ast->child1), case_name);
+	Z_LINENO_P(zend_ast_get_zval(ast->child1)) = 0;
 
 	if (value) {
 		ast->child2 = (zend_ast *) p; p += sizeof(zend_ast_zval);
@@ -554,6 +556,7 @@
 		ast->child2->attr = 0;
 		ZEND_ASSERT(!Z_REFCOUNTED_P(value));
 		ZVAL_COPY_VALUE(zend_ast_get_zval(ast->child2), value);
+		Z_LINENO_P(zend_ast_get_zval(ast->child2)) = 0;
 	} else {
 		ast->child2 = NULL;
 	}

php-8.3.7.tar.xz/Zend/zend_enum.h -> php-8.3.21.tar.xz/Zend/zend_enum.h Changed

php-8.3.7.tar.xz/Zend/zend_exceptions.c -> php-8.3.21.tar.xz/Zend/zend_exceptions.c Changed

@@ -115,15 +115,18 @@
 	ex = &zv;
 	do {
 		ancestor = zend_read_property_ex(i_get_exception_base(add_previous), add_previous, ZSTR_KNOWN(ZEND_STR_PREVIOUS), 1, &rv);
+		ZVAL_DEREF(ancestor);
 		while (Z_TYPE_P(ancestor) == IS_OBJECT) {
 			if (Z_OBJ_P(ancestor) == Z_OBJ_P(ex)) {
 				OBJ_RELEASE(add_previous);
 				return;
 			}
 			ancestor = zend_read_property_ex(i_get_exception_base(Z_OBJ_P(ancestor)), Z_OBJ_P(ancestor), ZSTR_KNOWN(ZEND_STR_PREVIOUS), 1, &rv);
+			ZVAL_DEREF(ancestor);
 		}
 		base_ce = i_get_exception_base(Z_OBJ_P(ex));
 		previous = zend_read_property_ex(base_ce, Z_OBJ_P(ex), ZSTR_KNOWN(ZEND_STR_PREVIOUS), 1, &rv);
+		ZVAL_DEREF(previous);
 		if (Z_TYPE_P(previous) == IS_NULL) {
 			zend_update_property_ex(base_ce, Z_OBJ_P(ex), ZSTR_KNOWN(ZEND_STR_PREVIOUS), &pv);
 			GC_DELREF(add_previous);
@@ -190,7 +193,6 @@
 		zend_exception_set_previous(exception, EG(exception));
 		EG(exception) = exception;
 		if (previous) {
-			ZEND_ASSERT(is_handle_exception_set() && "HANDLE_EXCEPTION not set?");
 			return;
 		}
 	}
@@ -626,6 +628,7 @@
 		RETURN_THROWS();
 	}
 
+	ZVAL_DEREF(trace);
 	/* Type should be guaranteed by property type. */
 	ZEND_ASSERT(Z_TYPE_P(trace) == IS_ARRAY);
 	RETURN_NEW_STR(zend_trace_to_string(Z_ARRVAL_P(trace), /* include_main */ true));
@@ -639,7 +642,7 @@
 
 	ZEND_PARSE_PARAMETERS_NONE();
 
-	ZVAL_COPY(return_value, GET_PROPERTY_SILENT(ZEND_THIS, ZEND_STR_PREVIOUS));
+	ZVAL_COPY_DEREF(return_value, GET_PROPERTY_SILENT(ZEND_THIS, ZEND_STR_PREVIOUS));
 } /* }}} */
 
 /* {{{ Obtain the string representation of the Exception object */
@@ -719,7 +722,8 @@
 
 		Z_PROTECT_RECURSION_P(exception);
 		exception = GET_PROPERTY(exception, ZEND_STR_PREVIOUS);
-		if (exception && Z_TYPE_P(exception) == IS_OBJECT && Z_IS_RECURSIVE_P(exception)) {
+		ZVAL_DEREF(exception);
+		if (Z_TYPE_P(exception) == IS_OBJECT && Z_IS_RECURSIVE_P(exception)) {
 			break;
 		}
 	}
@@ -727,13 +731,14 @@
 
 	exception = ZEND_THIS;
 	/* Reset apply counts */
-	while (exception && Z_TYPE_P(exception) == IS_OBJECT && (base_ce = i_get_exception_base(Z_OBJ_P(exception))) && instanceof_function(Z_OBJCE_P(exception), base_ce)) {
+	while (Z_TYPE_P(exception) == IS_OBJECT && (base_ce = i_get_exception_base(Z_OBJ_P(exception))) && instanceof_function(Z_OBJCE_P(exception), base_ce)) {
 		if (Z_IS_RECURSIVE_P(exception)) {
 			Z_UNPROTECT_RECURSION_P(exception);
 		} else {
 			break;
 		}
 		exception = GET_PROPERTY(exception, ZEND_STR_PREVIOUS);
+		ZVAL_DEREF(exception);
 	}
 
 	exception = ZEND_THIS;

php-8.3.7.tar.xz/Zend/zend_execute.c -> php-8.3.21.tar.xz/Zend/zend_execute.c Changed

@@ -872,7 +872,7 @@
 {
 	smart_str msg = {0};
 
-	if (Z_TYPE_P(value) <= IS_STRING) {
+	if (!EG(exception_ignore_args) && Z_TYPE_P(value) <= IS_STRING) {
 		smart_str_append_scalar(&msg, value, EG(exception_string_param_max_len));
 	} else {
 		smart_str_appendl(&msg, "of type ", sizeof("of type ")-1);
@@ -3232,8 +3232,14 @@
 				return;
 			}
 		}
+	} else if (prop_op_type == IS_CONST) {
+		/* CE mismatch, make cache slot consistent */
+		cache_slot0 = cache_slot1 = cache_slot2 = NULL;
 	}
 
+	/* Pointer on property callback is required */
+	ZEND_ASSERT(zobj->handlers->get_property_ptr_ptr != NULL);
+
 	if (prop_op_type == IS_CONST) {
 		name = Z_STR_P(prop_ptr);
 	} else {
@@ -4561,7 +4567,20 @@
 
 ZEND_API HashTable *zend_unfinished_execution_gc_ex(zend_execute_data *execute_data, zend_execute_data *call, zend_get_gc_buffer *gc_buffer, bool suspended_by_yield)
 {
-	if (!EX(func) || !ZEND_USER_CODE(EX(func)->common.type)) {
+	if (!EX(func)) {
+		return NULL;
+	}
+
+	if (EX_CALL_INFO() & ZEND_CALL_RELEASE_THIS) {
+		zend_get_gc_buffer_add_obj(gc_buffer, Z_OBJ(execute_data->This));
+	}
+
+	if (EX_CALL_INFO() & ZEND_CALL_CLOSURE) {
+		zend_get_gc_buffer_add_obj(gc_buffer, ZEND_CLOSURE_OBJECT(EX(func)));
+	}
+
+	if (!ZEND_USER_CODE(EX(func)->common.type)) {
+		ZEND_ASSERT(!(EX_CALL_INFO() & (ZEND_CALL_HAS_SYMBOL_TABLE|ZEND_CALL_FREE_EXTRA_ARGS|ZEND_CALL_HAS_EXTRA_NAMED_PARAMS)));
 		return NULL;
 	}
 
@@ -4582,12 +4601,6 @@
 		}
 	}
 
-	if (EX_CALL_INFO() & ZEND_CALL_RELEASE_THIS) {
-		zend_get_gc_buffer_add_obj(gc_buffer, Z_OBJ(execute_data->This));
-	}
-	if (EX_CALL_INFO() & ZEND_CALL_CLOSURE) {
-		zend_get_gc_buffer_add_obj(gc_buffer, ZEND_CLOSURE_OBJECT(EX(func)));
-	}
 	if (EX_CALL_INFO() & ZEND_CALL_HAS_EXTRA_NAMED_PARAMS) {
 		zval extra_named_params;
 		ZVAL_ARR(&extra_named_params, EX(extra_named_params));
@@ -4595,7 +4608,13 @@
 	}
 
 	if (call) {
-		uint32_t op_num = execute_data->opline - op_array->opcodes;
+		uint32_t op_num;
+		if (UNEXPECTED(execute_data->opline->opcode == ZEND_HANDLE_EXCEPTION)) {
+			op_num = EG(opline_before_exception) - op_array->opcodes;
+		} else {
+			op_num = execute_data->opline - op_array->opcodes;
+		}
+		ZEND_ASSERT(op_num < op_array->last);
 		if (suspended_by_yield) {
 			/* When the execution was suspended by yield, EX(opline) points to
 			 * next opline to execute. Otherwise, it points to the opline that

php-8.3.7.tar.xz/Zend/zend_execute_API.c -> php-8.3.21.tar.xz/Zend/zend_execute_API.c Changed

@@ -842,7 +842,11 @@
 						ZEND_CALL_NUM_ARGS(call) = i;
 cleanup_args:
 						zend_vm_stack_free_args(call);
+						if (ZEND_CALL_INFO(call) & ZEND_CALL_HAS_EXTRA_NAMED_PARAMS) {
+							zend_free_extra_named_params(call->extra_named_params);
+						}
 						zend_vm_stack_free_call_frame(call);
+						zend_release_fcall_info_cache(fci_cache);
 						return SUCCESS;
 					}
 				}
@@ -1555,7 +1559,9 @@
 			t_r.it_value.tv_sec = seconds;
 			t_r.it_value.tv_usec = t_r.it_interval.tv_sec = t_r.it_interval.tv_usec = 0;
 
-# if defined(__CYGWIN__) || defined(__PASE__)
+# if defined(__CYGWIN__) || defined(__PASE__) || (defined(__aarch64__) && defined(__APPLE__))
+			// ITIMER_PROF is broken in Apple Silicon system with MacOS >= 14
+			// See https://openradar.appspot.com/radar?id=5583058442911744.
 			setitimer(ITIMER_REAL, &t_r, NULL);
 		}
 		signo = SIGALRM;
@@ -1619,7 +1625,7 @@
 
 		no_timeout.it_value.tv_sec = no_timeout.it_value.tv_usec = no_timeout.it_interval.tv_sec = no_timeout.it_interval.tv_usec = 0;
 
-# if defined(__CYGWIN__) || defined(__PASE__)
+# if defined(__CYGWIN__) || defined(__PASE__) || (defined(__aarch64__) && defined(__APPLE__))
 		setitimer(ITIMER_REAL, &no_timeout, NULL);
 # else
 		setitimer(ITIMER_PROF, &no_timeout, NULL);

php-8.3.7.tar.xz/Zend/zend_fibers.c -> php-8.3.21.tar.xz/Zend/zend_fibers.c Changed

@@ -19,6 +19,7 @@
 
 #include "zend.h"
 #include "zend_API.h"
+#include "zend_gc.h"
 #include "zend_ini.h"
 #include "zend_vm.h"
 #include "zend_exceptions.h"
@@ -27,6 +28,7 @@
 #include "zend_mmap.h"
 #include "zend_compile.h"
 #include "zend_closures.h"
+#include "zend_generators.h"
 
 #include "zend_fibers.h"
 #include "zend_fibers_arginfo.h"
@@ -763,7 +765,25 @@
 	HashTable *lastSymTable = NULL;
 	zend_execute_data *ex = fiber->execute_data;
 	for (; ex; ex = ex->prev_execute_data) {
-		HashTable *symTable = zend_unfinished_execution_gc_ex(ex, ex->func && ZEND_USER_CODE(ex->func->type) ? ex->call : NULL, buf, false);
+		HashTable *symTable;
+		if (ZEND_CALL_INFO(ex) & ZEND_CALL_GENERATOR) {
+			/* The generator object is stored in ex->return_value */
+			zend_generator *generator = (zend_generator*)ex->return_value;
+			/* There are two cases to consider:
+			 * - If the generator is currently running, the Generator's GC
+			 *   handler will ignore it because it is not collectable. However,
+			 *   in this context the generator is suspended in Fiber::suspend()
+			 *   and may be collectable, so we can inspect it.
+			 * - If the generator is not running, the Generator's GC handler
+			 *   will inspect it. In this case we have to skip the frame.
+			 */
+			if (!(generator->flags & ZEND_GENERATOR_CURRENTLY_RUNNING)) {
+				continue;
+			}
+			symTable = zend_generator_frame_gc(buf, generator);
+		} else {
+			symTable = zend_unfinished_execution_gc_ex(ex, ex->func && ZEND_USER_CODE(ex->func->type) ? ex->call : NULL, buf, false);
+		}
 		if (symTable) {
 			if (lastSymTable) {
 				zval *val;

php-8.3.7.tar.xz/Zend/zend_gc.c -> php-8.3.21.tar.xz/Zend/zend_gc.c Changed

php-8.3.7.tar.xz/Zend/zend_generators.c -> php-8.3.21.tar.xz/Zend/zend_generators.c Changed

@@ -19,12 +19,14 @@
 
 #include "zend.h"
 #include "zend_API.h"
+#include "zend_hash.h"
 #include "zend_interfaces.h"
 #include "zend_exceptions.h"
 #include "zend_generators.h"
 #include "zend_closures.h"
 #include "zend_generators_arginfo.h"
 #include "zend_observer.h"
+#include "zend_vm_opcodes.h"
 
 ZEND_API zend_class_entry *zend_ce_generator;
 ZEND_API zend_class_entry *zend_ce_ClosedGeneratorException;
@@ -216,19 +218,55 @@
 	}
 }
 
+/* Check if the node 'generator' is running in a fiber */
+static inline bool check_node_running_in_fiber(zend_generator *generator) {
+	ZEND_ASSERT(generator->execute_data);
+
+	if (EXPECTED(generator->flags & ZEND_GENERATOR_IN_FIBER)) {
+		return true;
+	}
+
+	if (EXPECTED(generator->node.children == 0)) {
+		return false;
+	}
+
+	if (generator->node.children == 1) {
+		return check_node_running_in_fiber(generator->node.child.single);
+	}
+
+	zend_generator *child;
+	ZEND_HASH_FOREACH_PTR(generator->node.child.ht, child) {
+		if (check_node_running_in_fiber(child)) {
+			return true;
+		}
+	} ZEND_HASH_FOREACH_END();
+
+	return false;
+}
+
 static void zend_generator_dtor_storage(zend_object *object) /* {{{ */
 {
 	zend_generator *generator = (zend_generator*) object;
+	zend_generator *current_generator = zend_generator_get_current(generator);
 	zend_execute_data *ex = generator->execute_data;
 	uint32_t op_num, try_catch_offset;
 	int i;
 
-	/* Generator is running in a suspended fiber.
-	 * Will be dtor during fiber dtor */
-	if (zend_generator_get_current(generator)->flags & ZEND_GENERATOR_IN_FIBER) {
-		/* Prevent finally blocks from yielding */
-		generator->flags |= ZEND_GENERATOR_FORCED_CLOSE;
-		return;
+	/* If current_generator is running in a fiber, there are 2 cases to consider:
+	 *  - If generator is also marked with ZEND_GENERATOR_IN_FIBER, then the
+	 *    entire path from current_generator to generator is executing in a
+	 *    fiber. Do not dtor now: These will be dtor when terminating the fiber.
+	 *  - If generator is not marked with ZEND_GENERATOR_IN_FIBER, and has a
+	 *    child marked with ZEND_GENERATOR_IN_FIBER, then this an intermediate
+	 *    node of case 1. Otherwise generator is not executing in a fiber and we
+	 *    can dtor.
+	 */
+	if (current_generator->flags & ZEND_GENERATOR_IN_FIBER) {
+		if (check_node_running_in_fiber(generator)) {
+			/* Prevent finally blocks from yielding */
+			generator->flags |= ZEND_GENERATOR_FORCED_CLOSE;
+			return;
+		}
 	}
 
 	/* leave yield from mode to properly allow finally execution */
@@ -347,32 +385,11 @@
 }
 /* }}} */
 
-static HashTable *zend_generator_get_gc(zend_object *object, zval **table, int *n) /* {{{ */
+HashTable *zend_generator_frame_gc(zend_get_gc_buffer *gc_buffer, zend_generator *generator)
 {
-	zend_generator *generator = (zend_generator*)object;
 	zend_execute_data *execute_data = generator->execute_data;
 	zend_execute_data *call = NULL;
 
-	if (!execute_data) {
-		/* If the generator has been closed, it can only hold on to three values: The value, key
-		 * and retval. These three zvals are stored sequentially starting at &generator->value. */
-		*table = &generator->value;
-		*n = 3;
-		return NULL;
-	}
-
-	if (generator->flags & ZEND_GENERATOR_CURRENTLY_RUNNING) {
-		/* If the generator is currently running, we certainly won't be able to GC any values it
-		 * holds on to. The execute_data state might be inconsistent during execution (e.g. because
-		 * GC has been triggered in the middle of a variable reassignment), so we should not try
-		 * to inspect it here. */
-		*table = NULL;
-		*n = 0;
-		return NULL;
-	}
-
-
-	zend_get_gc_buffer *gc_buffer = zend_get_gc_buffer_create();
 	zend_get_gc_buffer_add_zval(gc_buffer, &generator->value);
 	zend_get_gc_buffer_add_zval(gc_buffer, &generator->key);
 	zend_get_gc_buffer_add_zval(gc_buffer, &generator->retval);
@@ -383,7 +400,7 @@
 		call = zend_generator_revert_call_stack(generator->frozen_call_stack);
 	}
 
-	zend_unfinished_execution_gc_ex(execute_data, call, gc_buffer, true);
+	HashTable *ht = zend_unfinished_execution_gc_ex(execute_data, call, gc_buffer, true);
 
 	if (UNEXPECTED(generator->frozen_call_stack)) {
 		zend_generator_revert_call_stack(call);
@@ -393,12 +410,37 @@
 		zend_get_gc_buffer_add_obj(gc_buffer, &generator->node.parent->std);
 	}
 
-	zend_get_gc_buffer_use(gc_buffer, table, n);
-	if (EX_CALL_INFO() & ZEND_CALL_HAS_SYMBOL_TABLE) {
-		return execute_data->symbol_table;
-	} else {
+	return ht;
+}
+
+static HashTable *zend_generator_get_gc(zend_object *object, zval **table, int *n) /* {{{ */
+{
+	zend_generator *generator = (zend_generator*)object;
+	zend_execute_data *execute_data = generator->execute_data;
+
+	if (!execute_data) {
+		/* If the generator has been closed, it can only hold on to three values: The value, key
+		 * and retval. These three zvals are stored sequentially starting at &generator->value. */
+		*table = &generator->value;
+		*n = 3;
 		return NULL;
 	}
+
+	if (generator->flags & ZEND_GENERATOR_CURRENTLY_RUNNING) {
+		/* If the generator is currently running, we certainly won't be able to GC any values it
+		 * holds on to. The execute_data state might be inconsistent during execution (e.g. because
+		 * GC has been triggered in the middle of a variable reassignment), so we should not try
+		 * to inspect it here. */
+		*table = NULL;
+		*n = 0;
+		return NULL;
+	}
+
+	zend_get_gc_buffer *gc_buffer = zend_get_gc_buffer_create();
+	HashTable *ht = zend_generator_frame_gc(gc_buffer, generator);
+	zend_get_gc_buffer_use(gc_buffer, table, n);
+
+	return ht;
 }
 /* }}} */
 
@@ -458,6 +500,9 @@
 	 * to pretend the exception happened during the YIELD opcode. */
 	EG(current_execute_data) = generator->execute_data;
 	generator->execute_data->opline--;
+	ZEND_ASSERT(generator->execute_data->opline->opcode == ZEND_YIELD
+			|| generator->execute_data->opline->opcode == ZEND_YIELD_FROM);
+	generator->execute_data->prev_execute_data = original_execute_data;
 
 	if (exception) {
 		zend_throw_exception_object(exception);
@@ -465,13 +510,14 @@
 		zend_rethrow_exception(EG(current_execute_data));
 	}
 
+	generator->execute_data->opline++;
+
 	/* if we don't stop an array/iterator yield from, the exception will only reach the generator after the values were all iterated over */
 	if (UNEXPECTED(Z_TYPE(generator->values) != IS_UNDEF)) {
 		zval_ptr_dtor(&generator->values);
 		ZVAL_UNDEF(&generator->values);
 	}
 
-	generator->execute_data->opline++;
 	EG(current_execute_data) = original_execute_data;
 }
 
@@ -601,8 +647,6 @@
 
 static zend_result zend_generator_get_next_delegated_value(zend_generator *generator) /* {{{ */
 {
-	--generator->execute_data->opline;
-
 	zval *value;
 	if (Z_TYPE(generator->values) == IS_ARRAY) {
 		HashTable *ht = Z_ARR(generator->values);
@@ -684,14 +728,12 @@
 		}
 	}
 
-	++generator->execute_data->opline;
 	return SUCCESS;
 
 failure:
 	zval_ptr_dtor(&generator->values);
 	ZVAL_UNDEF(&generator->values);
 
-	++generator->execute_data->opline;
 	return FAILURE;
 }
 /* }}} */
@@ -717,6 +759,11 @@
 		return;
 	}
 
+	if (EG(active_fiber)) {
+		orig_generator->flags |= ZEND_GENERATOR_IN_FIBER;
+		generator->flags |= ZEND_GENERATOR_IN_FIBER;
+	}
+
 	/* Drop the AT_FIRST_YIELD flag */
 	orig_generator->flags &= ~ZEND_GENERATOR_AT_FIRST_YIELD;
 
@@ -747,9 +794,19 @@
 			EG(current_execute_data) = original_execute_data;
 			EG(jit_trace_num) = original_jit_trace_num;
 
-			orig_generator->flags &= ~ZEND_GENERATOR_DO_INIT;
+			orig_generator->flags &= ~(ZEND_GENERATOR_DO_INIT | ZEND_GENERATOR_IN_FIBER);
+			generator->flags &= ~ZEND_GENERATOR_IN_FIBER;
 			return;
 		}
+		if (UNEXPECTED(EG(exception))) {
+			/* Decrementing opline_before_exception to pretend the exception
+			 * happened during the YIELD_FROM opcode. */
+			if (generator->execute_data) {
+				ZEND_ASSERT(generator->execute_data->opline == EG(exception_op));
+				ZEND_ASSERT((EG(opline_before_exception)-1)->opcode == ZEND_YIELD_FROM);
+				EG(opline_before_exception)--;
+			}
+		}
 		/* If there are no more delegated values, resume the generator
 		 * after the "yield from" expression. */
 	}
@@ -760,8 +817,7 @@
 	}
 
 	/* Resume execution */
-	generator->flags |= ZEND_GENERATOR_CURRENTLY_RUNNING
-						| (EG(active_fiber) ? ZEND_GENERATOR_IN_FIBER : 0);
+	generator->flags |= ZEND_GENERATOR_CURRENTLY_RUNNING;
 	if (!ZEND_OBSERVER_ENABLED) {
 		zend_execute_ex(generator->execute_data);
 	} else {
@@ -812,7 +868,7 @@
 		goto try_again;
 	}
 
-	orig_generator->flags &= ~ZEND_GENERATOR_DO_INIT;
+	orig_generator->flags &= ~(ZEND_GENERATOR_DO_INIT | ZEND_GENERATOR_IN_FIBER);
 }
 /* }}} */

php-8.3.7.tar.xz/Zend/zend_generators.h -> php-8.3.21.tar.xz/Zend/zend_generators.h Changed

php-8.3.7.tar.xz/Zend/zend_hash.c -> php-8.3.21.tar.xz/Zend/zend_hash.c Changed

@@ -2346,17 +2346,20 @@
 
 // We need to duplicate iterators to be able to search through all copy-on-write copies to find the actually iterated HashTable and position back
 static void zend_array_dup_ht_iterators(HashTable *source, HashTable *target) {
-	HashTableIterator *iter = EG(ht_iterators);
-	HashTableIterator *end  = iter + EG(ht_iterators_used);
+	uint32_t iter_index = 0;
+	uint32_t end_index = EG(ht_iterators_used);
 
-	while (iter != end) {
+	while (iter_index != end_index) {
+		HashTableIterator *iter = &EG(ht_iterators)iter_index;
 		if (iter->ht == source) {
 			uint32_t copy_idx = zend_hash_iterator_add(target, iter->pos);
+			/* Refetch iter because the memory may be reallocated. */
+			iter = &EG(ht_iterators)iter_index;
 			HashTableIterator *copy_iter = EG(ht_iterators) + copy_idx;
 			copy_iter->next_copy = iter->next_copy;
 			iter->next_copy = copy_idx;
 		}
-		iter++;
+		iter_index++;
 	}
 }
 
@@ -2971,13 +2974,12 @@
 	q->h = h;
 }
 
-ZEND_API void ZEND_FASTCALL zend_hash_sort_ex(HashTable *ht, sort_func_t sort, bucket_compare_func_t compar, bool renumber)
+static void zend_hash_sort_internal(HashTable *ht, sort_func_t sort, bucket_compare_func_t compar, bool renumber)
 {
 	Bucket *p;
 	uint32_t i, j;
 
 	IS_CONSISTENT(ht);
-	HT_ASSERT_RC1(ht);
 
 	if (!(ht->nNumOfElements>1) && !(renumber && ht->nNumOfElements>0)) {
 		/* Doesn't require sorting */
@@ -3064,6 +3066,33 @@
 	}
 }
 
+ZEND_API void ZEND_FASTCALL zend_hash_sort_ex(HashTable *ht, sort_func_t sort, bucket_compare_func_t compar, bool renumber)
+{
+	HT_ASSERT_RC1(ht);
+	zend_hash_sort_internal(ht, sort, compar, renumber);
+}
+
+void ZEND_FASTCALL zend_array_sort_ex(HashTable *ht, sort_func_t sort, bucket_compare_func_t compar, bool renumber)
+{
+	HT_ASSERT_RC1(ht);
+
+	/* Unpack the array early to avoid RCn assertion failures. */
+	if (HT_IS_PACKED(ht)) {
+		zend_hash_packed_to_hash(ht);
+	}
+
+	/* Adding a refcount prevents the array from going away. */
+	GC_ADDREF(ht);
+
+	zend_hash_sort_internal(ht, sort, compar, renumber);
+
+	if (UNEXPECTED(GC_DELREF(ht) == 0)) {
+		zend_array_destroy(ht);
+	} else {
+		gc_check_possible_root((zend_refcounted *)ht);
+	}
+}
+
 static zend_always_inline int zend_hash_compare_impl(HashTable *ht1, HashTable *ht2, compare_func_t compar, bool ordered) {
 	uint32_t idx1, idx2;
 	zend_string *key1, *key2;

php-8.3.7.tar.xz/Zend/zend_hash.h -> php-8.3.21.tar.xz/Zend/zend_hash.h Changed

@@ -296,12 +296,20 @@
 typedef int (*bucket_compare_func_t)(Bucket *a, Bucket *b);
 ZEND_API int   zend_hash_compare(HashTable *ht1, HashTable *ht2, compare_func_t compar, bool ordered);
 ZEND_API void  ZEND_FASTCALL zend_hash_sort_ex(HashTable *ht, sort_func_t sort_func, bucket_compare_func_t compare_func, bool renumber);
+void  ZEND_FASTCALL zend_array_sort_ex(HashTable *ht, sort_func_t sort_func, bucket_compare_func_t compare_func, bool renumber);
 ZEND_API zval* ZEND_FASTCALL zend_hash_minmax(const HashTable *ht, compare_func_t compar, uint32_t flag);
 
 static zend_always_inline void ZEND_FASTCALL zend_hash_sort(HashTable *ht, bucket_compare_func_t compare_func, bool renumber) {
 	zend_hash_sort_ex(ht, zend_sort, compare_func, renumber);
 }
 
+/* Use this variant over zend_hash_sort() when sorting user arrays that may
+ * trigger user code. It will ensure the user code cannot free the array during
+ * sorting. */
+static zend_always_inline void zend_array_sort(HashTable *ht, bucket_compare_func_t compare_func, bool renumber) {
+	zend_array_sort_ex(ht, zend_sort, compare_func, renumber);
+}
+
 static zend_always_inline uint32_t zend_hash_num_elements(const HashTable *ht) {
 	return ht->nNumOfElements;
 }

php-8.3.7.tar.xz/Zend/zend_inheritance.c -> php-8.3.21.tar.xz/Zend/zend_inheritance.c Changed

@@ -1078,31 +1078,45 @@
 	}
 }
 
-/**
- * @param check_only Set to false to throw compile errors on incompatible methods, or true to return INHERITANCE_ERROR.
- * @param checked Whether the compatibility check has already succeeded in zend_can_early_bind().
- * @param force_mutable Whether we know that child may be modified, i.e. doesn't live in shm.
- */
-static zend_always_inline inheritance_status do_inheritance_check_on_method_ex(
+#define ZEND_INHERITANCE_LAZY_CHILD_CLONE     (1<<0)
+#define ZEND_INHERITANCE_CHECK_SILENT         (1<<1) /* don't throw errors */
+#define ZEND_INHERITANCE_CHECK_PROTO          (1<<2) /* check method prototype (it might be already checked before) */
+#define ZEND_INHERITANCE_CHECK_VISIBILITY     (1<<3)
+#define ZEND_INHERITANCE_SET_CHILD_CHANGED    (1<<4)
+#define ZEND_INHERITANCE_SET_CHILD_PROTO      (1<<5)
+#define ZEND_INHERITANCE_RESET_CHILD_OVERRIDE (1<<6)
+
+static inheritance_status do_inheritance_check_on_method(
 		zend_function *child, zend_class_entry *child_scope,
 		zend_function *parent, zend_class_entry *parent_scope,
-		zend_class_entry *ce, zval *child_zv,
-		bool check_visibility, bool check_only, bool checked, bool force_mutable) /* {{{ */
+		zend_class_entry *ce, zval *child_zv, uint32_t flags) /* {{{ */
 {
 	uint32_t child_flags;
 	uint32_t parent_flags = parent->common.fn_flags;
 	zend_function *proto;
 
-	if (UNEXPECTED((parent_flags & ZEND_ACC_PRIVATE) && !(parent_flags & ZEND_ACC_ABSTRACT) && !(parent_flags & ZEND_ACC_CTOR))) {
-		if (!check_only) {
+#define SEPARATE_METHOD() do { \
+			if ((flags & ZEND_INHERITANCE_LAZY_CHILD_CLONE) \
+			 && child_scope != ce && child->type == ZEND_USER_FUNCTION) { \
+				/* op_array wasn't duplicated yet */ \
+				zend_function *new_function = zend_arena_alloc(&CG(arena), sizeof(zend_op_array)); \
+				memcpy(new_function, child, sizeof(zend_op_array)); \
+				Z_PTR_P(child_zv) = child = new_function; \
+				flags &= ~ZEND_INHERITANCE_LAZY_CHILD_CLONE; \
+			} \
+		} while(0)
+
+	if (UNEXPECTED((parent_flags & (ZEND_ACC_PRIVATE|ZEND_ACC_ABSTRACT|ZEND_ACC_CTOR)) == ZEND_ACC_PRIVATE)) {
+		if (flags & ZEND_INHERITANCE_SET_CHILD_CHANGED) {
+			SEPARATE_METHOD();
 			child->common.fn_flags |= ZEND_ACC_CHANGED;
 		}
 		/* The parent method is private and not an abstract so we don't need to check any inheritance rules */
 		return INHERITANCE_SUCCESS;
 	}
 
-	if (!checked && UNEXPECTED(parent_flags & ZEND_ACC_FINAL)) {
-		if (check_only) {
+	if ((flags & ZEND_INHERITANCE_CHECK_PROTO) && UNEXPECTED(parent_flags & ZEND_ACC_FINAL)) {
+		if (flags & ZEND_INHERITANCE_CHECK_SILENT) {
 			return INHERITANCE_ERROR;
 		}
 		zend_error_at_noreturn(E_COMPILE_ERROR, func_filename(child), func_lineno(child),
@@ -1113,8 +1127,9 @@
 	child_flags	= child->common.fn_flags;
 	/* You cannot change from static to non static and vice versa.
 	 */
-	if (!checked && UNEXPECTED((child_flags & ZEND_ACC_STATIC) != (parent_flags & ZEND_ACC_STATIC))) {
-		if (check_only) {
+	if ((flags & ZEND_INHERITANCE_CHECK_PROTO)
+	 && UNEXPECTED((child_flags & ZEND_ACC_STATIC) != (parent_flags & ZEND_ACC_STATIC))) {
+		if (flags & ZEND_INHERITANCE_CHECK_SILENT) {
 			return INHERITANCE_ERROR;
 		}
 		if (child_flags & ZEND_ACC_STATIC) {
@@ -1129,8 +1144,9 @@
 	}
 
 	/* Disallow making an inherited method abstract. */
-	if (!checked && UNEXPECTED((child_flags & ZEND_ACC_ABSTRACT) > (parent_flags & ZEND_ACC_ABSTRACT))) {
-		if (check_only) {
+	if ((flags & ZEND_INHERITANCE_CHECK_PROTO)
+	 && UNEXPECTED((child_flags & ZEND_ACC_ABSTRACT) > (parent_flags & ZEND_ACC_ABSTRACT))) {
+		if (flags & ZEND_INHERITANCE_CHECK_SILENT) {
 			return INHERITANCE_ERROR;
 		}
 		zend_error_at_noreturn(E_COMPILE_ERROR, func_filename(child), func_lineno(child),
@@ -1138,7 +1154,9 @@
 			ZEND_FN_SCOPE_NAME(parent), ZSTR_VAL(child->common.function_name), ZEND_FN_SCOPE_NAME(child));
 	}
 
-	if (!check_only && (parent_flags & (ZEND_ACC_PRIVATE|ZEND_ACC_CHANGED))) {
+	if ((flags & ZEND_INHERITANCE_SET_CHILD_CHANGED)
+	 && (parent_flags & (ZEND_ACC_PRIVATE|ZEND_ACC_CHANGED))) {
+		SEPARATE_METHOD();
 		child->common.fn_flags |= ZEND_ACC_CHANGED;
 	}
 
@@ -1154,27 +1172,16 @@
 		parent = proto;
 	}
 
-	if (!check_only && child->common.prototype != proto && child_zv) {
-		do {
-			if (child->common.scope != ce && child->type == ZEND_USER_FUNCTION) {
-				if (ce->ce_flags & ZEND_ACC_INTERFACE) {
-					/* Few parent interfaces contain the same method */
-					break;
-				} else {
-					/* op_array wasn't duplicated yet */
-					zend_function *new_function = zend_arena_alloc(&CG(arena), sizeof(zend_op_array));
-					memcpy(new_function, child, sizeof(zend_op_array));
-					Z_PTR_P(child_zv) = child = new_function;
-				}
-			}
-			child->common.prototype = proto;
-		} while (0);
+	if ((flags & ZEND_INHERITANCE_SET_CHILD_PROTO)
+	 && child->common.prototype != proto) {
+		SEPARATE_METHOD();
+		child->common.prototype = proto;
 	}
 
 	/* Prevent derived classes from restricting access that was available in parent classes (except deriving from non-abstract ctors) */
-	if (!checked && check_visibility
+	if ((flags & ZEND_INHERITANCE_CHECK_VISIBILITY)
 			&& (child_flags & ZEND_ACC_PPP_MASK) > (parent_flags & ZEND_ACC_PPP_MASK)) {
-		if (check_only) {
+		if (flags & ZEND_INHERITANCE_CHECK_SILENT) {
 			return INHERITANCE_ERROR;
 		}
 		zend_error_at_noreturn(E_COMPILE_ERROR, func_filename(child), func_lineno(child),
@@ -1182,30 +1189,26 @@
 			ZEND_FN_SCOPE_NAME(child), ZSTR_VAL(child->common.function_name), zend_visibility_string(parent_flags), ZEND_FN_SCOPE_NAME(parent), (parent_flags&ZEND_ACC_PUBLIC) ? "" : " or weaker");
 	}
 
-	if (!checked) {
-		if (check_only) {
+	if (flags & ZEND_INHERITANCE_CHECK_PROTO) {
+		if (flags & ZEND_INHERITANCE_CHECK_SILENT) {
 			return zend_do_perform_implementation_check(child, child_scope, parent, parent_scope);
 		}
 		perform_delayable_implementation_check(ce, child, child_scope, parent, parent_scope);
 	}
 
-	if (!check_only && (child->common.scope == ce || force_mutable)) {
+	if ((flags & ZEND_INHERITANCE_RESET_CHILD_OVERRIDE)
+	 && (child->common.fn_flags & ZEND_ACC_OVERRIDE)) {
+		SEPARATE_METHOD();
 		child->common.fn_flags &= ~ZEND_ACC_OVERRIDE;
 	}
 
+#undef SEPARATE_METHOD
+
 	return INHERITANCE_SUCCESS;
 }
 /* }}} */
 
-static zend_never_inline void do_inheritance_check_on_method(
-		zend_function *child, zend_class_entry *child_scope,
-		zend_function *parent, zend_class_entry *parent_scope,
-		zend_class_entry *ce, zval *child_zv, bool check_visibility)
-{
-	do_inheritance_check_on_method_ex(child, child_scope, parent, parent_scope, ce, child_zv, check_visibility, 0, 0, /* force_mutable */ false);
-}
-
-static zend_always_inline void do_inherit_method(zend_string *key, zend_function *parent, zend_class_entry *ce, bool is_interface, bool checked) /* {{{ */
+static void do_inherit_method(zend_string *key, zend_function *parent, zend_class_entry *ce, bool is_interface, uint32_t flags) /* {{{ */
 {
 	zval *child = zend_hash_find_known_hash(&ce->function_table, key);
 
@@ -1217,15 +1220,8 @@
 			return;
 		}
 
-		if (checked) {
-			do_inheritance_check_on_method_ex(
-				func, func->common.scope, parent, parent->common.scope, ce, child,
-				/* check_visibility */ 1, 0, checked, /* force_mutable */ false);
-		} else {
-			do_inheritance_check_on_method(
-				func, func->common.scope, parent, parent->common.scope, ce, child,
-				/* check_visibility */ 1);
-		}
+		do_inheritance_check_on_method(
+			func, func->common.scope, parent, parent->common.scope, ce, child, flags);
 	} else {
 
 		if (is_interface || (parent->common.fn_flags & (ZEND_ACC_ABSTRACT))) {
@@ -1649,16 +1645,18 @@
 		zend_hash_extend(&ce->function_table,
 			zend_hash_num_elements(&ce->function_table) +
 			zend_hash_num_elements(&parent_ce->function_table), 0);
+		uint32_t flags =
+			ZEND_INHERITANCE_LAZY_CHILD_CLONE |
+			ZEND_INHERITANCE_SET_CHILD_CHANGED |
+			ZEND_INHERITANCE_SET_CHILD_PROTO |
+			ZEND_INHERITANCE_RESET_CHILD_OVERRIDE;
 
-		if (checked) {
-			ZEND_HASH_MAP_FOREACH_STR_KEY_PTR(&parent_ce->function_table, key, func) {
-				do_inherit_method(key, func, ce, 0, 1);
-			} ZEND_HASH_FOREACH_END();
-		} else {
-			ZEND_HASH_MAP_FOREACH_STR_KEY_PTR(&parent_ce->function_table, key, func) {
-				do_inherit_method(key, func, ce, 0, 0);
-			} ZEND_HASH_FOREACH_END();
+		if (!checked) {
+			flags |= ZEND_INHERITANCE_CHECK_PROTO | ZEND_INHERITANCE_CHECK_VISIBILITY;
 		}
+		ZEND_HASH_MAP_FOREACH_STR_KEY_PTR(&parent_ce->function_table, key, func) {
+			do_inherit_method(key, func, ce, 0, flags);
+		} ZEND_HASH_FOREACH_END();
 	}
 
 	do_inherit_parent_constructor(ce);
@@ -1790,13 +1788,27 @@
 	zend_function *func;
 	zend_string *key;
 	zend_class_constant *c;
+	uint32_t flags = ZEND_INHERITANCE_CHECK_PROTO | ZEND_INHERITANCE_CHECK_VISIBILITY;
+
+	if (!(ce->ce_flags & ZEND_ACC_INTERFACE)) {
+		/* We are not setting the prototype of overridden interface methods because of abstract
+		 * constructors. See Zend/tests/interface_constructor_prototype_001.phpt. */
+		flags |=
+			ZEND_INHERITANCE_LAZY_CHILD_CLONE |
+			ZEND_INHERITANCE_SET_CHILD_PROTO |
+			ZEND_INHERITANCE_RESET_CHILD_OVERRIDE;
+	} else {
+		flags |=
+			ZEND_INHERITANCE_LAZY_CHILD_CLONE |
+			ZEND_INHERITANCE_RESET_CHILD_OVERRIDE;
+	}
 
 	ZEND_HASH_MAP_FOREACH_STR_KEY_PTR(&iface->constants_table, key, c) {
 		do_inherit_iface_constant(key, c, ce, iface);
 	} ZEND_HASH_FOREACH_END();
 
 	ZEND_HASH_MAP_FOREACH_STR_KEY_PTR(&iface->function_table, key, func) {
-		do_inherit_method(key, func, ce, 1, 0);
+		do_inherit_method(key, func, ce, 1, flags);
 	} ZEND_HASH_FOREACH_END();
 
 	do_implement_interface(ce, iface);
@@ -1967,7 +1979,7 @@
 			 */
 			do_inheritance_check_on_method(
 				existing_fn, fixup_trait_scope(existing_fn, ce), fn, fixup_trait_scope(fn, ce),
-				ce, NULL, /* check_visibility */ 0);
+				ce, NULL, ZEND_INHERITANCE_CHECK_PROTO | ZEND_INHERITANCE_RESET_CHILD_OVERRIDE);
 			return;
 		}
 
@@ -2006,9 +2018,14 @@
 	if (check_inheritance) {
 		/* Inherited members are overridden by members inserted by traits.
 		 * Check whether the trait method fulfills the inheritance requirements. */
-		do_inheritance_check_on_method_ex(
+		uint32_t flags = ZEND_INHERITANCE_CHECK_PROTO | ZEND_INHERITANCE_CHECK_VISIBILITY;
+		if (!(existing_fn->common.scope->ce_flags & ZEND_ACC_TRAIT)) {
+			flags |= ZEND_INHERITANCE_SET_CHILD_CHANGED |ZEND_INHERITANCE_SET_CHILD_PROTO |
+				ZEND_INHERITANCE_RESET_CHILD_OVERRIDE;
+		}
+		do_inheritance_check_on_method(
 			fn, fixup_trait_scope(fn, ce), existing_fn, fixup_trait_scope(existing_fn, ce),
-			ce, NULL, /* check_visibility */ 1, false, false, /* force_mutable */ true);
+			ce, NULL, flags);
 	}
 }
 /* }}} */
@@ -2031,9 +2048,11 @@
 
 static void zend_traits_check_private_final_inheritance(uint32_t original_fn_flags, zend_function *fn_copy, zend_string *name)
 {
-	/* If the function was originally already private+final, then it will have already been warned about.
-	 * If the function became private+final only after applying modifiers, we need to emit the same warning. */
-	if ((original_fn_flags & (ZEND_ACC_PRIVATE | ZEND_ACC_FINAL)) != (ZEND_ACC_PRIVATE | ZEND_ACC_FINAL)
+	/* If the function was originally already private+final, then it will have
+	 * already been warned about. Only emit this error when the used trait method
+	 * explicitly became final, avoiding errors for `as private` where it was
+	 * already final. */
+	if (!(original_fn_flags & ZEND_ACC_FINAL)
 		&& (fn_copy->common.fn_flags & (ZEND_ACC_PRIVATE | ZEND_ACC_FINAL)) == (ZEND_ACC_PRIVATE | ZEND_ACC_FINAL)
 		&& !zend_string_equals_literal_ci(name, ZEND_CONSTRUCTOR_FUNC_NAME)) {
 		zend_error(E_COMPILE_WARNING, "Private methods cannot be final as they are never overridden by other classes");
@@ -3261,10 +3280,11 @@
 		if (zv) {
 			zend_function *child_func = Z_FUNC_P(zv);
 			inheritance_status status =
-				do_inheritance_check_on_method_ex(
+				do_inheritance_check_on_method(
 					child_func, child_func->common.scope,
 					parent_func, parent_func->common.scope,
-					ce, NULL, /* check_visibility */ 1, 1, 0, /* force_mutable */ false);
+					ce, NULL,
+					ZEND_INHERITANCE_CHECK_SILENT | ZEND_INHERITANCE_CHECK_PROTO | ZEND_INHERITANCE_CHECK_VISIBILITY);
 			if (UNEXPECTED(status == INHERITANCE_WARNING)) {
 				overall_status = INHERITANCE_WARNING;
 			} else if (UNEXPECTED(status != INHERITANCE_SUCCESS)) {
@@ -3392,6 +3412,8 @@
 		CG(current_linking_class) = is_cacheable ? ce : NULL;
 
 		zend_try{
+			CG(zend_lineno) = ce->info.user.line_start;
+
 			if (is_cacheable) {
 				zend_begin_record_errors();
 			}

php-8.3.7.tar.xz/Zend/zend_ini.c -> php-8.3.21.tar.xz/Zend/zend_ini.c Changed

@@ -243,6 +243,7 @@
 			if (p->name) {
 				zend_string_release_ex(p->name, 1);
 			}
+			pefree(p, true);
 			zend_unregister_ini_entries_ex(module_number, module_type);
 			return FAILURE;
 		}
@@ -586,7 +587,7 @@
 	ZEND_INI_PARSE_QUANTITY_UNSIGNED,
 } zend_ini_parse_quantity_signed_result_t;
 
-static const char *zend_ini_consume_quantity_prefix(const char *const digits, const char *const str_end) {
+static const char *zend_ini_consume_quantity_prefix(const char *const digits, const char *const str_end, int base) {
 	const char *digits_consumed = digits;
 	/* Ignore leading whitespace. */
 	while (digits_consumed < str_end && zend_is_whitespace(*digits_consumed)) {++digits_consumed;}
@@ -597,7 +598,7 @@
 	if (digits_consumed0 == '0' && !isdigit(digits_consumed1)) {
 		/* Value is just 0 */
 		if ((digits_consumed+1) == str_end) {
-			return digits;
+			return digits_consumed;
 		}
 
 		switch (digits_consumed1) {
@@ -605,9 +606,14 @@
 			case 'X':
 			case 'o':
 			case 'O':
+				digits_consumed += 2;
+				break;
 			case 'b':
 			case 'B':
-				digits_consumed += 2;
+				if (base != 16) {
+					/* 0b or 0B is valid in base 16, but not in the other supported bases. */
+					digits_consumed += 2;
+				}
 				break;
 		}
 	}
@@ -695,19 +701,8 @@
 				return 0;
         }
         digits += 2;
-		if (UNEXPECTED(digits == str_end)) {
-			/* Escape the string to avoid null bytes and to make non-printable chars
-			 * visible */
-			smart_str_append_escaped(&invalid, ZSTR_VAL(value), ZSTR_LEN(value));
-			smart_str_0(&invalid);
-
-			*errstr = zend_strpprintf(0, "Invalid quantity \"%s\": no digits after base prefix, interpreting as \"0\" for backwards compatibility",
-							ZSTR_VAL(invalid.s));
-
-			smart_str_free(&invalid);
-			return 0;
-		}
-		if (UNEXPECTED(digits != zend_ini_consume_quantity_prefix(digits, str_end))) {
+		/* STRTOULL may silently ignore a prefix of whitespace, sign, and base prefix, which would be invalid at this position */
+		if (UNEXPECTED(digits == str_end || digits != zend_ini_consume_quantity_prefix(digits, str_end, base))) {
 			/* Escape the string to avoid null bytes and to make non-printable chars
 			 * visible */
 			smart_str_append_escaped(&invalid, ZSTR_VAL(value), ZSTR_LEN(value));

php-8.3.7.tar.xz/Zend/zend_ini_parser.c -> php-8.3.21.tar.xz/Zend/zend_ini_parser.c Changed

php-8.3.7.tar.xz/Zend/zend_ini_parser.h -> php-8.3.21.tar.xz/Zend/zend_ini_parser.h Changed

php-8.3.7.tar.xz/Zend/zend_ini_parser.output -> php-8.3.21.tar.xz/Zend/zend_ini_parser.output Changed

@@ -1,20 +1,20 @@
 Terminals unused in grammar
 
-   ':'
-   ','
-   '.'
-   '\''
-   '+'
-   '-'
-   '/'
-   '*'
-   '%'
-   '$'
-   '<'
-   '>'
-   '?'
-   '@'
-   '{'
+    ':'
+    ','
+    '.'
+    '\''
+    '+'
+    '-'
+    '/'
+    '*'
+    '%'
+    '$'
+    '<'
+    '>'
+    '?'
+    '@'
+    '{'
 
 
 Grammar
@@ -22,7 +22,7 @@
     0 $accept: statement_list "end of file"
 
     1 statement_list: statement_list statement
-    2               | %empty
+    2               | ε
 
     3 statement: TC_SECTION section_string_or_value ''
     4          | TC_LABEL '=' string_or_value
@@ -31,7 +31,7 @@
     7          | END_OF_LINE
 
     8 section_string_or_value: var_string_list_section
-    9                        | %empty
+    9                        | ε
 
    10 string_or_value: expr
    11                | BOOL_TRUE
@@ -40,11 +40,11 @@
    14                | END_OF_LINE
 
    15 option_offset: var_string_list
-   16              | %empty
+   16              | ε
 
    17 encapsed_list: encapsed_list cfg_var_ref
    18              | encapsed_list TC_QUOTED_STRING
-   19              | %empty
+   19              | ε
 
    20 var_string_list_section: cfg_var_ref
    21                        | constant_literal
@@ -72,7 +72,7 @@
    40            | TC_DOLLAR_CURLY TC_VARNAME TC_FALLBACK fallback '}'
 
    41 fallback: var_string_list
-   42         | %empty
+   42         | ε
 
    43 constant_literal: TC_CONSTANT
    44                 | TC_RAW
@@ -89,87 +89,100 @@
 
 Terminals, with rules where they appear
 
-"end of file" (0) 0
-'!' (33) 37
-'"' (34) 22 25 28 31
-'$' (36)
-'%' (37)
-'&' (38) 34
-'\'' (39)
-'(' (40) 38
-')' (41) 38
-'*' (42)
-'+' (43)
-',' (44)
-'-' (45)
-'.' (46)
-'/' (47)
-':' (58)
-'<' (60)
-'=' (61) 4 5
-'>' (62)
-'?' (63)
-'@' (64)
-'' (93) 3 5
-'^' (94) 35
-'{' (123)
-'|' (124) 33
-'}' (125) 39 40
-'~' (126) 36
-error (256)
-TC_SECTION (258) 3
-TC_RAW (259) 44 49
-TC_CONSTANT (260) 43 48
-TC_NUMBER (261) 45 50
-TC_STRING (262) 46 51
-TC_WHITESPACE (263) 47 52
-TC_LABEL (264) 4 6
-TC_OFFSET (265) 5
-TC_DOLLAR_CURLY (266) 39 40
-TC_VARNAME (267) 39 40
-TC_QUOTED_STRING (268) 18
-TC_FALLBACK (269) 40
-BOOL_TRUE (270) 11
-BOOL_FALSE (271) 12
-NULL_NULL (272) 13
-END_OF_LINE (273) 7 14
+    "end of file" (0) 0
+    '!' (33) 37
+    '"' (34) 22 25 28 31
+    '$' (36)
+    '%' (37)
+    '&' (38) 34
+    '\'' (39)
+    '(' (40) 38
+    ')' (41) 38
+    '*' (42)
+    '+' (43)
+    ',' (44)
+    '-' (45)
+    '.' (46)
+    '/' (47)
+    ':' (58)
+    '<' (60)
+    '=' (61) 4 5
+    '>' (62)
+    '?' (63)
+    '@' (64)
+    '' (93) 3 5
+    '^' (94) 35
+    '{' (123)
+    '|' (124) 33
+    '}' (125) 39 40
+    '~' (126) 36
+    error (256)
+    TC_SECTION (258) 3
+    TC_RAW (259) 44 49
+    TC_CONSTANT (260) 43 48
+    TC_NUMBER (261) 45 50
+    TC_STRING (262) 46 51
+    TC_WHITESPACE (263) 47 52
+    TC_LABEL (264) 4 6
+    TC_OFFSET (265) 5
+    TC_DOLLAR_CURLY (266) 39 40
+    TC_VARNAME (267) 39 40
+    TC_QUOTED_STRING (268) 18
+    TC_FALLBACK (269) 40
+    BOOL_TRUE (270) 11
+    BOOL_FALSE (271) 12
+    NULL_NULL (272) 13
+    END_OF_LINE (273) 7 14
 
 
 Nonterminals, with rules where they appear
 
-$accept (45)
-    on left: 0
-statement_list (46)
-    on left: 1 2, on right: 0 1
-statement (47)
-    on left: 3 4 5 6 7, on right: 1
-section_string_or_value (48)
-    on left: 8 9, on right: 3
-string_or_value (49)
-    on left: 10 11 12 13 14, on right: 4 5
-option_offset (50)
-    on left: 15 16, on right: 5
-encapsed_list (51)
-    on left: 17 18 19, on right: 17 18 22 25 28 31
-var_string_list_section (52)
-    on left: 20 21 22 23 24 25, on right: 8 23 24 25
-var_string_list (53)
-    on left: 26 27 28 29 30 31, on right: 15 29 30 31 32 41
-expr (54)
-    on left: 32 33 34 35 36 37 38, on right: 10 33 34 35 36 37 38
-cfg_var_ref (55)
-    on left: 39 40, on right: 17 20 23 26 29
-fallback (56)
-    on left: 41 42, on right: 40
-constant_literal (57)
-    on left: 43 44 45 46 47, on right: 21 24
-constant_string (58)
-    on left: 48 49 50 51 52, on right: 27 30
+    $accept (45)
+        on left: 0
+    statement_list (46)
+        on left: 1 2
+        on right: 0 1
+    statement (47)
+        on left: 3 4 5 6 7
+        on right: 1
+    section_string_or_value (48)
+        on left: 8 9
+        on right: 3
+    string_or_value (49)
+        on left: 10 11 12 13 14
+        on right: 4 5
+    option_offset (50)
+        on left: 15 16
+        on right: 5
+    encapsed_list (51)
+        on left: 17 18 19
+        on right: 17 18 22 25 28 31
+    var_string_list_section (52)
+        on left: 20 21 22 23 24 25
+        on right: 8 23 24 25
+    var_string_list (53)
+        on left: 26 27 28 29 30 31
+        on right: 15 29 30 31 32 41
+    expr (54)
+        on left: 32 33 34 35 36 37 38
+        on right: 10 33 34 35 36 37 38
+    cfg_var_ref (55)
+        on left: 39 40
+        on right: 17 20 23 26 29
+    fallback (56)
+        on left: 41 42
+        on right: 40
+    constant_literal (57)
+        on left: 43 44 45 46 47
+        on right: 21 24
+    constant_string (58)
+        on left: 48 49 50 51 52
+        on right: 27 30
 
 
 State 0
 
-    0 $accept: . statement_list "end of file"
+    0 $accept: • statement_list "end of file"
 
     $default  reduce using rule 2 (statement_list)
 
@@ -178,8 +191,8 @@
 
 State 1
 
-    0 $accept: statement_list . "end of file"
-    1 statement_list: statement_list . statement
+    0 $accept: statement_list • "end of file"
+    1 statement_list: statement_list • statement
 
     "end of file"  shift, and go to state 2
     TC_SECTION     shift, and go to state 3
@@ -192,14 +205,14 @@
 
 State 2
 
-    0 $accept: statement_list "end of file" .
+    0 $accept: statement_list "end of file" •
 
     $default  accept
 
 
 State 3
 
-    3 statement: TC_SECTION . section_string_or_value ''
+    3 statement: TC_SECTION • section_string_or_value ''
 
     TC_RAW           shift, and go to state 8
     TC_CONSTANT      shift, and go to state 9
@@ -219,8 +232,8 @@
 
 State 4
 
-    4 statement: TC_LABEL . '=' string_or_value
-    6          | TC_LABEL .
+    4 statement: TC_LABEL • '=' string_or_value
+    6          | TC_LABEL •
 
     '='  shift, and go to state 19
 
@@ -229,7 +242,7 @@
 
 State 5
 
-    5 statement: TC_OFFSET . option_offset '' '=' string_or_value
+    5 statement: TC_OFFSET • option_offset '' '=' string_or_value
 
     TC_RAW           shift, and go to state 20
     TC_CONSTANT      shift, and go to state 21
@@ -249,64 +262,64 @@
 
 State 6
 
-    7 statement: END_OF_LINE .
+    7 statement: END_OF_LINE •
 
     $default  reduce using rule 7 (statement)
 
 
 State 7
 
-    1 statement_list: statement_list statement .
+    1 statement_list: statement_list statement •
 
     $default  reduce using rule 1 (statement_list)
 
 
 State 8
 
-   44 constant_literal: TC_RAW .
+   44 constant_literal: TC_RAW •
 
     $default  reduce using rule 44 (constant_literal)
 
 
 State 9
 
-   43 constant_literal: TC_CONSTANT .
+   43 constant_literal: TC_CONSTANT •
 
     $default  reduce using rule 43 (constant_literal)
 
 
 State 10
 
-   45 constant_literal: TC_NUMBER .
+   45 constant_literal: TC_NUMBER •
 
     $default  reduce using rule 45 (constant_literal)
 
 
 State 11
 
-   46 constant_literal: TC_STRING .
+   46 constant_literal: TC_STRING •
 
     $default  reduce using rule 46 (constant_literal)
 
 
 State 12
 
-   47 constant_literal: TC_WHITESPACE .
+   47 constant_literal: TC_WHITESPACE •
 
     $default  reduce using rule 47 (constant_literal)
 
 
 State 13
 
-   39 cfg_var_ref: TC_DOLLAR_CURLY . TC_VARNAME '}'
-   40            | TC_DOLLAR_CURLY . TC_VARNAME TC_FALLBACK fallback '}'
+   39 cfg_var_ref: TC_DOLLAR_CURLY • TC_VARNAME '}'
+   40            | TC_DOLLAR_CURLY • TC_VARNAME TC_FALLBACK fallback '}'
 
     TC_VARNAME  shift, and go to state 30
 
 
 State 14
 
-   22 var_string_list_section: '"' . encapsed_list '"'
+   22 var_string_list_section: '"' • encapsed_list '"'
 
     $default  reduce using rule 19 (encapsed_list)
 
@@ -315,17 +328,17 @@
 
 State 15
 
-    3 statement: TC_SECTION section_string_or_value . ''
+    3 statement: TC_SECTION section_string_or_value • ''
 
     ''  shift, and go to state 32
 
 
 State 16
 
-    8 section_string_or_value: var_string_list_section .
-   23 var_string_list_section: var_string_list_section . cfg_var_ref
-   24                        | var_string_list_section . constant_literal
-   25                        | var_string_list_section . '"' encapsed_list '"'
+    8 section_string_or_value: var_string_list_section •
+   23 var_string_list_section: var_string_list_section • cfg_var_ref
+   24                        | var_string_list_section • constant_literal
+   25                        | var_string_list_section • '"' encapsed_list '"'
 
     TC_RAW           shift, and go to state 8
     TC_CONSTANT      shift, and go to state 9
@@ -343,21 +356,21 @@
 
 State 17
 
-   20 var_string_list_section: cfg_var_ref .
+   20 var_string_list_section: cfg_var_ref •
 
     $default  reduce using rule 20 (var_string_list_section)
 
 
 State 18
 
-   21 var_string_list_section: constant_literal .
+   21 var_string_list_section: constant_literal •
 
     $default  reduce using rule 21 (var_string_list_section)
 
 
 State 19
 
-    4 statement: TC_LABEL '=' . string_or_value
+    4 statement: TC_LABEL '=' • string_or_value
 
     TC_RAW           shift, and go to state 20
     TC_CONSTANT      shift, and go to state 21
@@ -383,42 +396,42 @@
 
 State 20
 
-   49 constant_string: TC_RAW .
+   49 constant_string: TC_RAW •
 
     $default  reduce using rule 49 (constant_string)
 
 
 State 21
 
-   48 constant_string: TC_CONSTANT .
+   48 constant_string: TC_CONSTANT •
 
     $default  reduce using rule 48 (constant_string)
 
 
 State 22
 
-   50 constant_string: TC_NUMBER .
+   50 constant_string: TC_NUMBER •
 
     $default  reduce using rule 50 (constant_string)
 
 
 State 23
 
-   51 constant_string: TC_STRING .
+   51 constant_string: TC_STRING •
 
     $default  reduce using rule 51 (constant_string)
 
 
 State 24
 
-   52 constant_string: TC_WHITESPACE .
+   52 constant_string: TC_WHITESPACE •
 
     $default  reduce using rule 52 (constant_string)
 
 
 State 25
 
-   28 var_string_list: '"' . encapsed_list '"'
+   28 var_string_list: '"' • encapsed_list '"'
 
     $default  reduce using rule 19 (encapsed_list)
 
@@ -427,17 +440,17 @@
 
 State 26
 
-    5 statement: TC_OFFSET option_offset . '' '=' string_or_value
+    5 statement: TC_OFFSET option_offset • '' '=' string_or_value
 
     ''  shift, and go to state 47
 
 
 State 27
 
-   15 option_offset: var_string_list .
-   29 var_string_list: var_string_list . cfg_var_ref
-   30                | var_string_list . constant_string
-   31                | var_string_list . '"' encapsed_list '"'
+   15 option_offset: var_string_list •
+   29 var_string_list: var_string_list • cfg_var_ref
+   30                | var_string_list • constant_string
+   31                | var_string_list • '"' encapsed_list '"'
 
     TC_RAW           shift, and go to state 20
     TC_CONSTANT      shift, and go to state 21
@@ -455,22 +468,22 @@
 
 State 28
 
-   26 var_string_list: cfg_var_ref .
+   26 var_string_list: cfg_var_ref •
 
     $default  reduce using rule 26 (var_string_list)
 
 
 State 29
 
-   27 var_string_list: constant_string .
+   27 var_string_list: constant_string •
 
     $default  reduce using rule 27 (var_string_list)
 
 
 State 30
 
-   39 cfg_var_ref: TC_DOLLAR_CURLY TC_VARNAME . '}'
-   40            | TC_DOLLAR_CURLY TC_VARNAME . TC_FALLBACK fallback '}'
+   39 cfg_var_ref: TC_DOLLAR_CURLY TC_VARNAME • '}'
+   40            | TC_DOLLAR_CURLY TC_VARNAME • TC_FALLBACK fallback '}'
 
     TC_FALLBACK  shift, and go to state 51
     '}'          shift, and go to state 52
@@ -478,9 +491,9 @@
 
 State 31
 
-   17 encapsed_list: encapsed_list . cfg_var_ref
-   18              | encapsed_list . TC_QUOTED_STRING
-   22 var_string_list_section: '"' encapsed_list . '"'
+   17 encapsed_list: encapsed_list • cfg_var_ref
+   18              | encapsed_list • TC_QUOTED_STRING
+   22 var_string_list_section: '"' encapsed_list • '"'
 
     TC_DOLLAR_CURLY   shift, and go to state 13
     TC_QUOTED_STRING  shift, and go to state 53
@@ -491,14 +504,14 @@
 
 State 32
 
-    3 statement: TC_SECTION section_string_or_value '' .
+    3 statement: TC_SECTION section_string_or_value '' •
 
     $default  reduce using rule 3 (statement)
 
 
 State 33
 
-   25 var_string_list_section: var_string_list_section '"' . encapsed_list '"'
+   25 var_string_list_section: var_string_list_section '"' • encapsed_list '"'
 
     $default  reduce using rule 19 (encapsed_list)
 
@@ -507,49 +520,49 @@
 
 State 34
 
-   23 var_string_list_section: var_string_list_section cfg_var_ref .
+   23 var_string_list_section: var_string_list_section cfg_var_ref •
 
     $default  reduce using rule 23 (var_string_list_section)
 
 
 State 35
 
-   24 var_string_list_section: var_string_list_section constant_literal .
+   24 var_string_list_section: var_string_list_section constant_literal •
 
     $default  reduce using rule 24 (var_string_list_section)
 
 
 State 36
 
-   11 string_or_value: BOOL_TRUE .
+   11 string_or_value: BOOL_TRUE •
 
     $default  reduce using rule 11 (string_or_value)
 
 
 State 37
 
-   12 string_or_value: BOOL_FALSE .
+   12 string_or_value: BOOL_FALSE •
 
     $default  reduce using rule 12 (string_or_value)
 
 
 State 38
 
-   13 string_or_value: NULL_NULL .
+   13 string_or_value: NULL_NULL •
 
     $default  reduce using rule 13 (string_or_value)
 
 
 State 39
 
-   14 string_or_value: END_OF_LINE .
+   14 string_or_value: END_OF_LINE •
 
     $default  reduce using rule 14 (string_or_value)
 
 
 State 40
 
-   36 expr: '~' . expr
+   36 expr: '~' • expr
 
     TC_RAW           shift, and go to state 20
     TC_CONSTANT      shift, and go to state 21
@@ -570,7 +583,7 @@
 
 State 41
 
-   37 expr: '!' . expr
+   37 expr: '!' • expr
 
     TC_RAW           shift, and go to state 20
     TC_CONSTANT      shift, and go to state 21
@@ -591,7 +604,7 @@
 
 State 42
 
-   38 expr: '(' . expr ')'
+   38 expr: '(' • expr ')'
 
     TC_RAW           shift, and go to state 20
     TC_CONSTANT      shift, and go to state 21
@@ -612,17 +625,17 @@
 
 State 43
 
-    4 statement: TC_LABEL '=' string_or_value .
+    4 statement: TC_LABEL '=' string_or_value •
 
     $default  reduce using rule 4 (statement)
 
 
 State 44
 
-   29 var_string_list: var_string_list . cfg_var_ref
-   30                | var_string_list . constant_string
-   31                | var_string_list . '"' encapsed_list '"'
-   32 expr: var_string_list .
+   29 var_string_list: var_string_list • cfg_var_ref
+   30                | var_string_list • constant_string
+   31                | var_string_list • '"' encapsed_list '"'
+   32 expr: var_string_list •
 
     TC_RAW           shift, and go to state 20
     TC_CONSTANT      shift, and go to state 21
@@ -640,10 +653,10 @@
 
 State 45
 
-   10 string_or_value: expr .
-   33 expr: expr . '|' expr
-   34     | expr . '&' expr
-   35     | expr . '^' expr
+   10 string_or_value: expr •
+   33 expr: expr • '|' expr
+   34     | expr • '&' expr
+   35     | expr • '^' expr
 
     '^'  shift, and go to state 60
     '|'  shift, and go to state 61
@@ -654,9 +667,9 @@
 
 State 46
 
-   17 encapsed_list: encapsed_list . cfg_var_ref
-   18              | encapsed_list . TC_QUOTED_STRING
-   28 var_string_list: '"' encapsed_list . '"'
+   17 encapsed_list: encapsed_list • cfg_var_ref
+   18              | encapsed_list • TC_QUOTED_STRING
+   28 var_string_list: '"' encapsed_list • '"'
 
     TC_DOLLAR_CURLY   shift, and go to state 13
     TC_QUOTED_STRING  shift, and go to state 53
@@ -667,14 +680,14 @@
 
 State 47
 
-    5 statement: TC_OFFSET option_offset '' . '=' string_or_value
+    5 statement: TC_OFFSET option_offset '' • '=' string_or_value
 
     '='  shift, and go to state 64
 
 
 State 48
 
-   31 var_string_list: var_string_list '"' . encapsed_list '"'
+   31 var_string_list: var_string_list '"' • encapsed_list '"'
 
     $default  reduce using rule 19 (encapsed_list)
 
@@ -683,21 +696,21 @@
 
 State 49
 
-   29 var_string_list: var_string_list cfg_var_ref .
+   29 var_string_list: var_string_list cfg_var_ref •
 
     $default  reduce using rule 29 (var_string_list)
 
 
 State 50
 
-   30 var_string_list: var_string_list constant_string .
+   30 var_string_list: var_string_list constant_string •
 
     $default  reduce using rule 30 (var_string_list)
 
 
 State 51
 
-   40 cfg_var_ref: TC_DOLLAR_CURLY TC_VARNAME TC_FALLBACK . fallback '}'
+   40 cfg_var_ref: TC_DOLLAR_CURLY TC_VARNAME TC_FALLBACK • fallback '}'
 
     TC_RAW           shift, and go to state 20
     TC_CONSTANT      shift, and go to state 21
@@ -717,37 +730,37 @@
 
 State 52
 
-   39 cfg_var_ref: TC_DOLLAR_CURLY TC_VARNAME '}' .
+   39 cfg_var_ref: TC_DOLLAR_CURLY TC_VARNAME '}' •
 
     $default  reduce using rule 39 (cfg_var_ref)
 
 
 State 53
 
-   18 encapsed_list: encapsed_list TC_QUOTED_STRING .
+   18 encapsed_list: encapsed_list TC_QUOTED_STRING •
 
     $default  reduce using rule 18 (encapsed_list)
 
 
 State 54
 
-   22 var_string_list_section: '"' encapsed_list '"' .
+   22 var_string_list_section: '"' encapsed_list '"' •
 
     $default  reduce using rule 22 (var_string_list_section)
 
 
 State 55
 
-   17 encapsed_list: encapsed_list cfg_var_ref .
+   17 encapsed_list: encapsed_list cfg_var_ref •
 
     $default  reduce using rule 17 (encapsed_list)
 
 
 State 56
 
-   17 encapsed_list: encapsed_list . cfg_var_ref
-   18              | encapsed_list . TC_QUOTED_STRING
-   25 var_string_list_section: var_string_list_section '"' encapsed_list . '"'
+   17 encapsed_list: encapsed_list • cfg_var_ref
+   18              | encapsed_list • TC_QUOTED_STRING
+   25 var_string_list_section: var_string_list_section '"' encapsed_list • '"'
 
     TC_DOLLAR_CURLY   shift, and go to state 13
     TC_QUOTED_STRING  shift, and go to state 53
@@ -758,30 +771,30 @@
 
 State 57
 
-   33 expr: expr . '|' expr
-   34     | expr . '&' expr
-   35     | expr . '^' expr
-   36     | '~' expr .
+   33 expr: expr • '|' expr
+   34     | expr • '&' expr
+   35     | expr • '^' expr
+   36     | '~' expr •
 
     $default  reduce using rule 36 (expr)
 
 
 State 58
 
-   33 expr: expr . '|' expr
-   34     | expr . '&' expr
-   35     | expr . '^' expr
-   37     | '!' expr .
+   33 expr: expr • '|' expr
+   34     | expr • '&' expr
+   35     | expr • '^' expr
+   37     | '!' expr •
 
     $default  reduce using rule 37 (expr)
 
 
 State 59
 
-   33 expr: expr . '|' expr
-   34     | expr . '&' expr
-   35     | expr . '^' expr
-   38     | '(' expr . ')'
+   33 expr: expr • '|' expr
+   34     | expr • '&' expr
+   35     | expr • '^' expr
+   38     | '(' expr • ')'
 
     '^'  shift, and go to state 60
     '|'  shift, and go to state 61
@@ -791,7 +804,7 @@
 
 State 60
 
-   35 expr: expr '^' . expr
+   35 expr: expr '^' • expr
 
     TC_RAW           shift, and go to state 20
     TC_CONSTANT      shift, and go to state 21
@@ -812,7 +825,7 @@
 
 State 61
 
-   33 expr: expr '|' . expr
+   33 expr: expr '|' • expr
 
     TC_RAW           shift, and go to state 20
     TC_CONSTANT      shift, and go to state 21
@@ -833,7 +846,7 @@
 
 State 62
 
-   34 expr: expr '&' . expr
+   34 expr: expr '&' • expr
 
     TC_RAW           shift, and go to state 20
     TC_CONSTANT      shift, and go to state 21
@@ -854,14 +867,14 @@
 
 State 63
 
-   28 var_string_list: '"' encapsed_list '"' .
+   28 var_string_list: '"' encapsed_list '"' •
 
     $default  reduce using rule 28 (var_string_list)
 
 
 State 64
 
-    5 statement: TC_OFFSET option_offset '' '=' . string_or_value
+    5 statement: TC_OFFSET option_offset '' '=' • string_or_value
 
     TC_RAW           shift, and go to state 20
     TC_CONSTANT      shift, and go to state 21
@@ -887,9 +900,9 @@
 
 State 65
 
-   17 encapsed_list: encapsed_list . cfg_var_ref
-   18              | encapsed_list . TC_QUOTED_STRING
-   31 var_string_list: var_string_list '"' encapsed_list . '"'
+   17 encapsed_list: encapsed_list • cfg_var_ref
+   18              | encapsed_list • TC_QUOTED_STRING
+   31 var_string_list: var_string_list '"' encapsed_list • '"'
 
     TC_DOLLAR_CURLY   shift, and go to state 13
     TC_QUOTED_STRING  shift, and go to state 53
@@ -900,10 +913,10 @@
 
 State 66
 
-   29 var_string_list: var_string_list . cfg_var_ref
-   30                | var_string_list . constant_string
-   31                | var_string_list . '"' encapsed_list '"'
-   41 fallback: var_string_list .
+   29 var_string_list: var_string_list • cfg_var_ref
+   30                | var_string_list • constant_string
+   31                | var_string_list • '"' encapsed_list '"'
+   41 fallback: var_string_list •
 
     TC_RAW           shift, and go to state 20
     TC_CONSTANT      shift, and go to state 21
@@ -921,71 +934,71 @@
 
 State 67
 
-   40 cfg_var_ref: TC_DOLLAR_CURLY TC_VARNAME TC_FALLBACK fallback . '}'
+   40 cfg_var_ref: TC_DOLLAR_CURLY TC_VARNAME TC_FALLBACK fallback • '}'
 
     '}'  shift, and go to state 75
 
 
 State 68
 
-   25 var_string_list_section: var_string_list_section '"' encapsed_list '"' .
+   25 var_string_list_section: var_string_list_section '"' encapsed_list '"' •
 
     $default  reduce using rule 25 (var_string_list_section)
 
 
 State 69
 
-   38 expr: '(' expr ')' .
+   38 expr: '(' expr ')' •
 
     $default  reduce using rule 38 (expr)
 
 
 State 70
 
-   33 expr: expr . '|' expr
-   34     | expr . '&' expr
-   35     | expr . '^' expr
-   35     | expr '^' expr .
+   33 expr: expr • '|' expr
+   34     | expr • '&' expr
+   35     | expr • '^' expr
+   35     | expr '^' expr •
 
     $default  reduce using rule 35 (expr)
 
 
 State 71
 
-   33 expr: expr . '|' expr
-   33     | expr '|' expr .
-   34     | expr . '&' expr
-   35     | expr . '^' expr
+   33 expr: expr • '|' expr
+   33     | expr '|' expr •
+   34     | expr • '&' expr
+   35     | expr • '^' expr
 
     $default  reduce using rule 33 (expr)
 
 
 State 72
 
-   33 expr: expr . '|' expr
-   34     | expr . '&' expr
-   34     | expr '&' expr .
-   35     | expr . '^' expr
+   33 expr: expr • '|' expr
+   34     | expr • '&' expr
+   34     | expr '&' expr •
+   35     | expr • '^' expr
 
     $default  reduce using rule 34 (expr)
 
 
 State 73
 
-    5 statement: TC_OFFSET option_offset '' '=' string_or_value .
+    5 statement: TC_OFFSET option_offset '' '=' string_or_value •
 
     $default  reduce using rule 5 (statement)
 
 
 State 74
 
-   31 var_string_list: var_string_list '"' encapsed_list '"' .
+   31 var_string_list: var_string_list '"' encapsed_list '"' •
 
     $default  reduce using rule 31 (var_string_list)
 
 
 State 75
 
-   40 cfg_var_ref: TC_DOLLAR_CURLY TC_VARNAME TC_FALLBACK fallback '}' .
+   40 cfg_var_ref: TC_DOLLAR_CURLY TC_VARNAME TC_FALLBACK fallback '}' •
 
     $default  reduce using rule 40 (cfg_var_ref)

php-8.3.7.tar.xz/Zend/zend_ini_parser.y -> php-8.3.21.tar.xz/Zend/zend_ini_parser.y Changed

php-8.3.7.tar.xz/Zend/zend_ini_scanner.c -> php-8.3.21.tar.xz/Zend/zend_ini_scanner.c Changed

@@ -1,4 +1,4 @@
-/* Generated by re2c 1.3 */
+/* Generated by re2c 3.0 */
 /*
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
@@ -429,45 +429,45 @@
 		YYFILL(5);
 		yych = *YYCURSOR;
 		if (yybm0+yych & 64) {
-			goto yy13;
+			goto yy9;
 		}
 		if (yych <= 'M') {
 			if (yych <= '$') {
 				if (yych <= '\f') {
 					if (yych <= 0x08) {
-						if (yych >= 0x01) goto yy4;
+						if (yych >= 0x01) goto yy1;
 					} else {
-						if (yych <= '\t') goto yy7;
-						if (yych <= '\n') goto yy10;
-						goto yy4;
+						if (yych <= '\t') goto yy4;
+						if (yych <= '\n') goto yy6;
+						goto yy1;
 					}
 				} else {
 					if (yych <= 0x1F) {
-						if (yych <= '\r') goto yy12;
-						goto yy4;
+						if (yych <= '\r') goto yy8;
+						goto yy1;
 					} else {
-						if (yych == '#') goto yy4;
-						goto yy15;
+						if (yych == '#') goto yy1;
+						goto yy10;
 					}
 				}
 			} else {
 				if (yych <= ':') {
 					if (yych <= '&') {
-						if (yych <= '%') goto yy4;
-						goto yy15;
+						if (yych <= '%') goto yy1;
+						goto yy10;
 					} else {
-						if (yych <= '\'') goto yy4;
-						if (yych <= ')') goto yy15;
-						goto yy4;
+						if (yych <= '\'') goto yy1;
+						if (yych <= ')') goto yy10;
+						goto yy1;
 					}
 				} else {
 					if (yych <= '=') {
-						if (yych <= ';') goto yy17;
-						if (yych <= '<') goto yy4;
-						goto yy19;
+						if (yych <= ';') goto yy11;
+						if (yych <= '<') goto yy1;
+						goto yy12;
 					} else {
-						if (yych == 'F') goto yy22;
-						goto yy4;
+						if (yych == 'F') goto yy13;
+						goto yy1;
 					}
 				}
 			}
@@ -475,67 +475,65 @@
 			if (yych <= 'e') {
 				if (yych <= 'X') {
 					if (yych <= 'O') {
-						if (yych <= 'N') goto yy23;
-						goto yy24;
+						if (yych <= 'N') goto yy14;
+						goto yy15;
 					} else {
-						if (yych == 'T') goto yy25;
-						goto yy4;
+						if (yych == 'T') goto yy16;
+						goto yy1;
 					}
 				} else {
 					if (yych <= '') {
-						if (yych <= 'Y') goto yy26;
-						if (yych <= 'Z') goto yy4;
-						goto yy27;
+						if (yych <= 'Y') goto yy17;
+						if (yych <= 'Z') goto yy1;
+						goto yy18;
 					} else {
-						if (yych <= '\\') goto yy4;
-						if (yych <= '^') goto yy15;
-						goto yy4;
+						if (yych <= '\\') goto yy1;
+						if (yych <= '^') goto yy10;
+						goto yy1;
 					}
 				}
 			} else {
 				if (yych <= 's') {
 					if (yych <= 'm') {
-						if (yych <= 'f') goto yy22;
-						goto yy4;
+						if (yych <= 'f') goto yy13;
+						goto yy1;
 					} else {
-						if (yych <= 'n') goto yy23;
-						if (yych <= 'o') goto yy24;
-						goto yy4;
+						if (yych <= 'n') goto yy14;
+						if (yych <= 'o') goto yy15;
+						goto yy1;
 					}
 				} else {
 					if (yych <= 'y') {
-						if (yych <= 't') goto yy25;
-						if (yych <= 'x') goto yy4;
-						goto yy26;
+						if (yych <= 't') goto yy16;
+						if (yych <= 'x') goto yy1;
+						goto yy17;
 					} else {
-						if (yych <= 'z') goto yy4;
-						if (yych <= '~') goto yy15;
-						goto yy4;
+						if (yych <= 'z') goto yy1;
+						if (yych <= '~') goto yy10;
+						goto yy1;
 					}
 				}
 			}
 		}
-		YYDEBUG(2, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(3, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	return 0;
 }
-yy4:
-		YYDEBUG(4, *YYCURSOR);
+yy1:
+		YYDEBUG(1, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-yy5:
-		YYDEBUG(5, *YYCURSOR);
+yy2:
+		YYDEBUG(2, *YYCURSOR);
 		if (yybm0+yych & 16) {
-			goto yy4;
+			goto yy1;
 		}
-		if (yych <= '=') goto yy6;
-		if (yych <= '') goto yy29;
-yy6:
-		YYDEBUG(6, *YYCURSOR);
+		if (yych <= '=') goto yy3;
+		if (yych <= '') goto yy19;
+yy3:
+		YYDEBUG(3, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{ /* Get option name */
 	/* Eat leading whitespace */
@@ -546,129 +544,123 @@
 
 	RETURN_TOKEN(TC_LABEL, yytext, yyleng);
 }
-yy7:
-		YYDEBUG(7, *YYCURSOR);
+yy4:
+		YYDEBUG(4, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(2);
 		yych = *YYCURSOR;
-		YYDEBUG(8, *YYCURSOR);
 		if (yybm0+yych & 32) {
-			goto yy7;
+			goto yy4;
 		}
 		if (yych <= '\r') {
-			if (yych <= 0x08) goto yy9;
-			if (yych <= '\n') goto yy10;
-			if (yych >= '\r') goto yy12;
+			if (yych <= 0x08) goto yy5;
+			if (yych <= '\n') goto yy6;
+			if (yych >= '\r') goto yy8;
 		} else {
 			if (yych <= ';') {
-				if (yych >= ';') goto yy17;
+				if (yych >= ';') goto yy11;
 			} else {
-				if (yych == '=') goto yy19;
+				if (yych == '=') goto yy12;
 			}
 		}
-yy9:
-		YYDEBUG(9, *YYCURSOR);
+yy5:
+		YYDEBUG(5, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	/* eat whitespace */
 	goto restart;
 }
-yy10:
-		YYDEBUG(10, *YYCURSOR);
+yy6:
+		YYDEBUG(6, *YYCURSOR);
 		++YYCURSOR;
-yy11:
-		YYDEBUG(11, *YYCURSOR);
+yy7:
+		YYDEBUG(7, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	SCNG(lineno)++;
 	return END_OF_LINE;
 }
-yy12:
-		YYDEBUG(12, *YYCURSOR);
+yy8:
+		YYDEBUG(8, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == '\n') goto yy10;
-		goto yy11;
-yy13:
-		YYDEBUG(13, *YYCURSOR);
+		if (yych == '\n') goto yy6;
+		goto yy7;
+yy9:
+		YYDEBUG(9, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(2);
 		yych = *YYCURSOR;
-		YYDEBUG(14, *YYCURSOR);
 		if (yybm0+yych & 64) {
-			goto yy13;
+			goto yy9;
 		}
 		if (yych <= '&') {
 			if (yych <= '\r') {
 				if (yych <= '\t') {
-					if (yych <= 0x00) goto yy6;
-					if (yych <= 0x08) goto yy4;
-					goto yy7;
+					if (yych <= 0x00) goto yy3;
+					if (yych <= 0x08) goto yy1;
+					goto yy4;
 				} else {
-					if (yych <= '\n') goto yy10;
-					if (yych <= '\f') goto yy4;
-					goto yy12;
+					if (yych <= '\n') goto yy6;
+					if (yych <= '\f') goto yy1;
+					goto yy8;
 				}
 			} else {
 				if (yych <= '#') {
-					if (yych <= 0x1F) goto yy4;
-					if (yych <= '"') goto yy6;
-					goto yy4;
+					if (yych <= 0x1F) goto yy1;
+					if (yych <= '"') goto yy3;
+					goto yy1;
 				} else {
-					if (yych == '%') goto yy4;
-					goto yy6;
+					if (yych == '%') goto yy1;
+					goto yy3;
 				}
 			}
 		} else {
 			if (yych <= '=') {
 				if (yych <= ':') {
-					if (yych <= '\'') goto yy4;
-					if (yych <= ')') goto yy6;
-					goto yy4;
+					if (yych <= '\'') goto yy1;
+					if (yych <= ')') goto yy3;
+					goto yy1;
 				} else {
-					if (yych <= ';') goto yy17;
-					if (yych <= '<') goto yy4;
-					goto yy19;
+					if (yych <= ';') goto yy11;
+					if (yych <= '<') goto yy1;
+					goto yy12;
 				}
 			} else {
 				if (yych <= '\\') {
-					if (yych == '') goto yy29;
-					goto yy4;
+					if (yych == '') goto yy19;
+					goto yy1;
 				} else {
-					if (yych <= '^') goto yy6;
-					if (yych <= 'z') goto yy4;
-					if (yych <= '~') goto yy6;
-					goto yy4;
+					if (yych <= '^') goto yy3;
+					if (yych <= 'z') goto yy1;
+					if (yych <= '~') goto yy3;
+					goto yy1;
 				}
 			}
 		}
-yy15:
-		YYDEBUG(15, *YYCURSOR);
+yy10:
+		YYDEBUG(10, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(16, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{ /* Disallow these chars outside option values */
 	return yytext0;
 }
-yy17:
-		YYDEBUG(17, *YYCURSOR);
+yy11:
+		YYDEBUG(11, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(2);
 		yych = *YYCURSOR;
-		YYDEBUG(18, *YYCURSOR);
 		if (yybm0+yych & 128) {
-			goto yy17;
+			goto yy11;
 		}
-		if (yych <= '\n') goto yy32;
-		goto yy34;
-yy19:
-		YYDEBUG(19, *YYCURSOR);
+		if (yych <= '\n') goto yy20;
+		goto yy22;
+yy12:
+		YYDEBUG(12, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(20, *YYCURSOR);
-		if (yych == '\t') goto yy19;
-		if (yych == ' ') goto yy19;
-		YYDEBUG(21, *YYCURSOR);
+		if (yych == '\t') goto yy12;
+		if (yych == ' ') goto yy12;
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{ /* Start option value */
 	if (SCNG(scanner_mode) == ZEND_INI_SCANNER_RAW) {
@@ -678,60 +670,59 @@
 	}
 	return '=';
 }
-yy22:
-		YYDEBUG(22, *YYCURSOR);
+yy13:
+		YYDEBUG(13, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'A') goto yy35;
-		if (yych == 'a') goto yy35;
-		goto yy5;
-yy23:
-		YYDEBUG(23, *YYCURSOR);
+		if (yych == 'A') goto yy23;
+		if (yych == 'a') goto yy23;
+		goto yy2;
+yy14:
+		YYDEBUG(14, *YYCURSOR);
 		yych = *++YYCURSOR;
 		if (yych <= 'U') {
-			if (yych == 'O') goto yy36;
-			if (yych <= 'T') goto yy5;
-			goto yy38;
+			if (yych == 'O') goto yy24;
+			if (yych <= 'T') goto yy2;
+			goto yy26;
 		} else {
 			if (yych <= 'o') {
-				if (yych <= 'n') goto yy5;
-				goto yy36;
+				if (yych <= 'n') goto yy2;
+				goto yy24;
 			} else {
-				if (yych == 'u') goto yy38;
-				goto yy5;
+				if (yych == 'u') goto yy26;
+				goto yy2;
 			}
 		}
-yy24:
-		YYDEBUG(24, *YYCURSOR);
+yy15:
+		YYDEBUG(15, *YYCURSOR);
 		yych = *++YYCURSOR;
 		if (yych <= 'N') {
-			if (yych == 'F') goto yy39;
-			if (yych <= 'M') goto yy5;
-			goto yy40;
+			if (yych == 'F') goto yy27;
+			if (yych <= 'M') goto yy2;
+			goto yy28;
 		} else {
 			if (yych <= 'f') {
-				if (yych <= 'e') goto yy5;
-				goto yy39;
+				if (yych <= 'e') goto yy2;
+				goto yy27;
 			} else {
-				if (yych == 'n') goto yy40;
-				goto yy5;
+				if (yych == 'n') goto yy28;
+				goto yy2;
 			}
 		}
-yy25:
-		YYDEBUG(25, *YYCURSOR);
+yy16:
+		YYDEBUG(16, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'R') goto yy43;
-		if (yych == 'r') goto yy43;
-		goto yy5;
-yy26:
-		YYDEBUG(26, *YYCURSOR);
+		if (yych == 'R') goto yy30;
+		if (yych == 'r') goto yy30;
+		goto yy2;
+yy17:
+		YYDEBUG(17, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'E') goto yy44;
-		if (yych == 'e') goto yy44;
-		goto yy5;
-yy27:
-		YYDEBUG(27, *YYCURSOR);
+		if (yych == 'E') goto yy31;
+		if (yych == 'e') goto yy31;
+		goto yy2;
+yy18:
+		YYDEBUG(18, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(28, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{ /* Section start */
 	/* Enter section data lookup state */
@@ -742,15 +733,13 @@
 	}
 	return TC_SECTION;
 }
-yy29:
-		YYDEBUG(29, *YYCURSOR);
+yy19:
+		YYDEBUG(19, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(30, *YYCURSOR);
-		if (yych == '\t') goto yy29;
-		if (yych == ' ') goto yy29;
-		YYDEBUG(31, *YYCURSOR);
+		if (yych == '\t') goto yy19;
+		if (yych == ' ') goto yy19;
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{ /* Start of option with offset */
 	/* Eat leading whitespace */
@@ -764,302 +753,296 @@
 
 	RETURN_TOKEN(TC_OFFSET, yytext, yyleng);
 }
-yy32:
-		YYDEBUG(32, *YYCURSOR);
+yy20:
+		YYDEBUG(20, *YYCURSOR);
 		++YYCURSOR;
-yy33:
-		YYDEBUG(33, *YYCURSOR);
+yy21:
+		YYDEBUG(21, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{ /* Comment */
 	BEGIN(INITIAL);
 	SCNG(lineno)++;
 	return END_OF_LINE;
 }
-yy34:
-		YYDEBUG(34, *YYCURSOR);
+yy22:
+		YYDEBUG(22, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == '\n') goto yy32;
-		goto yy33;
-yy35:
-		YYDEBUG(35, *YYCURSOR);
+		if (yych == '\n') goto yy20;
+		goto yy21;
+yy23:
+		YYDEBUG(23, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'L') goto yy45;
-		if (yych == 'l') goto yy45;
-		goto yy5;
-yy36:
-		YYDEBUG(36, *YYCURSOR);
+		if (yych == 'L') goto yy32;
+		if (yych == 'l') goto yy32;
+		goto yy2;
+yy24:
+		YYDEBUG(24, *YYCURSOR);
 		yych = *++YYCURSOR;
 		if (yych <= '\'') {
 			if (yych <= 0x1F) {
 				if (yych <= '\t') {
-					if (yych <= 0x00) goto yy37;
-					if (yych <= 0x08) goto yy5;
-					goto yy46;
+					if (yych <= 0x00) goto yy25;
+					if (yych <= 0x08) goto yy2;
+					goto yy33;
 				} else {
-					if (yych <= '\n') goto yy37;
-					if (yych != '\r') goto yy5;
+					if (yych <= '\n') goto yy25;
+					if (yych != '\r') goto yy2;
 				}
 			} else {
 				if (yych <= '#') {
-					if (yych <= ' ') goto yy48;
-					if (yych >= '#') goto yy5;
+					if (yych <= ' ') goto yy34;
+					if (yych >= '#') goto yy2;
 				} else {
-					if (yych == '%') goto yy5;
-					if (yych >= '\'') goto yy5;
+					if (yych == '%') goto yy2;
+					if (yych >= '\'') goto yy2;
 				}
 			}
 		} else {
 			if (yych <= 'N') {
 				if (yych <= ';') {
-					if (yych <= ')') goto yy37;
-					if (yych <= ':') goto yy5;
+					if (yych <= ')') goto yy25;
+					if (yych <= ':') goto yy2;
 				} else {
-					if (yych == '=') goto yy37;
-					if (yych <= 'M') goto yy5;
-					goto yy50;
+					if (yych == '=') goto yy25;
+					if (yych <= 'M') goto yy2;
+					goto yy35;
 				}
 			} else {
 				if (yych <= 'm') {
-					if (yych <= '\\') goto yy5;
-					if (yych >= '_') goto yy5;
+					if (yych <= '\\') goto yy2;
+					if (yych >= '_') goto yy2;
 				} else {
-					if (yych <= 'n') goto yy50;
-					if (yych <= 'z') goto yy5;
-					if (yych >= 0x7F) goto yy5;
+					if (yych <= 'n') goto yy35;
+					if (yych <= 'z') goto yy2;
+					if (yych >= 0x7F) goto yy2;
 				}
 			}
 		}
-yy37:
-		YYDEBUG(37, *YYCURSOR);
+yy25:
+		YYDEBUG(25, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{ /* FALSE value (when used outside option value/offset this causes parse error!)*/
 	RETURN_TOKEN(BOOL_FALSE, "", 0);
 }
-yy38:
-		YYDEBUG(38, *YYCURSOR);
+yy26:
+		YYDEBUG(26, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'L') goto yy51;
-		if (yych == 'l') goto yy51;
-		goto yy5;
-yy39:
-		YYDEBUG(39, *YYCURSOR);
+		if (yych == 'L') goto yy36;
+		if (yych == 'l') goto yy36;
+		goto yy2;
+yy27:
+		YYDEBUG(27, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'F') goto yy48;
-		if (yych == 'f') goto yy48;
-		goto yy5;
-yy40:
-		YYDEBUG(40, *YYCURSOR);
+		if (yych == 'F') goto yy34;
+		if (yych == 'f') goto yy34;
+		goto yy2;
+yy28:
+		YYDEBUG(28, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(41, *YYCURSOR);
 		if (yych <= '&') {
 			if (yych <= '\r') {
 				if (yych <= '\t') {
-					if (yych <= 0x00) goto yy42;
-					if (yych <= 0x08) goto yy4;
-					goto yy52;
+					if (yych <= 0x00) goto yy29;
+					if (yych <= 0x08) goto yy1;
+					goto yy37;
 				} else {
-					if (yych <= '\n') goto yy42;
-					if (yych <= '\f') goto yy4;
+					if (yych <= '\n') goto yy29;
+					if (yych <= '\f') goto yy1;
 				}
 			} else {
 				if (yych <= '"') {
-					if (yych <= 0x1F) goto yy4;
-					if (yych <= ' ') goto yy40;
+					if (yych <= 0x1F) goto yy1;
+					if (yych <= ' ') goto yy28;
 				} else {
-					if (yych == '$') goto yy42;
-					if (yych <= '%') goto yy4;
+					if (yych == '$') goto yy29;
+					if (yych <= '%') goto yy1;
 				}
 			}
 		} else {
 			if (yych <= '=') {
 				if (yych <= ':') {
-					if (yych <= '\'') goto yy4;
-					if (yych >= '*') goto yy4;
+					if (yych <= '\'') goto yy1;
+					if (yych >= '*') goto yy1;
 				} else {
-					if (yych == '<') goto yy4;
+					if (yych == '<') goto yy1;
 				}
 			} else {
 				if (yych <= '\\') {
-					if (yych == '') goto yy29;
-					goto yy4;
+					if (yych == '') goto yy19;
+					goto yy1;
 				} else {
-					if (yych <= '^') goto yy42;
-					if (yych <= 'z') goto yy4;
-					if (yych >= 0x7F) goto yy4;
+					if (yych <= '^') goto yy29;
+					if (yych <= 'z') goto yy1;
+					if (yych >= 0x7F) goto yy1;
 				}
 			}
 		}
-yy42:
-		YYDEBUG(42, *YYCURSOR);
+yy29:
+		YYDEBUG(29, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{ /* TRUE value (when used outside option value/offset this causes parse error!) */
 	RETURN_TOKEN(BOOL_TRUE, "1", 1);
 }
-yy43:
-		YYDEBUG(43, *YYCURSOR);
+yy30:
+		YYDEBUG(30, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'U') goto yy54;
-		if (yych == 'u') goto yy54;
-		goto yy5;
-yy44:
-		YYDEBUG(44, *YYCURSOR);
+		if (yych == 'U') goto yy38;
+		if (yych == 'u') goto yy38;
+		goto yy2;
+yy31:
+		YYDEBUG(31, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'S') goto yy40;
-		if (yych == 's') goto yy40;
-		goto yy5;
-yy45:
-		YYDEBUG(45, *YYCURSOR);
+		if (yych == 'S') goto yy28;
+		if (yych == 's') goto yy28;
+		goto yy2;
+yy32:
+		YYDEBUG(32, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'S') goto yy50;
-		if (yych == 's') goto yy50;
-		goto yy5;
-yy46:
-		YYDEBUG(46, *YYCURSOR);
+		if (yych == 'S') goto yy35;
+		if (yych == 's') goto yy35;
+		goto yy2;
+yy33:
+		YYDEBUG(33, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(47, *YYCURSOR);
-		if (yych == '\t') goto yy46;
-		if (yych == ' ') goto yy46;
-		goto yy37;
-yy48:
-		YYDEBUG(48, *YYCURSOR);
+		if (yych == '\t') goto yy33;
+		if (yych == ' ') goto yy33;
+		goto yy25;
+yy34:
+		YYDEBUG(34, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(49, *YYCURSOR);
 		if (yych <= '&') {
 			if (yych <= '\r') {
 				if (yych <= '\t') {
-					if (yych <= 0x00) goto yy37;
-					if (yych <= 0x08) goto yy4;
-					goto yy46;
+					if (yych <= 0x00) goto yy25;
+					if (yych <= 0x08) goto yy1;
+					goto yy33;
 				} else {
-					if (yych <= '\n') goto yy37;
-					if (yych <= '\f') goto yy4;
-					goto yy37;
+					if (yych <= '\n') goto yy25;
+					if (yych <= '\f') goto yy1;
+					goto yy25;
 				}
 			} else {
 				if (yych <= '"') {
-					if (yych <= 0x1F) goto yy4;
-					if (yych <= ' ') goto yy48;
-					goto yy37;
+					if (yych <= 0x1F) goto yy1;
+					if (yych <= ' ') goto yy34;
+					goto yy25;
 				} else {
-					if (yych == '$') goto yy37;
-					if (yych <= '%') goto yy4;
-					goto yy37;
+					if (yych == '$') goto yy25;
+					if (yych <= '%') goto yy1;
+					goto yy25;
 				}
 			}
 		} else {
 			if (yych <= '=') {
 				if (yych <= ':') {
-					if (yych <= '\'') goto yy4;
-					if (yych <= ')') goto yy37;
-					goto yy4;
+					if (yych <= '\'') goto yy1;
+					if (yych <= ')') goto yy25;
+					goto yy1;
 				} else {
-					if (yych == '<') goto yy4;
-					goto yy37;
+					if (yych == '<') goto yy1;
+					goto yy25;
 				}
 			} else {
 				if (yych <= '\\') {
-					if (yych == '') goto yy29;
-					goto yy4;
+					if (yych == '') goto yy19;
+					goto yy1;
 				} else {
-					if (yych <= '^') goto yy37;
-					if (yych <= 'z') goto yy4;
-					if (yych <= '~') goto yy37;
-					goto yy4;
+					if (yych <= '^') goto yy25;
+					if (yych <= 'z') goto yy1;
+					if (yych <= '~') goto yy25;
+					goto yy1;
 				}
 			}
 		}
-yy50:
-		YYDEBUG(50, *YYCURSOR);
+yy35:
+		YYDEBUG(35, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'E') goto yy48;
-		if (yych == 'e') goto yy48;
-		goto yy5;
-yy51:
-		YYDEBUG(51, *YYCURSOR);
+		if (yych == 'E') goto yy34;
+		if (yych == 'e') goto yy34;
+		goto yy2;
+yy36:
+		YYDEBUG(36, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'L') goto yy55;
-		if (yych == 'l') goto yy55;
-		goto yy5;
-yy52:
-		YYDEBUG(52, *YYCURSOR);
+		if (yych == 'L') goto yy39;
+		if (yych == 'l') goto yy39;
+		goto yy2;
+yy37:
+		YYDEBUG(37, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(53, *YYCURSOR);
-		if (yych == '\t') goto yy52;
-		if (yych == ' ') goto yy52;
-		goto yy42;
-yy54:
-		YYDEBUG(54, *YYCURSOR);
+		if (yych == '\t') goto yy37;
+		if (yych == ' ') goto yy37;
+		goto yy29;
+yy38:
+		YYDEBUG(38, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'E') goto yy40;
-		if (yych == 'e') goto yy40;
-		goto yy5;
-yy55:
-		YYDEBUG(55, *YYCURSOR);
+		if (yych == 'E') goto yy28;
+		if (yych == 'e') goto yy28;
+		goto yy2;
+yy39:
+		YYDEBUG(39, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(56, *YYCURSOR);
 		if (yych <= '&') {
 			if (yych <= '\r') {
 				if (yych <= '\t') {
-					if (yych <= 0x00) goto yy57;
-					if (yych <= 0x08) goto yy4;
-					goto yy58;
+					if (yych <= 0x00) goto yy40;
+					if (yych <= 0x08) goto yy1;
+					goto yy41;
 				} else {
-					if (yych <= '\n') goto yy57;
-					if (yych <= '\f') goto yy4;
+					if (yych <= '\n') goto yy40;
+					if (yych <= '\f') goto yy1;
 				}
 			} else {
 				if (yych <= '"') {
-					if (yych <= 0x1F) goto yy4;
-					if (yych <= ' ') goto yy55;
+					if (yych <= 0x1F) goto yy1;
+					if (yych <= ' ') goto yy39;
 				} else {
-					if (yych == '$') goto yy57;
-					if (yych <= '%') goto yy4;
+					if (yych == '$') goto yy40;
+					if (yych <= '%') goto yy1;
 				}
 			}
 		} else {
 			if (yych <= '=') {
 				if (yych <= ':') {
-					if (yych <= '\'') goto yy4;
-					if (yych >= '*') goto yy4;
+					if (yych <= '\'') goto yy1;
+					if (yych >= '*') goto yy1;
 				} else {
-					if (yych == '<') goto yy4;
+					if (yych == '<') goto yy1;
 				}
 			} else {
 				if (yych <= '\\') {
-					if (yych == '') goto yy29;
-					goto yy4;
+					if (yych == '') goto yy19;
+					goto yy1;
 				} else {
-					if (yych <= '^') goto yy57;
-					if (yych <= 'z') goto yy4;
-					if (yych >= 0x7F) goto yy4;
+					if (yych <= '^') goto yy40;
+					if (yych <= 'z') goto yy1;
+					if (yych >= 0x7F) goto yy1;
 				}
 			}
 		}
-yy57:
-		YYDEBUG(57, *YYCURSOR);
+yy40:
+		YYDEBUG(40, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN(NULL_NULL, "", 0);
 }
-yy58:
-		YYDEBUG(58, *YYCURSOR);
+yy41:
+		YYDEBUG(41, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(59, *YYCURSOR);
-		if (yych == '\t') goto yy58;
-		if (yych == ' ') goto yy58;
-		goto yy57;
+		if (yych == '\t') goto yy41;
+		if (yych == ' ') goto yy41;
+		goto yy40;
 	}
 /* *********************************** */
 yyc_ST_OFFSET:
@@ -1098,333 +1081,322 @@
 			132, 132, 132, 132, 132, 132, 132, 132, 
 			132, 132, 132, 132, 132, 132, 132, 132, 
 		};
-		YYDEBUG(60, *YYCURSOR);
+		YYDEBUG(42, *YYCURSOR);
 		YYFILL(2);
 		yych = *YYCURSOR;
 		if (yybm0+yych & 8) {
-			goto yy65;
+			goto yy46;
 		}
 		if (yych <= '/') {
 			if (yych <= '"') {
 				if (yych <= '\f') {
-					if (yych <= 0x08) goto yy62;
-					if (yych <= '\n') goto yy67;
+					if (yych <= 0x08) goto yy43;
+					if (yych <= '\n') goto yy47;
 				} else {
-					if (yych <= '\r') goto yy67;
-					if (yych >= '"') goto yy69;
+					if (yych <= '\r') goto yy47;
+					if (yych >= '"') goto yy49;
 				}
 			} else {
 				if (yych <= '&') {
-					if (yych == '$') goto yy71;
+					if (yych == '$') goto yy50;
 				} else {
-					if (yych <= '\'') goto yy72;
-					if (yych <= ',') goto yy62;
-					if (yych <= '.') goto yy73;
+					if (yych <= '\'') goto yy51;
+					if (yych <= ',') goto yy43;
+					if (yych <= '.') goto yy52;
 				}
 			}
 		} else {
 			if (yych <= '') {
 				if (yych <= ';') {
-					if (yych <= '9') goto yy74;
-					if (yych >= ';') goto yy67;
+					if (yych <= '9') goto yy53;
+					if (yych >= ';') goto yy47;
 				} else {
-					if (yych <= '@') goto yy62;
-					if (yych <= 'Z') goto yy77;
+					if (yych <= '@') goto yy43;
+					if (yych <= 'Z') goto yy55;
 				}
 			} else {
 				if (yych <= '^') {
-					if (yych <= '\\') goto yy80;
-					if (yych <= '') goto yy81;
+					if (yych <= '\\') goto yy57;
+					if (yych <= '') goto yy58;
 				} else {
-					if (yych == '`') goto yy62;
-					if (yych <= 'z') goto yy77;
+					if (yych == '`') goto yy43;
+					if (yych <= 'z') goto yy55;
 				}
 			}
 		}
-yy62:
-		YYDEBUG(62, *YYCURSOR);
+yy43:
+		YYDEBUG(43, *YYCURSOR);
 		yyaccept = 0;
 		YYMARKER = ++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-yy63:
-		YYDEBUG(63, *YYCURSOR);
+yy44:
+		YYDEBUG(44, *YYCURSOR);
 		if (yybm0+yych & 4) {
-			goto yy62;
+			goto yy43;
 		}
-		if (yych <= '"') goto yy64;
-		if (yych <= '$') goto yy83;
-		if (yych <= ';') goto yy64;
-		if (yych <= '\\') goto yy80;
-yy64:
-		YYDEBUG(64, *YYCURSOR);
+		if (yych <= '"') goto yy45;
+		if (yych <= '$') goto yy59;
+		if (yych <= ';') goto yy45;
+		if (yych <= '\\') goto yy57;
+yy45:
+		YYDEBUG(45, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{ /* Get rest as section/offset value */
 	RETURN_TOKEN(TC_STRING, yytext, yyleng);
 }
-yy65:
-		YYDEBUG(65, *YYCURSOR);
+yy46:
+		YYDEBUG(46, *YYCURSOR);
 		yyaccept = 0;
 		YYMARKER = ++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(66, *YYCURSOR);
 		if (yybm0+yych & 8) {
-			goto yy65;
+			goto yy46;
 		}
 		if (yych <= '$') {
 			if (yych <= '\r') {
-				if (yych <= 0x08) goto yy62;
-				if (yych <= '\n') goto yy64;
-				if (yych <= '\f') goto yy62;
-				goto yy64;
+				if (yych <= 0x08) goto yy43;
+				if (yych <= '\n') goto yy45;
+				if (yych <= '\f') goto yy43;
+				goto yy45;
 			} else {
-				if (yych == '"') goto yy69;
-				if (yych <= '#') goto yy62;
-				goto yy83;
+				if (yych == '"') goto yy49;
+				if (yych <= '#') goto yy43;
+				goto yy59;
 			}
 		} else {
 			if (yych <= ';') {
-				if (yych == '\'') goto yy64;
-				if (yych <= ':') goto yy62;
-				goto yy64;
+				if (yych == '\'') goto yy45;
+				if (yych <= ':') goto yy43;
+				goto yy45;
 			} else {
-				if (yych <= '') goto yy62;
-				if (yych <= '\\') goto yy80;
-				if (yych <= '') goto yy81;
-				goto yy62;
+				if (yych <= '') goto yy43;
+				if (yych <= '\\') goto yy57;
+				if (yych <= '') goto yy58;
+				goto yy43;
 			}
 		}
-yy67:
-		YYDEBUG(67, *YYCURSOR);
+yy47:
+		YYDEBUG(47, *YYCURSOR);
 		++YYCURSOR;
-yy68:
-		YYDEBUG(68, *YYCURSOR);
+yy48:
+		YYDEBUG(48, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	return 0;
 }
-yy69:
-		YYDEBUG(69, *YYCURSOR);
+yy49:
+		YYDEBUG(49, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(70, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{ /* Double quoted '"' string start */
 	yy_push_state(ST_DOUBLE_QUOTES);
 	return '"';
 }
-yy71:
-		YYDEBUG(71, *YYCURSOR);
+yy50:
+		YYDEBUG(50, *YYCURSOR);
 		yych = *++YYCURSOR;
 		if (yych <= '\\') {
-			if (yych <= 0x00) goto yy68;
-			if (yych <= '') goto yy62;
-			goto yy85;
+			if (yych <= 0x00) goto yy48;
+			if (yych <= '') goto yy43;
+			goto yy61;
 		} else {
-			if (yych == '{') goto yy87;
-			goto yy62;
+			if (yych == '{') goto yy62;
+			goto yy43;
 		}
-yy72:
-		YYDEBUG(72, *YYCURSOR);
+yy51:
+		YYDEBUG(51, *YYCURSOR);
 		yych = *++YYCURSOR;
 		if (yybm0+yych & 128) {
-			goto yy89;
+			goto yy63;
 		}
-		goto yy68;
-yy73:
-		YYDEBUG(73, *YYCURSOR);
+		goto yy48;
+yy52:
+		YYDEBUG(52, *YYCURSOR);
 		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych <= '/') goto yy63;
-		if (yych <= '9') goto yy91;
-		goto yy63;
-yy74:
-		YYDEBUG(74, *YYCURSOR);
+		if (yych <= '/') goto yy44;
+		if (yych <= '9') goto yy64;
+		goto yy44;
+yy53:
+		YYDEBUG(53, *YYCURSOR);
 		yyaccept = 1;
 		YYMARKER = ++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(75, *YYCURSOR);
 		if (yybm0+yych & 16) {
-			goto yy74;
+			goto yy53;
 		}
 		if (yych <= '&') {
 			if (yych <= '\r') {
-				if (yych == '\n') goto yy76;
-				if (yych <= '\f') goto yy62;
+				if (yych == '\n') goto yy54;
+				if (yych <= '\f') goto yy43;
 			} else {
 				if (yych <= '"') {
-					if (yych <= '!') goto yy62;
+					if (yych <= '!') goto yy43;
 				} else {
-					if (yych == '$') goto yy83;
-					goto yy62;
+					if (yych == '$') goto yy59;
+					goto yy43;
 				}
 			}
 		} else {
 			if (yych <= ':') {
-				if (yych <= '\'') goto yy76;
-				if (yych == '.') goto yy91;
-				goto yy62;
+				if (yych <= '\'') goto yy54;
+				if (yych == '.') goto yy64;
+				goto yy43;
 			} else {
 				if (yych <= '') {
-					if (yych >= '<') goto yy62;
+					if (yych >= '<') goto yy43;
 				} else {
-					if (yych <= '\\') goto yy80;
-					if (yych >= '^') goto yy62;
+					if (yych <= '\\') goto yy57;
+					if (yych >= '^') goto yy43;
 				}
 			}
 		}
-yy76:
-		YYDEBUG(76, *YYCURSOR);
+yy54:
+		YYDEBUG(54, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{ /* Get number option value as string */
 	RETURN_TOKEN(TC_NUMBER, yytext, yyleng);
 }
-yy77:
-		YYDEBUG(77, *YYCURSOR);
+yy55:
+		YYDEBUG(55, *YYCURSOR);
 		yyaccept = 2;
 		YYMARKER = ++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(78, *YYCURSOR);
 		if (yybm0+yych & 32) {
-			goto yy77;
+			goto yy55;
 		}
 		if (yych <= '$') {
 			if (yych <= '\r') {
-				if (yych == '\n') goto yy79;
-				if (yych <= '\f') goto yy62;
+				if (yych == '\n') goto yy56;
+				if (yych <= '\f') goto yy43;
 			} else {
-				if (yych == '"') goto yy79;
-				if (yych <= '#') goto yy62;
-				goto yy83;
+				if (yych == '"') goto yy56;
+				if (yych <= '#') goto yy43;
+				goto yy59;
 			}
 		} else {
 			if (yych <= ';') {
-				if (yych == '\'') goto yy79;
-				if (yych <= ':') goto yy62;
+				if (yych == '\'') goto yy56;
+				if (yych <= ':') goto yy43;
 			} else {
-				if (yych <= '') goto yy62;
-				if (yych <= '\\') goto yy80;
-				if (yych >= '^') goto yy62;
+				if (yych <= '') goto yy43;
+				if (yych <= '\\') goto yy57;
+				if (yych >= '^') goto yy43;
 			}
 		}
-yy79:
-		YYDEBUG(79, *YYCURSOR);
+yy56:
+		YYDEBUG(56, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{ /* Get constant option value */
 	RETURN_TOKEN(TC_CONSTANT, yytext, yyleng);
 }
-yy80:
-		YYDEBUG(80, *YYCURSOR);
+yy57:
+		YYDEBUG(57, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
-		yych = *YYCURSOR;
-		goto yy62;
-yy81:
-		YYDEBUG(81, *YYCURSOR);
+		goto yy43;
+yy58:
+		YYDEBUG(58, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(82, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{ /* End of section or an option offset */
 	BEGIN(INITIAL);
 	return '';
 }
-yy83:
-		YYDEBUG(83, *YYCURSOR);
+yy59:
+		YYDEBUG(59, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= '\\') {
-			if (yych <= 0x00) goto yy84;
-			if (yych <= '') goto yy62;
-			goto yy85;
+			if (yych <= 0x00) goto yy60;
+			if (yych <= '') goto yy43;
+			goto yy61;
 		} else {
-			if (yych != '{') goto yy62;
+			if (yych != '{') goto yy43;
 		}
-yy84:
-		YYDEBUG(84, *YYCURSOR);
+yy60:
+		YYDEBUG(60, *YYCURSOR);
 		YYCURSOR = YYMARKER;
 		if (yyaccept <= 1) {
 			if (yyaccept == 0) {
-				goto yy64;
+				goto yy45;
 			} else {
-				goto yy76;
+				goto yy54;
 			}
 		} else {
-			goto yy79;
+			goto yy56;
 		}
-yy85:
-		YYDEBUG(85, *YYCURSOR);
+yy61:
+		YYDEBUG(61, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(86, *YYCURSOR);
 		if (yybm0+yych & 64) {
-			goto yy85;
+			goto yy61;
 		}
-		goto yy62;
-yy87:
-		YYDEBUG(87, *YYCURSOR);
+		goto yy43;
+yy62:
+		YYDEBUG(62, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(88, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{ /* Variable start */
 	yy_push_state(ST_VARNAME);
 	return TC_DOLLAR_CURLY;
 }
-yy89:
-		YYDEBUG(89, *YYCURSOR);
+yy63:
+		YYDEBUG(63, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(90, *YYCURSOR);
 		if (yybm0+yych & 128) {
-			goto yy89;
-		}
-		goto yy93;
-yy91:
-		YYDEBUG(91, *YYCURSOR);
+			goto yy63;
+		}
+		goto yy65;
+yy64:
+		YYDEBUG(64, *YYCURSOR);
 		yyaccept = 1;
 		YYMARKER = ++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(92, *YYCURSOR);
 		if (yych <= '&') {
 			if (yych <= '\r') {
-				if (yych == '\n') goto yy76;
-				if (yych <= '\f') goto yy62;
-				goto yy76;
+				if (yych == '\n') goto yy54;
+				if (yych <= '\f') goto yy43;
+				goto yy54;
 			} else {
 				if (yych <= '"') {
-					if (yych <= '!') goto yy62;
-					goto yy76;
+					if (yych <= '!') goto yy43;
+					goto yy54;
 				} else {
-					if (yych == '$') goto yy83;
-					goto yy62;
+					if (yych == '$') goto yy59;
+					goto yy43;
 				}
 			}
 		} else {
 			if (yych <= ':') {
-				if (yych <= '\'') goto yy76;
-				if (yych <= '/') goto yy62;
-				if (yych <= '9') goto yy91;
-				goto yy62;
+				if (yych <= '\'') goto yy54;
+				if (yych <= '/') goto yy43;
+				if (yych <= '9') goto yy64;
+				goto yy43;
 			} else {
 				if (yych <= '') {
-					if (yych <= ';') goto yy76;
-					goto yy62;
+					if (yych <= ';') goto yy54;
+					goto yy43;
 				} else {
-					if (yych <= '\\') goto yy80;
-					if (yych <= '') goto yy76;
-					goto yy62;
+					if (yych <= '\\') goto yy57;
+					if (yych <= '') goto yy54;
+					goto yy43;
 				}
 			}
 		}
-yy93:
-		YYDEBUG(93, *YYCURSOR);
+yy65:
+		YYDEBUG(65, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(94, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{ /* Raw string */
 	/* Eat leading and trailing single quotes */
@@ -1472,355 +1444,344 @@
 			132, 132, 132, 132, 132, 132, 132, 132, 
 			132, 132, 132, 132, 132, 132, 132, 132, 
 		};
-		YYDEBUG(95, *YYCURSOR);
+		YYDEBUG(66, *YYCURSOR);
 		YYFILL(2);
 		yych = *YYCURSOR;
 		if (yybm0+yych & 8) {
-			goto yy100;
+			goto yy70;
 		}
 		if (yych <= '/') {
 			if (yych <= '"') {
 				if (yych <= '\f') {
-					if (yych <= 0x08) goto yy97;
-					if (yych <= '\n') goto yy102;
+					if (yych <= 0x08) goto yy67;
+					if (yych <= '\n') goto yy71;
 				} else {
-					if (yych <= '\r') goto yy102;
-					if (yych >= '"') goto yy104;
+					if (yych <= '\r') goto yy71;
+					if (yych >= '"') goto yy73;
 				}
 			} else {
 				if (yych <= '&') {
-					if (yych == '$') goto yy106;
+					if (yych == '$') goto yy74;
 				} else {
-					if (yych <= '\'') goto yy107;
-					if (yych <= ',') goto yy97;
-					if (yych <= '.') goto yy108;
+					if (yych <= '\'') goto yy75;
+					if (yych <= ',') goto yy67;
+					if (yych <= '.') goto yy76;
 				}
 			}
 		} else {
 			if (yych <= '') {
 				if (yych <= ';') {
-					if (yych <= '9') goto yy109;
-					if (yych >= ';') goto yy102;
+					if (yych <= '9') goto yy77;
+					if (yych >= ';') goto yy71;
 				} else {
-					if (yych <= '@') goto yy97;
-					if (yych <= 'Z') goto yy112;
+					if (yych <= '@') goto yy67;
+					if (yych <= 'Z') goto yy79;
 				}
 			} else {
 				if (yych <= '^') {
-					if (yych <= '\\') goto yy115;
-					if (yych <= '') goto yy116;
+					if (yych <= '\\') goto yy81;
+					if (yych <= '') goto yy82;
 				} else {
-					if (yych == '`') goto yy97;
-					if (yych <= 'z') goto yy112;
+					if (yych == '`') goto yy67;
+					if (yych <= 'z') goto yy79;
 				}
 			}
 		}
-yy97:
-		YYDEBUG(97, *YYCURSOR);
+yy67:
+		YYDEBUG(67, *YYCURSOR);
 		yyaccept = 0;
 		YYMARKER = ++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-yy98:
-		YYDEBUG(98, *YYCURSOR);
+yy68:
+		YYDEBUG(68, *YYCURSOR);
 		if (yybm0+yych & 4) {
-			goto yy97;
+			goto yy67;
 		}
-		if (yych <= '"') goto yy99;
-		if (yych <= '$') goto yy119;
-		if (yych <= ';') goto yy99;
-		if (yych <= '\\') goto yy115;
-yy99:
-		YYDEBUG(99, *YYCURSOR);
+		if (yych <= '"') goto yy69;
+		if (yych <= '$') goto yy84;
+		if (yych <= ';') goto yy69;
+		if (yych <= '\\') goto yy81;
+yy69:
+		YYDEBUG(69, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{ /* Get rest as section/offset value */
 	RETURN_TOKEN(TC_STRING, yytext, yyleng);
 }
-yy100:
-		YYDEBUG(100, *YYCURSOR);
+yy70:
+		YYDEBUG(70, *YYCURSOR);
 		yyaccept = 0;
 		YYMARKER = ++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(101, *YYCURSOR);
 		if (yybm0+yych & 8) {
-			goto yy100;
+			goto yy70;
 		}
 		if (yych <= '$') {
 			if (yych <= '\r') {
-				if (yych <= 0x08) goto yy97;
-				if (yych <= '\n') goto yy99;
-				if (yych <= '\f') goto yy97;
-				goto yy99;
+				if (yych <= 0x08) goto yy67;
+				if (yych <= '\n') goto yy69;
+				if (yych <= '\f') goto yy67;
+				goto yy69;
 			} else {
-				if (yych == '"') goto yy104;
-				if (yych <= '#') goto yy97;
-				goto yy119;
+				if (yych == '"') goto yy73;
+				if (yych <= '#') goto yy67;
+				goto yy84;
 			}
 		} else {
 			if (yych <= ';') {
-				if (yych == '\'') goto yy99;
-				if (yych <= ':') goto yy97;
-				goto yy99;
+				if (yych == '\'') goto yy69;
+				if (yych <= ':') goto yy67;
+				goto yy69;
 			} else {
-				if (yych <= '') goto yy97;
-				if (yych <= '\\') goto yy115;
-				if (yych <= '') goto yy99;
-				goto yy97;
+				if (yych <= '') goto yy67;
+				if (yych <= '\\') goto yy81;
+				if (yych <= '') goto yy69;
+				goto yy67;
 			}
 		}
-yy102:
-		YYDEBUG(102, *YYCURSOR);
+yy71:
+		YYDEBUG(71, *YYCURSOR);
 		++YYCURSOR;
-yy103:
-		YYDEBUG(103, *YYCURSOR);
+yy72:
+		YYDEBUG(72, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	return 0;
 }
-yy104:
-		YYDEBUG(104, *YYCURSOR);
+yy73:
+		YYDEBUG(73, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(105, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{ /* Double quoted '"' string start */
 	yy_push_state(ST_DOUBLE_QUOTES);
 	return '"';
 }
-yy106:
-		YYDEBUG(106, *YYCURSOR);
+yy74:
+		YYDEBUG(74, *YYCURSOR);
 		yych = *++YYCURSOR;
 		if (yych <= '\\') {
-			if (yych <= 0x00) goto yy103;
-			if (yych <= '') goto yy97;
-			goto yy121;
+			if (yych <= 0x00) goto yy72;
+			if (yych <= '') goto yy67;
+			goto yy86;
 		} else {
-			if (yych == '{') goto yy123;
-			goto yy97;
+			if (yych == '{') goto yy87;
+			goto yy67;
 		}
-yy107:
-		YYDEBUG(107, *YYCURSOR);
+yy75:
+		YYDEBUG(75, *YYCURSOR);
 		yych = *++YYCURSOR;
 		if (yybm0+yych & 128) {
-			goto yy125;
+			goto yy88;
 		}
-		goto yy103;
-yy108:
-		YYDEBUG(108, *YYCURSOR);
+		goto yy72;
+yy76:
+		YYDEBUG(76, *YYCURSOR);
 		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych <= '/') goto yy98;
-		if (yych <= '9') goto yy127;
-		goto yy98;
-yy109:
-		YYDEBUG(109, *YYCURSOR);
+		if (yych <= '/') goto yy68;
+		if (yych <= '9') goto yy89;
+		goto yy68;
+yy77:
+		YYDEBUG(77, *YYCURSOR);
 		yyaccept = 1;
 		YYMARKER = ++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(110, *YYCURSOR);
 		if (yybm0+yych & 16) {
-			goto yy109;
+			goto yy77;
 		}
 		if (yych <= '&') {
 			if (yych <= '\r') {
-				if (yych == '\n') goto yy111;
-				if (yych <= '\f') goto yy97;
+				if (yych == '\n') goto yy78;
+				if (yych <= '\f') goto yy67;
 			} else {
 				if (yych <= '"') {
-					if (yych <= '!') goto yy97;
+					if (yych <= '!') goto yy67;
 				} else {
-					if (yych == '$') goto yy119;
-					goto yy97;
+					if (yych == '$') goto yy84;
+					goto yy67;
 				}
 			}
 		} else {
 			if (yych <= ':') {
-				if (yych <= '\'') goto yy111;
-				if (yych == '.') goto yy127;
-				goto yy97;
+				if (yych <= '\'') goto yy78;
+				if (yych == '.') goto yy89;
+				goto yy67;
 			} else {
 				if (yych <= '') {
-					if (yych >= '<') goto yy97;
+					if (yych >= '<') goto yy67;
 				} else {
-					if (yych <= '\\') goto yy115;
-					if (yych >= '^') goto yy97;
+					if (yych <= '\\') goto yy81;
+					if (yych >= '^') goto yy67;
 				}
 			}
 		}
-yy111:
-		YYDEBUG(111, *YYCURSOR);
+yy78:
+		YYDEBUG(78, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{ /* Get number option value as string */
 	RETURN_TOKEN(TC_NUMBER, yytext, yyleng);
 }
-yy112:
-		YYDEBUG(112, *YYCURSOR);
+yy79:
+		YYDEBUG(79, *YYCURSOR);
 		yyaccept = 2;
 		YYMARKER = ++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(113, *YYCURSOR);
 		if (yybm0+yych & 32) {
-			goto yy112;
+			goto yy79;
 		}
 		if (yych <= '$') {
 			if (yych <= '\r') {
-				if (yych == '\n') goto yy114;
-				if (yych <= '\f') goto yy97;
+				if (yych == '\n') goto yy80;
+				if (yych <= '\f') goto yy67;
 			} else {
-				if (yych == '"') goto yy114;
-				if (yych <= '#') goto yy97;
-				goto yy119;
+				if (yych == '"') goto yy80;
+				if (yych <= '#') goto yy67;
+				goto yy84;
 			}
 		} else {
 			if (yych <= ';') {
-				if (yych == '\'') goto yy114;
-				if (yych <= ':') goto yy97;
+				if (yych == '\'') goto yy80;
+				if (yych <= ':') goto yy67;
 			} else {
-				if (yych <= '') goto yy97;
-				if (yych <= '\\') goto yy115;
-				if (yych >= '^') goto yy97;
+				if (yych <= '') goto yy67;
+				if (yych <= '\\') goto yy81;
+				if (yych >= '^') goto yy67;
 			}
 		}
-yy114:
-		YYDEBUG(114, *YYCURSOR);
+yy80:
+		YYDEBUG(80, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{ /* Get constant option value */
 	RETURN_TOKEN(TC_CONSTANT, yytext, yyleng);
 }
-yy115:
-		YYDEBUG(115, *YYCURSOR);
+yy81:
+		YYDEBUG(81, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
-		yych = *YYCURSOR;
-		goto yy97;
-yy116:
-		YYDEBUG(116, *YYCURSOR);
+		goto yy67;
+yy82:
+		YYDEBUG(82, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(2);
 		yych = *YYCURSOR;
-		YYDEBUG(117, *YYCURSOR);
 		if (yych <= '\f') {
-			if (yych <= 0x08) goto yy118;
-			if (yych <= '\t') goto yy116;
-			if (yych <= '\n') goto yy129;
+			if (yych <= 0x08) goto yy83;
+			if (yych <= '\t') goto yy82;
+			if (yych <= '\n') goto yy90;
 		} else {
-			if (yych <= '\r') goto yy130;
-			if (yych == ' ') goto yy116;
+			if (yych <= '\r') goto yy91;
+			if (yych == ' ') goto yy82;
 		}
-yy118:
-		YYDEBUG(118, *YYCURSOR);
+yy83:
+		YYDEBUG(83, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{ /* End of section */
 	BEGIN(INITIAL);
 	SCNG(lineno)++;
 	return '';
 }
-yy119:
-		YYDEBUG(119, *YYCURSOR);
+yy84:
+		YYDEBUG(84, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= '\\') {
-			if (yych <= 0x00) goto yy120;
-			if (yych <= '') goto yy97;
-			goto yy121;
+			if (yych <= 0x00) goto yy85;
+			if (yych <= '') goto yy67;
+			goto yy86;
 		} else {
-			if (yych != '{') goto yy97;
+			if (yych != '{') goto yy67;
 		}
-yy120:
-		YYDEBUG(120, *YYCURSOR);
+yy85:
+		YYDEBUG(85, *YYCURSOR);
 		YYCURSOR = YYMARKER;
 		if (yyaccept <= 1) {
 			if (yyaccept == 0) {
-				goto yy99;
+				goto yy69;
 			} else {
-				goto yy111;
+				goto yy78;
 			}
 		} else {
-			goto yy114;
+			goto yy80;
 		}
-yy121:
-		YYDEBUG(121, *YYCURSOR);
+yy86:
+		YYDEBUG(86, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(122, *YYCURSOR);
 		if (yybm0+yych & 64) {
-			goto yy121;
+			goto yy86;
 		}
-		goto yy97;
-yy123:
-		YYDEBUG(123, *YYCURSOR);
+		goto yy67;
+yy87:
+		YYDEBUG(87, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(124, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{ /* Variable start */
 	yy_push_state(ST_VARNAME);
 	return TC_DOLLAR_CURLY;
 }
-yy125:
-		YYDEBUG(125, *YYCURSOR);
+yy88:
+		YYDEBUG(88, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(126, *YYCURSOR);
 		if (yybm0+yych & 128) {
-			goto yy125;
+			goto yy88;
 		}
-		goto yy131;
-yy127:
-		YYDEBUG(127, *YYCURSOR);
+		goto yy92;
+yy89:
+		YYDEBUG(89, *YYCURSOR);
 		yyaccept = 1;
 		YYMARKER = ++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(128, *YYCURSOR);
 		if (yych <= '&') {
 			if (yych <= '\r') {
-				if (yych == '\n') goto yy111;
-				if (yych <= '\f') goto yy97;
-				goto yy111;
+				if (yych == '\n') goto yy78;
+				if (yych <= '\f') goto yy67;
+				goto yy78;
 			} else {
 				if (yych <= '"') {
-					if (yych <= '!') goto yy97;
-					goto yy111;
+					if (yych <= '!') goto yy67;
+					goto yy78;
 				} else {
-					if (yych == '$') goto yy119;
-					goto yy97;
+					if (yych == '$') goto yy84;
+					goto yy67;
 				}
 			}
 		} else {
 			if (yych <= ':') {
-				if (yych <= '\'') goto yy111;
-				if (yych <= '/') goto yy97;
-				if (yych <= '9') goto yy127;
-				goto yy97;
+				if (yych <= '\'') goto yy78;
+				if (yych <= '/') goto yy67;
+				if (yych <= '9') goto yy89;
+				goto yy67;
 			} else {
 				if (yych <= '') {
-					if (yych <= ';') goto yy111;
-					goto yy97;
+					if (yych <= ';') goto yy78;
+					goto yy67;
 				} else {
-					if (yych <= '\\') goto yy115;
-					if (yych <= '') goto yy111;
-					goto yy97;
+					if (yych <= '\\') goto yy81;
+					if (yych <= '') goto yy78;
+					goto yy67;
 				}
 			}
 		}
-yy129:
-		YYDEBUG(129, *YYCURSOR);
+yy90:
+		YYDEBUG(90, *YYCURSOR);
 		++YYCURSOR;
-		goto yy118;
-yy130:
-		YYDEBUG(130, *YYCURSOR);
+		goto yy83;
+yy91:
+		YYDEBUG(91, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == '\n') goto yy129;
-		goto yy118;
-yy131:
-		YYDEBUG(131, *YYCURSOR);
+		if (yych == '\n') goto yy90;
+		goto yy83;
+yy92:
+		YYDEBUG(92, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(132, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{ /* Raw string */
 	/* Eat leading and trailing single quotes */
@@ -1868,1123 +1829,1110 @@
 			 82,  82,  82,  82,  82,  82,  82,  82, 
 			 82,  82,  82,  82,  82,  82,  82,  82, 
 		};
-		YYDEBUG(133, *YYCURSOR);
+		YYDEBUG(93, *YYCURSOR);
 		YYFILL(6);
 		yych = *YYCURSOR;
 		if (yybm0+yych & 4) {
-			goto yy140;
+			goto yy99;
 		}
 		switch (yych) {
-		case 0x00:	goto yy135;
-		case '\t':
-		case '\n':	goto yy143;
-		case '\r':	goto yy145;
-		case ' ':
-		case '!':
-		case '&':
-		case '(':
-		case ')':
-		case '^':
-		case '|':
-		case '~':	goto yy146;
-		case '"':	goto yy149;
-		case '$':	goto yy151;
-		case '\'':	goto yy152;
-		case '-':
-		case '.':	goto yy153;
-		case '0':
-		case '1':
-		case '2':
-		case '3':
-		case '4':
-		case '5':
-		case '6':
-		case '7':
-		case '8':
-		case '9':	goto yy154;
-		case ';':	goto yy157;
-		case '=':	goto yy159;
-		case 'A':
-		case 'B':
-		case 'C':
-		case 'D':
-		case 'E':
-		case 'G':
-		case 'H':
-		case 'I':
-		case 'J':
-		case 'K':
-		case 'L':
-		case 'M':
-		case 'P':
-		case 'Q':
-		case 'R':
-		case 'S':
-		case 'U':
-		case 'V':
-		case 'W':
-		case 'X':
-		case 'Z':
-		case '_':
-		case 'a':
-		case 'b':
-		case 'c':
-		case 'd':
-		case 'e':
-		case 'g':
-		case 'h':
-		case 'i':
-		case 'j':
-		case 'k':
-		case 'l':
-		case 'm':
-		case 'p':
-		case 'q':
-		case 'r':
-		case 's':
-		case 'u':
-		case 'v':
-		case 'w':
-		case 'x':
-		case 'z':	goto yy161;
-		case 'F':
-		case 'f':	goto yy164;
-		case 'N':
-		case 'n':	goto yy165;
-		case 'O':
-		case 'o':	goto yy166;
-		case 'T':
-		case 't':	goto yy167;
-		case 'Y':
-		case 'y':	goto yy168;
-		default:	goto yy137;
+			case 0x00: goto yy94;
+			case '\t':
+			case '\n': goto yy101;
+			case '\r': goto yy103;
+			case ' ':
+			case '!':
+			case '&':
+			case '(':
+			case ')':
+			case '^':
+			case '|':
+			case '~': goto yy104;
+			case '"': goto yy105;
+			case '$': goto yy106;
+			case '\'': goto yy107;
+			case '-':
+			case '.': goto yy108;
+			case '0':
+			case '1':
+			case '2':
+			case '3':
+			case '4':
+			case '5':
+			case '6':
+			case '7':
+			case '8':
+			case '9': goto yy109;
+			case ';': goto yy111;
+			case '=': goto yy112;
+			case 'A':
+			case 'B':
+			case 'C':
+			case 'D':
+			case 'E':
+			case 'G':
+			case 'H':
+			case 'I':
+			case 'J':
+			case 'K':
+			case 'L':
+			case 'M':
+			case 'P':
+			case 'Q':
+			case 'R':
+			case 'S':
+			case 'U':
+			case 'V':
+			case 'W':
+			case 'X':
+			case 'Z':
+			case '_':
+			case 'a':
+			case 'b':
+			case 'c':
+			case 'd':
+			case 'e':
+			case 'g':
+			case 'h':
+			case 'i':
+			case 'j':
+			case 'k':
+			case 'l':
+			case 'm':
+			case 'p':
+			case 'q':
+			case 'r':
+			case 's':
+			case 'u':
+			case 'v':
+			case 'w':
+			case 'x':
+			case 'z': goto yy113;
+			case 'F':
+			case 'f': goto yy115;
+			case 'N':
+			case 'n': goto yy116;
+			case 'O':
+			case 'o': goto yy117;
+			case 'T':
+			case 't': goto yy118;
+			case 'Y':
+			case 'y': goto yy119;
+			default: goto yy96;
 		}
-yy135:
-		YYDEBUG(135, *YYCURSOR);
+yy94:
+		YYDEBUG(94, *YYCURSOR);
 		++YYCURSOR;
-yy136:
-		YYDEBUG(136, *YYCURSOR);
+yy95:
+		YYDEBUG(95, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{ /* End of option value (if EOF is reached before EOL */
 	BEGIN(INITIAL);
 	return END_OF_LINE;
 }
-yy137:
-		YYDEBUG(137, *YYCURSOR);
+yy96:
+		YYDEBUG(96, *YYCURSOR);
 		yyaccept = 0;
 		YYMARKER = ++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-yy138:
-		YYDEBUG(138, *YYCURSOR);
+yy97:
+		YYDEBUG(97, *YYCURSOR);
 		if (yybm0+yych & 2) {
-			goto yy137;
+			goto yy96;
 		}
-		if (yych <= '"') goto yy139;
-		if (yych <= '$') goto yy169;
-yy139:
-		YYDEBUG(139, *YYCURSOR);
+		if (yych <= '"') goto yy98;
+		if (yych <= '$') goto yy120;
+yy98:
+		YYDEBUG(98, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{ /* Get everything else as option/offset value */
 	RETURN_TOKEN(TC_STRING, yytext, yyleng);
 }
-yy140:
-		YYDEBUG(140, *YYCURSOR);
+yy99:
+		YYDEBUG(99, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(2);
 		yych = *YYCURSOR;
-		YYDEBUG(141, *YYCURSOR);
 		if (yybm0+yych & 4) {
-			goto yy140;
+			goto yy99;
 		}
 		if (yych <= '\r') {
-			if (yych <= 0x08) goto yy142;
-			if (yych <= '\n') goto yy143;
-			if (yych >= '\r') goto yy145;
+			if (yych <= 0x08) goto yy100;
+			if (yych <= '\n') goto yy101;
+			if (yych >= '\r') goto yy103;
 		} else {
 			if (yych <= '"') {
-				if (yych >= '"') goto yy149;
+				if (yych >= '"') goto yy105;
 			} else {
-				if (yych == ';') goto yy157;
+				if (yych == ';') goto yy111;
 			}
 		}
-yy142:
-		YYDEBUG(142, *YYCURSOR);
+yy100:
+		YYDEBUG(100, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN(TC_WHITESPACE, yytext, yyleng);
 }
-yy143:
-		YYDEBUG(143, *YYCURSOR);
+yy101:
+		YYDEBUG(101, *YYCURSOR);
 		++YYCURSOR;
-yy144:
-		YYDEBUG(144, *YYCURSOR);
+yy102:
+		YYDEBUG(102, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{ /* End of option value */
 	BEGIN(INITIAL);
 	SCNG(lineno)++;
 	return END_OF_LINE;
 }
-yy145:
-		YYDEBUG(145, *YYCURSOR);
+yy103:
+		YYDEBUG(103, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == '\n') goto yy143;
-		goto yy144;
-yy146:
-		YYDEBUG(146, *YYCURSOR);
+		if (yych == '\n') goto yy101;
+		goto yy102;
+yy104:
+		YYDEBUG(104, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(147, *YYCURSOR);
-		if (yych == '\t') goto yy146;
-		if (yych == ' ') goto yy146;
-		YYDEBUG(148, *YYCURSOR);
+		if (yych == '\t') goto yy104;
+		if (yych == ' ') goto yy104;
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{ /* Boolean operators */
 	return yytext0;
 }
-yy149:
-		YYDEBUG(149, *YYCURSOR);
+yy105:
+		YYDEBUG(105, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(150, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{ /* Double quoted '"' string start */
 	yy_push_state(ST_DOUBLE_QUOTES);
 	return '"';
 }
-yy151:
-		YYDEBUG(151, *YYCURSOR);
+yy106:
+		YYDEBUG(106, *YYCURSOR);
 		yych = *++YYCURSOR;
 		if (yych <= '\\') {
-			if (yych <= 0x00) goto yy136;
-			if (yych <= '') goto yy137;
-			goto yy171;
+			if (yych <= 0x00) goto yy95;
+			if (yych <= '') goto yy96;
+			goto yy122;
 		} else {
-			if (yych == '{') goto yy172;
-			goto yy137;
+			if (yych == '{') goto yy123;
+			goto yy96;
 		}
-yy152:
-		YYDEBUG(152, *YYCURSOR);
+yy107:
+		YYDEBUG(107, *YYCURSOR);
 		yych = *++YYCURSOR;
 		if (yybm0+yych & 64) {
-			goto yy174;
+			goto yy124;
 		}
-		goto yy136;
-yy153:
-		YYDEBUG(153, *YYCURSOR);
+		goto yy95;
+yy108:
+		YYDEBUG(108, *YYCURSOR);
 		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych <= '/') goto yy138;
-		if (yych <= '9') goto yy176;
-		goto yy138;
-yy154:
-		YYDEBUG(154, *YYCURSOR);
+		if (yych <= '/') goto yy97;
+		if (yych <= '9') goto yy125;
+		goto yy97;
+yy109:
+		YYDEBUG(109, *YYCURSOR);
 		yyaccept = 1;
 		YYMARKER = ++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(155, *YYCURSOR);
 		if (yybm0+yych & 8) {
-			goto yy154;
+			goto yy109;
 		}
 		if (yych <= '-') {
 			if (yych <= 0x1F) {
 				if (yych <= '\n') {
-					if (yych <= 0x00) goto yy156;
-					if (yych <= 0x08) goto yy137;
+					if (yych <= 0x00) goto yy110;
+					if (yych <= 0x08) goto yy96;
 				} else {
-					if (yych != '\r') goto yy137;
+					if (yych != '\r') goto yy96;
 				}
 			} else {
 				if (yych <= '$') {
-					if (yych <= '"') goto yy156;
-					if (yych <= '#') goto yy137;
-					goto yy169;
+					if (yych <= '"') goto yy110;
+					if (yych <= '#') goto yy96;
+					goto yy120;
 				} else {
-					if (yych <= '%') goto yy137;
-					if (yych >= '*') goto yy137;
+					if (yych <= '%') goto yy96;
+					if (yych >= '*') goto yy96;
 				}
 			}
 		} else {
 			if (yych <= '') {
 				if (yych <= ';') {
-					if (yych <= '.') goto yy176;
-					if (yych <= ':') goto yy137;
+					if (yych <= '.') goto yy125;
+					if (yych <= ':') goto yy96;
 				} else {
-					if (yych != '=') goto yy137;
+					if (yych != '=') goto yy96;
 				}
 			} else {
 				if (yych <= '|') {
-					if (yych <= '^') goto yy156;
-					if (yych <= '{') goto yy137;
+					if (yych <= '^') goto yy110;
+					if (yych <= '{') goto yy96;
 				} else {
-					if (yych != '~') goto yy137;
+					if (yych != '~') goto yy96;
 				}
 			}
 		}
-yy156:
-		YYDEBUG(156, *YYCURSOR);
+yy110:
+		YYDEBUG(110, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{ /* Get number option value as string */
 	RETURN_TOKEN(TC_NUMBER, yytext, yyleng);
 }
-yy157:
-		YYDEBUG(157, *YYCURSOR);
+yy111:
+		YYDEBUG(111, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(2);
 		yych = *YYCURSOR;
-		YYDEBUG(158, *YYCURSOR);
 		if (yybm0+yych & 16) {
-			goto yy157;
+			goto yy111;
 		}
-		if (yych <= '\n') goto yy178;
-		goto yy180;
-yy159:
-		YYDEBUG(159, *YYCURSOR);
+		if (yych <= '\n') goto yy126;
+		goto yy128;
+yy112:
+		YYDEBUG(112, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(160, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{ /* Make = used in option value to trigger error */
 	yyless(0);
 	BEGIN(INITIAL);
 	return END_OF_LINE;
 }
-yy161:
-		YYDEBUG(161, *YYCURSOR);
+yy113:
+		YYDEBUG(113, *YYCURSOR);
 		yyaccept = 2;
 		YYMARKER = ++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(162, *YYCURSOR);
 		if (yybm0+yych & 32) {
-			goto yy161;
+			goto yy113;
 		}
 		if (yych <= ')') {
 			if (yych <= '\r') {
 				if (yych <= 0x08) {
-					if (yych >= 0x01) goto yy137;
+					if (yych >= 0x01) goto yy96;
 				} else {
-					if (yych <= '\n') goto yy163;
-					if (yych <= '\f') goto yy137;
+					if (yych <= '\n') goto yy114;
+					if (yych <= '\f') goto yy96;
 				}
 			} else {
 				if (yych <= '#') {
-					if (yych <= 0x1F) goto yy137;
-					if (yych >= '#') goto yy137;
+					if (yych <= 0x1F) goto yy96;
+					if (yych >= '#') goto yy96;
 				} else {
-					if (yych <= '$') goto yy169;
-					if (yych <= '%') goto yy137;
+					if (yych <= '$') goto yy120;
+					if (yych <= '%') goto yy96;
 				}
 			}
 		} else {
 			if (yych <= '') {
 				if (yych <= ';') {
-					if (yych <= ':') goto yy137;
+					if (yych <= ':') goto yy96;
 				} else {
-					if (yych != '=') goto yy137;
+					if (yych != '=') goto yy96;
 				}
 			} else {
 				if (yych <= '|') {
-					if (yych <= '^') goto yy163;
-					if (yych <= '{') goto yy137;
+					if (yych <= '^') goto yy114;
+					if (yych <= '{') goto yy96;
 				} else {
-					if (yych != '~') goto yy137;
+					if (yych != '~') goto yy96;
 				}
 			}
 		}
-yy163:
-		YYDEBUG(163, *YYCURSOR);
+yy114:
+		YYDEBUG(114, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{ /* Get constant option value */
 	RETURN_TOKEN(TC_CONSTANT, yytext, yyleng);
 }
-yy164:
-		YYDEBUG(164, *YYCURSOR);
+yy115:
+		YYDEBUG(115, *YYCURSOR);
 		yyaccept = 2;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yych <= '<') {
 			if (yych <= '"') {
 				if (yych <= '\n') {
-					if (yych <= 0x00) goto yy163;
-					if (yych <= 0x08) goto yy138;
-					goto yy163;
+					if (yych <= 0x00) goto yy114;
+					if (yych <= 0x08) goto yy97;
+					goto yy114;
 				} else {
-					if (yych == '\r') goto yy163;
-					if (yych <= 0x1F) goto yy138;
-					goto yy163;
+					if (yych == '\r') goto yy114;
+					if (yych <= 0x1F) goto yy97;
+					goto yy114;
 				}
 			} else {
 				if (yych <= '/') {
-					if (yych <= '%') goto yy138;
-					if (yych <= ')') goto yy163;
-					goto yy138;
+					if (yych <= '%') goto yy97;
+					if (yych <= ')') goto yy114;
+					goto yy97;
 				} else {
-					if (yych <= '9') goto yy161;
-					if (yych == ';') goto yy163;
-					goto yy138;
+					if (yych <= '9') goto yy113;
+					if (yych == ';') goto yy114;
+					goto yy97;
 				}
 			}
 		} else {
 			if (yych <= '_') {
 				if (yych <= 'A') {
-					if (yych <= '=') goto yy163;
-					if (yych <= '@') goto yy138;
-					goto yy181;
+					if (yych <= '=') goto yy114;
+					if (yych <= '@') goto yy97;
+					goto yy129;
 				} else {
-					if (yych <= 'Z') goto yy161;
-					if (yych <= '') goto yy138;
-					if (yych <= '^') goto yy163;
-					goto yy161;
+					if (yych <= 'Z') goto yy113;
+					if (yych <= '') goto yy97;
+					if (yych <= '^') goto yy114;
+					goto yy113;
 				}
 			} else {
 				if (yych <= '{') {
-					if (yych <= '`') goto yy138;
-					if (yych <= 'a') goto yy181;
-					if (yych <= 'z') goto yy161;
-					goto yy138;
+					if (yych <= '`') goto yy97;
+					if (yych <= 'a') goto yy129;
+					if (yych <= 'z') goto yy113;
+					goto yy97;
 				} else {
-					if (yych == '}') goto yy138;
-					if (yych <= '~') goto yy163;
-					goto yy138;
+					if (yych == '}') goto yy97;
+					if (yych <= '~') goto yy114;
+					goto yy97;
 				}
 			}
 		}
-yy165:
-		YYDEBUG(165, *YYCURSOR);
+yy116:
+		YYDEBUG(116, *YYCURSOR);
 		yyaccept = 2;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yych <= 'N') {
 			if (yych <= '%') {
 				if (yych <= '\f') {
-					if (yych <= 0x00) goto yy163;
-					if (yych <= 0x08) goto yy138;
-					if (yych <= '\n') goto yy163;
-					goto yy138;
+					if (yych <= 0x00) goto yy114;
+					if (yych <= 0x08) goto yy97;
+					if (yych <= '\n') goto yy114;
+					goto yy97;
 				} else {
-					if (yych <= '\r') goto yy163;
-					if (yych <= 0x1F) goto yy138;
-					if (yych <= '"') goto yy163;
-					goto yy138;
+					if (yych <= '\r') goto yy114;
+					if (yych <= 0x1F) goto yy97;
+					if (yych <= '"') goto yy114;
+					goto yy97;
 				}
 			} else {
 				if (yych <= ':') {
-					if (yych <= ')') goto yy163;
-					if (yych <= '/') goto yy138;
-					if (yych <= '9') goto yy161;
-					goto yy138;
+					if (yych <= ')') goto yy114;
+					if (yych <= '/') goto yy97;
+					if (yych <= '9') goto yy113;
+					goto yy97;
 				} else {
 					if (yych <= '<') {
-						if (yych <= ';') goto yy163;
-						goto yy138;
+						if (yych <= ';') goto yy114;
+						goto yy97;
 					} else {
-						if (yych <= '=') goto yy163;
-						if (yych <= '@') goto yy138;
-						goto yy161;
+						if (yych <= '=') goto yy114;
+						if (yych <= '@') goto yy97;
+						goto yy113;
 					}
 				}
 			}
 		} else {
 			if (yych <= 'n') {
 				if (yych <= 'Z') {
-					if (yych <= 'O') goto yy182;
-					if (yych == 'U') goto yy184;
-					goto yy161;
+					if (yych <= 'O') goto yy130;
+					if (yych == 'U') goto yy132;
+					goto yy113;
 				} else {
 					if (yych <= '^') {
-						if (yych <= '') goto yy138;
-						goto yy163;
+						if (yych <= '') goto yy97;
+						goto yy114;
 					} else {
-						if (yych == '`') goto yy138;
-						goto yy161;
+						if (yych == '`') goto yy97;
+						goto yy113;
 					}
 				}
 			} else {
 				if (yych <= 'z') {
-					if (yych <= 'o') goto yy182;
-					if (yych == 'u') goto yy184;
-					goto yy161;
+					if (yych <= 'o') goto yy130;
+					if (yych == 'u') goto yy132;
+					goto yy113;
 				} else {
 					if (yych <= '|') {
-						if (yych <= '{') goto yy138;
-						goto yy163;
+						if (yych <= '{') goto yy97;
+						goto yy114;
 					} else {
-						if (yych == '~') goto yy163;
-						goto yy138;
+						if (yych == '~') goto yy114;
+						goto yy97;
 					}
 				}
 			}
 		}
-yy166:
-		YYDEBUG(166, *YYCURSOR);
+yy117:
+		YYDEBUG(117, *YYCURSOR);
 		yyaccept = 2;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yych <= 'E') {
 			if (yych <= '%') {
 				if (yych <= '\f') {
-					if (yych <= 0x00) goto yy163;
-					if (yych <= 0x08) goto yy138;
-					if (yych <= '\n') goto yy163;
-					goto yy138;
+					if (yych <= 0x00) goto yy114;
+					if (yych <= 0x08) goto yy97;
+					if (yych <= '\n') goto yy114;
+					goto yy97;
 				} else {
-					if (yych <= '\r') goto yy163;
-					if (yych <= 0x1F) goto yy138;
-					if (yych <= '"') goto yy163;
-					goto yy138;
+					if (yych <= '\r') goto yy114;
+					if (yych <= 0x1F) goto yy97;
+					if (yych <= '"') goto yy114;
+					goto yy97;
 				}
 			} else {
 				if (yych <= ':') {
-					if (yych <= ')') goto yy163;
-					if (yych <= '/') goto yy138;
-					if (yych <= '9') goto yy161;
-					goto yy138;
+					if (yych <= ')') goto yy114;
+					if (yych <= '/') goto yy97;
+					if (yych <= '9') goto yy113;
+					goto yy97;
 				} else {
 					if (yych <= '<') {
-						if (yych <= ';') goto yy163;
-						goto yy138;
+						if (yych <= ';') goto yy114;
+						goto yy97;
 					} else {
-						if (yych <= '=') goto yy163;
-						if (yych <= '@') goto yy138;
-						goto yy161;
+						if (yych <= '=') goto yy114;
+						if (yych <= '@') goto yy97;
+						goto yy113;
 					}
 				}
 			}
 		} else {
 			if (yych <= 'e') {
 				if (yych <= 'Z') {
-					if (yych <= 'F') goto yy185;
-					if (yych == 'N') goto yy186;
-					goto yy161;
+					if (yych <= 'F') goto yy133;
+					if (yych == 'N') goto yy134;
+					goto yy113;
 				} else {
 					if (yych <= '^') {
-						if (yych <= '') goto yy138;
-						goto yy163;
+						if (yych <= '') goto yy97;
+						goto yy114;
 					} else {
-						if (yych == '`') goto yy138;
-						goto yy161;
+						if (yych == '`') goto yy97;
+						goto yy113;
 					}
 				}
 			} else {
 				if (yych <= 'z') {
-					if (yych <= 'f') goto yy185;
-					if (yych == 'n') goto yy186;
-					goto yy161;
+					if (yych <= 'f') goto yy133;
+					if (yych == 'n') goto yy134;
+					goto yy113;
 				} else {
 					if (yych <= '|') {
-						if (yych <= '{') goto yy138;
-						goto yy163;
+						if (yych <= '{') goto yy97;
+						goto yy114;
 					} else {
-						if (yych == '~') goto yy163;
-						goto yy138;
+						if (yych == '~') goto yy114;
+						goto yy97;
 					}
 				}
 			}
 		}
-yy167:
-		YYDEBUG(167, *YYCURSOR);
+yy118:
+		YYDEBUG(118, *YYCURSOR);
 		yyaccept = 2;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yych <= '=') {
 			if (yych <= '"') {
 				if (yych <= '\n') {
-					if (yych <= 0x00) goto yy163;
-					if (yych <= 0x08) goto yy138;
-					goto yy163;
+					if (yych <= 0x00) goto yy114;
+					if (yych <= 0x08) goto yy97;
+					goto yy114;
 				} else {
-					if (yych == '\r') goto yy163;
-					if (yych <= 0x1F) goto yy138;
-					goto yy163;
+					if (yych == '\r') goto yy114;
+					if (yych <= 0x1F) goto yy97;
+					goto yy114;
 				}
 			} else {
 				if (yych <= '9') {
-					if (yych <= '%') goto yy138;
-					if (yych <= ')') goto yy163;
-					if (yych <= '/') goto yy138;
-					goto yy161;
+					if (yych <= '%') goto yy97;
+					if (yych <= ')') goto yy114;
+					if (yych <= '/') goto yy97;
+					goto yy113;
 				} else {
-					if (yych == ';') goto yy163;
-					if (yych <= '<') goto yy138;
-					goto yy163;
+					if (yych == ';') goto yy114;
+					if (yych <= '<') goto yy97;
+					goto yy114;
 				}
 			}
 		} else {
 			if (yych <= '`') {
 				if (yych <= 'Z') {
-					if (yych <= '@') goto yy138;
-					if (yych == 'R') goto yy188;
-					goto yy161;
+					if (yych <= '@') goto yy97;
+					if (yych == 'R') goto yy136;
+					goto yy113;
 				} else {
-					if (yych <= '') goto yy138;
-					if (yych <= '^') goto yy163;
-					if (yych <= '_') goto yy161;
-					goto yy138;
+					if (yych <= '') goto yy97;
+					if (yych <= '^') goto yy114;
+					if (yych <= '_') goto yy113;
+					goto yy97;
 				}
 			} else {
 				if (yych <= '{') {
-					if (yych == 'r') goto yy188;
-					if (yych <= 'z') goto yy161;
-					goto yy138;
+					if (yych == 'r') goto yy136;
+					if (yych <= 'z') goto yy113;
+					goto yy97;
 				} else {
-					if (yych == '}') goto yy138;
-					if (yych <= '~') goto yy163;
-					goto yy138;
+					if (yych == '}') goto yy97;
+					if (yych <= '~') goto yy114;
+					goto yy97;
 				}
 			}
 		}
-yy168:
-		YYDEBUG(168, *YYCURSOR);
+yy119:
+		YYDEBUG(119, *YYCURSOR);
 		yyaccept = 2;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yych <= '=') {
 			if (yych <= '"') {
 				if (yych <= '\n') {
-					if (yych <= 0x00) goto yy163;
-					if (yych <= 0x08) goto yy138;
-					goto yy163;
+					if (yych <= 0x00) goto yy114;
+					if (yych <= 0x08) goto yy97;
+					goto yy114;
 				} else {
-					if (yych == '\r') goto yy163;
-					if (yych <= 0x1F) goto yy138;
-					goto yy163;
+					if (yych == '\r') goto yy114;
+					if (yych <= 0x1F) goto yy97;
+					goto yy114;
 				}
 			} else {
 				if (yych <= '9') {
-					if (yych <= '%') goto yy138;
-					if (yych <= ')') goto yy163;
-					if (yych <= '/') goto yy138;
-					goto yy161;
+					if (yych <= '%') goto yy97;
+					if (yych <= ')') goto yy114;
+					if (yych <= '/') goto yy97;
+					goto yy113;
 				} else {
-					if (yych == ';') goto yy163;
-					if (yych <= '<') goto yy138;
-					goto yy163;
+					if (yych == ';') goto yy114;
+					if (yych <= '<') goto yy97;
+					goto yy114;
 				}
 			}
 		} else {
 			if (yych <= '`') {
 				if (yych <= 'Z') {
-					if (yych <= '@') goto yy138;
-					if (yych == 'E') goto yy189;
-					goto yy161;
+					if (yych <= '@') goto yy97;
+					if (yych == 'E') goto yy137;
+					goto yy113;
 				} else {
-					if (yych <= '') goto yy138;
-					if (yych <= '^') goto yy163;
-					if (yych <= '_') goto yy161;
-					goto yy138;
+					if (yych <= '') goto yy97;
+					if (yych <= '^') goto yy114;
+					if (yych <= '_') goto yy113;
+					goto yy97;
 				}
 			} else {
 				if (yych <= '{') {
-					if (yych == 'e') goto yy189;
-					if (yych <= 'z') goto yy161;
-					goto yy138;
+					if (yych == 'e') goto yy137;
+					if (yych <= 'z') goto yy113;
+					goto yy97;
 				} else {
-					if (yych == '}') goto yy138;
-					if (yych <= '~') goto yy163;
-					goto yy138;
+					if (yych == '}') goto yy97;
+					if (yych <= '~') goto yy114;
+					goto yy97;
 				}
 			}
 		}
-yy169:
-		YYDEBUG(169, *YYCURSOR);
+yy120:
+		YYDEBUG(120, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= '\\') {
-			if (yych <= 0x00) goto yy170;
-			if (yych <= '') goto yy137;
-			goto yy171;
+			if (yych <= 0x00) goto yy121;
+			if (yych <= '') goto yy96;
+			goto yy122;
 		} else {
-			if (yych != '{') goto yy137;
+			if (yych != '{') goto yy96;
 		}
-yy170:
-		YYDEBUG(170, *YYCURSOR);
+yy121:
+		YYDEBUG(121, *YYCURSOR);
 		YYCURSOR = YYMARKER;
 		if (yyaccept <= 2) {
 			if (yyaccept <= 1) {
 				if (yyaccept == 0) {
-					goto yy139;
+					goto yy98;
 				} else {
-					goto yy156;
+					goto yy110;
 				}
 			} else {
-				goto yy163;
+				goto yy114;
 			}
 		} else {
 			if (yyaccept <= 4) {
 				if (yyaccept == 3) {
-					goto yy183;
+					goto yy131;
 				} else {
-					goto yy187;
+					goto yy135;
 				}
 			} else {
-				goto yy204;
+				goto yy148;
 			}
 		}
-yy171:
-		YYDEBUG(171, *YYCURSOR);
+yy122:
+		YYDEBUG(122, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yybm0+yych & 128) {
-			goto yy190;
+			goto yy138;
 		}
-		goto yy137;
-yy172:
-		YYDEBUG(172, *YYCURSOR);
+		goto yy96;
+yy123:
+		YYDEBUG(123, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(173, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{ /* Variable start */
 	yy_push_state(ST_VARNAME);
 	return TC_DOLLAR_CURLY;
 }
-yy174:
-		YYDEBUG(174, *YYCURSOR);
+yy124:
+		YYDEBUG(124, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(175, *YYCURSOR);
 		if (yybm0+yych & 64) {
-			goto yy174;
+			goto yy124;
 		}
-		goto yy192;
-yy176:
-		YYDEBUG(176, *YYCURSOR);
+		goto yy139;
+yy125:
+		YYDEBUG(125, *YYCURSOR);
 		yyaccept = 1;
 		YYMARKER = ++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(177, *YYCURSOR);
 		if (yych <= '/') {
 			if (yych <= 0x1F) {
 				if (yych <= '\n') {
-					if (yych <= 0x00) goto yy156;
-					if (yych <= 0x08) goto yy137;
-					goto yy156;
+					if (yych <= 0x00) goto yy110;
+					if (yych <= 0x08) goto yy96;
+					goto yy110;
 				} else {
-					if (yych == '\r') goto yy156;
-					goto yy137;
+					if (yych == '\r') goto yy110;
+					goto yy96;
 				}
 			} else {
 				if (yych <= '$') {
-					if (yych <= '"') goto yy156;
-					if (yych <= '#') goto yy137;
-					goto yy169;
+					if (yych <= '"') goto yy110;
+					if (yych <= '#') goto yy96;
+					goto yy120;
 				} else {
-					if (yych <= '%') goto yy137;
-					if (yych <= ')') goto yy156;
-					goto yy137;
+					if (yych <= '%') goto yy96;
+					if (yych <= ')') goto yy110;
+					goto yy96;
 				}
 			}
 		} else {
 			if (yych <= '') {
 				if (yych <= ';') {
-					if (yych <= '9') goto yy176;
-					if (yych <= ':') goto yy137;
-					goto yy156;
+					if (yych <= '9') goto yy125;
+					if (yych <= ':') goto yy96;
+					goto yy110;
 				} else {
-					if (yych == '=') goto yy156;
-					goto yy137;
+					if (yych == '=') goto yy110;
+					goto yy96;
 				}
 			} else {
 				if (yych <= '|') {
-					if (yych <= '^') goto yy156;
-					if (yych <= '{') goto yy137;
-					goto yy156;
+					if (yych <= '^') goto yy110;
+					if (yych <= '{') goto yy96;
+					goto yy110;
 				} else {
-					if (yych == '~') goto yy156;
-					goto yy137;
+					if (yych == '~') goto yy110;
+					goto yy96;
 				}
 			}
 		}
-yy178:
-		YYDEBUG(178, *YYCURSOR);
+yy126:
+		YYDEBUG(126, *YYCURSOR);
 		++YYCURSOR;
-yy179:
-		YYDEBUG(179, *YYCURSOR);
+yy127:
+		YYDEBUG(127, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{ /* Comment */
 	BEGIN(INITIAL);
 	SCNG(lineno)++;
 	return END_OF_LINE;
 }
-yy180:
-		YYDEBUG(180, *YYCURSOR);
+yy128:
+		YYDEBUG(128, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == '\n') goto yy178;
-		goto yy179;
-yy181:
-		YYDEBUG(181, *YYCURSOR);
+		if (yych == '\n') goto yy126;
+		goto yy127;
+yy129:
+		YYDEBUG(129, *YYCURSOR);
 		yyaccept = 2;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yych <= '=') {
 			if (yych <= '"') {
 				if (yych <= '\n') {
-					if (yych <= 0x00) goto yy163;
-					if (yych <= 0x08) goto yy138;
-					goto yy163;
+					if (yych <= 0x00) goto yy114;
+					if (yych <= 0x08) goto yy97;
+					goto yy114;
 				} else {
-					if (yych == '\r') goto yy163;
-					if (yych <= 0x1F) goto yy138;
-					goto yy163;
+					if (yych == '\r') goto yy114;
+					if (yych <= 0x1F) goto yy97;
+					goto yy114;
 				}
 			} else {
 				if (yych <= '9') {
-					if (yych <= '%') goto yy138;
-					if (yych <= ')') goto yy163;
-					if (yych <= '/') goto yy138;
-					goto yy161;
+					if (yych <= '%') goto yy97;
+					if (yych <= ')') goto yy114;
+					if (yych <= '/') goto yy97;
+					goto yy113;
 				} else {
-					if (yych == ';') goto yy163;
-					if (yych <= '<') goto yy138;
-					goto yy163;
+					if (yych == ';') goto yy114;
+					if (yych <= '<') goto yy97;
+					goto yy114;
 				}
 			}
 		} else {
 			if (yych <= '`') {
 				if (yych <= 'Z') {
-					if (yych <= '@') goto yy138;
-					if (yych == 'L') goto yy194;
-					goto yy161;
+					if (yych <= '@') goto yy97;
+					if (yych == 'L') goto yy140;
+					goto yy113;
 				} else {
-					if (yych <= '') goto yy138;
-					if (yych <= '^') goto yy163;
-					if (yych <= '_') goto yy161;
-					goto yy138;
+					if (yych <= '') goto yy97;
+					if (yych <= '^') goto yy114;
+					if (yych <= '_') goto yy113;
+					goto yy97;
 				}
 			} else {
 				if (yych <= '{') {
-					if (yych == 'l') goto yy194;
-					if (yych <= 'z') goto yy161;
-					goto yy138;
+					if (yych == 'l') goto yy140;
+					if (yych <= 'z') goto yy113;
+					goto yy97;
 				} else {
-					if (yych == '}') goto yy138;
-					if (yych <= '~') goto yy163;
-					goto yy138;
+					if (yych == '}') goto yy97;
+					if (yych <= '~') goto yy114;
+					goto yy97;
 				}
 			}
 		}
-yy182:
-		YYDEBUG(182, *YYCURSOR);
+yy130:
+		YYDEBUG(130, *YYCURSOR);
 		yyaccept = 3;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yych <= '<') {
 			if (yych <= ' ') {
 				if (yych <= '\n') {
-					if (yych <= 0x00) goto yy183;
-					if (yych <= 0x08) goto yy138;
-					if (yych <= '\t') goto yy195;
+					if (yych <= 0x00) goto yy131;
+					if (yych <= 0x08) goto yy97;
+					if (yych <= '\t') goto yy141;
 				} else {
-					if (yych == '\r') goto yy183;
-					if (yych <= 0x1F) goto yy138;
-					goto yy195;
+					if (yych == '\r') goto yy131;
+					if (yych <= 0x1F) goto yy97;
+					goto yy141;
 				}
 			} else {
 				if (yych <= '/') {
-					if (yych <= '"') goto yy183;
-					if (yych <= '%') goto yy138;
-					if (yych >= '*') goto yy138;
+					if (yych <= '"') goto yy131;
+					if (yych <= '%') goto yy97;
+					if (yych >= '*') goto yy97;
 				} else {
-					if (yych <= '9') goto yy161;
-					if (yych != ';') goto yy138;
+					if (yych <= '9') goto yy113;
+					if (yych != ';') goto yy97;
 				}
 			}
 		} else {
 			if (yych <= '_') {
 				if (yych <= 'N') {
-					if (yych <= '=') goto yy183;
-					if (yych <= '@') goto yy138;
-					if (yych <= 'M') goto yy161;
-					goto yy197;
+					if (yych <= '=') goto yy131;
+					if (yych <= '@') goto yy97;
+					if (yych <= 'M') goto yy113;
+					goto yy142;
 				} else {
-					if (yych <= 'Z') goto yy161;
-					if (yych <= '') goto yy138;
-					if (yych >= '_') goto yy161;
+					if (yych <= 'Z') goto yy113;
+					if (yych <= '') goto yy97;
+					if (yych >= '_') goto yy113;
 				}
 			} else {
 				if (yych <= 'z') {
-					if (yych <= '`') goto yy138;
-					if (yych == 'n') goto yy197;
-					goto yy161;
+					if (yych <= '`') goto yy97;
+					if (yych == 'n') goto yy142;
+					goto yy113;
 				} else {
 					if (yych <= '|') {
-						if (yych <= '{') goto yy138;
+						if (yych <= '{') goto yy97;
 					} else {
-						if (yych != '~') goto yy138;
+						if (yych != '~') goto yy97;
 					}
 				}
 			}
 		}
-yy183:
-		YYDEBUG(183, *YYCURSOR);
+yy131:
+		YYDEBUG(131, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{ /* FALSE value (when used outside option value/offset this causes parse error!)*/
 	RETURN_TOKEN(BOOL_FALSE, "", 0);
 }
-yy184:
-		YYDEBUG(184, *YYCURSOR);
+yy132:
+		YYDEBUG(132, *YYCURSOR);
 		yyaccept = 2;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yych <= '=') {
 			if (yych <= '"') {
 				if (yych <= '\n') {
-					if (yych <= 0x00) goto yy163;
-					if (yych <= 0x08) goto yy138;
-					goto yy163;
+					if (yych <= 0x00) goto yy114;
+					if (yych <= 0x08) goto yy97;
+					goto yy114;
 				} else {
-					if (yych == '\r') goto yy163;
-					if (yych <= 0x1F) goto yy138;
-					goto yy163;
+					if (yych == '\r') goto yy114;
+					if (yych <= 0x1F) goto yy97;
+					goto yy114;
 				}
 			} else {
 				if (yych <= '9') {
-					if (yych <= '%') goto yy138;
-					if (yych <= ')') goto yy163;
-					if (yych <= '/') goto yy138;
-					goto yy161;
+					if (yych <= '%') goto yy97;
+					if (yych <= ')') goto yy114;
+					if (yych <= '/') goto yy97;
+					goto yy113;
 				} else {
-					if (yych == ';') goto yy163;
-					if (yych <= '<') goto yy138;
-					goto yy163;
+					if (yych == ';') goto yy114;
+					if (yych <= '<') goto yy97;
+					goto yy114;
 				}
 			}
 		} else {
 			if (yych <= '`') {
 				if (yych <= 'Z') {
-					if (yych <= '@') goto yy138;
-					if (yych == 'L') goto yy198;
-					goto yy161;
+					if (yych <= '@') goto yy97;
+					if (yych == 'L') goto yy143;
+					goto yy113;
 				} else {
-					if (yych <= '') goto yy138;
-					if (yych <= '^') goto yy163;
-					if (yych <= '_') goto yy161;
-					goto yy138;
+					if (yych <= '') goto yy97;
+					if (yych <= '^') goto yy114;
+					if (yych <= '_') goto yy113;
+					goto yy97;
 				}
 			} else {
 				if (yych <= '{') {
-					if (yych == 'l') goto yy198;
-					if (yych <= 'z') goto yy161;
-					goto yy138;
+					if (yych == 'l') goto yy143;
+					if (yych <= 'z') goto yy113;
+					goto yy97;
 				} else {
-					if (yych == '}') goto yy138;
-					if (yych <= '~') goto yy163;
-					goto yy138;
+					if (yych == '}') goto yy97;
+					if (yych <= '~') goto yy114;
+					goto yy97;
 				}
 			}
 		}
-yy185:
-		YYDEBUG(185, *YYCURSOR);
+yy133:
+		YYDEBUG(133, *YYCURSOR);
 		yyaccept = 2;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yych <= '=') {
 			if (yych <= '"') {
 				if (yych <= '\n') {
-					if (yych <= 0x00) goto yy163;
-					if (yych <= 0x08) goto yy138;
-					goto yy163;
+					if (yych <= 0x00) goto yy114;
+					if (yych <= 0x08) goto yy97;
+					goto yy114;
 				} else {
-					if (yych == '\r') goto yy163;
-					if (yych <= 0x1F) goto yy138;
-					goto yy163;
+					if (yych == '\r') goto yy114;
+					if (yych <= 0x1F) goto yy97;
+					goto yy114;
 				}
 			} else {
 				if (yych <= '9') {
-					if (yych <= '%') goto yy138;
-					if (yych <= ')') goto yy163;
-					if (yych <= '/') goto yy138;
-					goto yy161;
+					if (yych <= '%') goto yy97;
+					if (yych <= ')') goto yy114;
+					if (yych <= '/') goto yy97;
+					goto yy113;
 				} else {
-					if (yych == ';') goto yy163;
-					if (yych <= '<') goto yy138;
-					goto yy163;
+					if (yych == ';') goto yy114;
+					if (yych <= '<') goto yy97;
+					goto yy114;
 				}
 			}
 		} else {
 			if (yych <= '`') {
 				if (yych <= 'Z') {
-					if (yych <= '@') goto yy138;
-					if (yych == 'F') goto yy199;
-					goto yy161;
+					if (yych <= '@') goto yy97;
+					if (yych == 'F') goto yy144;
+					goto yy113;
 				} else {
-					if (yych <= '') goto yy138;
-					if (yych <= '^') goto yy163;
-					if (yych <= '_') goto yy161;
-					goto yy138;
+					if (yych <= '') goto yy97;
+					if (yych <= '^') goto yy114;
+					if (yych <= '_') goto yy113;
+					goto yy97;
 				}
 			} else {
 				if (yych <= '{') {
-					if (yych == 'f') goto yy199;
-					if (yych <= 'z') goto yy161;
-					goto yy138;
+					if (yych == 'f') goto yy144;
+					if (yych <= 'z') goto yy113;
+					goto yy97;
 				} else {
-					if (yych == '}') goto yy138;
-					if (yych <= '~') goto yy163;
-					goto yy138;
+					if (yych == '}') goto yy97;
+					if (yych <= '~') goto yy114;
+					goto yy97;
 				}
 			}
 		}
-yy186:
-		YYDEBUG(186, *YYCURSOR);
+yy134:
+		YYDEBUG(134, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm0+yych & 32) {
-			goto yy161;
+			goto yy113;
 		}
 		if (yych <= ')') {
 			if (yych <= '\f') {
 				if (yych <= 0x08) {
-					if (yych >= 0x01) goto yy138;
+					if (yych >= 0x01) goto yy97;
 				} else {
-					if (yych <= '\t') goto yy200;
-					if (yych >= '\v') goto yy138;
+					if (yych <= '\t') goto yy145;
+					if (yych >= '\v') goto yy97;
 				}
 			} else {
 				if (yych <= ' ') {
-					if (yych <= '\r') goto yy187;
-					if (yych <= 0x1F) goto yy138;
-					goto yy200;
+					if (yych <= '\r') goto yy135;
+					if (yych <= 0x1F) goto yy97;
+					goto yy145;
 				} else {
-					if (yych <= '"') goto yy187;
-					if (yych <= '%') goto yy138;
+					if (yych <= '"') goto yy135;
+					if (yych <= '%') goto yy97;
 				}
 			}
 		} else {
 			if (yych <= '') {
 				if (yych <= ';') {
-					if (yych <= ':') goto yy138;
+					if (yych <= ':') goto yy97;
 				} else {
-					if (yych != '=') goto yy138;
+					if (yych != '=') goto yy97;
 				}
 			} else {
 				if (yych <= '|') {
-					if (yych <= '^') goto yy187;
-					if (yych <= '{') goto yy138;
+					if (yych <= '^') goto yy135;
+					if (yych <= '{') goto yy97;
 				} else {
-					if (yych != '~') goto yy138;
+					if (yych != '~') goto yy97;
 				}
 			}
 		}
-yy187:
-		YYDEBUG(187, *YYCURSOR);
+yy135:
+		YYDEBUG(135, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{ /* TRUE value (when used outside option value/offset this causes parse error!) */
 	RETURN_TOKEN(BOOL_TRUE, "1", 1);
 }
-yy188:
-		YYDEBUG(188, *YYCURSOR);
+yy136:
+		YYDEBUG(136, *YYCURSOR);
 		yyaccept = 2;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yych <= '=') {
 			if (yych <= '"') {
 				if (yych <= '\n') {
-					if (yych <= 0x00) goto yy163;
-					if (yych <= 0x08) goto yy138;
-					goto yy163;
+					if (yych <= 0x00) goto yy114;
+					if (yych <= 0x08) goto yy97;
+					goto yy114;
 				} else {
-					if (yych == '\r') goto yy163;
-					if (yych <= 0x1F) goto yy138;
-					goto yy163;
+					if (yych == '\r') goto yy114;
+					if (yych <= 0x1F) goto yy97;
+					goto yy114;
 				}
 			} else {
 				if (yych <= '9') {
-					if (yych <= '%') goto yy138;
-					if (yych <= ')') goto yy163;
-					if (yych <= '/') goto yy138;
-					goto yy161;
+					if (yych <= '%') goto yy97;
+					if (yych <= ')') goto yy114;
+					if (yych <= '/') goto yy97;
+					goto yy113;
 				} else {
-					if (yych == ';') goto yy163;
-					if (yych <= '<') goto yy138;
-					goto yy163;
+					if (yych == ';') goto yy114;
+					if (yych <= '<') goto yy97;
+					goto yy114;
 				}
 			}
 		} else {
 			if (yych <= '`') {
 				if (yych <= 'Z') {
-					if (yych <= '@') goto yy138;
-					if (yych == 'U') goto yy202;
-					goto yy161;
+					if (yych <= '@') goto yy97;
+					if (yych == 'U') goto yy146;
+					goto yy113;
 				} else {
-					if (yych <= '') goto yy138;
-					if (yych <= '^') goto yy163;
-					if (yych <= '_') goto yy161;
-					goto yy138;
+					if (yych <= '') goto yy97;
+					if (yych <= '^') goto yy114;
+					if (yych <= '_') goto yy113;
+					goto yy97;
 				}
 			} else {
 				if (yych <= '{') {
-					if (yych == 'u') goto yy202;
-					if (yych <= 'z') goto yy161;
-					goto yy138;
+					if (yych == 'u') goto yy146;
+					if (yych <= 'z') goto yy113;
+					goto yy97;
 				} else {
-					if (yych == '}') goto yy138;
-					if (yych <= '~') goto yy163;
-					goto yy138;
+					if (yych == '}') goto yy97;
+					if (yych <= '~') goto yy114;
+					goto yy97;
 				}
 			}
 		}
-yy189:
-		YYDEBUG(189, *YYCURSOR);
+yy137:
+		YYDEBUG(137, *YYCURSOR);
 		yyaccept = 2;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yych <= '=') {
 			if (yych <= '"') {
 				if (yych <= '\n') {
-					if (yych <= 0x00) goto yy163;
-					if (yych <= 0x08) goto yy138;
-					goto yy163;
+					if (yych <= 0x00) goto yy114;
+					if (yych <= 0x08) goto yy97;
+					goto yy114;
 				} else {
-					if (yych == '\r') goto yy163;
-					if (yych <= 0x1F) goto yy138;
-					goto yy163;
+					if (yych == '\r') goto yy114;
+					if (yych <= 0x1F) goto yy97;
+					goto yy114;
 				}
 			} else {
 				if (yych <= '9') {
-					if (yych <= '%') goto yy138;
-					if (yych <= ')') goto yy163;
-					if (yych <= '/') goto yy138;
-					goto yy161;
+					if (yych <= '%') goto yy97;
+					if (yych <= ')') goto yy114;
+					if (yych <= '/') goto yy97;
+					goto yy113;
 				} else {
-					if (yych == ';') goto yy163;
-					if (yych <= '<') goto yy138;
-					goto yy163;
+					if (yych == ';') goto yy114;
+					if (yych <= '<') goto yy97;
+					goto yy114;
 				}
 			}
 		} else {
 			if (yych <= '`') {
 				if (yych <= 'Z') {
-					if (yych <= '@') goto yy138;
-					if (yych == 'S') goto yy186;
-					goto yy161;
+					if (yych <= '@') goto yy97;
+					if (yych == 'S') goto yy134;
+					goto yy113;
 				} else {
-					if (yych <= '') goto yy138;
-					if (yych <= '^') goto yy163;
-					if (yych <= '_') goto yy161;
-					goto yy138;
+					if (yych <= '') goto yy97;
+					if (yych <= '^') goto yy114;
+					if (yych <= '_') goto yy113;
+					goto yy97;
 				}
 			} else {
 				if (yych <= '{') {
-					if (yych == 's') goto yy186;
-					if (yych <= 'z') goto yy161;
-					goto yy138;
+					if (yych == 's') goto yy134;
+					if (yych <= 'z') goto yy113;
+					goto yy97;
 				} else {
-					if (yych == '}') goto yy138;
-					if (yych <= '~') goto yy163;
-					goto yy138;
+					if (yych == '}') goto yy97;
+					if (yych <= '~') goto yy114;
+					goto yy97;
 				}
 			}
 		}
-yy190:
-		YYDEBUG(190, *YYCURSOR);
+yy138:
+		YYDEBUG(138, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(191, *YYCURSOR);
 		if (yybm0+yych & 128) {
-			goto yy190;
+			goto yy138;
 		}
-		if (yych <= 0x00) goto yy139;
-		if (yych == '\\') goto yy171;
-		goto yy137;
-yy192:
-		YYDEBUG(192, *YYCURSOR);
+		if (yych <= 0x00) goto yy98;
+		if (yych == '\\') goto yy122;
+		goto yy96;
+yy139:
+		YYDEBUG(139, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(193, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{ /* Raw string */
 	/* Eat leading and trailing single quotes */
@@ -2994,332 +2942,329 @@
 	}
 	RETURN_TOKEN(TC_RAW, yytext, yyleng);
 }
-yy194:
-		YYDEBUG(194, *YYCURSOR);
+yy140:
+		YYDEBUG(140, *YYCURSOR);
 		yyaccept = 2;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yych <= '=') {
 			if (yych <= '"') {
 				if (yych <= '\n') {
-					if (yych <= 0x00) goto yy163;
-					if (yych <= 0x08) goto yy138;
-					goto yy163;
+					if (yych <= 0x00) goto yy114;
+					if (yych <= 0x08) goto yy97;
+					goto yy114;
 				} else {
-					if (yych == '\r') goto yy163;
-					if (yych <= 0x1F) goto yy138;
-					goto yy163;
+					if (yych == '\r') goto yy114;
+					if (yych <= 0x1F) goto yy97;
+					goto yy114;
 				}
 			} else {
 				if (yych <= '9') {
-					if (yych <= '%') goto yy138;
-					if (yych <= ')') goto yy163;
-					if (yych <= '/') goto yy138;
-					goto yy161;
+					if (yych <= '%') goto yy97;
+					if (yych <= ')') goto yy114;
+					if (yych <= '/') goto yy97;
+					goto yy113;
 				} else {
-					if (yych == ';') goto yy163;
-					if (yych <= '<') goto yy138;
-					goto yy163;
+					if (yych == ';') goto yy114;
+					if (yych <= '<') goto yy97;
+					goto yy114;
 				}
 			}
 		} else {
 			if (yych <= '`') {
 				if (yych <= 'Z') {
-					if (yych <= '@') goto yy138;
-					if (yych == 'S') goto yy197;
-					goto yy161;
+					if (yych <= '@') goto yy97;
+					if (yych == 'S') goto yy142;
+					goto yy113;
 				} else {
-					if (yych <= '') goto yy138;
-					if (yych <= '^') goto yy163;
-					if (yych <= '_') goto yy161;
-					goto yy138;
+					if (yych <= '') goto yy97;
+					if (yych <= '^') goto yy114;
+					if (yych <= '_') goto yy113;
+					goto yy97;
 				}
 			} else {
 				if (yych <= '{') {
-					if (yych == 's') goto yy197;
-					if (yych <= 'z') goto yy161;
-					goto yy138;
+					if (yych == 's') goto yy142;
+					if (yych <= 'z') goto yy113;
+					goto yy97;
 				} else {
-					if (yych == '}') goto yy138;
-					if (yych <= '~') goto yy163;
-					goto yy138;
+					if (yych == '}') goto yy97;
+					if (yych <= '~') goto yy114;
+					goto yy97;
 				}
 			}
 		}
-yy195:
-		YYDEBUG(195, *YYCURSOR);
+yy141:
+		YYDEBUG(141, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(196, *YYCURSOR);
-		if (yych == '\t') goto yy195;
-		if (yych == ' ') goto yy195;
-		goto yy183;
-yy197:
-		YYDEBUG(197, *YYCURSOR);
+		if (yych == '\t') goto yy141;
+		if (yych == ' ') goto yy141;
+		goto yy131;
+yy142:
+		YYDEBUG(142, *YYCURSOR);
 		yyaccept = 2;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yych <= '=') {
 			if (yych <= '"') {
 				if (yych <= '\n') {
-					if (yych <= 0x00) goto yy163;
-					if (yych <= 0x08) goto yy138;
-					goto yy163;
+					if (yych <= 0x00) goto yy114;
+					if (yych <= 0x08) goto yy97;
+					goto yy114;
 				} else {
-					if (yych == '\r') goto yy163;
-					if (yych <= 0x1F) goto yy138;
-					goto yy163;
+					if (yych == '\r') goto yy114;
+					if (yych <= 0x1F) goto yy97;
+					goto yy114;
 				}
 			} else {
 				if (yych <= '9') {
-					if (yych <= '%') goto yy138;
-					if (yych <= ')') goto yy163;
-					if (yych <= '/') goto yy138;
-					goto yy161;
+					if (yych <= '%') goto yy97;
+					if (yych <= ')') goto yy114;
+					if (yych <= '/') goto yy97;
+					goto yy113;
 				} else {
-					if (yych == ';') goto yy163;
-					if (yych <= '<') goto yy138;
-					goto yy163;
+					if (yych == ';') goto yy114;
+					if (yych <= '<') goto yy97;
+					goto yy114;
 				}
 			}
 		} else {
 			if (yych <= '`') {
 				if (yych <= 'Z') {
-					if (yych <= '@') goto yy138;
-					if (yych == 'E') goto yy199;
-					goto yy161;
+					if (yych <= '@') goto yy97;
+					if (yych == 'E') goto yy144;
+					goto yy113;
 				} else {
-					if (yych <= '') goto yy138;
-					if (yych <= '^') goto yy163;
-					if (yych <= '_') goto yy161;
-					goto yy138;
+					if (yych <= '') goto yy97;
+					if (yych <= '^') goto yy114;
+					if (yych <= '_') goto yy113;
+					goto yy97;
 				}
 			} else {
 				if (yych <= '{') {
-					if (yych == 'e') goto yy199;
-					if (yych <= 'z') goto yy161;
-					goto yy138;
+					if (yych == 'e') goto yy144;
+					if (yych <= 'z') goto yy113;
+					goto yy97;
 				} else {
-					if (yych == '}') goto yy138;
-					if (yych <= '~') goto yy163;
-					goto yy138;
+					if (yych == '}') goto yy97;
+					if (yych <= '~') goto yy114;
+					goto yy97;
 				}
 			}
 		}
-yy198:
-		YYDEBUG(198, *YYCURSOR);
+yy143:
+		YYDEBUG(143, *YYCURSOR);
 		yyaccept = 2;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yych <= '=') {
 			if (yych <= '"') {
 				if (yych <= '\n') {
-					if (yych <= 0x00) goto yy163;
-					if (yych <= 0x08) goto yy138;
-					goto yy163;
+					if (yych <= 0x00) goto yy114;
+					if (yych <= 0x08) goto yy97;
+					goto yy114;
 				} else {
-					if (yych == '\r') goto yy163;
-					if (yych <= 0x1F) goto yy138;
-					goto yy163;
+					if (yych == '\r') goto yy114;
+					if (yych <= 0x1F) goto yy97;
+					goto yy114;
 				}
 			} else {
 				if (yych <= '9') {
-					if (yych <= '%') goto yy138;
-					if (yych <= ')') goto yy163;
-					if (yych <= '/') goto yy138;
-					goto yy161;
+					if (yych <= '%') goto yy97;
+					if (yych <= ')') goto yy114;
+					if (yych <= '/') goto yy97;
+					goto yy113;
 				} else {
-					if (yych == ';') goto yy163;
-					if (yych <= '<') goto yy138;
-					goto yy163;
+					if (yych == ';') goto yy114;
+					if (yych <= '<') goto yy97;
+					goto yy114;
 				}
 			}
 		} else {
 			if (yych <= '`') {
 				if (yych <= 'Z') {
-					if (yych <= '@') goto yy138;
-					if (yych == 'L') goto yy203;
-					goto yy161;
+					if (yych <= '@') goto yy97;
+					if (yych == 'L') goto yy147;
+					goto yy113;
 				} else {
-					if (yych <= '') goto yy138;
-					if (yych <= '^') goto yy163;
-					if (yych <= '_') goto yy161;
-					goto yy138;
+					if (yych <= '') goto yy97;
+					if (yych <= '^') goto yy114;
+					if (yych <= '_') goto yy113;
+					goto yy97;
 				}
 			} else {
 				if (yych <= '{') {
-					if (yych == 'l') goto yy203;
-					if (yych <= 'z') goto yy161;
-					goto yy138;
+					if (yych == 'l') goto yy147;
+					if (yych <= 'z') goto yy113;
+					goto yy97;
 				} else {
-					if (yych == '}') goto yy138;
-					if (yych <= '~') goto yy163;
-					goto yy138;
+					if (yych == '}') goto yy97;
+					if (yych <= '~') goto yy114;
+					goto yy97;
 				}
 			}
 		}
-yy199:
-		YYDEBUG(199, *YYCURSOR);
+yy144:
+		YYDEBUG(144, *YYCURSOR);
 		yyaccept = 3;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm0+yych & 32) {
-			goto yy161;
+			goto yy113;
 		}
 		if (yych <= ')') {
 			if (yych <= '\f') {
 				if (yych <= 0x08) {
-					if (yych <= 0x00) goto yy183;
-					goto yy138;
+					if (yych <= 0x00) goto yy131;
+					goto yy97;
 				} else {
-					if (yych <= '\t') goto yy195;
-					if (yych <= '\n') goto yy183;
-					goto yy138;
+					if (yych <= '\t') goto yy141;
+					if (yych <= '\n') goto yy131;
+					goto yy97;
 				}
 			} else {
 				if (yych <= ' ') {
-					if (yych <= '\r') goto yy183;
-					if (yych <= 0x1F) goto yy138;
-					goto yy195;
+					if (yych <= '\r') goto yy131;
+					if (yych <= 0x1F) goto yy97;
+					goto yy141;
 				} else {
-					if (yych <= '"') goto yy183;
-					if (yych <= '%') goto yy138;
-					goto yy183;
+					if (yych <= '"') goto yy131;
+					if (yych <= '%') goto yy97;
+					goto yy131;
 				}
 			}
 		} else {
 			if (yych <= '') {
 				if (yych <= ';') {
-					if (yych <= ':') goto yy138;
-					goto yy183;
+					if (yych <= ':') goto yy97;
+					goto yy131;
 				} else {
-					if (yych == '=') goto yy183;
-					goto yy138;
+					if (yych == '=') goto yy131;
+					goto yy97;
 				}
 			} else {
 				if (yych <= '|') {
-					if (yych <= '^') goto yy183;
-					if (yych <= '{') goto yy138;
-					goto yy183;
+					if (yych <= '^') goto yy131;
+					if (yych <= '{') goto yy97;
+					goto yy131;
 				} else {
-					if (yych == '~') goto yy183;
-					goto yy138;
+					if (yych == '~') goto yy131;
+					goto yy97;
 				}
 			}
 		}
-yy200:
-		YYDEBUG(200, *YYCURSOR);
+yy145:
+		YYDEBUG(145, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(201, *YYCURSOR);
-		if (yych == '\t') goto yy200;
-		if (yych == ' ') goto yy200;
-		goto yy187;
-yy202:
-		YYDEBUG(202, *YYCURSOR);
+		if (yych == '\t') goto yy145;
+		if (yych == ' ') goto yy145;
+		goto yy135;
+yy146:
+		YYDEBUG(146, *YYCURSOR);
 		yyaccept = 2;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yych <= '=') {
 			if (yych <= '"') {
 				if (yych <= '\n') {
-					if (yych <= 0x00) goto yy163;
-					if (yych <= 0x08) goto yy138;
-					goto yy163;
+					if (yych <= 0x00) goto yy114;
+					if (yych <= 0x08) goto yy97;
+					goto yy114;
 				} else {
-					if (yych == '\r') goto yy163;
-					if (yych <= 0x1F) goto yy138;
-					goto yy163;
+					if (yych == '\r') goto yy114;
+					if (yych <= 0x1F) goto yy97;
+					goto yy114;
 				}
 			} else {
 				if (yych <= '9') {
-					if (yych <= '%') goto yy138;
-					if (yych <= ')') goto yy163;
-					if (yych <= '/') goto yy138;
-					goto yy161;
+					if (yych <= '%') goto yy97;
+					if (yych <= ')') goto yy114;
+					if (yych <= '/') goto yy97;
+					goto yy113;
 				} else {
-					if (yych == ';') goto yy163;
-					if (yych <= '<') goto yy138;
-					goto yy163;
+					if (yych == ';') goto yy114;
+					if (yych <= '<') goto yy97;
+					goto yy114;
 				}
 			}
 		} else {
 			if (yych <= '`') {
 				if (yych <= 'Z') {
-					if (yych <= '@') goto yy138;
-					if (yych == 'E') goto yy186;
-					goto yy161;
+					if (yych <= '@') goto yy97;
+					if (yych == 'E') goto yy134;
+					goto yy113;
 				} else {
-					if (yych <= '') goto yy138;
-					if (yych <= '^') goto yy163;
-					if (yych <= '_') goto yy161;
-					goto yy138;
+					if (yych <= '') goto yy97;
+					if (yych <= '^') goto yy114;
+					if (yych <= '_') goto yy113;
+					goto yy97;
 				}
 			} else {
 				if (yych <= '{') {
-					if (yych == 'e') goto yy186;
-					if (yych <= 'z') goto yy161;
-					goto yy138;
+					if (yych == 'e') goto yy134;
+					if (yych <= 'z') goto yy113;
+					goto yy97;
 				} else {
-					if (yych == '}') goto yy138;
-					if (yych <= '~') goto yy163;
-					goto yy138;
+					if (yych == '}') goto yy97;
+					if (yych <= '~') goto yy114;
+					goto yy97;
 				}
 			}
 		}
-yy203:
-		YYDEBUG(203, *YYCURSOR);
+yy147:
+		YYDEBUG(147, *YYCURSOR);
 		yyaccept = 5;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm0+yych & 32) {
-			goto yy161;
+			goto yy113;
 		}
 		if (yych <= ')') {
 			if (yych <= '\f') {
 				if (yych <= 0x08) {
-					if (yych >= 0x01) goto yy138;
+					if (yych >= 0x01) goto yy97;
 				} else {
-					if (yych <= '\t') goto yy205;
-					if (yych >= '\v') goto yy138;
+					if (yych <= '\t') goto yy149;
+					if (yych >= '\v') goto yy97;
 				}
 			} else {
 				if (yych <= ' ') {
-					if (yych <= '\r') goto yy204;
-					if (yych <= 0x1F) goto yy138;
-					goto yy205;
+					if (yych <= '\r') goto yy148;
+					if (yych <= 0x1F) goto yy97;
+					goto yy149;
 				} else {
-					if (yych <= '"') goto yy204;
-					if (yych <= '%') goto yy138;
+					if (yych <= '"') goto yy148;
+					if (yych <= '%') goto yy97;
 				}
 			}
 		} else {
 			if (yych <= '') {
 				if (yych <= ';') {
-					if (yych <= ':') goto yy138;
+					if (yych <= ':') goto yy97;
 				} else {
-					if (yych != '=') goto yy138;
+					if (yych != '=') goto yy97;
 				}
 			} else {
 				if (yych <= '|') {
-					if (yych <= '^') goto yy204;
-					if (yych <= '{') goto yy138;
+					if (yych <= '^') goto yy148;
+					if (yych <= '{') goto yy97;
 				} else {
-					if (yych != '~') goto yy138;
+					if (yych != '~') goto yy97;
 				}
 			}
 		}
-yy204:
-		YYDEBUG(204, *YYCURSOR);
+yy148:
+		YYDEBUG(148, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN(NULL_NULL, "", 0);
 }
-yy205:
-		YYDEBUG(205, *YYCURSOR);
+yy149:
+		YYDEBUG(149, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(206, *YYCURSOR);
-		if (yych == '\t') goto yy205;
-		if (yych == ' ') goto yy205;
-		goto yy204;
+		if (yych == '\t') goto yy149;
+		if (yych == ' ') goto yy149;
+		goto yy148;
 	}
 /* *********************************** */
 yyc_ST_SECTION_RAW:
@@ -3358,65 +3303,61 @@
 			 64,  64,  64,  64,  64,  64,  64,  64, 
 			 64,  64,  64,  64,  64,  64,  64,  64, 
 		};
-		YYDEBUG(207, *YYCURSOR);
+		YYDEBUG(150, *YYCURSOR);
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yybm0+yych & 64) {
-			goto yy209;
+			goto yy151;
 		}
-		if (yych <= '\r') goto yy212;
-		goto yy214;
-yy209:
-		YYDEBUG(209, *YYCURSOR);
+		if (yych <= '\r') goto yy152;
+		goto yy153;
+yy151:
+		YYDEBUG(151, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(210, *YYCURSOR);
 		if (yybm0+yych & 64) {
-			goto yy209;
+			goto yy151;
 		}
-		YYDEBUG(211, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{ /* Raw value, only used when SCNG(scanner_mode) == ZEND_INI_SCANNER_RAW. */
 	RETURN_TOKEN(TC_RAW, yytext, yyleng);
 }
-yy212:
-		YYDEBUG(212, *YYCURSOR);
+yy152:
+		YYDEBUG(152, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(213, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	return 0;
 }
-yy214:
-		YYDEBUG(214, *YYCURSOR);
+yy153:
+		YYDEBUG(153, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(2);
 		yych = *YYCURSOR;
-		YYDEBUG(215, *YYCURSOR);
 		if (yybm0+yych & 128) {
-			goto yy214;
+			goto yy153;
 		}
-		if (yych <= 0x08) goto yy216;
-		if (yych <= '\n') goto yy217;
-		if (yych == '\r') goto yy218;
-yy216:
-		YYDEBUG(216, *YYCURSOR);
+		if (yych <= 0x08) goto yy154;
+		if (yych <= '\n') goto yy155;
+		if (yych == '\r') goto yy156;
+yy154:
+		YYDEBUG(154, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{ /* End of section */
 	BEGIN(INITIAL);
 	SCNG(lineno)++;
 	return '';
 }
-yy217:
-		YYDEBUG(217, *YYCURSOR);
+yy155:
+		YYDEBUG(155, *YYCURSOR);
 		++YYCURSOR;
-		goto yy216;
-yy218:
-		YYDEBUG(218, *YYCURSOR);
+		goto yy154;
+yy156:
+		YYDEBUG(156, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == '\n') goto yy217;
-		goto yy216;
+		if (yych == '\n') goto yy155;
+		goto yy154;
 	}
 /* *********************************** */
 yyc_ST_DOUBLE_QUOTES:
@@ -3455,15 +3396,14 @@
 			  0,   0,   0,   0,   0,   0,   0,   0, 
 			  0,   0,   0,   0,   0,   0,   0,   0, 
 		};
-		YYDEBUG(219, *YYCURSOR);
+		YYDEBUG(157, *YYCURSOR);
 		YYFILL(2);
 		yych = *YYCURSOR;
-		if (yych == '"') goto yy223;
-		if (yych == '$') goto yy226;
-		YYDEBUG(221, *YYCURSOR);
+		if (yych == '"') goto yy159;
+		if (yych == '$') goto yy160;
 		++YYCURSOR;
-yy222:
-		YYDEBUG(222, *YYCURSOR);
+yy158:
+		YYDEBUG(158, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{ /* Escape double quoted string contents */
 	if (YYCURSOR > YYLIMIT) {
@@ -3505,28 +3445,24 @@
 	Z_EXTRA_P(ini_lval) = 0;
 	return TC_QUOTED_STRING;
 }
-yy223:
-		YYDEBUG(223, *YYCURSOR);
+yy159:
+		YYDEBUG(159, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(224, *YYCURSOR);
 		if (yybm0+yych & 128) {
-			goto yy223;
+			goto yy159;
 		}
-		YYDEBUG(225, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{ /* Double quoted '"' string ends */
 	yy_pop_state();
 	return '"';
 }
-yy226:
-		YYDEBUG(226, *YYCURSOR);
+yy160:
+		YYDEBUG(160, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych != '{') goto yy222;
-		YYDEBUG(227, *YYCURSOR);
+		if (yych != '{') goto yy158;
 		++YYCURSOR;
-		YYDEBUG(228, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{ /* Variable start */
 	yy_push_state(ST_VARNAME);
@@ -3570,378 +3506,368 @@
 			  8,   8,   8,   8,   8,   8,   8,   8, 
 			  8,   8,   8,   8,   8,   8,   8,   8, 
 		};
-		YYDEBUG(229, *YYCURSOR);
+		YYDEBUG(161, *YYCURSOR);
 		YYFILL(2);
 		yych = *YYCURSOR;
 		if (yybm0+yych & 16) {
-			goto yy234;
+			goto yy165;
 		}
 		if (yych <= '/') {
 			if (yych <= '"') {
 				if (yych <= '\f') {
-					if (yych <= 0x08) goto yy231;
-					if (yych <= '\n') goto yy236;
+					if (yych <= 0x08) goto yy162;
+					if (yych <= '\n') goto yy166;
 				} else {
-					if (yych <= '\r') goto yy236;
-					if (yych >= '"') goto yy238;
+					if (yych <= '\r') goto yy166;
+					if (yych >= '"') goto yy168;
 				}
 			} else {
 				if (yych <= '&') {
-					if (yych == '$') goto yy240;
+					if (yych == '$') goto yy169;
 				} else {
-					if (yych <= '\'') goto yy236;
-					if (yych <= ',') goto yy231;
-					if (yych <= '.') goto yy241;
+					if (yych <= '\'') goto yy166;
+					if (yych <= ',') goto yy162;
+					if (yych <= '.') goto yy170;
 				}
 			}
 		} else {
 			if (yych <= '\\') {
 				if (yych <= ';') {
-					if (yych <= '9') goto yy242;
-					if (yych >= ';') goto yy236;
+					if (yych <= '9') goto yy171;
+					if (yych >= ';') goto yy166;
 				} else {
-					if (yych <= '@') goto yy231;
-					if (yych <= 'Z') goto yy245;
-					if (yych >= '\\') goto yy248;
+					if (yych <= '@') goto yy162;
+					if (yych <= 'Z') goto yy173;
+					if (yych >= '\\') goto yy175;
 				}
 			} else {
 				if (yych <= '`') {
-					if (yych == '_') goto yy245;
+					if (yych == '_') goto yy173;
 				} else {
-					if (yych <= 'z') goto yy245;
-					if (yych == '}') goto yy249;
+					if (yych <= 'z') goto yy173;
+					if (yych == '}') goto yy176;
 				}
 			}
 		}
-yy231:
-		YYDEBUG(231, *YYCURSOR);
+yy162:
+		YYDEBUG(162, *YYCURSOR);
 		yyaccept = 0;
 		YYMARKER = ++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-yy232:
-		YYDEBUG(232, *YYCURSOR);
+yy163:
+		YYDEBUG(163, *YYCURSOR);
 		if (yybm0+yych & 8) {
-			goto yy231;
+			goto yy162;
 		}
-		if (yych <= '"') goto yy233;
-		if (yych <= '$') goto yy251;
-		if (yych <= ';') goto yy233;
-		if (yych <= '\\') goto yy248;
-yy233:
-		YYDEBUG(233, *YYCURSOR);
+		if (yych <= '"') goto yy164;
+		if (yych <= '$') goto yy177;
+		if (yych <= ';') goto yy164;
+		if (yych <= '\\') goto yy175;
+yy164:
+		YYDEBUG(164, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{ /* Same as below, but excluding '}' */
 	RETURN_TOKEN(TC_STRING, yytext, yyleng);
 }
-yy234:
-		YYDEBUG(234, *YYCURSOR);
+yy165:
+		YYDEBUG(165, *YYCURSOR);
 		yyaccept = 0;
 		YYMARKER = ++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(235, *YYCURSOR);
 		if (yybm0+yych & 16) {
-			goto yy234;
+			goto yy165;
 		}
 		if (yych <= '$') {
 			if (yych <= '\r') {
-				if (yych <= 0x08) goto yy231;
-				if (yych <= '\n') goto yy233;
-				if (yych <= '\f') goto yy231;
-				goto yy233;
+				if (yych <= 0x08) goto yy162;
+				if (yych <= '\n') goto yy164;
+				if (yych <= '\f') goto yy162;
+				goto yy164;
 			} else {
-				if (yych == '"') goto yy238;
-				if (yych <= '#') goto yy231;
-				goto yy251;
+				if (yych == '"') goto yy168;
+				if (yych <= '#') goto yy162;
+				goto yy177;
 			}
 		} else {
 			if (yych <= ';') {
-				if (yych == '\'') goto yy233;
-				if (yych <= ':') goto yy231;
-				goto yy233;
+				if (yych == '\'') goto yy164;
+				if (yych <= ':') goto yy162;
+				goto yy164;
 			} else {
 				if (yych <= '\\') {
-					if (yych <= '') goto yy231;
-					goto yy248;
+					if (yych <= '') goto yy162;
+					goto yy175;
 				} else {
-					if (yych == '}') goto yy233;
-					goto yy231;
+					if (yych == '}') goto yy164;
+					goto yy162;
 				}
 			}
 		}
-yy236:
-		YYDEBUG(236, *YYCURSOR);
+yy166:
+		YYDEBUG(166, *YYCURSOR);
 		++YYCURSOR;
-yy237:
-		YYDEBUG(237, *YYCURSOR);
+yy167:
+		YYDEBUG(167, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	return 0;
 }
-yy238:
-		YYDEBUG(238, *YYCURSOR);
+yy168:
+		YYDEBUG(168, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(239, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{ /* Double quoted '"' string start */
 	yy_push_state(ST_DOUBLE_QUOTES);
 	return '"';
 }
-yy240:
-		YYDEBUG(240, *YYCURSOR);
+yy169:
+		YYDEBUG(169, *YYCURSOR);
 		yych = *++YYCURSOR;
 		if (yych <= '\\') {
-			if (yych <= 0x00) goto yy237;
-			if (yych <= '') goto yy231;
-			goto yy253;
+			if (yych <= 0x00) goto yy167;
+			if (yych <= '') goto yy162;
+			goto yy179;
 		} else {
-			if (yych == '{') goto yy255;
-			goto yy231;
+			if (yych == '{') goto yy180;
+			goto yy162;
 		}
-yy241:
-		YYDEBUG(241, *YYCURSOR);
+yy170:
+		YYDEBUG(170, *YYCURSOR);
 		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych <= '/') goto yy232;
-		if (yych <= '9') goto yy257;
-		goto yy232;
-yy242:
-		YYDEBUG(242, *YYCURSOR);
+		if (yych <= '/') goto yy163;
+		if (yych <= '9') goto yy181;
+		goto yy163;
+yy171:
+		YYDEBUG(171, *YYCURSOR);
 		yyaccept = 1;
 		YYMARKER = ++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(243, *YYCURSOR);
 		if (yybm0+yych & 32) {
-			goto yy242;
+			goto yy171;
 		}
 		if (yych <= '&') {
 			if (yych <= '\r') {
-				if (yych == '\n') goto yy244;
-				if (yych <= '\f') goto yy231;
+				if (yych == '\n') goto yy172;
+				if (yych <= '\f') goto yy162;
 			} else {
 				if (yych <= '"') {
-					if (yych <= '!') goto yy231;
+					if (yych <= '!') goto yy162;
 				} else {
-					if (yych == '$') goto yy251;
-					goto yy231;
+					if (yych == '$') goto yy177;
+					goto yy162;
 				}
 			}
 		} else {
 			if (yych <= ';') {
 				if (yych <= '-') {
-					if (yych >= '(') goto yy231;
+					if (yych >= '(') goto yy162;
 				} else {
-					if (yych <= '.') goto yy257;
-					if (yych <= ':') goto yy231;
+					if (yych <= '.') goto yy181;
+					if (yych <= ':') goto yy162;
 				}
 			} else {
 				if (yych <= '\\') {
-					if (yych <= '') goto yy231;
-					goto yy248;
+					if (yych <= '') goto yy162;
+					goto yy175;
 				} else {
-					if (yych != '}') goto yy231;
+					if (yych != '}') goto yy162;
 				}
 			}
 		}
-yy244:
-		YYDEBUG(244, *YYCURSOR);
+yy172:
+		YYDEBUG(172, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{ /* Get number option value as string */
 	RETURN_TOKEN(TC_NUMBER, yytext, yyleng);
 }
-yy245:
-		YYDEBUG(245, *YYCURSOR);
+yy173:
+		YYDEBUG(173, *YYCURSOR);
 		yyaccept = 2;
 		YYMARKER = ++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(246, *YYCURSOR);
 		if (yybm0+yych & 64) {
-			goto yy245;
+			goto yy173;
 		}
 		if (yych <= '$') {
 			if (yych <= '\r') {
-				if (yych == '\n') goto yy247;
-				if (yych <= '\f') goto yy231;
+				if (yych == '\n') goto yy174;
+				if (yych <= '\f') goto yy162;
 			} else {
-				if (yych == '"') goto yy247;
-				if (yych <= '#') goto yy231;
-				goto yy251;
+				if (yych == '"') goto yy174;
+				if (yych <= '#') goto yy162;
+				goto yy177;
 			}
 		} else {
 			if (yych <= ';') {
-				if (yych == '\'') goto yy247;
-				if (yych <= ':') goto yy231;
+				if (yych == '\'') goto yy174;
+				if (yych <= ':') goto yy162;
 			} else {
 				if (yych <= '\\') {
-					if (yych <= '') goto yy231;
-					goto yy248;
+					if (yych <= '') goto yy162;
+					goto yy175;
 				} else {
-					if (yych != '}') goto yy231;
+					if (yych != '}') goto yy162;
 				}
 			}
 		}
-yy247:
-		YYDEBUG(247, *YYCURSOR);
+yy174:
+		YYDEBUG(174, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{ /* Get constant option value */
 	RETURN_TOKEN(TC_CONSTANT, yytext, yyleng);
 }
-yy248:
-		YYDEBUG(248, *YYCURSOR);
+yy175:
+		YYDEBUG(175, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
-		yych = *YYCURSOR;
-		goto yy231;
-yy249:
-		YYDEBUG(249, *YYCURSOR);
+		goto yy162;
+yy176:
+		YYDEBUG(176, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(250, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{ /* Variable/fallback end */
 	yy_pop_state();
 	return '}';
 }
-yy251:
-		YYDEBUG(251, *YYCURSOR);
+yy177:
+		YYDEBUG(177, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= '\\') {
-			if (yych <= 0x00) goto yy252;
-			if (yych <= '') goto yy231;
-			goto yy253;
+			if (yych <= 0x00) goto yy178;
+			if (yych <= '') goto yy162;
+			goto yy179;
 		} else {
-			if (yych != '{') goto yy231;
+			if (yych != '{') goto yy162;
 		}
-yy252:
-		YYDEBUG(252, *YYCURSOR);
+yy178:
+		YYDEBUG(178, *YYCURSOR);
 		YYCURSOR = YYMARKER;
 		if (yyaccept <= 1) {
 			if (yyaccept == 0) {
-				goto yy233;
+				goto yy164;
 			} else {
-				goto yy244;
+				goto yy172;
 			}
 		} else {
-			goto yy247;
+			goto yy174;
 		}
-yy253:
-		YYDEBUG(253, *YYCURSOR);
+yy179:
+		YYDEBUG(179, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(254, *YYCURSOR);
 		if (yybm0+yych & 128) {
-			goto yy253;
+			goto yy179;
 		}
-		goto yy231;
-yy255:
-		YYDEBUG(255, *YYCURSOR);
+		goto yy162;
+yy180:
+		YYDEBUG(180, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(256, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{ /* Variable start */
 	yy_push_state(ST_VARNAME);
 	return TC_DOLLAR_CURLY;
 }
-yy257:
-		YYDEBUG(257, *YYCURSOR);
+yy181:
+		YYDEBUG(181, *YYCURSOR);
 		yyaccept = 1;
 		YYMARKER = ++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(258, *YYCURSOR);
 		if (yych <= '&') {
 			if (yych <= '\r') {
-				if (yych == '\n') goto yy244;
-				if (yych <= '\f') goto yy231;
-				goto yy244;
+				if (yych == '\n') goto yy172;
+				if (yych <= '\f') goto yy162;
+				goto yy172;
 			} else {
 				if (yych <= '"') {
-					if (yych <= '!') goto yy231;
-					goto yy244;
+					if (yych <= '!') goto yy162;
+					goto yy172;
 				} else {
-					if (yych == '$') goto yy251;
-					goto yy231;
+					if (yych == '$') goto yy177;
+					goto yy162;
 				}
 			}
 		} else {
 			if (yych <= ';') {
 				if (yych <= '/') {
-					if (yych <= '\'') goto yy244;
-					goto yy231;
+					if (yych <= '\'') goto yy172;
+					goto yy162;
 				} else {
-					if (yych <= '9') goto yy257;
-					if (yych <= ':') goto yy231;
-					goto yy244;
+					if (yych <= '9') goto yy181;
+					if (yych <= ':') goto yy162;
+					goto yy172;
 				}
 			} else {
 				if (yych <= '\\') {
-					if (yych <= '') goto yy231;
-					goto yy248;
+					if (yych <= '') goto yy162;
+					goto yy175;
 				} else {
-					if (yych == '}') goto yy244;
-					goto yy231;
+					if (yych == '}') goto yy172;
+					goto yy162;
 				}
 			}
 		}
 	}
 /* *********************************** */
 yyc_ST_VARNAME:
-	YYDEBUG(259, *YYCURSOR);
+	YYDEBUG(182, *YYCURSOR);
 	YYFILL(2);
 	yych = *YYCURSOR;
 	if (yych <= ')') {
 		if (yych <= ' ') {
 			if (yych <= '\n') {
-				if (yych <= 0x00) goto yy261;
-				if (yych <= 0x08) goto yy263;
+				if (yych <= 0x00) goto yy183;
+				if (yych <= 0x08) goto yy184;
 			} else {
-				if (yych != '\r') goto yy263;
+				if (yych != '\r') goto yy184;
 			}
 		} else {
 			if (yych <= '$') {
-				if (yych == '#') goto yy263;
+				if (yych == '#') goto yy184;
 			} else {
-				if (yych == '&') goto yy261;
-				if (yych <= '\'') goto yy263;
+				if (yych == '&') goto yy183;
+				if (yych <= '\'') goto yy184;
 			}
 		}
 	} else {
 		if (yych <= '') {
 			if (yych <= ';') {
-				if (yych <= '9') goto yy263;
-				if (yych <= ':') goto yy265;
+				if (yych <= '9') goto yy184;
+				if (yych <= ':') goto yy186;
 			} else {
-				if (yych == '=') goto yy261;
-				if (yych <= 'Z') goto yy263;
+				if (yych == '=') goto yy183;
+				if (yych <= 'Z') goto yy184;
 			}
 		} else {
 			if (yych <= 'z') {
-				if (yych <= '\\') goto yy263;
-				if (yych >= '_') goto yy263;
+				if (yych <= '\\') goto yy184;
+				if (yych >= '_') goto yy184;
 			} else {
-				if (yych == '}') goto yy266;
-				if (yych >= 0x7F) goto yy263;
+				if (yych == '}') goto yy187;
+				if (yych >= 0x7F) goto yy184;
 			}
 		}
 	}
-yy261:
-	YYDEBUG(261, *YYCURSOR);
+yy183:
+	YYDEBUG(183, *YYCURSOR);
 	++YYCURSOR;
-	YYDEBUG(262, *YYCURSOR);
 	yyleng = YYCURSOR - SCNG(yy_text);
 	{
 	return 0;
 }
-yy263:
-	YYDEBUG(263, *YYCURSOR);
+yy184:
+	YYDEBUG(184, *YYCURSOR);
 	++YYCURSOR;
-yy264:
-	YYDEBUG(264, *YYCURSOR);
+yy185:
+	YYDEBUG(185, *YYCURSOR);
 	yyleng = YYCURSOR - SCNG(yy_text);
 	{ /* Variable name */
 	if (YYCURSOR0 == ':' && YYCURSOR1 == '-') {
@@ -3994,24 +3920,22 @@
 
 	RETURN_TOKEN(TC_VARNAME, yytext, yyleng);
 }
-yy265:
-	YYDEBUG(265, *YYCURSOR);
+yy186:
+	YYDEBUG(186, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == '-') goto yy268;
-	goto yy264;
-yy266:
-	YYDEBUG(266, *YYCURSOR);
+	if (yych == '-') goto yy188;
+	goto yy185;
+yy187:
+	YYDEBUG(187, *YYCURSOR);
 	++YYCURSOR;
-	YYDEBUG(267, *YYCURSOR);
 	yyleng = YYCURSOR - SCNG(yy_text);
 	{ /* Variable/fallback end */
 	yy_pop_state();
 	return '}';
 }
-yy268:
-	YYDEBUG(268, *YYCURSOR);
+yy188:
+	YYDEBUG(188, *YYCURSOR);
 	++YYCURSOR;
-	YYDEBUG(269, *YYCURSOR);
 	yyleng = YYCURSOR - SCNG(yy_text);
 	{ /* End Variable name, fallback start */
 fallback_lexing:
@@ -4056,40 +3980,38 @@
 			 64,  64,  64,  64,  64,  64,  64,  64, 
 			 64,  64,  64,  64,  64,  64,  64,  64, 
 		};
-		YYDEBUG(270, *YYCURSOR);
+		YYDEBUG(189, *YYCURSOR);
 		YYFILL(3);
 		yych = *YYCURSOR;
 		if (yych <= '\f') {
 			if (yych <= 0x08) {
-				if (yych >= 0x01) goto yy274;
+				if (yych >= 0x01) goto yy190;
 			} else {
-				if (yych <= '\t') goto yy276;
-				if (yych <= '\n') goto yy277;
-				goto yy274;
+				if (yych <= '\t') goto yy192;
+				if (yych <= '\n') goto yy193;
+				goto yy190;
 			}
 		} else {
 			if (yych <= ' ') {
-				if (yych <= '\r') goto yy279;
-				if (yych <= 0x1F) goto yy274;
-				goto yy276;
+				if (yych <= '\r') goto yy195;
+				if (yych <= 0x1F) goto yy190;
+				goto yy192;
 			} else {
-				if (yych == ';') goto yy280;
-				goto yy274;
+				if (yych == ';') goto yy196;
+				goto yy190;
 			}
 		}
-		YYDEBUG(272, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(273, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{ /* End of option value (if EOF is reached before EOL */
 	BEGIN(INITIAL);
 	return END_OF_LINE;
 }
-yy274:
-		YYDEBUG(274, *YYCURSOR);
+yy190:
+		YYDEBUG(190, *YYCURSOR);
 		++YYCURSOR;
-yy275:
-		YYDEBUG(275, *YYCURSOR);
+yy191:
+		YYDEBUG(191, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{ /* Raw value, only used when SCNG(scanner_mode) == ZEND_INI_SCANNER_RAW. */
 	const unsigned char *sc = NULL;
@@ -4134,90 +4056,89 @@
 
 	RETURN_TOKEN(TC_RAW, yytext, yyleng);
 }
-yy276:
-		YYDEBUG(276, *YYCURSOR);
+yy192:
+		YYDEBUG(192, *YYCURSOR);
 		yych = *++YYCURSOR;
 		if (yych <= '\r') {
-			if (yych <= 0x08) goto yy275;
-			if (yych <= '\n') goto yy283;
-			if (yych <= '\f') goto yy275;
-			goto yy283;
+			if (yych <= 0x08) goto yy191;
+			if (yych <= '\n') goto yy198;
+			if (yych <= '\f') goto yy191;
+			goto yy198;
 		} else {
 			if (yych <= ' ') {
-				if (yych <= 0x1F) goto yy275;
-				goto yy283;
+				if (yych <= 0x1F) goto yy191;
+				goto yy198;
 			} else {
-				if (yych == ';') goto yy283;
-				goto yy275;
+				if (yych == ';') goto yy198;
+				goto yy191;
 			}
 		}
-yy277:
-		YYDEBUG(277, *YYCURSOR);
+yy193:
+		YYDEBUG(193, *YYCURSOR);
 		++YYCURSOR;
-yy278:
-		YYDEBUG(278, *YYCURSOR);
+yy194:
+		YYDEBUG(194, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{ /* End of option value */
 	BEGIN(INITIAL);
 	SCNG(lineno)++;
 	return END_OF_LINE;
 }
-yy279:
-		YYDEBUG(279, *YYCURSOR);
+yy195:
+		YYDEBUG(195, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == '\n') goto yy277;
-		goto yy278;
-yy280:
-		YYDEBUG(280, *YYCURSOR);
+		if (yych == '\n') goto yy193;
+		goto yy194;
+yy196:
+		YYDEBUG(196, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(2);
 		yych = *YYCURSOR;
-		YYDEBUG(281, *YYCURSOR);
 		if (yybm0+yych & 64) {
-			goto yy280;
+			goto yy196;
 		}
-		if (yych <= '\n') goto yy285;
-		goto yy287;
-yy282:
-		YYDEBUG(282, *YYCURSOR);
+		if (yych <= '\n') goto yy200;
+		goto yy202;
+yy197:
+		YYDEBUG(197, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(2);
 		yych = *YYCURSOR;
-yy283:
-		YYDEBUG(283, *YYCURSOR);
+yy198:
+		YYDEBUG(198, *YYCURSOR);
 		if (yybm0+yych & 128) {
-			goto yy282;
+			goto yy197;
 		}
 		if (yych <= '\f') {
-			if (yych <= 0x08) goto yy284;
-			if (yych <= '\n') goto yy277;
+			if (yych <= 0x08) goto yy199;
+			if (yych <= '\n') goto yy193;
 		} else {
-			if (yych <= '\r') goto yy279;
-			if (yych == ';') goto yy280;
+			if (yych <= '\r') goto yy195;
+			if (yych == ';') goto yy196;
 		}
-yy284:
-		YYDEBUG(284, *YYCURSOR);
+yy199:
+		YYDEBUG(199, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	/* eat whitespace */
 	goto restart;
 }
-yy285:
-		YYDEBUG(285, *YYCURSOR);
+yy200:
+		YYDEBUG(200, *YYCURSOR);
 		++YYCURSOR;
-yy286:
-		YYDEBUG(286, *YYCURSOR);
+yy201:
+		YYDEBUG(201, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{ /* Comment */
 	BEGIN(INITIAL);
 	SCNG(lineno)++;
 	return END_OF_LINE;
 }
-yy287:
-		YYDEBUG(287, *YYCURSOR);
+yy202:
+		YYDEBUG(202, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == '\n') goto yy285;
-		goto yy286;
+		if (yych == '\n') goto yy200;
+		goto yy201;
 	}
 }

php-8.3.7.tar.xz/Zend/zend_ini_scanner_defs.h -> php-8.3.21.tar.xz/Zend/zend_ini_scanner_defs.h Changed

php-8.3.7.tar.xz/Zend/zend_interfaces.c -> php-8.3.21.tar.xz/Zend/zend_interfaces.c Changed

php-8.3.7.tar.xz/Zend/zend_language_parser.c -> php-8.3.21.tar.xz/Zend/zend_language_parser.c Changed

@@ -1,8 +1,9 @@
-/* A Bison parser, made by GNU Bison 3.0.4.  */
+/* A Bison parser, made by GNU Bison 3.8.2.  */
 
 /* Bison implementation for Yacc-like parsers in C
 
-   Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2021 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -15,7 +16,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* As a special exception, you may create a larger work that contains
    part or all of the Bison parser skeleton and distribute that work
@@ -33,6 +34,10 @@
 /* C LALR(1) parser skeleton written by Richard Stallman, by
    simplifying the original so-called "semantic" parser.  */
 
+/* DO NOT RELY ON FEATURES THAT ARE NOT DOCUMENTED in the manual,
+   especially those whose name start with YY_ or yy_.  They are
+   private implementation details that can be changed or removed.  */
+
 /* All symbols defined below should begin with yy or YY, to avoid
    infringing on user name space.  This should be done even for local
    variables, as they might otherwise be expanded by user macros.
@@ -40,11 +45,11 @@
    define necessary library symbols; they are noted "INFRINGES ON
    USER NAME SPACE" below.  */
 
-/* Identify Bison output.  */
-#define YYBISON 1
+/* Identify Bison output, and Bison version.  */
+#define YYBISON 30802
 
-/* Bison version.  */
-#define YYBISON_VERSION "3.0.4"
+/* Bison version string.  */
+#define YYBISON_VERSION "3.8.2"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -60,7 +65,6 @@
 
 /* "%code top" blocks.  */
 
-
 #include "zend.h"
 #include "zend_list.h"
 #include "zend_globals.h"
@@ -78,7 +82,6 @@
 #define YYFREE free
 #endif
 
-
 /* Substitute the type names.  */
 #define YYSTYPE         ZENDSTYPE
 /* Substitute the variable and function names.  */
@@ -89,253 +92,479 @@
 #define yynerrs         zendnerrs
 
 
-/* Copy the first part of user declarations.  */
-
-
-
-# ifndef YY_NULLPTR
-#  if defined __cplusplus && 201103L <= __cplusplus
-#   define YY_NULLPTR nullptr
+# ifndef YY_CAST
+#  ifdef __cplusplus
+#   define YY_CAST(Type, Val) static_cast<Type> (Val)
+#   define YY_REINTERPRET_CAST(Type, Val) reinterpret_cast<Type> (Val)
 #  else
-#   define YY_NULLPTR 0
+#   define YY_CAST(Type, Val) ((Type) (Val))
+#   define YY_REINTERPRET_CAST(Type, Val) ((Type) (Val))
 #  endif
 # endif
-
-/* Enabling verbose error messages.  */
-#ifdef YYERROR_VERBOSE
-# undef YYERROR_VERBOSE
-# define YYERROR_VERBOSE 1
-#else
-# define YYERROR_VERBOSE 1
-#endif
-
-/* In a future release of Bison, this section will be replaced
-   by #include "zend_language_parser.h".  */
-#ifndef YY_ZEND_ZEND_ZEND_LANGUAGE_PARSER_H_INCLUDED
-# define YY_ZEND_ZEND_ZEND_LANGUAGE_PARSER_H_INCLUDED
-/* Debug traces.  */
-#ifndef ZENDDEBUG
-# if defined YYDEBUG
-#if YYDEBUG
-#   define ZENDDEBUG 1
+# ifndef YY_NULLPTR
+#  if defined __cplusplus
+#   if 201103L <= __cplusplus
+#    define YY_NULLPTR nullptr
+#   else
+#    define YY_NULLPTR 0
+#   endif
 #  else
-#   define ZENDDEBUG 0
+#   define YY_NULLPTR ((void*)0)
 #  endif
-# else /* ! defined YYDEBUG */
-#  define ZENDDEBUG 0
-# endif /* ! defined YYDEBUG */
-#endif  /* ! defined ZENDDEBUG */
-#if ZENDDEBUG
-extern int zenddebug;
-#endif
-/* "%code requires" blocks.  */
+# endif
 
+#include "zend_language_parser.h"
+/* Symbol kind.  */
+enum yysymbol_kind_t
+{
+  YYSYMBOL_YYEMPTY = -2,
+  YYSYMBOL_YYEOF = 0,                      /* "end of file"  */
+  YYSYMBOL_YYerror = 1,                    /* error  */
+  YYSYMBOL_YYUNDEF = 2,                    /* "invalid token"  */
+  YYSYMBOL_PREC_ARROW_FUNCTION = 3,        /* PREC_ARROW_FUNCTION  */
+  YYSYMBOL_4_ = 4,                         /* '='  */
+  YYSYMBOL_5_ = 5,                         /* '?'  */
+  YYSYMBOL_6_ = 6,                         /* ':'  */
+  YYSYMBOL_7_ = 7,                         /* '|'  */
+  YYSYMBOL_8_ = 8,                         /* '^'  */
+  YYSYMBOL_9_ = 9,                         /* '<'  */
+  YYSYMBOL_10_ = 10,                       /* '>'  */
+  YYSYMBOL_11_ = 11,                       /* '.'  */
+  YYSYMBOL_12_ = 12,                       /* '+'  */
+  YYSYMBOL_13_ = 13,                       /* '-'  */
+  YYSYMBOL_14_ = 14,                       /* '*'  */
+  YYSYMBOL_15_ = 15,                       /* '/'  */
+  YYSYMBOL_16_ = 16,                       /* '%'  */
+  YYSYMBOL_17_ = 17,                       /* '!'  */
+  YYSYMBOL_18_ = 18,                       /* '~'  */
+  YYSYMBOL_19_ = 19,                       /* '@'  */
+  YYSYMBOL_T_NOELSE = 20,                  /* T_NOELSE  */
+  YYSYMBOL_T_LNUMBER = 21,                 /* "integer"  */
+  YYSYMBOL_T_DNUMBER = 22,                 /* "floating-point number"  */
+  YYSYMBOL_T_STRING = 23,                  /* "identifier"  */
+  YYSYMBOL_T_NAME_FULLY_QUALIFIED = 24,    /* "fully qualified name"  */
+  YYSYMBOL_T_NAME_RELATIVE = 25,           /* "namespace-relative name"  */
+  YYSYMBOL_T_NAME_QUALIFIED = 26,          /* "namespaced name"  */
+  YYSYMBOL_T_VARIABLE = 27,                /* "variable"  */
+  YYSYMBOL_T_INLINE_HTML = 28,             /* T_INLINE_HTML  */
+  YYSYMBOL_T_ENCAPSED_AND_WHITESPACE = 29, /* "string content"  */
+  YYSYMBOL_T_CONSTANT_ENCAPSED_STRING = 30, /* "quoted string"  */
+  YYSYMBOL_T_STRING_VARNAME = 31,          /* "variable name"  */
+  YYSYMBOL_T_NUM_STRING = 32,              /* "number"  */
+  YYSYMBOL_T_INCLUDE = 33,                 /* "'include'"  */
+  YYSYMBOL_T_INCLUDE_ONCE = 34,            /* "'include_once'"  */
+  YYSYMBOL_T_EVAL = 35,                    /* "'eval'"  */
+  YYSYMBOL_T_REQUIRE = 36,                 /* "'require'"  */
+  YYSYMBOL_T_REQUIRE_ONCE = 37,            /* "'require_once'"  */
+  YYSYMBOL_T_LOGICAL_OR = 38,              /* "'or'"  */
+  YYSYMBOL_T_LOGICAL_XOR = 39,             /* "'xor'"  */
+  YYSYMBOL_T_LOGICAL_AND = 40,             /* "'and'"  */
+  YYSYMBOL_T_PRINT = 41,                   /* "'print'"  */
+  YYSYMBOL_T_YIELD = 42,                   /* "'yield'"  */
+  YYSYMBOL_T_YIELD_FROM = 43,              /* "'yield from'"  */
+  YYSYMBOL_T_INSTANCEOF = 44,              /* "'instanceof'"  */
+  YYSYMBOL_T_NEW = 45,                     /* "'new'"  */
+  YYSYMBOL_T_CLONE = 46,                   /* "'clone'"  */
+  YYSYMBOL_T_EXIT = 47,                    /* "'exit'"  */
+  YYSYMBOL_T_IF = 48,                      /* "'if'"  */
+  YYSYMBOL_T_ELSEIF = 49,                  /* "'elseif'"  */
+  YYSYMBOL_T_ELSE = 50,                    /* "'else'"  */
+  YYSYMBOL_T_ENDIF = 51,                   /* "'endif'"  */
+  YYSYMBOL_T_ECHO = 52,                    /* "'echo'"  */
+  YYSYMBOL_T_DO = 53,                      /* "'do'"  */
+  YYSYMBOL_T_WHILE = 54,                   /* "'while'"  */
+  YYSYMBOL_T_ENDWHILE = 55,                /* "'endwhile'"  */
+  YYSYMBOL_T_FOR = 56,                     /* "'for'"  */
+  YYSYMBOL_T_ENDFOR = 57,                  /* "'endfor'"  */
+  YYSYMBOL_T_FOREACH = 58,                 /* "'foreach'"  */
+  YYSYMBOL_T_ENDFOREACH = 59,              /* "'endforeach'"  */
+  YYSYMBOL_T_DECLARE = 60,                 /* "'declare'"  */
+  YYSYMBOL_T_ENDDECLARE = 61,              /* "'enddeclare'"  */
+  YYSYMBOL_T_AS = 62,                      /* "'as'"  */
+  YYSYMBOL_T_SWITCH = 63,                  /* "'switch'"  */
+  YYSYMBOL_T_ENDSWITCH = 64,               /* "'endswitch'"  */
+  YYSYMBOL_T_CASE = 65,                    /* "'case'"  */
+  YYSYMBOL_T_DEFAULT = 66,                 /* "'default'"  */
+  YYSYMBOL_T_MATCH = 67,                   /* "'match'"  */
+  YYSYMBOL_T_BREAK = 68,                   /* "'break'"  */
+  YYSYMBOL_T_CONTINUE = 69,                /* "'continue'"  */
+  YYSYMBOL_T_GOTO = 70,                    /* "'goto'"  */
+  YYSYMBOL_T_FUNCTION = 71,                /* "'function'"  */
+  YYSYMBOL_T_FN = 72,                      /* "'fn'"  */
+  YYSYMBOL_T_CONST = 73,                   /* "'const'"  */
+  YYSYMBOL_T_RETURN = 74,                  /* "'return'"  */
+  YYSYMBOL_T_TRY = 75,                     /* "'try'"  */
+  YYSYMBOL_T_CATCH = 76,                   /* "'catch'"  */
+  YYSYMBOL_T_FINALLY = 77,                 /* "'finally'"  */
+  YYSYMBOL_T_THROW = 78,                   /* "'throw'"  */
+  YYSYMBOL_T_USE = 79,                     /* "'use'"  */
+  YYSYMBOL_T_INSTEADOF = 80,               /* "'insteadof'"  */
+  YYSYMBOL_T_GLOBAL = 81,                  /* "'global'"  */
+  YYSYMBOL_T_STATIC = 82,                  /* "'static'"  */
+  YYSYMBOL_T_ABSTRACT = 83,                /* "'abstract'"  */
+  YYSYMBOL_T_FINAL = 84,                   /* "'final'"  */
+  YYSYMBOL_T_PRIVATE = 85,                 /* "'private'"  */
+  YYSYMBOL_T_PROTECTED = 86,               /* "'protected'"  */
+  YYSYMBOL_T_PUBLIC = 87,                  /* "'public'"  */
+  YYSYMBOL_T_READONLY = 88,                /* "'readonly'"  */
+  YYSYMBOL_T_VAR = 89,                     /* "'var'"  */
+  YYSYMBOL_T_UNSET = 90,                   /* "'unset'"  */
+  YYSYMBOL_T_ISSET = 91,                   /* "'isset'"  */
+  YYSYMBOL_T_EMPTY = 92,                   /* "'empty'"  */
+  YYSYMBOL_T_HALT_COMPILER = 93,           /* "'__halt_compiler'"  */
+  YYSYMBOL_T_CLASS = 94,                   /* "'class'"  */
+  YYSYMBOL_T_TRAIT = 95,                   /* "'trait'"  */
+  YYSYMBOL_T_INTERFACE = 96,               /* "'interface'"  */
+  YYSYMBOL_T_ENUM = 97,                    /* "'enum'"  */
+  YYSYMBOL_T_EXTENDS = 98,                 /* "'extends'"  */
+  YYSYMBOL_T_IMPLEMENTS = 99,              /* "'implements'"  */
+  YYSYMBOL_T_NAMESPACE = 100,              /* "'namespace'"  */
+  YYSYMBOL_T_LIST = 101,                   /* "'list'"  */
+  YYSYMBOL_T_ARRAY = 102,                  /* "'array'"  */
+  YYSYMBOL_T_CALLABLE = 103,               /* "'callable'"  */
+  YYSYMBOL_T_LINE = 104,                   /* "'__LINE__'"  */
+  YYSYMBOL_T_FILE = 105,                   /* "'__FILE__'"  */
+  YYSYMBOL_T_DIR = 106,                    /* "'__DIR__'"  */
+  YYSYMBOL_T_CLASS_C = 107,                /* "'__CLASS__'"  */
+  YYSYMBOL_T_TRAIT_C = 108,                /* "'__TRAIT__'"  */
+  YYSYMBOL_T_METHOD_C = 109,               /* "'__METHOD__'"  */
+  YYSYMBOL_T_FUNC_C = 110,                 /* "'__FUNCTION__'"  */
+  YYSYMBOL_T_NS_C = 111,                   /* "'__NAMESPACE__'"  */
+  YYSYMBOL_T_ATTRIBUTE = 112,              /* "'#'"  */
+  YYSYMBOL_T_PLUS_EQUAL = 113,             /* "'+='"  */
+  YYSYMBOL_T_MINUS_EQUAL = 114,            /* "'-='"  */
+  YYSYMBOL_T_MUL_EQUAL = 115,              /* "'*='"  */
+  YYSYMBOL_T_DIV_EQUAL = 116,              /* "'/='"  */
+  YYSYMBOL_T_CONCAT_EQUAL = 117,           /* "'.='"  */
+  YYSYMBOL_T_MOD_EQUAL = 118,              /* "'%='"  */
+  YYSYMBOL_T_AND_EQUAL = 119,              /* "'&='"  */
+  YYSYMBOL_T_OR_EQUAL = 120,               /* "'|='"  */
+  YYSYMBOL_T_XOR_EQUAL = 121,              /* "'^='"  */
+  YYSYMBOL_T_SL_EQUAL = 122,               /* "'<<='"  */
+  YYSYMBOL_T_SR_EQUAL = 123,               /* "'>>='"  */
+  YYSYMBOL_T_COALESCE_EQUAL = 124,         /* "'??='"  */
+  YYSYMBOL_T_BOOLEAN_OR = 125,             /* "'||'"  */
+  YYSYMBOL_T_BOOLEAN_AND = 126,            /* "'&&'"  */
+  YYSYMBOL_T_IS_EQUAL = 127,               /* "'=='"  */
+  YYSYMBOL_T_IS_NOT_EQUAL = 128,           /* "'!='"  */
+  YYSYMBOL_T_IS_IDENTICAL = 129,           /* "'==='"  */
+  YYSYMBOL_T_IS_NOT_IDENTICAL = 130,       /* "'!=='"  */
+  YYSYMBOL_T_IS_SMALLER_OR_EQUAL = 131,    /* "'<='"  */
+  YYSYMBOL_T_IS_GREATER_OR_EQUAL = 132,    /* "'>='"  */
+  YYSYMBOL_T_SPACESHIP = 133,              /* "'<=>'"  */
+  YYSYMBOL_T_SL = 134,                     /* "'<<'"  */
+  YYSYMBOL_T_SR = 135,                     /* "'>>'"  */
+  YYSYMBOL_T_INC = 136,                    /* "'++'"  */
+  YYSYMBOL_T_DEC = 137,                    /* "'--'"  */
+  YYSYMBOL_T_INT_CAST = 138,               /* "'(int)'"  */
+  YYSYMBOL_T_DOUBLE_CAST = 139,            /* "'(double)'"  */
+  YYSYMBOL_T_STRING_CAST = 140,            /* "'(string)'"  */
+  YYSYMBOL_T_ARRAY_CAST = 141,             /* "'(array)'"  */
+  YYSYMBOL_T_OBJECT_CAST = 142,            /* "'(object)'"  */
+  YYSYMBOL_T_BOOL_CAST = 143,              /* "'(bool)'"  */
+  YYSYMBOL_T_UNSET_CAST = 144,             /* "'(unset)'"  */
+  YYSYMBOL_T_OBJECT_OPERATOR = 145,        /* "'->'"  */
+  YYSYMBOL_T_NULLSAFE_OBJECT_OPERATOR = 146, /* "'?->'"  */
+  YYSYMBOL_T_DOUBLE_ARROW = 147,           /* "'=>'"  */
+  YYSYMBOL_T_COMMENT = 148,                /* "comment"  */
+  YYSYMBOL_T_DOC_COMMENT = 149,            /* "doc comment"  */
+  YYSYMBOL_T_OPEN_TAG = 150,               /* "open tag"  */
+  YYSYMBOL_T_OPEN_TAG_WITH_ECHO = 151,     /* "'<?='"  */
+  YYSYMBOL_T_CLOSE_TAG = 152,              /* "'?>'"  */
+  YYSYMBOL_T_WHITESPACE = 153,             /* "whitespace"  */
+  YYSYMBOL_T_START_HEREDOC = 154,          /* "heredoc start"  */
+  YYSYMBOL_T_END_HEREDOC = 155,            /* "heredoc end"  */
+  YYSYMBOL_T_DOLLAR_OPEN_CURLY_BRACES = 156, /* "'${'"  */
+  YYSYMBOL_T_CURLY_OPEN = 157,             /* "'{$'"  */
+  YYSYMBOL_T_PAAMAYIM_NEKUDOTAYIM = 158,   /* "'::'"  */
+  YYSYMBOL_T_NS_SEPARATOR = 159,           /* "'\\'"  */
+  YYSYMBOL_T_ELLIPSIS = 160,               /* "'...'"  */
+  YYSYMBOL_T_COALESCE = 161,               /* "'??'"  */
+  YYSYMBOL_T_POW = 162,                    /* "'**'"  */
+  YYSYMBOL_T_POW_EQUAL = 163,              /* "'**='"  */
+  YYSYMBOL_T_AMPERSAND_FOLLOWED_BY_VAR_OR_VARARG = 164, /* "'&'"  */
+  YYSYMBOL_T_AMPERSAND_NOT_FOLLOWED_BY_VAR_OR_VARARG = 165, /* "amp"  */
+  YYSYMBOL_T_BAD_CHARACTER = 166,          /* "invalid character"  */
+  YYSYMBOL_T_ERROR = 167,                  /* T_ERROR  */
+  YYSYMBOL_168_ = 168,                     /* ','  */
+  YYSYMBOL_169_ = 169,                     /* ''  */
+  YYSYMBOL_170_ = 170,                     /* '('  */
+  YYSYMBOL_171_ = 171,                     /* ')'  */
+  YYSYMBOL_172_ = 172,                     /* ';'  */
+  YYSYMBOL_173_ = 173,                     /* '{'  */
+  YYSYMBOL_174_ = 174,                     /* '}'  */
+  YYSYMBOL_175_ = 175,                     /* ''  */
+  YYSYMBOL_176_ = 176,                     /* '`'  */
+  YYSYMBOL_177_ = 177,                     /* '"'  */
+  YYSYMBOL_178_ = 178,                     /* '$'  */
+  YYSYMBOL_YYACCEPT = 179,                 /* $accept  */
+  YYSYMBOL_start = 180,                    /* start  */
+  YYSYMBOL_reserved_non_modifiers = 181,   /* reserved_non_modifiers  */
+  YYSYMBOL_semi_reserved = 182,            /* semi_reserved  */
+  YYSYMBOL_ampersand = 183,                /* ampersand  */
+  YYSYMBOL_identifier = 184,               /* identifier  */
+  YYSYMBOL_top_statement_list = 185,       /* top_statement_list  */
+  YYSYMBOL_namespace_declaration_name = 186, /* namespace_declaration_name  */
+  YYSYMBOL_namespace_name = 187,           /* namespace_name  */
+  YYSYMBOL_legacy_namespace_name = 188,    /* legacy_namespace_name  */
+  YYSYMBOL_name = 189,                     /* name  */
+  YYSYMBOL_attribute_decl = 190,           /* attribute_decl  */
+  YYSYMBOL_attribute_group = 191,          /* attribute_group  */
+  YYSYMBOL_attribute = 192,                /* attribute  */
+  YYSYMBOL_attributes = 193,               /* attributes  */
+  YYSYMBOL_attributed_statement = 194,     /* attributed_statement  */
+  YYSYMBOL_top_statement = 195,            /* top_statement  */
+  YYSYMBOL_196_1 = 196,                    /* $@1  */
+  YYSYMBOL_197_2 = 197,                    /* $@2  */
+  YYSYMBOL_use_type = 198,                 /* use_type  */
+  YYSYMBOL_group_use_declaration = 199,    /* group_use_declaration  */
+  YYSYMBOL_mixed_group_use_declaration = 200, /* mixed_group_use_declaration  */
+  YYSYMBOL_possible_comma = 201,           /* possible_comma  */
+  YYSYMBOL_inline_use_declarations = 202,  /* inline_use_declarations  */
+  YYSYMBOL_unprefixed_use_declarations = 203, /* unprefixed_use_declarations  */
+  YYSYMBOL_use_declarations = 204,         /* use_declarations  */
+  YYSYMBOL_inline_use_declaration = 205,   /* inline_use_declaration  */
+  YYSYMBOL_unprefixed_use_declaration = 206, /* unprefixed_use_declaration  */
+  YYSYMBOL_use_declaration = 207,          /* use_declaration  */
+  YYSYMBOL_const_list = 208,               /* const_list  */
+  YYSYMBOL_inner_statement_list = 209,     /* inner_statement_list  */
+  YYSYMBOL_inner_statement = 210,          /* inner_statement  */
+  YYSYMBOL_statement = 211,                /* statement  */
+  YYSYMBOL_212_3 = 212,                    /* $@3  */
+  YYSYMBOL_catch_list = 213,               /* catch_list  */
+  YYSYMBOL_catch_name_list = 214,          /* catch_name_list  */
+  YYSYMBOL_optional_variable = 215,        /* optional_variable  */
+  YYSYMBOL_finally_statement = 216,        /* finally_statement  */
+  YYSYMBOL_unset_variables = 217,          /* unset_variables  */
+  YYSYMBOL_unset_variable = 218,           /* unset_variable  */
+  YYSYMBOL_function_name = 219,            /* function_name  */
+  YYSYMBOL_function_declaration_statement = 220, /* function_declaration_statement  */
+  YYSYMBOL_is_reference = 221,             /* is_reference  */
+  YYSYMBOL_is_variadic = 222,              /* is_variadic  */
+  YYSYMBOL_class_declaration_statement = 223, /* class_declaration_statement  */
+  YYSYMBOL_224_4 = 224,                    /* @4  */
+  YYSYMBOL_225_5 = 225,                    /* @5  */
+  YYSYMBOL_class_modifiers = 226,          /* class_modifiers  */
+  YYSYMBOL_anonymous_class_modifiers = 227, /* anonymous_class_modifiers  */
+  YYSYMBOL_anonymous_class_modifiers_optional = 228, /* anonymous_class_modifiers_optional  */
+  YYSYMBOL_class_modifier = 229,           /* class_modifier  */
+  YYSYMBOL_trait_declaration_statement = 230, /* trait_declaration_statement  */
+  YYSYMBOL_231_6 = 231,                    /* @6  */
+  YYSYMBOL_interface_declaration_statement = 232, /* interface_declaration_statement  */
+  YYSYMBOL_233_7 = 233,                    /* @7  */
+  YYSYMBOL_enum_declaration_statement = 234, /* enum_declaration_statement  */
+  YYSYMBOL_235_8 = 235,                    /* @8  */
+  YYSYMBOL_enum_backing_type = 236,        /* enum_backing_type  */
+  YYSYMBOL_enum_case = 237,                /* enum_case  */
+  YYSYMBOL_enum_case_expr = 238,           /* enum_case_expr  */
+  YYSYMBOL_extends_from = 239,             /* extends_from  */
+  YYSYMBOL_interface_extends_list = 240,   /* interface_extends_list  */
+  YYSYMBOL_implements_list = 241,          /* implements_list  */
+  YYSYMBOL_foreach_variable = 242,         /* foreach_variable  */
+  YYSYMBOL_for_statement = 243,            /* for_statement  */
+  YYSYMBOL_foreach_statement = 244,        /* foreach_statement  */
+  YYSYMBOL_declare_statement = 245,        /* declare_statement  */
+  YYSYMBOL_switch_case_list = 246,         /* switch_case_list  */
+  YYSYMBOL_case_list = 247,                /* case_list  */
+  YYSYMBOL_case_separator = 248,           /* case_separator  */
+  YYSYMBOL_match = 249,                    /* match  */
+  YYSYMBOL_match_arm_list = 250,           /* match_arm_list  */
+  YYSYMBOL_non_empty_match_arm_list = 251, /* non_empty_match_arm_list  */
+  YYSYMBOL_match_arm = 252,                /* match_arm  */
+  YYSYMBOL_match_arm_cond_list = 253,      /* match_arm_cond_list  */
+  YYSYMBOL_while_statement = 254,          /* while_statement  */
+  YYSYMBOL_if_stmt_without_else = 255,     /* if_stmt_without_else  */
+  YYSYMBOL_if_stmt = 256,                  /* if_stmt  */
+  YYSYMBOL_alt_if_stmt_without_else = 257, /* alt_if_stmt_without_else  */
+  YYSYMBOL_alt_if_stmt = 258,              /* alt_if_stmt  */
+  YYSYMBOL_parameter_list = 259,           /* parameter_list  */
+  YYSYMBOL_non_empty_parameter_list = 260, /* non_empty_parameter_list  */
+  YYSYMBOL_attributed_parameter = 261,     /* attributed_parameter  */
+  YYSYMBOL_optional_cpp_modifiers = 262,   /* optional_cpp_modifiers  */
+  YYSYMBOL_parameter = 263,                /* parameter  */
+  YYSYMBOL_optional_type_without_static = 264, /* optional_type_without_static  */
+  YYSYMBOL_type_expr = 265,                /* type_expr  */
+  YYSYMBOL_type = 266,                     /* type  */
+  YYSYMBOL_union_type_element = 267,       /* union_type_element  */
+  YYSYMBOL_union_type = 268,               /* union_type  */
+  YYSYMBOL_intersection_type = 269,        /* intersection_type  */
+  YYSYMBOL_type_expr_without_static = 270, /* type_expr_without_static  */
+  YYSYMBOL_type_without_static = 271,      /* type_without_static  */
+  YYSYMBOL_union_type_without_static_element = 272, /* union_type_without_static_element  */
+  YYSYMBOL_union_type_without_static = 273, /* union_type_without_static  */
+  YYSYMBOL_intersection_type_without_static = 274, /* intersection_type_without_static  */
+  YYSYMBOL_return_type = 275,              /* return_type  */
+  YYSYMBOL_argument_list = 276,            /* argument_list  */
+  YYSYMBOL_non_empty_argument_list = 277,  /* non_empty_argument_list  */
+  YYSYMBOL_argument = 278,                 /* argument  */
+  YYSYMBOL_global_var_list = 279,          /* global_var_list  */
+  YYSYMBOL_global_var = 280,               /* global_var  */
+  YYSYMBOL_static_var_list = 281,          /* static_var_list  */
+  YYSYMBOL_static_var = 282,               /* static_var  */
+  YYSYMBOL_class_statement_list = 283,     /* class_statement_list  */
+  YYSYMBOL_attributed_class_statement = 284, /* attributed_class_statement  */
+  YYSYMBOL_class_statement = 285,          /* class_statement  */
+  YYSYMBOL_class_name_list = 286,          /* class_name_list  */
+  YYSYMBOL_trait_adaptations = 287,        /* trait_adaptations  */
+  YYSYMBOL_trait_adaptation_list = 288,    /* trait_adaptation_list  */
+  YYSYMBOL_trait_adaptation = 289,         /* trait_adaptation  */
+  YYSYMBOL_trait_precedence = 290,         /* trait_precedence  */
+  YYSYMBOL_trait_alias = 291,              /* trait_alias  */
+  YYSYMBOL_trait_method_reference = 292,   /* trait_method_reference  */
+  YYSYMBOL_absolute_trait_method_reference = 293, /* absolute_trait_method_reference  */
+  YYSYMBOL_method_body = 294,              /* method_body  */
+  YYSYMBOL_property_modifiers = 295,       /* property_modifiers  */
+  YYSYMBOL_method_modifiers = 296,         /* method_modifiers  */
+  YYSYMBOL_class_const_modifiers = 297,    /* class_const_modifiers  */
+  YYSYMBOL_non_empty_member_modifiers = 298, /* non_empty_member_modifiers  */
+  YYSYMBOL_member_modifier = 299,          /* member_modifier  */
+  YYSYMBOL_property_list = 300,            /* property_list  */
+  YYSYMBOL_property = 301,                 /* property  */
+  YYSYMBOL_class_const_list = 302,         /* class_const_list  */
+  YYSYMBOL_class_const_decl = 303,         /* class_const_decl  */
+  YYSYMBOL_const_decl = 304,               /* const_decl  */
+  YYSYMBOL_echo_expr_list = 305,           /* echo_expr_list  */
+  YYSYMBOL_echo_expr = 306,                /* echo_expr  */
+  YYSYMBOL_for_exprs = 307,                /* for_exprs  */
+  YYSYMBOL_non_empty_for_exprs = 308,      /* non_empty_for_exprs  */
+  YYSYMBOL_anonymous_class = 309,          /* anonymous_class  */
+  YYSYMBOL_310_9 = 310,                    /* @9  */
+  YYSYMBOL_new_expr = 311,                 /* new_expr  */
+  YYSYMBOL_expr = 312,                     /* expr  */
+  YYSYMBOL_inline_function = 313,          /* inline_function  */
+  YYSYMBOL_fn = 314,                       /* fn  */
+  YYSYMBOL_function = 315,                 /* function  */
+  YYSYMBOL_backup_doc_comment = 316,       /* backup_doc_comment  */
+  YYSYMBOL_backup_fn_flags = 317,          /* backup_fn_flags  */
+  YYSYMBOL_backup_lex_pos = 318,           /* backup_lex_pos  */
+  YYSYMBOL_returns_ref = 319,              /* returns_ref  */
+  YYSYMBOL_lexical_vars = 320,             /* lexical_vars  */
+  YYSYMBOL_lexical_var_list = 321,         /* lexical_var_list  */
+  YYSYMBOL_lexical_var = 322,              /* lexical_var  */
+  YYSYMBOL_function_call = 323,            /* function_call  */
+  YYSYMBOL_324_10 = 324,                   /* @10  */
+  YYSYMBOL_class_name = 325,               /* class_name  */
+  YYSYMBOL_class_name_reference = 326,     /* class_name_reference  */
+  YYSYMBOL_exit_expr = 327,                /* exit_expr  */
+  YYSYMBOL_backticks_expr = 328,           /* backticks_expr  */
+  YYSYMBOL_ctor_arguments = 329,           /* ctor_arguments  */
+  YYSYMBOL_dereferenceable_scalar = 330,   /* dereferenceable_scalar  */
+  YYSYMBOL_scalar = 331,                   /* scalar  */
+  YYSYMBOL_constant = 332,                 /* constant  */
+  YYSYMBOL_class_constant = 333,           /* class_constant  */
+  YYSYMBOL_optional_expr = 334,            /* optional_expr  */
+  YYSYMBOL_variable_class_name = 335,      /* variable_class_name  */
+  YYSYMBOL_fully_dereferenceable = 336,    /* fully_dereferenceable  */
+  YYSYMBOL_array_object_dereferenceable = 337, /* array_object_dereferenceable  */
+  YYSYMBOL_callable_expr = 338,            /* callable_expr  */
+  YYSYMBOL_callable_variable = 339,        /* callable_variable  */
+  YYSYMBOL_variable = 340,                 /* variable  */
+  YYSYMBOL_simple_variable = 341,          /* simple_variable  */
+  YYSYMBOL_static_member = 342,            /* static_member  */
+  YYSYMBOL_new_variable = 343,             /* new_variable  */
+  YYSYMBOL_member_name = 344,              /* member_name  */
+  YYSYMBOL_property_name = 345,            /* property_name  */
+  YYSYMBOL_array_pair_list = 346,          /* array_pair_list  */
+  YYSYMBOL_possible_array_pair = 347,      /* possible_array_pair  */
+  YYSYMBOL_non_empty_array_pair_list = 348, /* non_empty_array_pair_list  */
+  YYSYMBOL_array_pair = 349,               /* array_pair  */
+  YYSYMBOL_encaps_list = 350,              /* encaps_list  */
+  YYSYMBOL_encaps_var = 351,               /* encaps_var  */
+  YYSYMBOL_encaps_var_offset = 352,        /* encaps_var_offset  */
+  YYSYMBOL_internal_functions_in_yacc = 353, /* internal_functions_in_yacc  */
+  YYSYMBOL_isset_variables = 354,          /* isset_variables  */
+  YYSYMBOL_isset_variable = 355            /* isset_variable  */
+};
+typedef enum yysymbol_kind_t yysymbol_kind_t;
 
-#include "zend_compile.h"
 
 
 
-/* Token type.  */
-#ifndef ZENDTOKENTYPE
-# define ZENDTOKENTYPE
-  enum zendtokentype
-  {
-    END = 0,
-    T_THROW = 258,
-    PREC_ARROW_FUNCTION = 259,
-    T_INCLUDE = 260,
-    T_INCLUDE_ONCE = 261,
-    T_REQUIRE = 262,
-    T_REQUIRE_ONCE = 263,
-    T_LOGICAL_OR = 264,
-    T_LOGICAL_XOR = 265,
-    T_LOGICAL_AND = 266,
-    T_PRINT = 267,
-    T_YIELD = 268,
-    T_DOUBLE_ARROW = 269,
-    T_YIELD_FROM = 270,
-    T_PLUS_EQUAL = 271,
-    T_MINUS_EQUAL = 272,
-    T_MUL_EQUAL = 273,
-    T_DIV_EQUAL = 274,
-    T_CONCAT_EQUAL = 275,
-    T_MOD_EQUAL = 276,
-    T_AND_EQUAL = 277,
-    T_OR_EQUAL = 278,
-    T_XOR_EQUAL = 279,
-    T_SL_EQUAL = 280,
-    T_SR_EQUAL = 281,
-    T_POW_EQUAL = 282,
-    T_COALESCE_EQUAL = 283,
-    T_COALESCE = 284,
-    T_BOOLEAN_OR = 285,
-    T_BOOLEAN_AND = 286,
-    T_AMPERSAND_NOT_FOLLOWED_BY_VAR_OR_VARARG = 287,
-    T_AMPERSAND_FOLLOWED_BY_VAR_OR_VARARG = 288,
-    T_IS_EQUAL = 289,
-    T_IS_NOT_EQUAL = 290,
-    T_IS_IDENTICAL = 291,
-    T_IS_NOT_IDENTICAL = 292,
-    T_SPACESHIP = 293,
-    T_IS_SMALLER_OR_EQUAL = 294,
-    T_IS_GREATER_OR_EQUAL = 295,
-    T_SL = 296,
-    T_SR = 297,
-    T_INSTANCEOF = 298,
-    T_INT_CAST = 299,
-    T_DOUBLE_CAST = 300,
-    T_STRING_CAST = 301,
-    T_ARRAY_CAST = 302,
-    T_OBJECT_CAST = 303,
-    T_BOOL_CAST = 304,
-    T_UNSET_CAST = 305,
-    T_POW = 306,
-    T_CLONE = 307,
-    T_NOELSE = 308,
-    T_ELSEIF = 309,
-    T_ELSE = 310,
-    T_LNUMBER = 311,
-    T_DNUMBER = 312,
-    T_STRING = 313,
-    T_NAME_FULLY_QUALIFIED = 314,
-    T_NAME_RELATIVE = 315,
-    T_NAME_QUALIFIED = 316,
-    T_VARIABLE = 317,
-    T_INLINE_HTML = 318,
-    T_ENCAPSED_AND_WHITESPACE = 319,
-    T_CONSTANT_ENCAPSED_STRING = 320,
-    T_STRING_VARNAME = 321,
-    T_NUM_STRING = 322,
-    T_EVAL = 323,
-    T_NEW = 324,
-    T_EXIT = 325,
-    T_IF = 326,
-    T_ENDIF = 327,
-    T_ECHO = 328,
-    T_DO = 329,
-    T_WHILE = 330,
-    T_ENDWHILE = 331,
-    T_FOR = 332,
-    T_ENDFOR = 333,
-    T_FOREACH = 334,
-    T_ENDFOREACH = 335,
-    T_DECLARE = 336,
-    T_ENDDECLARE = 337,
-    T_AS = 338,
-    T_SWITCH = 339,
-    T_ENDSWITCH = 340,
-    T_CASE = 341,
-    T_DEFAULT = 342,
-    T_MATCH = 343,
-    T_BREAK = 344,
-    T_CONTINUE = 345,
-    T_GOTO = 346,
-    T_FUNCTION = 347,
-    T_FN = 348,
-    T_CONST = 349,
-    T_RETURN = 350,
-    T_TRY = 351,
-    T_CATCH = 352,
-    T_FINALLY = 353,
-    T_USE = 354,
-    T_INSTEADOF = 355,
-    T_GLOBAL = 356,
-    T_STATIC = 357,
-    T_ABSTRACT = 358,
-    T_FINAL = 359,
-    T_PRIVATE = 360,
-    T_PROTECTED = 361,
-    T_PUBLIC = 362,
-    T_READONLY = 363,
-    T_VAR = 364,
-    T_UNSET = 365,
-    T_ISSET = 366,
-    T_EMPTY = 367,
-    T_HALT_COMPILER = 368,
-    T_CLASS = 369,
-    T_TRAIT = 370,
-    T_INTERFACE = 371,
-    T_ENUM = 372,
-    T_EXTENDS = 373,
-    T_IMPLEMENTS = 374,
-    T_NAMESPACE = 375,
-    T_LIST = 376,
-    T_ARRAY = 377,
-    T_CALLABLE = 378,
-    T_LINE = 379,
-    T_FILE = 380,
-    T_DIR = 381,
-    T_CLASS_C = 382,
-    T_TRAIT_C = 383,
-    T_METHOD_C = 384,
-    T_FUNC_C = 385,
-    T_NS_C = 386,
-    T_ATTRIBUTE = 387,
-    T_INC = 388,
-    T_DEC = 389,
-    T_OBJECT_OPERATOR = 390,
-    T_NULLSAFE_OBJECT_OPERATOR = 391,
-    T_COMMENT = 392,
-    T_DOC_COMMENT = 393,
-    T_OPEN_TAG = 394,
-    T_OPEN_TAG_WITH_ECHO = 395,
-    T_CLOSE_TAG = 396,
-    T_WHITESPACE = 397,
-    T_START_HEREDOC = 398,
-    T_END_HEREDOC = 399,
-    T_DOLLAR_OPEN_CURLY_BRACES = 400,
-    T_CURLY_OPEN = 401,
-    T_PAAMAYIM_NEKUDOTAYIM = 402,
-    T_NS_SEPARATOR = 403,
-    T_ELLIPSIS = 404,
-    T_BAD_CHARACTER = 405,
-    T_ERROR = 406
-  };
+#ifdef short
+# undef short
 #endif
 
-/* Value type.  */
-#if ! defined ZENDSTYPE && ! defined ZENDSTYPE_IS_DECLARED
-typedef zend_parser_stack_elem ZENDSTYPE;
-# define ZENDSTYPE_IS_TRIVIAL 1
-# define ZENDSTYPE_IS_DECLARED 1
+/* On compilers that do not define __PTRDIFF_MAX__ etc., make sure
+   <limits.h> and (if available) <stdint.h> are included
+   so that the code can choose integer types of a good width.  */
+
+#ifndef __PTRDIFF_MAX__
+# include <limits.h> /* INFRINGES ON USER NAME SPACE */
+# if defined __STDC_VERSION__ && 199901 <= __STDC_VERSION__
+#  include <stdint.h> /* INFRINGES ON USER NAME SPACE */
+#  define YY_STDINT_H
+# endif
 #endif
 
-
-
-ZEND_API int zendparse (void);
-
-#endif /* !YY_ZEND_ZEND_ZEND_LANGUAGE_PARSER_H_INCLUDED  */
-
-/* Copy the second part of user declarations.  */
-
-
-
-#ifdef short
-# undef short
+/* Narrow types that promote to a signed type and that can represent a
+   signed or unsigned integer of at least N bits.  In tables they can
+   save space and decrease cache pressure.  Promoting to a signed type
+   helps avoid bugs in integer arithmetic.  */
+
+#ifdef __INT_LEAST8_MAX__
+typedef __INT_LEAST8_TYPE__ yytype_int8;
+#elif defined YY_STDINT_H
+typedef int_least8_t yytype_int8;
+#else
+typedef signed char yytype_int8;
 #endif
 
-#ifdef YYTYPE_UINT8
-typedef YYTYPE_UINT8 yytype_uint8;
+#ifdef __INT_LEAST16_MAX__
+typedef __INT_LEAST16_TYPE__ yytype_int16;
+#elif defined YY_STDINT_H
+typedef int_least16_t yytype_int16;
 #else
-typedef unsigned char yytype_uint8;
+typedef short yytype_int16;
 #endif
 
-#ifdef YYTYPE_INT8
-typedef YYTYPE_INT8 yytype_int8;
-#else
-typedef signed char yytype_int8;
+/* Work around bug in HP-UX 11.23, which defines these macros
+   incorrectly for preprocessor constants.  This workaround can likely
+   be removed in 2023, as HPE has promised support for HP-UX 11.23
+   (aka HP-UX 11i v2) only through the end of 2022; see Table 2 of
+   <https://h20195.www2.hpe.com/V2/getpdf.aspx/4AA4-7673ENW.pdf>.  */
+#ifdef __hpux
+# undef UINT_LEAST8_MAX
+# undef UINT_LEAST16_MAX
+# define UINT_LEAST8_MAX 255
+# define UINT_LEAST16_MAX 65535
 #endif
 
-#ifdef YYTYPE_UINT16
-typedef YYTYPE_UINT16 yytype_uint16;
+#if defined __UINT_LEAST8_MAX__ && __UINT_LEAST8_MAX__ <= __INT_MAX__
+typedef __UINT_LEAST8_TYPE__ yytype_uint8;
+#elif (!defined __UINT_LEAST8_MAX__ && defined YY_STDINT_H \
+       && UINT_LEAST8_MAX <= INT_MAX)
+typedef uint_least8_t yytype_uint8;
+#elif !defined __UINT_LEAST8_MAX__ && UCHAR_MAX <= INT_MAX
+typedef unsigned char yytype_uint8;
 #else
-typedef unsigned short int yytype_uint16;
+typedef short yytype_uint8;
 #endif
 
-#ifdef YYTYPE_INT16
-typedef YYTYPE_INT16 yytype_int16;
+#if defined __UINT_LEAST16_MAX__ && __UINT_LEAST16_MAX__ <= __INT_MAX__
+typedef __UINT_LEAST16_TYPE__ yytype_uint16;
+#elif (!defined __UINT_LEAST16_MAX__ && defined YY_STDINT_H \
+       && UINT_LEAST16_MAX <= INT_MAX)
+typedef uint_least16_t yytype_uint16;
+#elif !defined __UINT_LEAST16_MAX__ && USHRT_MAX <= INT_MAX
+typedef unsigned short yytype_uint16;
 #else
-typedef short int yytype_int16;
+typedef int yytype_uint16;
+#endif
+
+#ifndef YYPTRDIFF_T
+# if defined __PTRDIFF_TYPE__ && defined __PTRDIFF_MAX__
+#  define YYPTRDIFF_T __PTRDIFF_TYPE__
+#  define YYPTRDIFF_MAXIMUM __PTRDIFF_MAX__
+# elif defined PTRDIFF_MAX
+#  ifndef ptrdiff_t
+#   include <stddef.h> /* INFRINGES ON USER NAME SPACE */
+#  endif
+#  define YYPTRDIFF_T ptrdiff_t
+#  define YYPTRDIFF_MAXIMUM PTRDIFF_MAX
+# else
+#  define YYPTRDIFF_T long
+#  define YYPTRDIFF_MAXIMUM LONG_MAX
+# endif
 #endif
 
 #ifndef YYSIZE_T
@@ -343,15 +572,28 @@
 #  define YYSIZE_T __SIZE_TYPE__
 # elif defined size_t
 #  define YYSIZE_T size_t
-# elif ! defined YYSIZE_T
+# elif defined __STDC_VERSION__ && 199901 <= __STDC_VERSION__
 #  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
 #  define YYSIZE_T size_t
 # else
-#  define YYSIZE_T unsigned int
+#  define YYSIZE_T unsigned
 # endif
 #endif
 
-#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
+#define YYSIZE_MAXIMUM                                  \
+  YY_CAST (YYPTRDIFF_T,                                 \
+           (YYPTRDIFF_MAXIMUM < YY_CAST (YYSIZE_T, -1)  \
+            ? YYPTRDIFF_MAXIMUM                         \
+            : YY_CAST (YYSIZE_T, -1)))
+
+#define YYSIZEOF(X) YY_CAST (YYPTRDIFF_T, sizeof (X))
+
+
+/* Stored state numbers (used for stacks). */
+typedef yytype_int16 yy_state_t;
+
+/* State numbers in computations.  */
+typedef int yy_state_fast_t;
 
 #ifndef YY_
 # if defined YYENABLE_NLS && YYENABLE_NLS
@@ -365,47 +607,43 @@
 # endif
 #endif
 
-#ifndef YY_ATTRIBUTE
-# if (defined __GNUC__                                               \
-      && (2 < __GNUC__ || (__GNUC__ == 2 && 96 <= __GNUC_MINOR__)))  \
-     || defined __SUNPRO_C && 0x5110 <= __SUNPRO_C
-#  define YY_ATTRIBUTE(Spec) __attribute__(Spec)
-# else
-#  define YY_ATTRIBUTE(Spec) /* empty */
-# endif
-#endif
 
 #ifndef YY_ATTRIBUTE_PURE
-# define YY_ATTRIBUTE_PURE   YY_ATTRIBUTE ((__pure__))
+# if defined __GNUC__ && 2 < __GNUC__ + (96 <= __GNUC_MINOR__)
+#  define YY_ATTRIBUTE_PURE __attribute__ ((__pure__))
+# else
+#  define YY_ATTRIBUTE_PURE
+# endif
 #endif
 
 #ifndef YY_ATTRIBUTE_UNUSED
-# define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__))
-#endif
-
-#if !defined _Noreturn \
-     && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112)
-# if defined _MSC_VER && 1200 <= _MSC_VER
-#  define _Noreturn __declspec (noreturn)
+# if defined __GNUC__ && 2 < __GNUC__ + (7 <= __GNUC_MINOR__)
+#  define YY_ATTRIBUTE_UNUSED __attribute__ ((__unused__))
 # else
-#  define _Noreturn YY_ATTRIBUTE ((__noreturn__))
+#  define YY_ATTRIBUTE_UNUSED
 # endif
 #endif
 
 /* Suppress unused-variable warnings by "using" E.  */
 #if ! defined lint || defined __GNUC__
-# define YYUSE(E) ((void) (E))
+# define YY_USE(E) ((void) (E))
 #else
-# define YYUSE(E) /* empty */
+# define YY_USE(E) /* empty */
 #endif
 
-#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
 /* Suppress an incorrect diagnostic about yylval being uninitialized.  */
-# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \
-    _Pragma ("GCC diagnostic push") \
-    _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\
+#if defined __GNUC__ && ! defined __ICC && 406 <= __GNUC__ * 100 + __GNUC_MINOR__
+# if __GNUC__ * 100 + __GNUC_MINOR__ < 407
+#  define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN                           \
+    _Pragma ("GCC diagnostic push")                                     \
+    _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")
+# else
+#  define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN                           \
+    _Pragma ("GCC diagnostic push")                                     \
+    _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")              \
     _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
-# define YY_IGNORE_MAYBE_UNINITIALIZED_END \
+# endif
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END      \
     _Pragma ("GCC diagnostic pop")
 #else
 # define YY_INITIAL_VALUE(Value) Value
@@ -418,8 +656,22 @@
 # define YY_INITIAL_VALUE(Value) /* Nothing. */
 #endif
 
+#if defined __cplusplus && defined __GNUC__ && ! defined __ICC && 6 <= __GNUC__
+# define YY_IGNORE_USELESS_CAST_BEGIN                          \
+    _Pragma ("GCC diagnostic push")                            \
+    _Pragma ("GCC diagnostic ignored \"-Wuseless-cast\"")
+# define YY_IGNORE_USELESS_CAST_END            \
+    _Pragma ("GCC diagnostic pop")
+#endif
+#ifndef YY_IGNORE_USELESS_CAST_BEGIN
+# define YY_IGNORE_USELESS_CAST_BEGIN
+# define YY_IGNORE_USELESS_CAST_END
+#endif
 
-#if ! defined yyoverflow || YYERROR_VERBOSE
+
+#define YY_ASSERT(E) ((void) (0 && (E)))
+
+#if 1
 
 /* The parser invokes alloca or malloc; define the necessary symbols.  */
 
@@ -484,8 +736,7 @@
 #   endif
 #  endif
 # endif
-#endif /* ! defined yyoverflow || YYERROR_VERBOSE */
-
+#endif /* 1 */
 
 #if (! defined yyoverflow \
      && (! defined __cplusplus \
@@ -494,17 +745,17 @@
 /* A type that is properly aligned for any stack member.  */
 union yyalloc
 {
-  yytype_int16 yyss_alloc;
+  yy_state_t yyss_alloc;
   YYSTYPE yyvs_alloc;
 };
 
 /* The size of the maximum gap between one aligned stack and the next.  */
-# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
+# define YYSTACK_GAP_MAXIMUM (YYSIZEOF (union yyalloc) - 1)
 
 /* The size of an array large to enough to hold all stacks, each with
    N elements.  */
 # define YYSTACK_BYTES(N) \
-     ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
+     ((N) * (YYSIZEOF (yy_state_t) + YYSIZEOF (YYSTYPE)) \
       + YYSTACK_GAP_MAXIMUM)
 
 # define YYCOPY_NEEDED 1
@@ -517,11 +768,11 @@
 # define YYSTACK_RELOCATE(Stack_alloc, Stack)                           \
     do                                                                  \
       {                                                                 \
-        YYSIZE_T yynewbytes;                                            \
+        YYPTRDIFF_T yynewbytes;                                         \
         YYCOPY (&yyptr->Stack_alloc, Stack, yysize);                    \
         Stack = &yyptr->Stack_alloc;                                    \
-        yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
-        yyptr += yynewbytes / sizeof (*yyptr);                          \
+        yynewbytes = yystacksize * YYSIZEOF (*Stack) + YYSTACK_GAP_MAXIMUM; \
+        yyptr += yynewbytes / YYSIZEOF (*yyptr);                        \
       }                                                                 \
     while (0)
 
@@ -533,12 +784,12 @@
 # ifndef YYCOPY
 #  if defined __GNUC__ && 1 < __GNUC__
 #   define YYCOPY(Dst, Src, Count) \
-      __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src)))
+      __builtin_memcpy (Dst, Src, YY_CAST (YYSIZE_T, (Count)) * sizeof (*(Src)))
 #  else
 #   define YYCOPY(Dst, Src, Count)              \
       do                                        \
         {                                       \
-          YYSIZE_T yyi;                         \
+          YYPTRDIFF_T yyi;                      \
           for (yyi = 0; yyi < (Count); yyi++)   \
             (Dst)yyi = (Src)yyi;            \
         }                                       \
@@ -550,7 +801,7 @@
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  3
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   8794
+#define YYLAST   9776
 
 /* YYNTOKENS -- Number of terminals.  */
 #define YYNTOKENS  179
@@ -561,31 +812,34 @@
 /* YYNSTATES -- Number of states.  */
 #define YYNSTATES  1131
 
-/* YYTRANSLATEYYX -- Symbol number corresponding to YYX as returned
-   by yylex, with out-of-bounds checking.  */
-#define YYUNDEFTOK  2
+/* YYMAXUTOK -- Last valid token kind.  */
 #define YYMAXUTOK   406
 
-#define YYTRANSLATE(YYX)                                                \
-  ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslateYYX : YYUNDEFTOK)
+
+/* YYTRANSLATE(TOKEN-NUM) -- Symbol number corresponding to TOKEN-NUM
+   as returned by yylex, with out-of-bounds checking.  */
+#define YYTRANSLATE(YYX)                                \
+  (0 <= (YYX) && (YYX) <= YYMAXUTOK                     \
+   ? YY_CAST (yysymbol_kind_t, yytranslateYYX)        \
+   : YYSYMBOL_YYUNDEF)
 
 /* YYTRANSLATETOKEN-NUM -- Symbol number corresponding to TOKEN-NUM
-   as returned by yylex, without out-of-bounds checking.  */
+   as returned by yylex.  */
 static const yytype_uint8 yytranslate =
 {
        0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,    56,   177,     2,   178,    55,     2,     2,
-     170,   171,    53,    51,   168,    52,    48,    54,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,    31,   172,
-      44,    16,    46,    30,    66,     2,     2,     2,     2,     2,
+       2,     2,     2,    17,   177,     2,   178,    16,     2,     2,
+     170,   171,    14,    12,   168,    13,    11,    15,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     6,   172,
+       9,     4,    10,     5,    19,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,   175,     2,   169,    36,     2,   176,     2,     2,     2,
+       2,   175,     2,   169,     8,     2,   176,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,   173,    35,   174,    58,     2,     2,     2,
+       2,     2,     2,   173,     7,   174,    18,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -598,12 +852,12 @@
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     1,     2,     3,     4,
-       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
-      15,    17,    18,    19,    20,    21,    22,    23,    24,    25,
-      26,    27,    28,    29,    32,    33,    34,    37,    38,    39,
-      40,    41,    42,    43,    45,    47,    49,    50,    57,    59,
-      60,    61,    62,    63,    64,    65,    67,    68,    69,    70,
+       2,     2,     2,     2,     2,     2,     1,     2,     3,    20,
+      21,    22,    23,    24,    25,    26,    27,    28,    29,    30,
+      31,    32,    33,    34,    35,    36,    37,    38,    39,    40,
+      41,    42,    43,    44,    45,    46,    47,    48,    49,    50,
+      51,    52,    53,    54,    55,    56,    57,    58,    59,    60,
+      61,    62,    63,    64,    65,    66,    67,    68,    69,    70,
       71,    72,    73,    74,    75,    76,    77,    78,    79,    80,
       81,    82,    83,    84,    85,    86,    87,    88,    89,    90,
       91,    92,    93,    94,    95,    96,    97,    98,    99,   100,
@@ -617,8 +871,8 @@
 };
 
 #if ZENDDEBUG
-  /* YYRLINEYYN -- Source line where rule number YYN was defined.  */
-static const yytype_uint16 yyrline =
+/* YYRLINEYYN -- Source line where rule number YYN was defined.  */
+static const yytype_int16 yyrline =
 {
        0,   295,   295,   299,   299,   299,   299,   299,   299,   299,
      299,   300,   300,   300,   300,   300,   300,   300,   300,   300,
@@ -683,37 +937,37 @@
 };
 #endif
 
-#if ZENDDEBUG || YYERROR_VERBOSE || 1
+/** Accessing symbol of state STATE.  */
+#define YY_ACCESSING_SYMBOL(State) YY_CAST (yysymbol_kind_t, yystosState)
+
+#if 1
+/* The user-facing name of the symbol whose (internal) number is
+   YYSYMBOL.  No bounds checking.  */
+static const char *yysymbol_name (yysymbol_kind_t yysymbol) YY_ATTRIBUTE_UNUSED;
+
 /* YYTNAMESYMBOL-NUM -- String name of the symbol SYMBOL-NUM.
    First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
 static const char *const yytname =
 {
-  "\"end of file\"", "error", "$undefined", "\"'throw'\"",
-  "PREC_ARROW_FUNCTION", "\"'include'\"", "\"'include_once'\"",
-  "\"'require'\"", "\"'require_once'\"", "\"'or'\"", "\"'xor'\"",
-  "\"'and'\"", "\"'print'\"", "\"'yield'\"", "\"'=>'\"",
-  "\"'yield from'\"", "'='", "\"'+='\"", "\"'-='\"", "\"'*='\"",
-  "\"'/='\"", "\"'.='\"", "\"'%='\"", "\"'&='\"", "\"'|='\"", "\"'^='\"",
-  "\"'<<='\"", "\"'>>='\"", "\"'**='\"", "\"'?""?='\"", "'?'", "':'",
-  "\"'?""?'\"", "\"'||'\"", "\"'&&'\"", "'|'", "'^'", "\"amp\"", "\"'&'\"",
-  "\"'=='\"", "\"'!='\"", "\"'==='\"", "\"'!=='\"", "\"'<=>'\"", "'<'",
-  "\"'<='\"", "'>'", "\"'>='\"", "'.'", "\"'<<'\"", "\"'>>'\"", "'+'",
-  "'-'", "'*'", "'/'", "'%'", "'!'", "\"'instanceof'\"", "'~'",
-  "\"'(int)'\"", "\"'(double)'\"", "\"'(string)'\"", "\"'(array)'\"",
-  "\"'(object)'\"", "\"'(bool)'\"", "\"'(unset)'\"", "'@'", "\"'**'\"",
-  "\"'clone'\"", "T_NOELSE", "\"'elseif'\"", "\"'else'\"", "\"integer\"",
+  "\"end of file\"", "error", "\"invalid token\"", "PREC_ARROW_FUNCTION",
+  "'='", "'?'", "':'", "'|'", "'^'", "'<'", "'>'", "'.'", "'+'", "'-'",
+  "'*'", "'/'", "'%'", "'!'", "'~'", "'@'", "T_NOELSE", "\"integer\"",
   "\"floating-point number\"", "\"identifier\"",
   "\"fully qualified name\"", "\"namespace-relative name\"",
   "\"namespaced name\"", "\"variable\"", "T_INLINE_HTML",
   "\"string content\"", "\"quoted string\"", "\"variable name\"",
-  "\"number\"", "\"'eval'\"", "\"'new'\"", "\"'exit'\"", "\"'if'\"",
-  "\"'endif'\"", "\"'echo'\"", "\"'do'\"", "\"'while'\"", "\"'endwhile'\"",
-  "\"'for'\"", "\"'endfor'\"", "\"'foreach'\"", "\"'endforeach'\"",
-  "\"'declare'\"", "\"'enddeclare'\"", "\"'as'\"", "\"'switch'\"",
-  "\"'endswitch'\"", "\"'case'\"", "\"'default'\"", "\"'match'\"",
-  "\"'break'\"", "\"'continue'\"", "\"'goto'\"", "\"'function'\"",
-  "\"'fn'\"", "\"'const'\"", "\"'return'\"", "\"'try'\"", "\"'catch'\"",
-  "\"'finally'\"", "\"'use'\"", "\"'insteadof'\"", "\"'global'\"",
+  "\"number\"", "\"'include'\"", "\"'include_once'\"", "\"'eval'\"",
+  "\"'require'\"", "\"'require_once'\"", "\"'or'\"", "\"'xor'\"",
+  "\"'and'\"", "\"'print'\"", "\"'yield'\"", "\"'yield from'\"",
+  "\"'instanceof'\"", "\"'new'\"", "\"'clone'\"", "\"'exit'\"", "\"'if'\"",
+  "\"'elseif'\"", "\"'else'\"", "\"'endif'\"", "\"'echo'\"", "\"'do'\"",
+  "\"'while'\"", "\"'endwhile'\"", "\"'for'\"", "\"'endfor'\"",
+  "\"'foreach'\"", "\"'endforeach'\"", "\"'declare'\"", "\"'enddeclare'\"",
+  "\"'as'\"", "\"'switch'\"", "\"'endswitch'\"", "\"'case'\"",
+  "\"'default'\"", "\"'match'\"", "\"'break'\"", "\"'continue'\"",
+  "\"'goto'\"", "\"'function'\"", "\"'fn'\"", "\"'const'\"",
+  "\"'return'\"", "\"'try'\"", "\"'catch'\"", "\"'finally'\"",
+  "\"'throw'\"", "\"'use'\"", "\"'insteadof'\"", "\"'global'\"",
   "\"'static'\"", "\"'abstract'\"", "\"'final'\"", "\"'private'\"",
   "\"'protected'\"", "\"'public'\"", "\"'readonly'\"", "\"'var'\"",
   "\"'unset'\"", "\"'isset'\"", "\"'empty'\"", "\"'__halt_compiler'\"",
@@ -722,10 +976,17 @@
   "\"'array'\"", "\"'callable'\"", "\"'__LINE__'\"", "\"'__FILE__'\"",
   "\"'__DIR__'\"", "\"'__CLASS__'\"", "\"'__TRAIT__'\"",
   "\"'__METHOD__'\"", "\"'__FUNCTION__'\"", "\"'__NAMESPACE__'\"",
-  "\"'#'\"", "\"'++'\"", "\"'--'\"", "\"'->'\"", "\"'?->'\"",
+  "\"'#'\"", "\"'+='\"", "\"'-='\"", "\"'*='\"", "\"'/='\"", "\"'.='\"",
+  "\"'%='\"", "\"'&='\"", "\"'|='\"", "\"'^='\"", "\"'<<='\"", "\"'>>='\"",
+  "\"'?""?='\"", "\"'||'\"", "\"'&&'\"", "\"'=='\"", "\"'!='\"",
+  "\"'==='\"", "\"'!=='\"", "\"'<='\"", "\"'>='\"", "\"'<=>'\"",
+  "\"'<<'\"", "\"'>>'\"", "\"'++'\"", "\"'--'\"", "\"'(int)'\"",
+  "\"'(double)'\"", "\"'(string)'\"", "\"'(array)'\"", "\"'(object)'\"",
+  "\"'(bool)'\"", "\"'(unset)'\"", "\"'->'\"", "\"'?->'\"", "\"'=>'\"",
   "\"comment\"", "\"doc comment\"", "\"open tag\"", "\"'<?='\"",
   "\"'?>'\"", "\"whitespace\"", "\"heredoc start\"", "\"heredoc end\"",
   "\"'${'\"", "\"'{$'\"", "\"'::'\"", "\"'\\\\'\"", "\"'...'\"",
+  "\"'?""?'\"", "\"'**'\"", "\"'**='\"", "\"'&'\"", "\"amp\"",
   "\"invalid character\"", "T_ERROR", "','", "''", "'('", "')'", "';'",
   "'{'", "'}'", "''", "'`'", "'\"'", "'$'", "$accept", "start",
   "reserved_non_modifiers", "semi_reserved", "ampersand", "identifier",
@@ -783,202 +1044,182 @@
   "encaps_var_offset", "internal_functions_in_yacc", "isset_variables",
   "isset_variable", YY_NULLPTR
 };
-#endif
 
-# ifdef YYPRINT
-/* YYTOKNUMNUM -- (External) token number corresponding to the
-   (internal) symbol number NUM (which must be that of a token).  */
-static const yytype_uint16 yytoknum =
+static const char *
+yysymbol_name (yysymbol_kind_t yysymbol)
 {
-       0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
-     265,   266,   267,   268,   269,   270,    61,   271,   272,   273,
-     274,   275,   276,   277,   278,   279,   280,   281,   282,   283,
-      63,    58,   284,   285,   286,   124,    94,   287,   288,   289,
-     290,   291,   292,   293,    60,   294,    62,   295,    46,   296,
-     297,    43,    45,    42,    47,    37,    33,   298,   126,   299,
-     300,   301,   302,   303,   304,   305,    64,   306,   307,   308,
-     309,   310,   311,   312,   313,   314,   315,   316,   317,   318,
-     319,   320,   321,   322,   323,   324,   325,   326,   327,   328,
-     329,   330,   331,   332,   333,   334,   335,   336,   337,   338,
-     339,   340,   341,   342,   343,   344,   345,   346,   347,   348,
-     349,   350,   351,   352,   353,   354,   355,   356,   357,   358,
-     359,   360,   361,   362,   363,   364,   365,   366,   367,   368,
-     369,   370,   371,   372,   373,   374,   375,   376,   377,   378,
-     379,   380,   381,   382,   383,   384,   385,   386,   387,   388,
-     389,   390,   391,   392,   393,   394,   395,   396,   397,   398,
-     399,   400,   401,   402,   403,   404,   405,   406,    44,    93,
-      40,    41,    59,   123,   125,    91,    96,    34,    36
-};
-# endif
+  return yytnameyysymbol;
+}
+#endif
 
-#define YYPACT_NINF -931
+#define YYPACT_NINF (-901)
 
-#define yypact_value_is_default(Yystate) \
-  (!!((Yystate) == (-931)))
+#define yypact_value_is_default(Yyn) \
+  ((Yyn) == YYPACT_NINF)
 
-#define YYTABLE_NINF -568
+#define YYTABLE_NINF (-568)
 
-#define yytable_value_is_error(Yytable_value) \
-  (!!((Yytable_value) == (-568)))
+#define yytable_value_is_error(Yyn) \
+  ((Yyn) == YYTABLE_NINF)
 
-  /* YYPACTSTATE-NUM -- Index in YYTABLE of the portion describing
-     STATE-NUM.  */
+/* YYPACTSTATE-NUM -- Index in YYTABLE of the portion describing
+   STATE-NUM.  */
 static const yytype_int16 yypact =
 {
-    -931,    34,  1753,  -931,  6194,  6194,  6194,  6194,  6194,  6194,
-    6194,  6194,  6194,  6194,  6194,  6194,  6194,  6194,  6194,  6194,
-    6194,  6194,  6194,  6194,  6194,  -931,  -931,    66,  -931,  -931,
-    -931,  -931,  -931,  -931,   -67,   231,   -58,   -35,  6194,  4862,
-      12,    38,    70,    90,   111,   125,  6194,  6194,    98,  -931,
-    -931,   149,  6194,   131,   535,    24,   275,  -931,  -931,   140,
-     160,   201,   205,   210,  -931,  -931,  -931,  -931,  7844,   218,
-     220,  -931,  -931,  -931,  -931,  -931,  -931,  -931,  -931,   506,
-    7696,  7696,   137,  6194,  -931,  -931,  5010,   167,   202,   -21,
-     -56,  -931,   882,  -931,  -931,  -931,  -931,  -931,   495,  -931,
-    -931,  -931,  -931,  -931,    93,  -931,    89,  -931,  -931,  7170,
-    -931,   237,   237,  -931,   156,   327,  -931,   230,   352,   284,
-     303,   391,  -931,   272,   919,  -931,  -931,  -931,  -931,   251,
-     140,   229,  8637,   237,  8637,  8637,  8637,  8637,  3826,  8727,
-    3826,   161,   161,    52,   161,   161,   161,   161,   161,   161,
-     161,   161,   161,  -931,  -931,  6194,  -931,  -931,  6194,  -931,
-     254,   367,   264,  -931,  -931,   305,   140,  -931,   542,  6194,
-    -931,  6194,   -83,  -931,  8637,   309,  6194,  6194,  6194,   149,
-    6194,  6194,  8637,   299,   308,   312,   473,   -17,  -931,   321,
-    -931,  -931,  -931,  -931,  -931,  -931,  -931,   -48,   333,   323,
-       2,  -931,    65,  -931,  -931,   482,    97,  -931,  -931,  1133,
-    -931,  7696,  6194,  6194,   330,   442,   454,   458,   465,  -931,
-    -931,  -931,  -931,  -931,  -931,  -931,  -931,  -931,  -931,  -931,
-    -931,  -931,  -931,  -931,  -931,  -931,  -931,  -931,  -931,  -931,
-    -931,  -931,  -931,  -931,  -931,  -931,  -931,  -931,  -931,  -931,
-    -931,  -931,  -931,  -931,  -931,  -931,  -931,  -931,  -931,  -931,
-    -931,  -931,  -931,  -931,  -931,  -931,  -931,  -931,  -931,  -931,
-    -931,  -931,  -931,  -931,  -931,  -931,  -931,  -931,  -931,  -931,
-    -931,  -931,  -931,  -931,  -931,  -931,  -931,  -931,  -931,  -931,
-    -931,  -931,  -931,  -931,  -931,  -931,  -931,  -931,  -931,  -931,
-    -931,   369,   378,  5010,  5010,  -931,   390,   140,  6194,  5010,
-     400,  -931,  -931,   640,   640,   151,   117,  -931,  5454,  7696,
-     152,  -931,  1296,  1901,  -931,  -931,   404,  6194,  7696,  8539,
-     439,  -931,   422,  -931,    88,   430,   208,    88,    91,  6194,
-    -931,  -931,   251,  -931,  -931,  -931,  -931,  -931,   446,  4862,
-     450,   600,   466,  6194,  6194,  6194,  5602,  6194,  6194,  6194,
-    6194,  6194,  6194,  6194,  6194,  6194,  6194,  6194,  6194,  6194,
-    6194,  6194,  6194,  6194,  6194,  6194,  6194,  6194,  6194,  6194,
-    6194,   558,  6194,  -931,  -931,  -931,   -16,  3832,  3977,    53,
-      53,  6194,  6194,   140,  5158,  6194,  6194,  6194,  6194,  6194,
-    6194,  6194,  6194,  6194,  6194,  6194,  6194,  6194,  -931,  -931,
-    -931,  6194,  7219,  7268,  -931,  -931,  -931,    24,  -931,  -931,
-      53,    53,    24,  6194,  6194,   469,  7317,  6194,  -931,   471,
-    7366,   474,   494,  8637,  8440,   224,  7415,  7464,  -931,  -931,
-    -931,  6194,   149,  -931,  -931,  2049,   573,   491,   -44,   499,
-     119,  -931,   333,  -931,    24,  -931,  6194,   588,  -931,  6194,
-    6194,  6194,  6194,  6194,  6194,  5750,  6194,    19,   -67,   999,
-      30,   125,   653,   654,   103,   140,   201,   205,   218,   220,
-     656,   658,   661,   664,   666,   673,   675,   677,  5898,  -931,
-     678,   545,  -931,  8637,   550,  -931,   280,  8637,   552,  -931,
-    7513,   538,   587,  -931,   591,   691,  -931,   556,  -931,   561,
-     563,   506,   564,  -931,  7562,   566,   663,   665,   313,  -931,
-    -931,   332,  6778,   567,  -931,  -931,  -931,   732,   568,  -931,
-     882,  -931,  -931,  -931,  5010,  8637,   425,  5306,   724,  5010,
-    -931,  -931,  6827,  -931,   670,  6194,  -931,  6194,  -931,  -931,
-    8685,  7982,  3826,  6194,  8588,  6341,  6490,  3976,  6634,  8111,
-    5354,  5354,  5502,  5502,  5502,  5502,  5502,  1592,  1592,  1592,
-    1592,  1036,  1058,  1058,   606,   606,    52,    52,    52,  -931,
-     161,   575,  -931,  -931,  -931,   577,  6194,   578,   580,   140,
-    6194,   578,   580,   140,  -931,  6194,  -931,   140,   140,  6876,
-     582,  -931,  7696,  3826,  3826,  3826,  3826,  3826,  3826,  3826,
-    3826,  3826,  3826,  3826,  3826,  3826,  3826,  3826,  -931,  -931,
-     140,  -931,  -931,  -931,  -931,  6925,   592,  -931,  4122,  -931,
-    6194,  4270,  6194,  6194,  8390,  -931,    16,   597,  8637,  -931,
-    -931,  -931,   246,   602,  -931,  -931,   679,  -931,  -931,  8637,
-    -931,  -931,  8637,  6194,  1309,   608,  7696,   610,  6194,   613,
-    -931,  -931,   506,   650,   614,   506,  -931,   145,   650,  -931,
-    1457,   772,  -931,  -931,  -931,   619,  -931,  -931,  -931,   712,
-    -931,  -931,  -931,   627,  -931,  6194,  -931,  -931,   626,  -931,
-     628,   630,  7696,  8637,  6194,  -931,  -931,   587,  7611,  7660,
-    2197,  6341,  6194,   559,   637,   559,  6974,  -931,  7023,  -931,
-    7072,  -931,  -931,  -931,  -931,   640,   587,  -931,  -931,  -931,
-    -931,  7709,  -931,  -931,  -931,   633,  8637,   642,  5010,  7696,
-       9,    15,  4418,   644,   647,  -931,  6046,  -931,   421,   699,
-     182,   646,  -931,  -931,   182,  8637,  6194,  -931,  -931,  -931,
-     648,  -931,  -931,  -931,   506,  -931,  -931,   655,  -931,   659,
-     512,  -931,  -931,  -931,   512,  -931,  -931,    86,   786,   793,
-     794,  -931,  -931,  1605,  -931,  6194,  -931,  -931,  7758,   662,
-     772,  5010,   431,  3826,   650,  4862,   804,   668,  6341,  -931,
-    -931,  -931,  -931,  -931,  -931,  -931,   645,   674,   669,  -931,
-      71,  -931,   926,  -931,   559,   684,   671,   671,  -931,   650,
-    3677,   672,  2345,  6194,  5010,   687,    17,  8390,  4566,  -931,
-    -931,  -931,  -931,   475,  -931,    40,   692,   689,   693,  -931,
-     697,  8637,   696,   694,  -931,   799,  -931,   246,   700,   709,
-    -931,  -931,   655,   713,  1379,   506,  -931,  -931,   848,     5,
-     512,   434,   434,   512,   717,  -931,  3826,   718,  -931,   722,
-    -931,  -931,  -931,  -931,  -931,   863,   635,  -931,   479,   479,
-     865,  -931,   166,   866,   869,   871,  -931,   738,   796,  -931,
-    -931,   741,   749,   750,    25,   752,  -931,  -931,  -931,  2493,
-     553,   753,  6194,    21,    51,  -931,  -931,   910,  -931,  6046,
-    -931,  6194,   935,   506,  -931,  -931,  -931,  -931,   182,   777,
-    -931,  -931,   506,  -931,  -931,   728,  -931,  -931,  -931,    71,
-     844,   846,   808,  -931,  4044,  -931,  -931,  -931,  -931,  -931,
-    -931,  -931,  -931,   772,   788,  3677,   145,   948,  -931,  -931,
-     934,     7,  -931,   798,   479,   399,   399,   479,   863,   803,
-     863,   801,  -931,  4714,  -931,  4566,  2641,   805,   806,  -931,
-    7121,  -931,  -931,  -931,  -931,  6194,  -931,  8637,  6194,    55,
-    -931,  2789,  -931,  -931,  4931,  7989,   121,  -931,   897,   237,
-    6639,  -931,  4988,  -931,  -931,  -931,  -931,  -931,   901,  -931,
-    -931,  -931,  -931,  -931,  -931,   279,  -931,  -931,  -931,  -931,
-    -931,  -931,   809,  -931,  -931,  -931,  3677,  8637,  8637,   506,
-    -931,   811,  -931,  -931,   969,  -931,  6349,  -931,   971,   159,
-    -931,  7989,   973,   976,   978,   979,   980,  8134,   168,  -931,
-    -931,  5079,  -931,  -931,   825,  -931,   925,   839,  -931,   835,
-    5136,  2937,  -931,  3677,  -931,   836,  6194,   838,   853,  -931,
-    -931,  6494,  -931,   845,   847,   912,   904,   858,  6194,  -931,
-     897,  -931,  -931,  6194,  6194,   973,   174,  8134,  -931,  -931,
-    6194,  1006,  -931,  -931,   279,   860,  -931,  -931,   852,  -931,
-    8637,  -931,  -931,  -931,  -931,  -931,  8279,   506,  7989,  8637,
-    -931,   862,  8637,  8637,  -931,  -931,  8637,  6194,  3085,  -931,
-    -931,  3233,  -931,  3381,  -931,  -931,  7989,   655,  -931,  -931,
-     559,  -931,  -931,  -931,  8637,  -931,  -931,  -931,  -931,   864,
-    -931,  -931,   863,  -931,   389,  -931,  -931,  -931,  3529,  -931,
-    -931
+    -901,    84,  3645,  -901,  7152,  7152,  7152,  7152,  7152,  -901,
+    -901,    98,  -901,  -901,  -901,  -901,  -901,  -901,  7152,  7152,
+     -81,  7152,  7152,  7152,  7152,  7152,   574,  7152,   -13,     9,
+    7152,  5983,    36,    82,   103,   111,   113,   124,  7152,  7152,
+     231,  -901,  -901,   245,  7152,   147,  7152,   291,    37,    40,
+    -901,  -901,   133,   155,   160,   176,   181,  -901,  -901,  -901,
+    -901,  9398,   219,   236,  -901,  -901,  -901,  -901,  -901,  -901,
+    -901,  -901,   597,  8965,  8965,  7152,  7152,  7152,  7152,  7152,
+    7152,  7152,    87,  7152,  -901,  -901,  6150,   211,   255,    29,
+      30,  -901,  1987,  -901,  -901,  -901,  -901,  -901,   508,  -901,
+    -901,  -901,  -901,  -901,   398,  -901,   623,  -901,  -901,  2821,
+    -901,   209,   209,  -901,   250,   387,  -901,   196,   492,   274,
+     279,   324,  -901,   289,  2162,  -901,  -901,  -901,  -901,   535,
+     133,   380,   304,   209,   304,    41,   304,   304,  -901,  8324,
+    8324,  7152,  8324,  8324,  8418,  2965,  8418,  -901,  -901,  7152,
+    -901,   465,   272,   385,  -901,  -901,   333,   133,  -901,   548,
+    -901,  7152,  -901,  7152,    49,  -901,  8324,   449,  7152,  7152,
+    7152,   245,  7152,  7152,  8324,   337,   340,   342,   513,   171,
+    -901,   358,  -901,  8324,  -901,  -901,  -901,  -901,  -901,  -901,
+      11,   557,   365,   286,  -901,   305,  -901,  -901,   536,   308,
+    -901,  -901,  2977,  -901,  8965,  7152,  7152,   392,   523,   550,
+     553,   556,  -901,  -901,  -901,  -901,  -901,  -901,  -901,  -901,
+    -901,  -901,  -901,  -901,  -901,  -901,  -901,  -901,  -901,  -901,
+    -901,  -901,  -901,  -901,  -901,  -901,  -901,  -901,  -901,  -901,
+    -901,  -901,  -901,  -901,  -901,  -901,  -901,  -901,  -901,  -901,
+    -901,  -901,  -901,  -901,  -901,  -901,  -901,  -901,  -901,  -901,
+    -901,  -901,  -901,  -901,  -901,  -901,  -901,  -901,  -901,  -901,
+    -901,  -901,  -901,  -901,  -901,  -901,  -901,  -901,  -901,  -901,
+    -901,  -901,  -901,  -901,  -901,  -901,  -901,  -901,  -901,  -901,
+    -901,  -901,  -901,  -901,   386,   414,  6150,  6150,  -901,   397,
+     133,  7152,  6150,   419,  -901,  -901,   582,   582,   304,   304,
+     304,   304,   304,   304,   304,   188,   115,  -901,  6651,  8965,
+     135,  -901,  7260,  3812,   424,  7152,  -901,  -901,  8965,  8136,
+     434,  -901,   442,  -901,   102,   463,   300,   102,    80,  7152,
+    -901,  -901,   535,  -901,  -901,  -901,  -901,  -901,   455,  5983,
+     472,   641,   477,  1985,  7152,  7152,  7152,  7152,  7152,  7152,
+    7152,  7152,  7152,  7152,  7152,  7152,  7152,    99,  7152,  7152,
+    7152,  7152,  7152,  7152,  7152,  7152,  7152,  7152,  7152,  7152,
+    7152,  7152,  7152,  -901,  -901,  -901,   208,  8729,  8876,    52,
+      52,  7152,  7152,   133,  6317,  7152,  7152,  7152,  7152,  7152,
+    7152,  7152,  7152,  7152,  7152,  7152,  7152,  -901,  -901,  7152,
+    -901,  7326,  7152,  7338,  -901,  -901,  -901,    37,  -901,  -901,
+      52,    52,    37,  7152,  7152,   480,  7394,  7152,  -901,   483,
+    7528,   498,   496,  8324,  8181,   303,  7575,  7587,  -901,  -901,
+    -901,  7152,   245,  -901,  -901,  3979,   655,   512,    28,   541,
+     370,  -901,   557,  -901,    37,  -901,  7152,   687,  -901,    89,
+    7152,  7152,   -81,  7152,  7152,  7152,  2152,   765,  7152,    27,
+     124,   716,   724,  7152,    88,   133,   160,   176,   219,   236,
+     726,   727,   729,   730,   732,   733,   735,   742,  6818,  -901,
+     747,   588,  -901,  8324,   594,  -901,   313,  8324,   595,  -901,
+    7634,   592,   668,  -901,   669,   763,  -901,   603,  -901,   606,
+     608,   597,   609,  -901,  7768,   611,   758,   759,   488,  -901,
+    -901,   453,  2331,   610,  -901,  -901,  -901,   542,   616,  -901,
+    1987,  -901,  -901,  -901,  6150,  8324,   447,  6484,   783,  6150,
+    -901,  -901,  2345,  -901,   771,  7152,  -901,  7152,  -901,  -901,
+    7152,  8193,  8596,  2798,  1130,  1130,   197,   117,   117,    41,
+      41,    41,  8365,  8377,  8418,  -901,  8428,  8557,  8875,  8875,
+    8875,  8875,  1130,  1130,  8875,   131,   131,  2720,   304,  9017,
+    9017,   625,  -901,  -901,  -901,   626,  7152,   628,   629,   133,
+    7152,   628,   629,   133,  -901,  7152,  -901,   133,   133,  2395,
+     632,  -901,  8965,  8418,  8418,  8418,  8418,  8418,  8418,  8418,
+    8418,  8418,  8418,  8418,  8418,  8418,  8418,  -901,  8418,  -901,
+     133,  -901,  -901,  -901,  -901,  2409,   635,  -901,  1145,  -901,
+    7152,  1313,  7152,  7152,  8572,  -901,    26,   627,  8324,  -901,
+    -901,  -901,   281,   633,  -901,  -901,   743,  -901,  -901,  8324,
+    -901,  -901,  8324,  7152,  3144,   636,  8965,   650,  7152,   651,
+    -901,  -901,   597,   713,   652,   597,  -901,    46,   713,  -901,
+    3311,   819,  -901,  -901,  -901,   654,  -901,  -901,  -901,   794,
+    -901,  -901,  -901,   660,  -901,  7152,  -901,  -901,   659,  -901,
+     661,   663,  8965,  8324,  7152,  -901,  -901,   668,  7815,  7827,
+    4146,  2720,  7152,   440,   667,   440,  2577,  -901,  2591,  -901,
+    2641,  -901,  -901,  -901,  -901,   582,   668,  -901,  -901,  -901,
+    -901,  7874,  -901,  -901,  -901,   672,  8324,   670,  6150,  8965,
+      92,   128,  1481,   673,   678,  -901,  6985,  -901,   558,   769,
+     470,   671,  -901,  -901,   470,  8324,  7152,  -901,  -901,  -901,
+     679,  -901,  -901,  -901,   597,  -901,  -901,   684,  -901,   681,
+     482,  -901,  -901,  -901,   482,  -901,  -901,    31,   848,   850,
+     693,  -901,  -901,  3478,  -901,  7152,  -901,  -901,  8124,   688,
+     819,  6150,   475,  8418,   713,  5983,   855,   691,  2720,  -901,
+    -901,  -901,  -901,  -901,  -901,  -901,   854,   696,   697,  -901,
+     130,  -901,   842,  -901,   440,   699,   701,   701,  -901,   713,
+    5816,   702,  4313,  7152,  6150,   704,   201,  8572,  1649,  -901,
+    -901,  -901,  -901,   631,  -901,    15,   698,   707,   708,  -901,
+     710,  8324,   705,   709,  -901,   860,  -901,   281,   715,   722,
+    -901,  -901,   684,   711,  1960,   597,  -901,  -901,   728,    90,
+     482,   416,   416,   482,   718,  -901,  8418,   723,  -901,   721,
+    -901,  -901,  -901,  -901,  -901,   893,   731,  -901,   607,   607,
+     736,  -901,    58,   896,   897,   740,  -901,   738,   827,  -901,
+    -901,   739,   746,   749,   258,   760,  -901,  -901,  -901,  4480,
+     695,   741,  7152,    33,    55,  -901,  -901,   797,  -901,  6985,
+    -901,  7152,   798,   597,  -901,  -901,  -901,  -901,   470,   744,
+    -901,  -901,   597,  -901,  -901,  1048,  -901,  -901,  -901,   130,
+     836,   837,   989,  -901,  2127,  -901,  -901,  -901,  -901,  -901,
+    -901,  -901,  -901,   819,   773,  5816,    46,   800,  -901,  -901,
+     784,   137,  -901,   790,   607,   263,   263,   607,   893,   781,
+     893,   779,  -901,  1817,  -901,  1649,  4647,   785,   791,  -901,
+    2655,  -901,  -901,  -901,  -901,  7152,  -901,  8324,  7152,    69,
+    -901,  4814,  -901,  -901,  2791,  9487,   185,  -901,   929,   209,
+    8017,  -901,  2823,  -901,  -901,  -901,  -901,  -901,   935,  -901,
+    -901,  -901,  -901,  -901,  -901,    83,  -901,  -901,  -901,  -901,
+    -901,  -901,   792,  -901,  -901,  -901,  5816,  8324,  8324,   597,
+    -901,   796,  -901,  -901,   961,  -901,  9136,  -901,   964,   375,
+    -901,  9487,   967,   970,   975,   977,   978,  9576,   383,  -901,
+    -901,  6125,  -901,  -901,   810,  -901,   957,   817,  -901,   813,
+    6292,  4981,  -901,  5816,  -901,   815,  7152,   821,   831,  -901,
+    -901,  9267,  -901,   822,   823,   934,   911,   839,  7152,  -901,
+     929,  -901,  -901,  7152,  7152,   967,   402,  9576,  -901,  -901,
+    7152,   994,  -901,  -901,    83,   829,  -901,  -901,   830,  -901,
+    8324,  -901,  -901,  -901,  -901,  -901,  9665,   597,  9487,  8324,
+    -901,   833,  8324,  8324,  -901,  -901,  8324,  7152,  5148,  -901,
+    -901,  5315,  -901,  5482,  -901,  -901,  9487,   684,  -901,  -901,
+     440,  -901,  -901,  -901,  8324,  -901,  -901,  -901,  -901,   835,
+    -901,  -901,   893,  -901,   487,  -901,  -901,  -901,  5649,  -901,
+    -901
 };
 
-  /* YYDEFACTSTATE-NUM -- Default reduction number in state STATE-NUM.
-     Performed when YYTABLE does not specify something else to do.  Zero
-     means the default is an error.  */
-static const yytype_uint16 yydefact =
+/* YYDEFACTSTATE-NUM -- Default reduction number in state STATE-NUM.
+   Performed when YYTABLE does not specify something else to do.  Zero
+   means the default is an error.  */
+static const yytype_int16 yydefact =
 {
-      86,     0,     2,     1,     0,     0,     0,     0,     0,     0,
-     451,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   498,   499,    93,    95,    96,
-      94,   541,   162,   496,     0,   199,   487,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   519,   519,     0,   464,
-     463,     0,   519,     0,     0,     0,   482,   201,   202,   203,
-       0,     0,     0,     0,   193,   204,   206,   208,   116,     0,
-       0,   507,   508,   509,   514,   510,   511,   512,   513,     0,
+      86,     0,     2,     1,     0,     0,     0,     0,     0,   498,
+     499,    93,    95,    96,    94,   541,   162,   496,     0,     0,
+       0,     0,     0,     0,   451,     0,   199,     0,   487,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   519,   519,
+       0,   464,   463,     0,   519,     0,     0,     0,     0,   482,
+     201,   202,   203,     0,     0,     0,     0,   193,   204,   206,
+     208,   116,     0,     0,   507,   508,   509,   514,   510,   511,
+     512,   513,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,   169,   144,   560,   489,     0,     0,
      506,   102,     0,   110,    85,   109,   104,   105,     0,   195,
      106,   107,   108,   460,   253,   150,     0,   151,   434,     0,
      456,   468,   468,   536,     0,   503,   448,   504,   505,     0,
      526,     0,   480,   537,   378,   531,   538,   438,    93,   482,
-       0,     0,   455,   468,   589,   590,   592,   593,   450,   452,
-     454,   419,   420,   421,   422,   439,   440,   441,   442,   443,
-     444,   445,   447,   383,   172,     0,   482,   203,     0,   483,
-     199,   200,     0,   197,   376,   484,   492,   546,   485,   519,
-     446,     0,     0,   367,   368,     0,     0,   369,     0,     0,
-       0,     0,   520,     0,     0,     0,     0,     0,   142,     0,
-     144,    89,    92,    90,   123,   124,    91,   139,     0,     0,
-       0,   134,     0,   307,   308,   311,     0,   310,   458,     0,
-     477,     0,     0,     0,     0,     0,     0,     0,     0,    33,
-       3,     4,     6,     7,     8,     9,    10,    46,    47,    11,
-      13,    16,    17,    83,    88,     5,    12,    14,    15,    18,
-      19,    20,    21,    22,    23,    24,    25,    26,    27,    28,
-      29,    49,    50,    51,    52,    71,    53,    41,    42,    43,
-      70,    44,    45,    30,    31,    32,    34,    35,    36,    74,
-      75,    76,    77,    78,    79,    80,    37,    38,    39,    40,
-      61,    59,    60,    72,    56,    57,    58,    48,    54,    55,
-      66,    67,    68,    62,    63,    65,    64,    69,    73,    84,
-      87,   114,     0,   560,   560,    99,   127,    97,     0,   560,
-     524,   527,   525,   398,   400,   575,     0,   501,     0,     0,
-       0,   573,     0,     0,    82,    81,     0,     0,     0,   565,
+       0,     0,   419,   468,   420,   421,   422,   447,   172,   589,
+     590,     0,   592,   593,   450,   452,   454,   482,   203,     0,
+     483,   199,   200,     0,   197,   376,   484,   492,   546,   485,
+     383,   519,   446,     0,     0,   367,   368,     0,     0,   369,
+       0,     0,     0,     0,   520,     0,     0,     0,     0,     0,
+     142,     0,   144,   455,    89,    92,    90,   123,   124,    91,
+     139,     0,     0,     0,   134,     0,   307,   308,   311,     0,
+     310,   458,     0,   477,     0,     0,     0,     0,     0,     0,
+       0,     0,    83,    88,     3,     4,     5,     6,     7,     8,
+       9,    10,    46,    47,    11,    12,    13,    14,    15,    16,
+      17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
+      27,    28,    29,    49,    50,    51,    52,    71,    53,    41,
+      42,    43,    70,    44,    45,    30,    31,    32,    33,    34,
+      35,    36,    74,    75,    76,    77,    78,    79,    80,    37,
+      38,    39,    40,    61,    59,    60,    72,    56,    57,    58,
+      48,    54,    55,    66,    67,    68,    62,    63,    65,    64,
+      69,    73,    84,    87,   114,     0,   560,   560,    99,   127,
+      97,     0,   560,   524,   527,   525,   398,   400,   439,   440,
+     441,   442,   443,   444,   445,   575,     0,   501,     0,     0,
+       0,   573,     0,     0,     0,     0,    81,    82,     0,   565,
        0,   563,   559,   561,   490,     0,   491,     0,     0,     0,
      543,   476,     0,   103,   111,   457,   191,   196,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
@@ -986,14 +1227,14 @@
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,   163,   469,   465,   465,     0,     0,     0,
        0,     0,   519,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   397,   399,
+       0,     0,     0,     0,     0,     0,     0,   397,   399,     0,
      465,     0,     0,     0,   377,   198,   373,     0,   493,   375,
        0,     0,     0,     0,   519,     0,     0,     0,   161,     0,
        0,     0,   370,   372,     0,     0,     0,     0,   156,   157,
      171,     0,     0,   122,   158,     0,     0,     0,   139,     0,
-       0,   118,     0,   120,     0,   159,     0,     0,   160,    33,
-       3,     4,     6,     7,    46,   451,    13,    93,     5,    12,
-     487,    71,   464,   463,    74,    80,    39,    40,    48,    54,
+       0,   118,     0,   120,     0,   159,     0,     0,   160,    93,
+       3,     4,     5,     6,     7,    46,   451,    12,    13,   487,
+      71,   464,   463,    33,    74,    80,    39,    40,    48,    54,
      507,   508,   509,   514,   510,   511,   512,   513,     0,   298,
        0,   127,   301,   303,   127,   181,   522,   596,   127,   594,
        0,     0,   215,   465,   217,   210,   113,     0,    86,     0,
@@ -1001,13 +1242,13 @@
      574,     0,     0,   522,   572,   502,   571,   433,     0,   149,
        0,   146,   143,   145,   560,   568,   522,     0,   495,   560,
      449,   497,     0,   459,     0,     0,   254,     0,   144,   257,
-     403,   405,   404,     0,     0,   437,   401,   402,   406,   409,
-     407,   408,   425,   426,   423,   424,   431,   427,   428,   429,
-     430,   410,   417,   418,   411,   412,   413,   415,   416,   432,
-     414,     0,   184,   185,   465,     0,     0,   515,   544,     0,
+       0,     0,   406,   409,   427,   429,   410,   411,   412,   413,
+     415,   416,   403,   405,   404,   432,   401,   402,   425,   426,
+     423,   424,   428,   430,   431,   417,   418,   437,   414,   408,
+     407,     0,   184,   185,   465,     0,     0,   515,   544,     0,
        0,   516,   545,     0,   556,     0,   558,   539,   540,     0,
        0,   481,     0,   381,   384,   385,   386,   388,   389,   390,
-     391,   392,   393,   394,   395,   387,   396,   453,   591,   486,
+     391,   392,   393,   394,   395,   396,   387,   591,   453,   486,
      492,   551,   549,   550,   552,     0,     0,   488,     0,   366,
        0,     0,   369,     0,     0,   167,     0,     0,   465,   141,
      173,   140,     0,     0,   119,   121,   139,   133,   306,   312,
@@ -1062,1945 +1303,2141 @@
      341
 };
 
-  /* YYPGOTONTERM-NUM.  */
+/* YYPGOTONTERM-NUM.  */
 static const yytype_int16 yypgoto =
 {
-    -931,  -931,   -53,  -869,   -98,   -63,  -486,  -931,   -11,  -190,
-     115,   525,  -931,   -47,    -2,     0,  -931,  -931,  -931,   983,
-    -931,  -931,  -487,  -931,  -931,   854,   216,  -723,   603,   875,
-    -162,  -931,    44,  -931,  -931,  -931,  -931,  -931,  -931,   401,
-    -931,  -931,  -931,  -931,  -931,  -931,  -931,  -931,  -931,  -931,
-       1,  -931,  -931,  -931,  -931,  -931,  -931,  -931,  -931,  -931,
-    -591,  -931,  -619,   239,  -931,   108,  -931,  -931,  -686,   105,
-    -931,  -931,  -931,   173,  -931,  -931,  -931,  -931,  -931,  -931,
-    -665,  -931,   192,  -931,   270,   148,  -850,  -518,  -284,  -931,
-     314,  -931,  -740,  -323,  -931,   211,  -930,   -49,  -931,   427,
-    -931,   625,  -931,   641,  -816,   169,  -931,  -739,  -931,  -931,
-      32,  -931,  -931,  -931,  -931,  -931,  -931,  -931,  -931,  -605,
-    -796,  -931,    45,    79,    47,   688,  -931,   680,  -616,  -931,
-     960,  -931,  -931,    58,     3,  -931,    -1,  -366,  -872,  -931,
-    -109,  -931,  -931,    59,  -931,  -931,   -23,   751,  -931,  -931,
-     514,   -71,  -931,   -55,   -43,   -20,  -931,  -931,  -931,  -931,
-    -931,   -27,   437,  -931,  -931,   747,   -22,  -216,   598,  -931,
-    -931,   540,   562,  -931,  -931,  -931,   492
+    -901,  -901,   -85,  -761,   -99,   -43,  -455,  -901,   -22,  -172,
+     108,   499,  -901,   -77,    -2,     1,  -901,  -901,  -901,   960,
+    -901,  -901,  -326,  -901,  -901,   818,   175,  -682,   561,   844,
+    -178,  -901,    61,  -901,  -901,  -901,  -901,  -901,  -901,   361,
+    -901,  -901,  -901,  -901,  -901,  -901,  -901,  -901,  -901,  -901,
+     -12,  -901,  -901,  -901,  -901,  -901,  -901,  -901,  -901,  -901,
+    -530,  -901,  -591,   202,  -901,    63,  -901,  -901,  -640,    62,
+    -901,  -901,  -901,   122,  -901,  -901,  -901,  -901,  -901,  -901,
+    -674,  -901,   157,  -901,   228,   106,  -853,  -515,  -170,  -901,
+     262,  -901,  -634,  -255,  -901,   159,  -900,    16,  -901,   376,
+    -901,   577,  -901,   575,  -733,   118,  -901,  -738,  -901,  -901,
+     -16,  -901,  -901,  -901,  -901,  -901,  -901,  -901,  -901,  -646,
+    -785,  -901,   -24,    10,   -21,   601,  -901,   620,  -612,  -901,
+     898,  -901,  -901,    22,   -14,  -901,    -1,  -177,  -818,  -901,
+    -110,  -901,  -901,   -26,  -901,  -901,   -17,   683,  -901,  -901,
+     431,   -68,  -901,   -66,   -63,    43,  -901,  -901,  -901,  -901,
+    -901,   -52,   694,  -901,  -901,   676,  -302,  -260,   517,  -901,
+    -901,   617,   409,  -901,  -901,  -901,   399
 };
 
-  /* YYDEFGOTONTERM-NUM.  */
+/* YYDEFGOTONTERM-NUM.  */
 static const yytype_int16 yydefgoto =
 {
-      -1,     1,   298,   299,   328,   490,     2,   301,   739,   197,
-      90,   305,   306,    91,   131,   531,    94,   507,   302,   740,
-     449,   199,   512,   741,   839,   200,   742,   743,   201,   187,
+       0,     1,   291,   292,   328,   490,     2,   294,   739,   190,
+      90,   298,   299,    91,   131,   531,    94,   507,   295,   740,
+     449,   192,   512,   741,   839,   193,   742,   743,   194,   179,
      323,   532,   533,   732,   738,   969,  1011,   834,   494,   495,
-     584,    96,   943,   988,    97,   544,   215,    98,   161,   162,
-      99,   100,   216,   101,   217,   102,   218,   668,   916,  1047,
+     584,    96,   943,   988,    97,   544,   208,    98,   152,   153,
+      99,   100,   209,   101,   210,   102,   211,   668,   916,  1047,
      663,   666,   755,   730,  1000,   888,   821,   735,   823,   963,
      103,   827,   828,   829,   830,   724,   104,   105,   106,   107,
      797,   798,   799,   800,   801,   870,   766,   767,   768,   769,
-     770,   871,   771,   873,   874,   875,   937,   210,   491,   492,
-     202,   203,   206,   207,   844,   917,   918,   757,  1017,  1051,
+     770,   871,   771,   873,   874,   875,   937,   203,   491,   492,
+     195,   196,   199,   200,   844,   917,   918,   757,  1017,  1051,
     1052,  1053,  1054,  1055,  1056,  1127,   919,   920,   921,   922,
-     803,  1019,  1020,  1028,  1029,   188,   172,   173,   431,   432,
-     164,   620,   108,   109,   110,   111,   133,   585,  1032,  1070,
-     385,   950,  1037,  1038,   113,   393,   114,   166,   170,   335,
-     419,   115,   116,   117,   118,   183,   119,   120,   121,   122,
-     123,   124,   125,   126,   168,   589,   597,   330,   331,   332,
+     803,  1019,  1020,  1028,  1029,   180,   164,   165,   431,   432,
+     155,   620,   108,   109,   110,   111,   133,   585,  1032,  1070,
+     385,   950,  1037,  1038,   113,   393,   114,   157,   162,   335,
+     419,   115,   116,   117,   118,   175,   119,   120,   121,   122,
+     123,   124,   125,   126,   159,   589,   597,   330,   331,   332,
      333,   320,   321,   683,   127,   498,   499
 };
 
-  /* YYTABLEYYPACTSTATE-NUM -- What to do in state STATE-NUM.  If
-     positive, shift that token.  If negative, reduce the rule whose
-     number is the opposite.  If YYTABLE_NINF, syntax error.  */
+/* YYTABLEYYPACTSTATE-NUM -- What to do in state STATE-NUM.  If
+   positive, shift that token.  If negative, reduce the rule whose
+   number is the opposite.  If YYTABLE_NINF, syntax error.  */
 static const yytype_int16 yytable =
 {
-      92,   112,    93,   386,   655,   300,   876,   657,   448,   310,
-     310,   659,   165,   384,   384,   842,   725,   836,   994,   581,
-     996,   840,   670,   817,   410,   311,   311,   184,   445,  -221,
-     924,  -222,   189,   160,     3,   384,   163,   312,   312,  -224,
-     805,   341,   853,   196,   947,   343,    95,   733,   825,   772,
-     -83,   446,   961,   313,   314,   446,   307,    31,   582,   208,
-     872,   -14,   132,   134,   135,   136,   137,   138,   139,   140,
-     141,   142,   143,   144,   145,   146,   147,   148,   149,   150,
-     151,   152,   153,   175,   343,   427,   984,   509,   510,   428,
-    1009,   112,   344,   515,   974,   345,   174,   154,   802,   347,
-     802,   868,    31,   155,   182,   182,   784,  -483,   583,   381,
-     182,  1026,   169,   343,   209,   982,   447,   418,   -83,   382,
-     643,  -277,  1034,   850,  1039,   809,   876,   594,   939,   940,
-    1027,    31,   208,  1010,   345,   171,   890,   664,   894,   877,
-     310,   322,   892,   893,   329,   128,    28,    29,    30,   425,
-     159,   442,   339,   892,   893,   443,   311,    89,  1026,   350,
-     351,   163,   415,   348,   349,   860,   315,  1031,   312,   315,
-     452,   524,   185,   976,   453,   760,   925,   352,   986,   872,
-     818,  1040,   176,   773,   496,   972,  -221,   196,  -222,   734,
-     879,   802,  1123,   962,   159,   315,  -224,   882,  1026,   802,
-     169,  -290,    89,   944,   989,   990,   990,   993,   177,   762,
-     763,    49,    50,   412,   895,   315,   413,   316,   704,   128,
-      28,    29,    30,   186,  1113,   964,   595,   182,   382,   426,
-     315,    89,   524,   454,   430,   433,   434,   455,   436,   437,
-     178,   869,   847,  1120,  1121,   315,   848,   334,   310,   318,
-     319,  1124,   318,   319,   838,  1129,   191,   310,   513,   193,
-     179,   802,   646,   761,   311,   457,  -482,   493,   541,   458,
-     497,   500,   737,   311,   324,   325,   312,   519,   318,   319,
-     315,   180,   337,   762,   763,   312,   315,   452,   524,   845,
-    1106,   645,   523,  1015,  1016,   181,   602,   317,   318,   319,
-     759,   536,   516,   517,   190,   128,    28,    29,    30,    31,
-     209,   867,   525,   318,   319,   764,   324,   325,   690,   387,
-     191,   530,   112,   193,   587,   591,   518,  1060,   318,   319,
-     211,  1061,   926,   927,   927,   930,  1067,    49,    50,   897,
-    1068,   900,  1067,   902,   601,   543,  1094,   342,  1107,   156,
-      57,    58,   909,   205,   194,   157,   195,  1035,   165,    49,
-      50,   329,   329,   318,   319,   679,   514,   329,   598,   318,
-     319,   212,   600,    57,    58,   213,   522,    79,   157,    79,
-     214,  -527,  -527,    49,    50,   535,   700,   680,   303,   843,
-     304,   681,   442,   546,   416,   635,   682,   542,   622,   623,
-     429,   158,    79,  -527,   626,  -527,   854,   191,   192,    89,
-     193,   550,   551,   552,   554,   555,   556,   557,   558,   559,
-     560,   561,   562,   563,   564,   565,   566,   567,   568,   569,
-     570,   571,   572,   573,   574,   575,   576,   577,   578,   692,
-     580,   196,  -528,   530,   112,  1119,   165,   388,  -183,   599,
-     182,  -183,   603,   604,   605,   606,   607,   608,   609,   610,
-     611,   612,   613,   614,   615,   616,  -521,   160,   417,   617,
-     163,   438,   167,   128,    28,    29,    30,   208,  -524,  -524,
-     439,   625,   182,   343,   440,   174,    57,    58,   307,   441,
-    -524,   157,   204,   444,   934,   451,   159,  -530,   456,   638,
-    -524,   501,  -524,  -525,  -525,   802,   684,   685,   128,    28,
-      29,    30,   815,   951,   649,  -525,   502,   132,   134,   135,
-     136,   137,   138,   139,   153,  -525,   340,  -525,   503,   112,
-     689,   310,   504,   345,   832,   833,   729,   762,   763,   505,
-     707,   506,   389,   390,   709,   975,   652,   311,   711,   712,
-    1075,   508,   761,   128,    28,    29,    30,   810,   511,   312,
-     812,  1125,  1126,   310,   391,   859,   392,   928,   929,   869,
-    -530,   418,   762,   763,   534,   715,   891,   892,   893,   311,
-     128,    28,    29,    30,   159,   310,   128,    28,    29,    30,
-     539,   312,   329,  -567,  -567,   693,  -567,   329,   883,  -566,
-    -566,   311,  -566,   698,   764,   699,   540,   731,   538,   191,
-     192,   701,   193,   312,    57,    58,   545,   762,   763,   157,
-     547,   310,   991,   992,   156,   346,   159,   336,   338,   496,
-     761,   548,   128,    28,    29,    30,    31,   311,   549,   753,
-     627,   630,   758,   194,   706,   195,   632,   641,   708,   312,
-     762,   763,  1059,   710,   958,   892,   893,   889,   310,   378,
-     379,   380,   633,   381,   642,   782,   205,  1071,    92,   112,
-      93,   644,   720,   382,   311,   723,   156,   789,   790,   791,
-     792,   793,   794,   795,   -43,   -70,   312,   -66,   721,   -67,
-     433,   726,   -68,   420,   421,   -62,  1091,   -63,   530,   112,
-     935,   796,   816,   796,   -65,   422,   -64,    79,   -69,   653,
-     661,   745,   493,   654,    95,   423,   497,   424,   656,   729,
-     658,   662,   667,  1109,   956,   665,  1111,  1112,   158,   669,
-    -260,   758,   671,   674,   672,   676,    89,   677,   688,   678,
-     694,   687,   971,   778,   697,   703,   310,   705,  -553,   343,
-    -555,   714,   783,   789,   790,   791,   792,   793,   794,   795,
-     788,   718,   311,   789,   790,   791,   792,   793,   794,   795,
-     736,    92,   112,    93,   312,   744,   820,   159,   446,   748,
-     159,   750,   765,    79,   752,   754,   329,   756,   775,  -529,
-     731,  -522,  -522,    79,   831,   776,   777,   779,   835,   780,
-     781,  1006,   796,  -522,   652,   813,  -128,   804,   530,   112,
-     530,   112,   814,  -522,   837,  -522,   822,    95,   167,   824,
-     841,   851,   923,   845,   588,   592,   596,   596,   852,   861,
-     911,   853,   846,   856,   858,   862,  1041,   866,  -346,   329,
-     863,  -554,   915,  1043,   880,   865,   789,   790,   791,   792,
-     793,   794,   795,   913,   621,   878,   884,   596,   596,   624,
-     896,   899,   887,   898,   796,   901,   903,   904,   343,   159,
-    1021,   433,   329,   905,   907,   765,    79,   908,   520,   765,
-     970,   384,   526,  -523,  -523,   850,   910,   530,   112,   758,
-     931,   204,   932,   933,   936,  -523,   520,  1036,   526,   520,
-     526,   945,  -529,   942,   946,  -523,   167,  -523,   947,   948,
-    1098,   949,  1014,   952,  1101,   765,  -345,  1103,  -347,   979,
-     953,   954,   915,   955,   965,   959,   789,   790,   791,   792,
-     793,   794,   795,   530,   112,   394,   395,   396,   397,   398,
-     399,   400,   401,   402,   403,   404,   405,   406,   407,   968,
-     960,   973,    49,  1050,   530,   112,   980,   831,  1062,   967,
-     159,   983,   985,   987,  1128,   765,   765,   765,   765,   530,
-     112,   944,   915,   995,   997,  1018,  1036,  1003,  1004,  1033,
-     915,  1042,  1045,   765,   765,  1046,  1044,  1058,  1050,  1063,
-      49,    50,   -74,  1057,   -54,   -55,  1064,   999,  1072,   887,
-     342,    57,    58,  1073,   530,   112,   157,  1074,  1076,  1079,
-    1081,  1086,    64,    65,    66,    67,  -482,  1084,   159,  1085,
-    1087,  1088,  1097,  1007,  1102,  1108,  1008,   159,  1057,   915,
-      79,  1100,  1110,  1105,   765,  1122,   673,   198,   915,   530,
-     112,   530,   112,  1118,   789,   790,   791,   792,   793,   794,
-     795,   765,   450,   906,   435,   647,   885,   749,   938,   765,
-     765,   765,   765,  1001,   758,  1005,   864,   978,   408,   409,
-    -522,  -522,   966,   128,    28,    29,    30,    31,   849,   648,
-     941,   747,  -522,  1083,   977,   374,   375,   376,   377,   378,
-     379,   380,  -522,   381,  -522,   765,   530,   112,   650,   530,
-     112,   530,   112,   382,  1080,  1090,  1066,   629,   796,   376,
-     377,   378,   379,   380,  1095,   381,  1089,   156,    57,    58,
-     414,  1092,  1093,   157,   159,   382,   530,   112,  1096,  -199,
-     639,   159,   579,  1099,   716,   593,   459,   695,   460,   461,
-     462,   463,   224,   225,   226,   464,   465,    79,    11,     0,
-     751,     0,     0,     0,     0,  1114,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   159,     0,     0,   158,
-       0,     0,     0,     0,     0,     0,     0,    89,     0,     0,
-       0,     0,     0,     0,    12,    13,     0,     0,     0,    14,
-     229,    15,    16,    17,    18,    19,    20,    21,    22,    23,
-       0,   466,   159,   231,   232,    25,    26,   467,    28,    29,
-      30,    31,     0,     0,    33,     0,     0,   468,   469,   470,
-     238,   239,   240,   241,   242,   243,   244,   245,   246,   247,
-     248,   249,   250,   251,   252,   253,   254,   471,   256,   257,
-     258,   472,   473,   261,   262,   263,   264,   265,   266,   267,
-     268,   474,   270,   271,   272,   273,   274,   475,   276,   277,
-     476,   477,     0,   280,   281,   282,   283,   284,   285,   286,
-     478,   479,   289,   480,   481,   482,   483,   484,   485,   486,
-     487,    79,    80,    81,     0,     0,     0,     0,     0,     0,
-       0,     0,    82,     0,     0,     0,     0,     0,   488,     0,
-       0,     0,     0,    83,   489,   353,   354,   355,    86,    87,
-      88,    89,   459,     0,   460,   461,   462,   463,   224,   225,
-     226,   464,   465,     0,    11,     0,   356,     0,   357,   358,
-     359,   360,   361,   362,   363,   364,   365,   366,   367,   368,
-     369,   370,   371,   372,   373,   374,   375,   376,   377,   378,
-     379,   380,     0,   381,     0,     0,     0,     0,     0,     0,
-      12,    13,     0,   382,     0,    14,   229,    15,    16,    17,
-      18,    19,    20,    21,    22,    23,     0,   466,     0,   231,
-     232,    25,    26,   467,    28,    29,    30,    31,     0,     0,
-      33,     0,     0,   468,   469,   470,   238,   239,   240,   241,
-     242,   243,   244,   245,   246,   247,   248,   249,   250,   251,
-     252,   253,   254,   471,   256,   257,   258,   472,   473,   261,
-     262,   263,   264,   265,   266,   267,   268,   474,   270,   271,
-     272,   273,   274,   475,   276,   277,   476,   477,     0,   280,
-     281,   282,   283,   284,   285,   286,   478,   479,   289,   480,
-     481,   482,   483,   484,   485,   486,   487,    79,    80,    81,
-       4,     0,     5,     6,     7,     8,     0,   527,    82,     9,
-      10,     0,    11,     0,   746,     0,     0,     0,     0,    83,
-       0,   911,     0,     0,    86,    87,    88,    89,     0,  -346,
-       0,     0,     0,     0,   912,     0,     0,   789,   790,   791,
-     792,   793,   794,   795,   913,     0,     0,     0,    12,    13,
-       0,     0,     0,    14,     0,    15,    16,    17,    18,    19,
-      20,    21,    22,    23,     0,    24,     0,    79,     0,    25,
-      26,    27,    28,    29,    30,    31,    32,     0,    33,     0,
-       0,    34,    35,    36,    37,     0,    38,    39,    40,     0,
-      41,     0,    42,   914,    43,     0,     0,    44,     0,     0,
-       0,    45,    46,    47,    48,    49,    50,    51,    52,    53,
-       0,     0,    54,     0,    55,    56,    57,    58,     0,     0,
-       0,    59,     0,    60,    61,    62,    63,    64,    65,    66,
-      67,     0,     0,    68,    69,    70,     0,    71,    72,    73,
-      74,    75,    76,    77,    78,    79,    80,    81,     4,     0,
-       5,     6,     7,     8,     0,     0,    82,     9,    10,     0,
-      11,     0,     0,     0,     0,     0,     0,    83,     0,    84,
-      85,   774,    86,    87,    88,    89,  -568,  -568,  -568,  -568,
-     373,   374,   375,   376,   377,   378,   379,   380,     0,   381,
-       0,     0,     0,     0,     0,     0,    12,    13,     0,   382,
-       0,    14,     0,    15,    16,    17,    18,    19,    20,    21,
-      22,    23,     0,    24,     0,     0,     0,    25,    26,    27,
-      28,    29,    30,    31,    32,     0,    33,     0,     0,    34,
-      35,    36,    37,     0,    38,    39,    40,     0,    41,     0,
-      42,     0,    43,     0,     0,    44,     0,     0,     0,    45,
-      46,    47,    48,    49,    50,    51,    52,    53,     0,     0,
-      54,     0,    55,    56,    57,    58,     0,     0,     0,    59,
-       0,    60,    61,    62,    63,    64,    65,    66,    67,     0,
-       0,    68,    69,    70,     0,    71,    72,    73,    74,    75,
-      76,    77,    78,    79,    80,    81,     4,     0,     5,     6,
-       7,     8,     0,     0,    82,     9,    10,     0,    11,     0,
-       0,     0,     0,     0,     0,    83,     0,    84,    85,   855,
-      86,    87,    88,    89,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    12,    13,     0,     0,     0,    14,
-       0,    15,    16,    17,    18,    19,    20,    21,    22,    23,
-       0,    24,     0,     0,     0,    25,    26,    27,    28,    29,
-      30,    31,    32,     0,    33,     0,     0,    34,    35,    36,
-      37,     0,    38,    39,    40,     0,    41,     0,    42,     0,
-      43,     0,     0,    44,     0,     0,     0,    45,    46,    47,
-      48,    49,    50,    51,    52,    53,     0,     0,    54,     0,
-      55,    56,    57,    58,     0,     0,     0,    59,     0,    60,
-      61,    62,    63,    64,    65,    66,    67,     0,     0,    68,
-      69,    70,     0,    71,    72,    73,    74,    75,    76,    77,
-      78,    79,    80,    81,     4,     0,     5,     6,     7,     8,
-       0,     0,    82,     9,    10,     0,    11,     0,     0,     0,
-       0,     0,     0,    83,     0,    84,    85,     0,    86,    87,
-      88,    89,     0,     0,     0,     0,     0,     0,     0,     0,
+      92,   112,   386,    93,   445,   303,   303,   304,   304,   156,
+     305,   305,   384,   384,   154,   343,   842,   876,   293,   448,
+     725,   306,   307,   410,   151,   189,   132,   134,   135,   136,
+     137,   805,   733,   -14,   384,   201,   509,   510,  -277,   961,
+     139,   140,   515,   142,   143,   144,   145,   146,   994,   160,
+     996,   760,   166,   670,   343,   300,    15,   802,   836,   802,
+     174,   174,   840,    95,    15,  -290,   174,   198,   183,   128,
+      12,    13,    14,   446,   343,   594,  1009,   772,   345,    15,
+     892,   893,   176,   984,     3,   367,   347,   181,   598,   141,
+     446,   112,   167,   344,   825,   -83,  1010,   308,   309,   310,
+     311,   312,   313,   314,   138,   322,   341,   315,   329,   524,
+    1035,    41,    42,   924,   315,   201,   316,   345,   622,   623,
+     892,   893,   128,    12,    13,    14,    15,  1027,   761,   315,
+     877,   361,   362,   363,   150,   868,   303,   876,   304,   154,
+     415,   305,   315,   359,   360,   361,   362,   363,   762,   763,
+     802,   -83,   496,   128,    12,    13,    14,   161,   802,    41,
+      42,   367,   315,   411,   524,   655,   872,   784,   657,   189,
+     447,   413,   659,   418,   976,   367,  1034,   974,  1039,   163,
+     150,   147,   890,   174,   894,   426,   809,   643,  -483,   895,
+     430,   433,   434,   860,   436,   437,   850,   161,   982,   734,
+     202,   882,   339,   380,   425,   962,   168,    89,   581,   359,
+     360,   361,   362,   363,   773,    89,   764,   427,   879,  1026,
+     802,   428,  1123,   944,   493,   595,   972,   497,   500,   964,
+      89,   582,   762,   763,   939,   940,   318,   319,   315,   817,
+     334,   367,   317,   318,   319,   847,  -482,   326,   327,   848,
+    1031,   303,   169,   304,   177,   853,   305,   541,   318,   319,
+     303,   925,   304,   818,  1040,   305,  1026,   523,   178,   149,
+     519,   318,   319,   170,   690,  -221,   536,    89,  1113,   380,
+     646,   171,   315,   172,   337,   872,   128,    12,    13,    14,
+     525,   318,   319,   380,   173,   602,   583,  1120,  1121,  -221,
+     869,  1106,   947,   202,   184,  1124,  1026,   186,   986,  1129,
+     989,   990,   990,   993,   184,   185,   513,   186,   329,   329,
+     182,   530,   112,   514,   329,   204,   664,   315,   543,   524,
+     205,   377,   378,   516,   517,   926,   927,   927,   930,   442,
+     522,  -527,  -527,   443,   587,   591,   206,   535,  -222,  1107,
+     156,   207,   187,   845,   188,    50,    51,  1015,  1016,   380,
+     148,   542,   187,   518,   188,   762,   763,   318,   319,  -527,
+     700,  -527,  -222,   326,   327,   551,   552,   553,   554,   555,
+     556,   557,   558,   559,   560,   561,   562,   563,   564,   296,
+     566,   567,   568,   569,   570,   571,   572,   573,   574,   575,
+     576,   577,   578,   579,   580,  -224,   297,   704,   387,   601,
+     546,   318,   319,   599,   174,   838,   603,   604,   605,   606,
+     607,   608,   609,   610,   611,   612,   613,   614,   615,  -224,
+     189,   616,   388,   869,   618,   600,  1119,  -521,   692,   128,
+      12,    13,    14,   530,   112,   625,   174,   348,   349,   166,
+     156,    41,    42,   343,   452,   154,   318,   319,   453,  -528,
+     201,   737,   342,   638,   802,   151,   380,   626,   815,   389,
+     390,   442,   867,   454,   635,   150,   457,   455,   649,   416,
+     458,  -183,   139,   140,  -183,   142,   143,   144,   145,   759,
+     160,   417,    72,   184,   300,   183,   186,   391,   761,   392,
+     897,   679,   900,   429,   902,   128,    12,    13,    14,   438,
+     652,   680,   439,   909,   440,   681,   345,   441,   762,   763,
+     682,   859,   789,   790,   791,   792,   793,   794,   795,   112,
+     444,   689,  -524,  -524,   303,   729,   304,   451,   452,   305,
+     456,   810,   645,  1060,   812,  -524,   502,  1061,    50,    51,
+     715,  1067,    72,   148,   883,  1068,   329,  -530,   506,   693,
+    -524,   329,  -524,   501,   761,   511,   303,   698,   304,   699,
+    1067,   305,   701,   503,  1094,   150,   504,    72,   843,   505,
+     184,   185,   731,   186,   762,   763,   764,   508,   303,  -530,
+     304,    50,    51,   305,   534,   854,   148,   128,    12,    13,
+      14,    15,   346,   538,   496,   707,    41,    42,   706,   709,
+     539,  -260,   708,   711,   712,  -567,  -567,   710,  -567,   150,
+     128,    12,    13,    14,   303,   545,   304,   684,   685,   305,
+     128,    12,    13,    14,   832,   833,   418,  -525,  -525,   540,
+     782,   889,   547,  -566,  -566,   753,  -566,   548,   758,   549,
+    -525,   627,   721,   630,   433,   726,   147,    50,    51,  1125,
+    1126,   303,   148,   304,   633,  -525,   305,  -525,    92,   112,
+     632,    93,   350,   351,   352,   745,   493,   816,   641,   147,
+     497,   928,   929,   934,   935,   642,    72,  -523,  -523,   720,
+     991,   992,   723,   420,   421,   891,   892,   893,   530,   112,
+    -523,   796,   951,   796,   336,   338,   422,   778,   956,   762,
+     763,  1075,  -529,   644,   198,  -523,   783,  -523,   729,   343,
+     158,   423,   -43,   424,   788,   520,   971,  -522,  -522,   526,
+     -70,    95,   -66,   -67,   975,   -68,   -62,   758,   -63,   -65,
+    -522,   -64,   197,   520,   149,   526,   520,   526,   -69,   303,
+     329,   304,    89,   653,   305,  -522,   654,  -522,   831,   958,
+     892,   893,   656,   658,   661,   731,   662,   665,   652,   667,
+     150,    92,   112,   150,    93,   765,   669,   671,   674,   672,
+     676,   677,   678,   340,   687,  1006,   688,   694,   128,    12,
+      13,    14,    15,   820,   697,   703,   705,   856,  -553,  -555,
+     736,   714,   796,   329,   718,   446,   744,   748,   530,   112,
+     530,   112,   754,   789,   790,   791,   792,   793,   794,   795,
+    1041,   750,   752,   775,  -529,   756,   776,  1043,   923,   777,
+     779,   835,   780,   781,    95,   433,   329,   804,   343,   837,
+     814,  1059,   915,    72,   813,   822,   861,   147,    50,    51,
+     824,   841,   845,   148,   846,   851,  1071,   852,   853,  -199,
+     858,   862,   150,   863,   796,   866,   896,   865,   765,  1021,
+     878,  -554,   765,   884,   880,   903,   899,    72,   901,   887,
+     384,   898,   904,   905,   910,  1091,   970,   530,   112,   907,
+     908,   931,   933,   850,  1098,   758,  1036,   932,  1101,   936,
+     942,  1103,  -128,   945,   946,   947,   949,    41,   765,   948,
+     980,   952,  1109,   959,   960,  1111,  1112,   953,   973,   979,
+     954,   831,   915,   967,   789,   790,   791,   792,   793,   794,
+     795,   955,  1014,   530,   112,   149,   789,   790,   791,   792,
+     793,   794,   795,    89,   965,   968,   983,   985,  1128,   944,
+     987,   995,   997,   150,   530,   112,  1018,  1003,   765,   765,
+     765,   765,  1033,  1004,  1042,  1046,    72,  1045,  1058,   530,
+     112,  1063,   915,  1050,   -74,  1036,   765,   765,  1062,   -54,
+     915,   -55,  1064,  1072,  1073,  1074,  1076,  1007,  1079,  -482,
+    1008,  1087,  1044,  1081,  1084,  1085,  1086,  1088,  1097,  1057,
+    1100,  1105,  1102,  1110,   530,   112,  1122,   191,  1050,   450,
+     673,   150,   906,   647,   999,   435,   887,   749,  1001,   885,
+     150,   966,  1005,   938,   864,   978,   849,   765,   941,   915,
+     747,   648,   650,   977,  1057,  1083,  1090,  1066,   915,   530,
+     112,   530,   112,   639,   765,  1108,  1095,   629,  1099,   414,
+     565,   716,   765,   765,   765,   765,   695,   751,     0,     0,
+    -345,   158,  -347,  1118,   593,     0,     0,     0,  1080,     0,
+     758,   789,   790,   791,   792,   793,   794,   795,     0,     0,
+    1089,   588,   592,   596,   596,  1092,  1093,     0,   765,     0,
+       0,     0,  1096,     0,     0,     0,   530,   112,     0,   530,
+     112,   530,   112,     0,     0,     0,     0,     0,   796,     0,
+       0,   621,     0,   911,   596,   596,   624,   150,     0,  1114,
+       0,  -346,     0,     0,   150,     0,   530,   112,     0,     0,
+     789,   790,   791,   792,   793,   794,   795,   913,     0,  -568,
+    -568,   358,   359,   360,   361,   362,   363,     0,   197,     0,
+       0,   719,     0,     0,     0,     0,     0,     4,     5,   150,
+      72,   158,     6,     7,     8,     0,     9,    10,    11,    12,
+      13,    14,    15,    16,   367,    17,     0,     0,    18,    19,
+      20,    21,    22,     0,     0,     0,    23,    24,    25,     0,
+      26,    27,    28,    29,     0,   150,     0,    30,    31,    32,
+       0,    33,     0,    34,     0,    35,     0,     0,    36,     0,
+       0,     0,    37,    38,    39,    40,    41,    42,     0,    44,
+      45,     0,     0,    46,     0,     0,    48,    49,     0,     0,
+       0,     0,     0,   130,     0,    53,    54,    55,     0,     0,
+       0,     0,     0,     0,     0,     0,    62,    63,     0,    64,
+      65,    66,    67,    68,    69,    70,    71,    72,     0,     0,
+       0,  -568,  -568,     0,   377,   378,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,    73,    74,    75,    76,    77,    78,    79,    80,    81,
+       0,     0,   380,     0,     0,     0,     0,     0,     0,    82,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,    83,     0,    84,    85,   722,
+      86,    87,    88,    89,     0,     4,     5,     0,     0,     0,
+       6,     7,     8,     0,     9,    10,    11,    12,    13,    14,
+      15,    16,     0,    17,     0,     0,    18,    19,    20,    21,
+      22,     0,     0,     0,    23,    24,    25,     0,    26,    27,
+      28,    29,     0,     0,     0,    30,    31,    32,     0,    33,
+       0,    34,     0,    35,     0,     0,    36,     0,     0,     0,
+      37,    38,    39,    40,    41,    42,     0,    44,    45,     0,
+       0,    46,     0,     0,    48,    49,     0,     0,     0,     0,
+       0,   130,     0,    53,    54,    55,     0,     0,     0,     0,
+       0,     0,     0,     0,    62,    63,     0,    64,    65,    66,
+      67,    68,    69,    70,    71,    72,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    73,
+      74,    75,    76,    77,    78,    79,    80,    81,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,    82,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,    83,     0,    84,    85,   819,    86,    87,
+      88,    89,     0,     4,     5,     0,     0,     0,     6,     7,
+       8,     0,     9,    10,    11,    12,    13,    14,    15,    16,
+       0,    17,     0,     0,    18,    19,    20,    21,    22,     0,
+       0,     0,    23,    24,    25,     0,    26,    27,    28,    29,
+       0,     0,     0,    30,    31,    32,     0,    33,     0,    34,
+       0,    35,     0,     0,    36,     0,     0,     0,    37,    38,
+      39,    40,    41,    42,     0,    44,    45,     0,     0,    46,
+       0,     0,    48,    49,     0,     0,     0,     0,     0,   130,
+       0,    53,    54,    55,     0,     0,     0,     0,     0,     0,
+       0,     0,    62,    63,     0,    64,    65,    66,    67,    68,
+      69,    70,    71,    72,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,    73,    74,    75,
+      76,    77,    78,    79,    80,    81,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,    82,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,    83,     0,    84,    85,   886,    86,    87,    88,    89,
+       0,     4,     5,     0,     0,     0,     6,     7,     8,     0,
+       9,    10,    11,    12,    13,    14,    15,    16,     0,    17,
+       0,     0,    18,    19,    20,    21,    22,     0,     0,     0,
+      23,    24,    25,     0,    26,    27,    28,    29,     0,     0,
+       0,    30,    31,    32,     0,    33,     0,    34,     0,    35,
+       0,     0,    36,     0,     0,     0,    37,    38,    39,    40,
+      41,    42,     0,    44,    45,     0,     0,    46,     0,     0,
+      48,    49,     0,     0,     0,     0,     0,   130,     0,    53,
+      54,    55,     0,     0,     0,     0,     0,     0,     0,     0,
+      62,    63,     0,    64,    65,    66,    67,    68,    69,    70,
+      71,    72,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,    73,    74,    75,    76,    77,
+      78,    79,    80,    81,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,    82,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    83,
+       0,    84,    85,   998,    86,    87,    88,    89,     0,     4,
+       5,     0,     0,     0,     6,     7,     8,     0,     9,    10,
+      11,    12,    13,    14,    15,    16,     0,    17,     0,     0,
+      18,    19,    20,    21,    22,     0,     0,     0,    23,    24,
+      25,     0,    26,    27,    28,    29,     0,     0,     0,    30,
+      31,    32,     0,    33,     0,    34,     0,    35,     0,     0,
+      36,     0,     0,     0,    37,    38,    39,    40,    41,    42,
+       0,    44,    45,     0,     0,    46,     0,     0,    48,    49,
+       0,     0,     0,     0,     0,   130,     0,    53,    54,    55,
+       0,     0,     0,     0,     0,     0,     0,     0,    62,    63,
+       0,    64,    65,    66,    67,    68,    69,    70,    71,    72,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,    73,    74,    75,    76,    77,    78,    79,
+      80,    81,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,    82,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,    83,     0,    84,
+      85,   550,    86,    87,    88,    89,     0,     4,     5,     0,
+       0,     0,     6,     7,     8,     0,     9,    10,   128,    12,
+      13,    14,    15,     0,     0,    17,     0,     0,    18,    19,
+      20,    21,    22,     0,     0,   911,    23,    24,    25,     0,
+      26,    27,    28,  -346,     0,     0,     0,     0,     0,   912,
+       0,     0,   789,   790,   791,   792,   793,   794,   795,   913,
+       0,     0,    37,     0,     0,     0,    41,    42,    41,    42,
+       0,     0,     0,    46,     0,     0,     0,   129,     0,   342,
+      50,    51,    72,   130,     0,   148,    54,    55,     0,     0,
+       0,    57,    58,    59,    60,     0,    62,    63,     0,    64,
+      65,    66,    67,    68,    69,    70,    71,    72,     0,    72,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,    73,    74,    75,    76,    77,    78,    79,    80,    81,
+       0,     0,     0,     0,   914,     0,     0,     0,     0,    82,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,    83,     0,     0,   -47,     0,
+      86,    87,    88,    89,     4,     5,   394,     0,     0,     6,
+       7,     8,     0,     9,    10,   128,    12,    13,    14,    15,
+       0,     0,    17,     0,     0,    18,    19,    20,    21,    22,
+       0,     0,   911,    23,    24,    25,     0,    26,    27,    28,
+    -346,     0,     0,     0,     0,     0,   912,     0,     0,   789,
+     790,   791,   792,   793,   794,   795,   913,     0,     0,    37,
+       0,     0,     0,    41,    42,     0,     0,     0,     0,     0,
+      46,     0,     0,     0,   129,     0,     0,     0,     0,    72,
+     130,     0,     0,    54,    55,     0,     0,     0,     0,     0,
+       0,     0,     0,    62,    63,     0,    64,    65,    66,    67,
+      68,    69,    70,    71,    72,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   395,   396,   397,   398,   399,
+     400,   401,   402,   403,   404,   405,   406,     0,    73,    74,
+      75,    76,    77,    78,    79,    80,    81,     0,   407,   408,
+       0,   981,     0,     0,     0,     0,    82,  -522,  -522,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    -522,     0,    83,     0,     0,   409,     0,    86,    87,    88,
+      89,     0,     0,     0,     0,  -522,   353,  -522,   354,   355,
+     356,   357,   358,   359,   360,   361,   362,   363,     0,     0,
+     353,     0,   354,   355,   356,   357,   358,   359,   360,   361,
+     362,   363,     0,     0,     0,     0,     0,     0,     0,   364,
+     365,   366,     0,     0,     0,   367,     0,     0,     0,     0,
+       0,     0,     0,   364,   365,   366,     0,     0,     0,   367,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     353,     0,   354,   355,   356,   357,   358,   359,   360,   361,
+     362,   363,     0,     0,   353,     0,   354,   355,   356,   357,
+     358,   359,   360,   361,   362,   363,     0,     0,     0,     0,
+       0,     0,     0,   364,   365,   366,     0,     0,     0,   367,
+       0,     0,     0,     0,     0,     0,     0,   364,   365,   366,
+       0,     0,     0,   367,     0,     0,   368,   369,   370,   371,
+     372,   373,   374,   375,   376,   377,   378,     0,     0,     0,
+     368,   369,   370,   371,   372,   373,   374,   375,   376,   377,
+     378,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   379,   380,     0,   381,   382,     0,     0,     0,
+       0,     0,     0,     0,     0,   686,   379,   380,     0,   381,
+     382,     0,     0,     0,     0,     0,     0,     0,     0,   696,
+     368,   369,   370,   371,   372,   373,   374,   375,   376,   377,
+     378,     0,     0,     0,   368,   369,   370,   371,   372,   373,
+     374,   375,   376,   377,   378,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   379,   380,     0,   381,
+     382,     0,     0,     0,     0,     0,     0,     0,     0,   713,
+     379,   380,     0,   381,   382,     0,     0,     0,     0,     0,
+       0,     0,   353,   717,   354,   355,   356,   357,   358,   359,
+     360,   361,   362,   363,     0,     0,   353,     0,   354,   355,
+     356,   357,   358,   359,   360,   361,   362,   363,     0,     0,
+       0,     0,     0,     0,     0,   364,   365,   366,     0,     0,
+       0,   367,     0,     0,     0,     0,     0,     0,     0,   364,
+     365,   366,     0,     0,     0,   367,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   353,     0,   354,   355,
+     356,   357,   358,   359,   360,   361,   362,   363,     0,     0,
+     353,   961,   354,   355,   356,   357,   358,   359,   360,   361,
+     362,   363,     0,     0,     0,     0,     0,     0,     0,   364,
+     365,   366,     0,     0,     0,   367,     0,     0,     0,     0,
+       0,     0,     0,   364,   365,   366,     0,     0,     0,   367,
+       0,     0,   368,   369,   370,   371,   372,   373,   374,   375,
+     376,   377,   378,     0,     0,     0,   368,   369,   370,   371,
+     372,   373,   374,   375,   376,   377,   378,   354,   355,   356,
+     357,   358,   359,   360,   361,   362,   363,     0,   379,   380,
+       0,   381,   382,     0,     0,     0,     0,     0,     0,     0,
+       0,   806,   379,   380,     0,   381,   382,     0,     0,     0,
+       0,     0,     0,     0,   367,   807,   368,   369,   370,   371,
+     372,   373,   374,   375,   376,   377,   378,     0,     0,     0,
+     368,   369,   370,   371,   372,   373,   374,   375,   376,   377,
+     378,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   379,   380,     0,   381,   382,   356,   357,   358,
+     359,   360,   361,   362,   363,   808,   379,   380,     0,   381,
+     382,     0,     0,     0,     0,     0,   353,   962,   354,   355,
+     356,   357,   358,   359,   360,   361,   362,   363,     0,     0,
+       0,     0,   367,     0,     0,   368,   369,   370,   371,   372,
+     373,   374,   375,   376,   377,   378,   911,     0,     0,   364,
+     365,   366,     0,     0,  -346,   367,     0,     0,     0,     0,
+     912,     0,     0,   789,   790,   791,   792,   793,   794,   795,
+     913,   379,   380,     0,   381,   382,     0,     0,   911,     0,
+       0,     0,     0,     0,     0,     0,  -346,     0,     0,     0,
+       0,     0,   912,    72,     0,   789,   790,   791,   792,   793,
+     794,   795,   913,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   370,   371,   372,   373,   374,
+     375,   376,   377,   378,     0,    72,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   368,   369,   370,   371,
+     372,   373,   374,   375,   376,   377,   378,     0,     0,     0,
+     380,     0,   381,   382,     0,  1013,     0,     0,     0,     0,
+     353,     0,   354,   355,   356,   357,   358,   359,   360,   361,
+     362,   363,   379,   380,     0,   381,   382,     0,     0,     4,
+       5,     0,     0,   383,     6,     7,     8,  1030,     9,    10,
+     459,    12,    13,    14,    15,     0,     0,    17,     0,   367,
+     460,   461,   462,   463,   464,   219,   220,   221,   465,   466,
+      25,   224,   467,   468,   469,   228,   229,   230,   231,   232,
+     233,   234,   235,   236,   237,   238,   239,   240,   241,   242,
+     243,   244,   245,   246,   470,   248,   249,   250,   471,   472,
+     253,   254,   255,   256,   257,   473,   259,   260,   261,   474,
+     263,   264,   265,   266,   267,   475,   269,   270,   476,   477,
+       0,   273,   274,   275,   276,   277,   278,   279,   478,   479,
+     282,   480,   481,   482,   483,   484,   485,   486,   487,    72,
+     368,   369,   370,   371,   372,   373,   374,   375,   376,   377,
+     378,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   412,    73,    74,    75,    76,    77,    78,    79,
+      80,    81,     0,     0,     0,     0,   379,   380,     0,   381,
+     382,    82,     0,     0,     0,     0,     0,   488,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,    83,   489,     0,
+       0,     0,    86,    87,    88,    89,     4,     5,     0,     0,
+       0,     6,     7,     8,     0,     9,    10,   459,    12,    13,
+      14,    15,     0,     0,    17,     0,     0,   460,   461,   462,
+     463,   464,   219,   220,   221,   465,   466,    25,   224,   467,
+     468,   469,   228,   229,   230,   231,   232,   233,   234,   235,
+     236,   237,   238,   239,   240,   241,   242,   243,   244,   245,
+     246,   470,   248,   249,   250,   471,   472,   253,   254,   255,
+     256,   257,   473,   259,   260,   261,   474,   263,   264,   265,
+     266,   267,   475,   269,   270,   476,   477,     0,   273,   274,
+     275,   276,   277,   278,   279,   478,   479,   282,   480,   481,
+     482,   483,   484,   485,   486,   487,    72,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+      73,    74,    75,    76,    77,    78,    79,    80,    81,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    82,     0,
+       0,     0,     0,     0,   746,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,    83,     0,     0,     0,     0,    86,
+      87,    88,    89,     4,     5,     0,     0,     0,     6,     7,
+       8,     0,     9,    10,    11,    12,    13,    14,    15,    16,
+       0,    17,     0,     0,    18,    19,    20,    21,    22,     0,
+       0,     0,    23,    24,    25,     0,    26,    27,    28,    29,
+       0,     0,     0,    30,    31,    32,     0,    33,     0,    34,
+       0,    35,     0,     0,    36,     0,     0,     0,    37,    38,
+      39,    40,    41,    42,    43,    44,    45,     0,     0,    46,
+      47,     0,    48,    49,    50,    51,     0,     0,     0,    52,
+       0,    53,    54,    55,    56,    57,    58,    59,    60,     0,
+       0,    61,    62,    63,     0,    64,    65,    66,    67,    68,
+      69,    70,    71,    72,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,    73,    74,    75,
+      76,    77,    78,    79,    80,    81,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,    82,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,    83,     0,    84,    85,   774,    86,    87,    88,    89,
+       4,     5,     0,     0,     0,     6,     7,     8,     0,     9,
+      10,    11,    12,    13,    14,    15,    16,     0,    17,     0,
+       0,    18,    19,    20,    21,    22,     0,     0,     0,    23,
+      24,    25,     0,    26,    27,    28,    29,     0,     0,     0,
+      30,    31,    32,     0,    33,     0,    34,     0,    35,     0,
+       0,    36,     0,     0,     0,    37,    38,    39,    40,    41,
+      42,    43,    44,    45,     0,     0,    46,    47,     0,    48,
+      49,    50,    51,     0,     0,     0,    52,     0,    53,    54,
+      55,    56,    57,    58,    59,    60,     0,     0,    61,    62,
+      63,     0,    64,    65,    66,    67,    68,    69,    70,    71,
+      72,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,    73,    74,    75,    76,    77,    78,
+      79,    80,    81,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,    82,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    83,     0,
+      84,    85,   855,    86,    87,    88,    89,     4,     5,     0,
+       0,     0,     6,     7,     8,     0,     9,    10,    11,    12,
+      13,    14,    15,    16,     0,    17,     0,     0,    18,    19,
+      20,    21,    22,     0,     0,     0,    23,    24,    25,     0,
+      26,    27,    28,    29,     0,     0,     0,    30,    31,    32,
+       0,    33,     0,    34,     0,    35,     0,     0,    36,     0,
+       0,     0,    37,    38,    39,    40,    41,    42,    43,    44,
+      45,     0,     0,    46,    47,     0,    48,    49,    50,    51,
+       0,     0,     0,    52,     0,    53,    54,    55,    56,    57,
+      58,    59,    60,     0,     0,    61,    62,    63,     0,    64,
+      65,    66,    67,    68,    69,    70,    71,    72,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,    73,    74,    75,    76,    77,    78,    79,    80,    81,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    82,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,    12,    13,     0,     0,     0,    14,     0,    15,
-      16,    17,    18,    19,    20,    21,    22,    23,     0,    24,
-       0,     0,     0,    25,    26,    27,    28,    29,    30,    31,
-      32,     0,    33,     0,     0,    34,    35,    36,    37,     0,
-      38,    39,    40,     0,    41,     0,    42,     0,    43,     0,
-       0,    44,     0,     0,     0,    45,    46,    47,    48,    49,
-      50,     0,    52,    53,     0,     0,     0,     0,    55,    56,
-      57,    58,     0,     0,     0,    59,     0,    60,    61,    62,
-     528,    64,    65,    66,    67,     0,     0,     0,    69,    70,
-       0,    71,    72,    73,    74,    75,    76,    77,    78,    79,
-      80,    81,     4,     0,     5,     6,     7,     8,     0,     0,
-      82,     9,    10,     0,    11,     0,     0,     0,     0,     0,
-       0,    83,     0,    84,    85,   529,    86,    87,    88,    89,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-      12,    13,     0,     0,     0,    14,     0,    15,    16,    17,
-      18,    19,    20,    21,    22,    23,     0,    24,     0,     0,
-       0,    25,    26,    27,    28,    29,    30,    31,    32,     0,
-      33,     0,     0,    34,    35,    36,    37,     0,    38,    39,
-      40,     0,    41,     0,    42,     0,    43,     0,     0,    44,
-       0,     0,     0,    45,    46,    47,    48,    49,    50,     0,
-      52,    53,     0,     0,     0,     0,    55,    56,    57,    58,
-       0,     0,     0,    59,     0,    60,    61,    62,   528,    64,
-      65,    66,    67,     0,     0,     0,    69,    70,     0,    71,
-      72,    73,    74,    75,    76,    77,    78,    79,    80,    81,
-       4,     0,     5,     6,     7,     8,     0,     0,    82,     9,
-      10,     0,    11,     0,     0,     0,     0,     0,     0,    83,
-       0,    84,    85,   640,    86,    87,    88,    89,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,    12,    13,
-       0,     0,     0,    14,     0,    15,    16,    17,    18,    19,
-      20,    21,    22,    23,     0,    24,     0,     0,     0,    25,
-      26,    27,    28,    29,    30,    31,    32,     0,    33,     0,
-       0,    34,    35,    36,    37,   787,    38,    39,    40,     0,
-      41,     0,    42,     0,    43,     0,     0,    44,     0,     0,
-       0,    45,    46,    47,    48,    49,    50,     0,    52,    53,
-       0,     0,     0,     0,    55,    56,    57,    58,     0,     0,
-       0,    59,     0,    60,    61,    62,   528,    64,    65,    66,
-      67,     0,     0,     0,    69,    70,     0,    71,    72,    73,
-      74,    75,    76,    77,    78,    79,    80,    81,     4,     0,
-       5,     6,     7,     8,     0,     0,    82,     9,    10,     0,
-      11,     0,     0,     0,     0,     0,     0,    83,     0,    84,
-      85,     0,    86,    87,    88,    89,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,    12,    13,     0,     0,
-       0,    14,     0,    15,    16,    17,    18,    19,    20,    21,
-      22,    23,     0,    24,     0,     0,     0,    25,    26,    27,
-      28,    29,    30,    31,    32,     0,    33,     0,     0,    34,
-      35,    36,    37,     0,    38,    39,    40,   881,    41,     0,
-      42,     0,    43,     0,     0,    44,     0,     0,     0,    45,
-      46,    47,    48,    49,    50,     0,    52,    53,     0,     0,
-       0,     0,    55,    56,    57,    58,     0,     0,     0,    59,
-       0,    60,    61,    62,   528,    64,    65,    66,    67,     0,
-       0,     0,    69,    70,     0,    71,    72,    73,    74,    75,
-      76,    77,    78,    79,    80,    81,     4,     0,     5,     6,
-       7,     8,     0,     0,    82,     9,    10,     0,    11,     0,
        0,     0,     0,     0,     0,    83,     0,    84,    85,     0,
-      86,    87,    88,    89,     0,     0,     0,     0,     0,     0,
+      86,    87,    88,    89,     4,     5,     0,     0,     0,     6,
+       7,     8,     0,     9,    10,    11,    12,    13,    14,    15,
+      16,     0,    17,     0,     0,    18,    19,    20,    21,    22,
+       0,     0,     0,    23,    24,    25,     0,    26,    27,    28,
+      29,     0,     0,     0,    30,    31,    32,     0,    33,     0,
+      34,     0,    35,     0,     0,    36,     0,     0,     0,    37,
+      38,    39,    40,    41,    42,     0,    44,    45,     0,     0,
+      46,     0,     0,    48,    49,    50,    51,     0,     0,     0,
+      52,     0,    53,    54,    55,   528,    57,    58,    59,    60,
+       0,     0,     0,    62,    63,     0,    64,    65,    66,    67,
+      68,    69,    70,    71,    72,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    73,    74,
+      75,    76,    77,    78,    79,    80,    81,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,    82,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,    83,     0,    84,    85,   529,    86,    87,    88,
+      89,     4,     5,     0,     0,     0,     6,     7,     8,     0,
+       9,    10,    11,    12,    13,    14,    15,    16,     0,    17,
+       0,     0,    18,    19,    20,    21,    22,     0,     0,     0,
+      23,    24,    25,     0,    26,    27,    28,    29,     0,     0,
+       0,    30,    31,    32,     0,    33,     0,    34,     0,    35,
+       0,     0,    36,     0,     0,     0,    37,    38,    39,    40,
+      41,    42,     0,    44,    45,     0,     0,    46,     0,     0,
+      48,    49,    50,    51,     0,     0,     0,    52,     0,    53,
+      54,    55,   528,    57,    58,    59,    60,     0,     0,     0,
+      62,    63,     0,    64,    65,    66,    67,    68,    69,    70,
+      71,    72,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,    73,    74,    75,    76,    77,
+      78,    79,    80,    81,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,    82,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    83,
+       0,    84,    85,   640,    86,    87,    88,    89,     4,     5,
+       0,     0,     0,     6,     7,     8,     0,     9,    10,    11,
+      12,    13,    14,    15,    16,     0,    17,     0,     0,    18,
+      19,    20,    21,    22,     0,     0,     0,    23,    24,    25,
+       0,    26,    27,    28,    29,     0,     0,   787,    30,    31,
+      32,     0,    33,     0,    34,     0,    35,     0,     0,    36,
+       0,     0,     0,    37,    38,    39,    40,    41,    42,     0,
+      44,    45,     0,     0,    46,     0,     0,    48,    49,    50,
+      51,     0,     0,     0,    52,     0,    53,    54,    55,   528,
+      57,    58,    59,    60,     0,     0,     0,    62,    63,     0,
+      64,    65,    66,    67,    68,    69,    70,    71,    72,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,    73,    74,    75,    76,    77,    78,    79,    80,
+      81,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+      82,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,    83,     0,    84,    85,
+       0,    86,    87,    88,    89,     4,     5,     0,     0,     0,
+       6,     7,     8,     0,     9,    10,    11,    12,    13,    14,
+      15,    16,     0,    17,     0,     0,    18,    19,    20,    21,
+      22,     0,     0,     0,    23,    24,    25,     0,    26,    27,
+      28,    29,     0,     0,     0,    30,    31,    32,   881,    33,
+       0,    34,     0,    35,     0,     0,    36,     0,     0,     0,
+      37,    38,    39,    40,    41,    42,     0,    44,    45,     0,
+       0,    46,     0,     0,    48,    49,    50,    51,     0,     0,
+       0,    52,     0,    53,    54,    55,   528,    57,    58,    59,
+      60,     0,     0,     0,    62,    63,     0,    64,    65,    66,
+      67,    68,    69,    70,    71,    72,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    73,
+      74,    75,    76,    77,    78,    79,    80,    81,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,    82,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    12,    13,     0,     0,     0,    14,
-       0,    15,    16,    17,    18,    19,    20,    21,    22,    23,
-       0,    24,     0,     0,     0,    25,    26,    27,    28,    29,
-      30,    31,    32,     0,    33,     0,     0,    34,    35,    36,
-      37,     0,    38,    39,    40,     0,    41,     0,    42,     0,
-      43,   957,     0,    44,     0,     0,     0,    45,    46,    47,
-      48,    49,    50,     0,    52,    53,     0,     0,     0,     0,
-      55,    56,    57,    58,     0,     0,     0,    59,     0,    60,
-      61,    62,   528,    64,    65,    66,    67,     0,     0,     0,
-      69,    70,     0,    71,    72,    73,    74,    75,    76,    77,
-      78,    79,    80,    81,     4,     0,     5,     6,     7,     8,
-       0,     0,    82,     9,    10,     0,    11,     0,     0,     0,
        0,     0,     0,    83,     0,    84,    85,     0,    86,    87,
-      88,    89,     0,     0,     0,     0,     0,     0,     0,     0,
+      88,    89,     4,     5,     0,     0,     0,     6,     7,     8,
+       0,     9,    10,    11,    12,    13,    14,    15,    16,     0,
+      17,     0,     0,    18,    19,    20,    21,    22,     0,     0,
+       0,    23,    24,    25,     0,    26,    27,    28,    29,     0,
+       0,     0,    30,    31,    32,     0,    33,     0,    34,     0,
+      35,   957,     0,    36,     0,     0,     0,    37,    38,    39,
+      40,    41,    42,     0,    44,    45,     0,     0,    46,     0,
+       0,    48,    49,    50,    51,     0,     0,     0,    52,     0,
+      53,    54,    55,   528,    57,    58,    59,    60,     0,     0,
+       0,    62,    63,     0,    64,    65,    66,    67,    68,    69,
+      70,    71,    72,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,    12,    13,     0,     0,     0,    14,     0,    15,
-      16,    17,    18,    19,    20,    21,    22,    23,     0,    24,
-       0,     0,     0,    25,    26,    27,    28,    29,    30,    31,
-      32,     0,    33,     0,     0,    34,    35,    36,    37,     0,
-      38,    39,    40,     0,    41,     0,    42,  1002,    43,     0,
-       0,    44,     0,     0,     0,    45,    46,    47,    48,    49,
-      50,     0,    52,    53,     0,     0,     0,     0,    55,    56,
-      57,    58,     0,     0,     0,    59,     0,    60,    61,    62,
-     528,    64,    65,    66,    67,     0,     0,     0,    69,    70,
-       0,    71,    72,    73,    74,    75,    76,    77,    78,    79,
-      80,    81,     4,     0,     5,     6,     7,     8,     0,     0,
-      82,     9,    10,     0,    11,     0,     0,     0,     0,     0,
-       0,    83,     0,    84,    85,     0,    86,    87,    88,    89,
+       0,     0,     0,     0,     0,     0,    73,    74,    75,    76,
+      77,    78,    79,    80,    81,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,    82,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+      83,     0,    84,    85,     0,    86,    87,    88,    89,     4,
+       5,     0,     0,     0,     6,     7,     8,     0,     9,    10,
+      11,    12,    13,    14,    15,    16,     0,    17,     0,     0,
+      18,    19,    20,    21,    22,     0,     0,     0,    23,    24,
+      25,     0,    26,    27,    28,    29,     0,     0,     0,    30,
+      31,    32,     0,    33,     0,    34,  1002,    35,     0,     0,
+      36,     0,     0,     0,    37,    38,    39,    40,    41,    42,
+       0,    44,    45,     0,     0,    46,     0,     0,    48,    49,
+      50,    51,     0,     0,     0,    52,     0,    53,    54,    55,
+     528,    57,    58,    59,    60,     0,     0,     0,    62,    63,
+       0,    64,    65,    66,    67,    68,    69,    70,    71,    72,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,    73,    74,    75,    76,    77,    78,    79,
+      80,    81,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,    82,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,    83,     0,    84,
+      85,     0,    86,    87,    88,    89,     4,     5,     0,     0,
+       0,     6,     7,     8,     0,     9,    10,    11,    12,    13,
+      14,    15,    16,     0,    17,     0,     0,    18,    19,    20,
+      21,    22,     0,     0,     0,    23,    24,    25,     0,    26,
+      27,    28,    29,     0,     0,     0,    30,    31,    32,     0,
+      33,     0,    34,     0,    35,     0,     0,    36,     0,     0,
+       0,    37,    38,    39,    40,    41,    42,     0,    44,    45,
+       0,     0,    46,     0,     0,    48,    49,    50,    51,     0,
+       0,     0,    52,     0,    53,    54,    55,   528,    57,    58,
+      59,    60,     0,     0,     0,    62,    63,     0,    64,    65,
+      66,    67,    68,    69,    70,    71,    72,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+      73,    74,    75,    76,    77,    78,    79,    80,    81,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    82,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,    83,     0,    84,    85,  1012,    86,
+      87,    88,    89,     4,     5,     0,     0,     0,     6,     7,
+       8,     0,     9,    10,    11,    12,    13,    14,    15,    16,
+       0,    17,     0,     0,    18,    19,    20,    21,    22,     0,
+       0,     0,    23,    24,    25,     0,    26,    27,    28,    29,
+       0,     0,     0,    30,    31,    32,     0,    33,  1078,    34,
+       0,    35,     0,     0,    36,     0,     0,     0,    37,    38,
+      39,    40,    41,    42,     0,    44,    45,     0,     0,    46,
+       0,     0,    48,    49,    50,    51,     0,     0,     0,    52,
+       0,    53,    54,    55,   528,    57,    58,    59,    60,     0,
+       0,     0,    62,    63,     0,    64,    65,    66,    67,    68,
+      69,    70,    71,    72,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,    73,    74,    75,
+      76,    77,    78,    79,    80,    81,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,    82,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-      12,    13,     0,     0,     0,    14,     0,    15,    16,    17,
-      18,    19,    20,    21,    22,    23,     0,    24,     0,     0,
-       0,    25,    26,    27,    28,    29,    30,    31,    32,     0,
-      33,     0,     0,    34,    35,    36,    37,     0,    38,    39,
-      40,     0,    41,     0,    42,     0,    43,     0,     0,    44,
-       0,     0,     0,    45,    46,    47,    48,    49,    50,     0,
-      52,    53,     0,     0,     0,     0,    55,    56,    57,    58,
-       0,     0,     0,    59,     0,    60,    61,    62,   528,    64,
-      65,    66,    67,     0,     0,     0,    69,    70,     0,    71,
-      72,    73,    74,    75,    76,    77,    78,    79,    80,    81,
-       4,     0,     5,     6,     7,     8,     0,     0,    82,     9,
-      10,     0,    11,     0,     0,     0,     0,     0,     0,    83,
-       0,    84,    85,  1012,    86,    87,    88,    89,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,    12,    13,
-       0,     0,     0,    14,     0,    15,    16,    17,    18,    19,
-      20,    21,    22,    23,     0,    24,     0,     0,     0,    25,
-      26,    27,    28,    29,    30,    31,    32,     0,    33,     0,
-       0,    34,    35,    36,    37,     0,    38,    39,    40,     0,
-      41,  1078,    42,     0,    43,     0,     0,    44,     0,     0,
-       0,    45,    46,    47,    48,    49,    50,     0,    52,    53,
-       0,     0,     0,     0,    55,    56,    57,    58,     0,     0,
-       0,    59,     0,    60,    61,    62,   528,    64,    65,    66,
-      67,     0,     0,     0,    69,    70,     0,    71,    72,    73,
-      74,    75,    76,    77,    78,    79,    80,    81,     4,     0,
-       5,     6,     7,     8,     0,     0,    82,     9,    10,     0,
-      11,     0,     0,     0,     0,     0,     0,    83,     0,    84,
-      85,     0,    86,    87,    88,    89,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,    12,    13,     0,     0,
-       0,    14,     0,    15,    16,    17,    18,    19,    20,    21,
-      22,    23,     0,    24,     0,     0,     0,    25,    26,    27,
-      28,    29,    30,    31,    32,     0,    33,     0,     0,    34,
-      35,    36,    37,     0,    38,    39,    40,     0,    41,     0,
-      42,     0,    43,     0,     0,    44,     0,     0,     0,    45,
-      46,    47,    48,    49,    50,     0,    52,    53,     0,     0,
-       0,     0,    55,    56,    57,    58,     0,     0,     0,    59,
-       0,    60,    61,    62,   528,    64,    65,    66,    67,     0,
-       0,     0,    69,    70,     0,    71,    72,    73,    74,    75,
-      76,    77,    78,    79,    80,    81,     4,     0,     5,     6,
-       7,     8,     0,     0,    82,     9,    10,     0,    11,     0,
-       0,     0,     0,     0,     0,    83,     0,    84,    85,  1115,
-      86,    87,    88,    89,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    12,    13,     0,     0,     0,    14,
-       0,    15,    16,    17,    18,    19,    20,    21,    22,    23,
-       0,    24,     0,     0,     0,    25,    26,    27,    28,    29,
-      30,    31,    32,     0,    33,     0,     0,    34,    35,    36,
-      37,     0,    38,    39,    40,     0,    41,     0,    42,     0,
-      43,     0,     0,    44,     0,     0,     0,    45,    46,    47,
-      48,    49,    50,     0,    52,    53,     0,     0,     0,     0,
-      55,    56,    57,    58,     0,     0,     0,    59,     0,    60,
-      61,    62,   528,    64,    65,    66,    67,     0,     0,     0,
-      69,    70,     0,    71,    72,    73,    74,    75,    76,    77,
-      78,    79,    80,    81,     4,     0,     5,     6,     7,     8,
-       0,     0,    82,     9,    10,     0,    11,     0,     0,     0,
-       0,     0,     0,    83,     0,    84,    85,  1116,    86,    87,
-      88,    89,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,    12,    13,     0,     0,     0,    14,     0,    15,
-      16,    17,    18,    19,    20,    21,    22,    23,     0,    24,
-       0,     0,     0,    25,    26,    27,    28,    29,    30,    31,
-      32,     0,    33,     0,     0,    34,    35,    36,    37,     0,
-      38,    39,    40,     0,    41,     0,    42,     0,    43,     0,
-       0,    44,     0,     0,     0,    45,    46,    47,    48,    49,
-      50,     0,    52,    53,     0,     0,     0,     0,    55,    56,
-      57,    58,     0,     0,     0,    59,     0,    60,    61,    62,
-     528,    64,    65,    66,    67,     0,     0,     0,    69,    70,
-       0,    71,    72,    73,    74,    75,    76,    77,    78,    79,
-      80,    81,     4,     0,     5,     6,     7,     8,     0,     0,
-      82,     9,    10,     0,    11,     0,     0,     0,     0,     0,
-       0,    83,     0,    84,    85,  1117,    86,    87,    88,    89,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-      12,    13,     0,     0,     0,    14,     0,    15,    16,    17,
-      18,    19,    20,    21,    22,    23,     0,    24,     0,     0,
-       0,    25,    26,    27,    28,    29,    30,    31,    32,     0,
-      33,     0,     0,    34,    35,    36,    37,     0,    38,    39,
-      40,     0,    41,     0,    42,     0,    43,     0,     0,    44,
-       0,     0,     0,    45,    46,    47,    48,    49,    50,     0,
-      52,    53,     0,     0,     0,     0,    55,    56,    57,    58,
-       0,     0,     0,    59,     0,    60,    61,    62,   528,    64,
-      65,    66,    67,     0,     0,     0,    69,    70,     0,    71,
-      72,    73,    74,    75,    76,    77,    78,    79,    80,    81,
-       4,     0,     5,     6,     7,     8,     0,     0,    82,     9,
-      10,     0,    11,     0,     0,     0,     0,     0,     0,    83,
-       0,    84,    85,  1130,    86,    87,    88,    89,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,    12,    13,
-       0,     0,     0,    14,     0,    15,    16,    17,    18,    19,
-      20,    21,    22,    23,     0,    24,     0,     0,     0,    25,
-      26,    27,    28,    29,    30,    31,    32,     0,    33,     0,
-       0,    34,    35,    36,    37,     0,    38,    39,    40,     0,
-      41,     0,    42,     0,    43,     0,     0,    44,     0,     0,
-       0,    45,    46,    47,    48,    49,    50,     0,    52,    53,
-       0,     0,     0,     0,    55,    56,    57,    58,     0,     0,
-       0,    59,     0,    60,    61,    62,   528,    64,    65,    66,
-      67,     0,     0,     0,    69,    70,     0,    71,    72,    73,
-      74,    75,    76,    77,    78,    79,    80,    81,     0,     0,
-       0,     0,     0,     0,     0,   219,    82,   220,   221,   222,
-     223,   224,   225,   226,   227,   228,     0,    83,     0,    84,
-      85,     0,    86,    87,    88,    89,   356,     0,   357,   358,
-     359,   360,   361,   362,   363,   364,   365,   366,   367,   368,
-     369,   370,   371,   372,   373,   374,   375,   376,   377,   378,
-     379,   380,     0,   381,     0,     0,     0,     0,     0,   229,
-       0,     0,     0,   382,     0,     0,     0,     0,     0,     0,
-     230,     0,   231,   232,     0,     0,   233,     0,     0,     0,
-      31,     0,     0,     0,     0,     0,   235,   236,   237,   238,
-     239,   240,   241,   242,   243,   244,   245,   246,   247,   248,
-     249,   250,   251,   252,   253,   254,   255,   256,   257,   258,
-     259,   260,   261,   262,   263,   264,   265,   266,   267,   268,
-     269,   270,   271,   272,   273,   274,   275,   276,   277,   278,
-     279,     0,   280,   281,   282,   283,   284,   285,   286,   287,
-     288,   289,   290,   291,   292,   293,   294,   295,   296,   297,
-     219,     0,   220,   221,   222,   223,   224,   225,   226,   227,
-     228,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   586,     0,     0,     0,     0,
-      89,   360,   361,   362,   363,   364,   365,   366,   367,   368,
-     369,   370,   371,   372,   373,   374,   375,   376,   377,   378,
-     379,   380,     0,   381,   229,     0,     0,     0,     0,     0,
-       0,     0,     0,   382,     0,   230,     0,   231,   232,     0,
-       0,   233,     0,     0,     0,    31,     0,     0,     0,     0,
-       0,   235,   236,   237,   238,   239,   240,   241,   242,   243,
-     244,   245,   246,   247,   248,   249,   250,   251,   252,   253,
-     254,   255,   256,   257,   258,   259,   260,   261,   262,   263,
-     264,   265,   266,   267,   268,   269,   270,   271,   272,   273,
-     274,   275,   276,   277,   278,   279,     0,   280,   281,   282,
-     283,   284,   285,   286,   287,   288,   289,   290,   291,   292,
-     293,   294,   295,   296,   297,     4,     0,     5,     6,     7,
-       8,     0,     0,     0,     9,    10,     0,    11,     0,     0,
-       0,     0,     0,     0,     0,     0,   911,     0,     0,     0,
-     590,     0,     0,   719,  -346,    89,     0,     0,     0,   912,
-       0,     0,   789,   790,   791,   792,   793,   794,   795,   913,
-       0,     0,     0,    12,    13,     0,     0,     0,    14,     0,
-      15,    16,    17,    18,    19,    20,    21,    22,    23,     0,
-      24,     0,    79,     0,    25,    26,    27,    28,    29,    30,
-      31,    32,     0,    33,     0,     0,    34,    35,    36,    37,
-       0,    38,    39,    40,     0,    41,     0,    42,   981,    43,
-       0,     0,    44,     0,     0,     0,    45,    46,    47,    48,
-      49,    50,     0,    52,    53,     0,     0,     0,     0,    55,
-      56,     0,     0,     0,     0,     0,   130,     0,    60,    61,
-      62,     0,     0,     0,     0,     0,     0,     0,     0,    69,
-      70,     0,    71,    72,    73,    74,    75,    76,    77,    78,
-      79,    80,    81,     4,     0,     5,     6,     7,     8,     0,
-       0,    82,     9,    10,     0,    11,     0,     0,     0,     0,
-       0,     0,    83,     0,    84,    85,     0,    86,    87,    88,
-      89,   722,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    12,    13,     0,     0,     0,    14,     0,    15,    16,
-      17,    18,    19,    20,    21,    22,    23,     0,    24,     0,
-       0,     0,    25,    26,    27,    28,    29,    30,    31,    32,
-       0,    33,     0,     0,    34,    35,    36,    37,     0,    38,
-      39,    40,     0,    41,     0,    42,     0,    43,     0,     0,
-      44,     0,     0,     0,    45,    46,    47,    48,    49,    50,
-       0,    52,    53,     0,     0,     0,     0,    55,    56,     0,
-       0,     0,     0,     0,   130,     0,    60,    61,    62,     0,
-       0,     0,     0,     0,     0,     0,     0,    69,    70,     0,
-      71,    72,    73,    74,    75,    76,    77,    78,    79,    80,
-      81,     4,     0,     5,     6,     7,     8,     0,     0,    82,
-       9,    10,     0,    11,     0,     0,     0,     0,     0,     0,
-      83,     0,    84,    85,     0,    86,    87,    88,    89,   819,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,    12,
-      13,     0,     0,     0,    14,     0,    15,    16,    17,    18,
-      19,    20,    21,    22,    23,     0,    24,     0,     0,     0,
-      25,    26,    27,    28,    29,    30,    31,    32,     0,    33,
-       0,     0,    34,    35,    36,    37,     0,    38,    39,    40,
-       0,    41,     0,    42,     0,    43,     0,     0,    44,     0,
-       0,     0,    45,    46,    47,    48,    49,    50,     0,    52,
-      53,     0,     0,     0,     0,    55,    56,     0,     0,     0,
-       0,     0,   130,     0,    60,    61,    62,     0,     0,     0,
-       0,     0,     0,     0,     0,    69,    70,     0,    71,    72,
-      73,    74,    75,    76,    77,    78,    79,    80,    81,     4,
-       0,     5,     6,     7,     8,     0,     0,    82,     9,    10,
-       0,    11,     0,     0,     0,     0,     0,     0,    83,     0,
-      84,    85,     0,    86,    87,    88,    89,   886,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,    12,    13,     0,
-       0,     0,    14,     0,    15,    16,    17,    18,    19,    20,
-      21,    22,    23,     0,    24,     0,     0,     0,    25,    26,
-      27,    28,    29,    30,    31,    32,     0,    33,     0,     0,
-      34,    35,    36,    37,     0,    38,    39,    40,     0,    41,
-       0,    42,     0,    43,     0,     0,    44,     0,     0,     0,
-      45,    46,    47,    48,    49,    50,     0,    52,    53,     0,
-       0,     0,     0,    55,    56,     0,     0,     0,     0,     0,
-     130,     0,    60,    61,    62,     0,     0,     0,     0,     0,
-       0,     0,     0,    69,    70,     0,    71,    72,    73,    74,
-      75,    76,    77,    78,    79,    80,    81,     4,     0,     5,
-       6,     7,     8,     0,     0,    82,     9,    10,     0,    11,
+       0,    83,     0,    84,    85,     0,    86,    87,    88,    89,
+       4,     5,     0,     0,     0,     6,     7,     8,     0,     9,
+      10,    11,    12,    13,    14,    15,    16,     0,    17,     0,
+       0,    18,    19,    20,    21,    22,     0,     0,     0,    23,
+      24,    25,     0,    26,    27,    28,    29,     0,     0,     0,
+      30,    31,    32,     0,    33,     0,    34,     0,    35,     0,
+       0,    36,     0,     0,     0,    37,    38,    39,    40,    41,
+      42,     0,    44,    45,     0,     0,    46,     0,     0,    48,
+      49,    50,    51,     0,     0,     0,    52,     0,    53,    54,
+      55,   528,    57,    58,    59,    60,     0,     0,     0,    62,
+      63,     0,    64,    65,    66,    67,    68,    69,    70,    71,
+      72,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,    73,    74,    75,    76,    77,    78,
+      79,    80,    81,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,    82,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    83,     0,
+      84,    85,  1115,    86,    87,    88,    89,     4,     5,     0,
+       0,     0,     6,     7,     8,     0,     9,    10,    11,    12,
+      13,    14,    15,    16,     0,    17,     0,     0,    18,    19,
+      20,    21,    22,     0,     0,     0,    23,    24,    25,     0,
+      26,    27,    28,    29,     0,     0,     0,    30,    31,    32,
+       0,    33,     0,    34,     0,    35,     0,     0,    36,     0,
+       0,     0,    37,    38,    39,    40,    41,    42,     0,    44,
+      45,     0,     0,    46,     0,     0,    48,    49,    50,    51,
+       0,     0,     0,    52,     0,    53,    54,    55,   528,    57,
+      58,    59,    60,     0,     0,     0,    62,    63,     0,    64,
+      65,    66,    67,    68,    69,    70,    71,    72,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,    73,    74,    75,    76,    77,    78,    79,    80,    81,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    82,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,    83,     0,    84,    85,  1116,
+      86,    87,    88,    89,     4,     5,     0,     0,     0,     6,
+       7,     8,     0,     9,    10,    11,    12,    13,    14,    15,
+      16,     0,    17,     0,     0,    18,    19,    20,    21,    22,
+       0,     0,     0,    23,    24,    25,     0,    26,    27,    28,
+      29,     0,     0,     0,    30,    31,    32,     0,    33,     0,
+      34,     0,    35,     0,     0,    36,     0,     0,     0,    37,
+      38,    39,    40,    41,    42,     0,    44,    45,     0,     0,
+      46,     0,     0,    48,    49,    50,    51,     0,     0,     0,
+      52,     0,    53,    54,    55,   528,    57,    58,    59,    60,
+       0,     0,     0,    62,    63,     0,    64,    65,    66,    67,
+      68,    69,    70,    71,    72,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    73,    74,
+      75,    76,    77,    78,    79,    80,    81,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,    82,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,    83,     0,    84,    85,  1117,    86,    87,    88,
+      89,     4,     5,     0,     0,     0,     6,     7,     8,     0,
+       9,    10,    11,    12,    13,    14,    15,    16,     0,    17,
+       0,     0,    18,    19,    20,    21,    22,     0,     0,     0,
+      23,    24,    25,     0,    26,    27,    28,    29,     0,     0,
+       0,    30,    31,    32,     0,    33,     0,    34,     0,    35,
+       0,     0,    36,     0,     0,     0,    37,    38,    39,    40,
+      41,    42,     0,    44,    45,     0,     0,    46,     0,     0,
+      48,    49,    50,    51,     0,     0,     0,    52,     0,    53,
+      54,    55,   528,    57,    58,    59,    60,     0,     0,     0,
+      62,    63,     0,    64,    65,    66,    67,    68,    69,    70,
+      71,    72,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,    73,    74,    75,    76,    77,
+      78,    79,    80,    81,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,    82,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    83,
+       0,    84,    85,  1130,    86,    87,    88,    89,     4,     5,
+       0,     0,     0,     6,     7,     8,     0,     9,    10,    11,
+      12,    13,    14,    15,    16,     0,    17,     0,     0,    18,
+      19,    20,    21,    22,     0,     0,     0,    23,    24,    25,
+       0,    26,    27,    28,    29,     0,     0,     0,    30,    31,
+      32,     0,    33,     0,    34,     0,    35,     0,     0,    36,
+       0,     0,     0,    37,    38,    39,    40,    41,    42,     0,
+      44,    45,     0,     0,    46,     0,     0,    48,    49,    50,
+      51,     0,     0,     0,    52,     0,    53,    54,    55,   528,
+      57,    58,    59,    60,     0,     0,     0,    62,    63,     0,
+      64,    65,    66,    67,    68,    69,    70,    71,    72,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,    73,    74,    75,    76,    77,    78,    79,    80,
+      81,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+      82,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,    83,     0,    84,    85,
-       0,    86,    87,    88,    89,   998,     0,     0,     0,     0,
+       0,    86,    87,    88,    89,     4,     5,     0,     0,     0,
+       6,     7,     8,     0,     9,    10,    11,    12,    13,    14,
+      15,    16,     0,    17,     0,     0,    18,    19,    20,    21,
+      22,     0,     0,     0,    23,    24,    25,     0,    26,    27,
+      28,    29,     0,     0,     0,    30,    31,    32,     0,    33,
+       0,    34,     0,    35,     0,     0,    36,     0,     0,     0,
+      37,    38,    39,    40,    41,    42,     0,    44,    45,     0,
+       0,    46,     0,     0,    48,    49,     0,     0,     0,     0,
+       0,   130,     0,    53,    54,    55,     0,     0,     0,     0,
+       0,     0,     0,     0,    62,    63,     0,    64,    65,    66,
+      67,    68,    69,    70,    71,    72,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,    12,    13,     0,     0,     0,
-      14,     0,    15,    16,    17,    18,    19,    20,    21,    22,
-      23,     0,    24,     0,     0,     0,    25,    26,    27,    28,
-      29,    30,    31,    32,     0,    33,     0,     0,    34,    35,
-      36,    37,     0,    38,    39,    40,     0,    41,     0,    42,
-       0,    43,     0,     0,    44,     0,     0,     0,    45,    46,
-      47,    48,    49,    50,     0,    52,    53,     0,     0,     0,
-       0,    55,    56,     0,     0,     0,     0,     0,   130,     0,
-      60,    61,    62,     0,     0,     0,     0,     0,     0,     0,
-       0,    69,    70,     0,    71,    72,    73,    74,    75,    76,
-      77,    78,    79,    80,    81,     4,     0,     5,     6,     7,
-       8,     0,     0,    82,     9,    10,     0,    11,     0,     0,
-       0,     0,     0,     0,    83,     0,    84,    85,     0,    86,
-      87,    88,    89,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,    12,    13,     0,     0,     0,    14,     0,
-      15,    16,    17,    18,    19,    20,    21,    22,    23,     0,
-      24,     0,     0,     0,    25,    26,    27,    28,    29,    30,
-      31,    32,     0,    33,     0,     0,    34,    35,    36,    37,
-       0,    38,    39,    40,     0,    41,     0,    42,     0,    43,
-       0,     0,    44,     0,     0,     0,    45,    46,    47,    48,
-      49,    50,     0,    52,    53,     0,     0,     0,     0,    55,
-      56,     0,     0,     0,     0,     0,   130,     0,    60,    61,
-      62,     0,     0,     0,     0,     0,     0,     0,     0,    69,
-      70,     0,    71,    72,    73,    74,    75,    76,    77,    78,
-      79,    80,    81,     4,     0,     5,     6,     7,     8,     0,
-       0,    82,     9,    10,     0,    11,     0,     0,     0,     0,
-       0,     0,    83,   911,    84,    85,     0,    86,    87,    88,
-      89,  -346,     0,     0,     0,     0,   912,   324,   325,   789,
-     790,   791,   792,   793,   794,   795,   913,     0,     0,     0,
-       0,    12,    13,     0,     0,     0,    14,     0,    15,    16,
-      17,    18,    19,    20,    21,    22,    23,     0,    24,    79,
-       0,     0,    25,    26,   128,    28,    29,    30,    31,     0,
-     911,    33,     0,     0,    34,    35,    36,     0,  -346,     0,
-       0,     0,     0,   912,     0,  1013,   789,   790,   791,   792,
-     793,   794,   795,   913,    45,     0,     0,     0,    49,    50,
-       0,     0,     0,     0,     0,     0,     0,     0,   129,     0,
-       0,     0,     0,     0,   130,     0,    79,    61,    62,     0,
-       0,     0,     0,     0,     0,     0,     0,   326,    70,     0,
-      71,    72,    73,    74,    75,    76,    77,    78,    79,    80,
-      81,     4,  1030,     5,     6,     7,     8,     0,     0,    82,
-       9,    10,     0,    11,     0,   327,     0,     0,     0,     0,
-      83,   911,     0,     0,     0,    86,    87,    88,    89,  -346,
-       0,     0,     0,     0,   912,   324,   325,   789,   790,   791,
-     792,   793,   794,   795,   913,     0,     0,     0,     0,    12,
-      13,     0,     0,     0,    14,     0,    15,    16,    17,    18,
-      19,    20,    21,    22,    23,     0,    24,    79,     0,     0,
-      25,    26,   128,    28,    29,    30,    31,     0,   911,    33,
-       0,     0,    34,    35,    36,     0,  -346,     0,     0,     0,
-       0,   912,     0,  1069,   789,   790,   791,   792,   793,   794,
-     795,   913,    45,     0,     0,     0,    49,    50,     0,     0,
-       0,     0,     0,     0,     0,     0,   129,     0,     0,     0,
-       0,     0,   130,     0,    79,    61,    62,     0,     0,     0,
-       0,     0,     0,     0,     0,    69,    70,     0,    71,    72,
-      73,    74,    75,    76,    77,    78,    79,    80,    81,     4,
-    1077,     5,     6,     7,     8,     0,     0,    82,     9,    10,
-       0,    11,     0,     0,     0,     0,     0,     0,    83,     0,
-       0,     0,     0,    86,    87,    88,    89,     0,     0,     0,
-       0,     0,     0,   324,   325,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,    12,    13,     0,
-       0,     0,    14,     0,    15,    16,    17,    18,    19,    20,
-      21,    22,    23,     0,    24,     0,     0,     0,    25,    26,
-     128,    28,    29,    30,    31,     0,     0,    33,     0,     0,
-      34,    35,    36,   364,   365,   366,   367,   368,   369,   370,
-     371,   372,   373,   374,   375,   376,   377,   378,   379,   380,
-      45,   381,     0,     0,    49,    50,     0,     0,     0,     0,
-       0,   382,     0,     0,   129,     0,     0,     0,     0,     0,
-     130,     0,     0,    61,    62,     0,     0,     0,     0,     0,
-       0,     0,     0,   691,    70,     0,    71,    72,    73,    74,
-      75,    76,    77,    78,    79,    80,    81,     4,     0,     5,
-       6,     7,     8,     0,     0,    82,     9,    10,     0,    11,
-       0,     0,     0,     0,     0,     0,    83,     0,     0,     0,
-       0,    86,    87,    88,    89,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,    12,    13,     0,     0,     0,
-      14,     0,    15,    16,    17,    18,    19,    20,    21,    22,
-      23,     0,    24,     0,     0,     0,    25,    26,   128,    28,
-      29,    30,    31,     0,     0,    33,   521,     0,    34,    35,
-      36,  -568,  -568,  -568,  -568,  -568,   369,   370,   371,   372,
-     373,   374,   375,   376,   377,   378,   379,   380,    45,   381,
-       0,     0,    49,    50,     0,     0,     0,     0,     0,   382,
-       0,     0,   129,     0,     0,     0,     0,     0,   130,     0,
-       0,    61,    62,     0,     0,     0,     0,     0,     0,     0,
-       0,    69,    70,     0,    71,    72,    73,    74,    75,    76,
-      77,    78,    79,    80,    81,     4,     0,     5,     6,     7,
-       8,     0,     0,    82,     9,    10,     0,    11,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    73,
+      74,    75,    76,    77,    78,    79,    80,    81,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,    82,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,    83,     0,    84,    85,     0,    86,    87,
+      88,    89,     4,     5,     0,     0,     0,     6,     7,     8,
+       0,     9,    10,   128,    12,    13,    14,    15,     0,     0,
+      17,     0,     0,    18,    19,    20,    21,    22,     0,     0,
+     911,    23,    24,    25,     0,    26,    27,    28,  -346,     0,
+       0,     0,     0,     0,   912,     0,     0,   789,   790,   791,
+     792,   793,   794,   795,   913,     0,     0,    37,     0,     0,
+       0,    41,    42,     0,     0,     0,     0,     0,    46,     0,
+       0,     0,   129,     0,     0,     0,     0,    72,   130,     0,
+       0,    54,    55,     0,     0,     0,     0,     0,     0,     0,
+       0,   324,    63,     0,    64,    65,    66,    67,    68,    69,
+      70,    71,    72,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,    73,    74,    75,    76,
+      77,    78,    79,    80,    81,     0,     0,     0,     0,  1069,
+       0,     0,     0,     0,    82,     0,     0,     0,     0,     0,
+     325,     0,     0,     0,   326,   327,     0,     0,     0,     0,
+      83,     0,     0,     0,     0,    86,    87,    88,    89,     4,
+       5,     0,     0,     0,     6,     7,     8,     0,     9,    10,
+     128,    12,    13,    14,    15,     0,     0,    17,     0,     0,
+      18,    19,    20,    21,    22,     0,     0,   911,    23,    24,
+      25,     0,    26,    27,    28,  -346,     0,     0,     0,     0,
+       0,   912,     0,     0,   789,   790,   791,   792,   793,   794,
+     795,   913,     0,     0,    37,     0,     0,     0,    41,    42,
+       0,     0,     0,     0,     0,    46,     0,     0,     0,   129,
+       0,     0,     0,     0,    72,   130,     0,     0,    54,    55,
+       0,     0,     0,     0,     0,     0,     0,     0,    62,    63,
+       0,    64,    65,    66,    67,    68,    69,    70,    71,    72,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,    73,    74,    75,    76,    77,    78,    79,
+      80,    81,     0,     0,     0,     0,  1077,     0,     0,     0,
+       0,    82,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   326,   327,     0,     0,     0,     0,    83,     0,     0,
+       0,     0,    86,    87,    88,    89,     4,     5,     0,     0,
+       0,     6,     7,     8,     0,     9,    10,   128,    12,    13,
+      14,    15,     0,     0,    17,     0,     0,    18,    19,    20,
+      21,    22,     0,     0,     0,    23,    24,    25,     0,    26,
+      27,    28,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,    37,     0,     0,     0,    41,    42,     0,     0,     0,
+       0,     0,    46,     0,     0,     0,   129,     0,     0,     0,
+       0,     0,   130,     0,     0,    54,    55,     0,     0,     0,
+       0,     0,     0,     0,     0,   691,    63,     0,    64,    65,
+      66,    67,    68,    69,    70,    71,    72,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+      73,    74,    75,    76,    77,    78,    79,    80,    81,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    82,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   326,   327,
        0,     0,     0,     0,    83,     0,     0,     0,     0,    86,
-      87,    88,    89,   553,     0,     0,     0,     0,     0,     0,
+      87,    88,    89,     4,     5,     0,     0,     0,     6,     7,
+       8,     0,     9,    10,   128,    12,    13,    14,    15,     0,
+       0,    17,   521,     0,    18,    19,    20,    21,    22,     0,
+       0,     0,    23,    24,    25,     0,    26,    27,    28,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    37,     0,
+       0,     0,    41,    42,     0,     0,     0,     0,     0,    46,
+       0,     0,     0,   129,     0,     0,     0,     0,     0,   130,
+       0,     0,    54,    55,     0,     0,     0,     0,     0,     0,
+       0,     0,    62,    63,     0,    64,    65,    66,    67,    68,
+      69,    70,    71,    72,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,    73,    74,    75,
+      76,    77,    78,    79,    80,    81,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,    82,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,    83,     0,     0,     0,     0,    86,    87,    88,    89,
+       4,     5,     0,     0,     0,     6,     7,     8,     0,     9,
+      10,   128,    12,    13,    14,    15,     0,     0,    17,     0,
+       0,    18,    19,    20,    21,    22,     0,     0,     0,    23,
+      24,    25,     0,    26,    27,    28,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,    37,     0,     0,     0,    41,
+      42,     0,     0,     0,     0,     0,    46,     0,     0,     0,
+     129,     0,     0,     0,     0,     0,   130,     0,     0,    54,
+      55,     0,     0,     0,     0,     0,     0,     0,     0,    62,
+      63,     0,    64,    65,    66,    67,    68,    69,    70,    71,
+      72,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,    73,    74,    75,    76,    77,    78,
+      79,    80,    81,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,    82,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    83,   651,
+       0,     0,     0,    86,    87,    88,    89,     4,     5,     0,
+       0,     0,     6,     7,     8,     0,     9,    10,   128,    12,
+      13,    14,    15,     0,     0,    17,     0,     0,    18,    19,
+      20,    21,    22,     0,     0,     0,    23,    24,    25,     0,
+      26,    27,    28,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   826,    37,     0,     0,     0,    41,    42,     0,     0,
+       0,     0,     0,    46,     0,     0,     0,   129,     0,     0,
+       0,     0,     0,   130,     0,     0,    54,    55,     0,     0,
+       0,     0,     0,     0,     0,     0,    62,    63,     0,    64,
+      65,    66,    67,    68,    69,    70,    71,    72,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,    73,    74,    75,    76,    77,    78,    79,    80,    81,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    82,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,    83,     0,     0,     0,     0,
+      86,    87,    88,    89,     4,     5,     0,     0,     0,     6,
+       7,     8,     0,     9,    10,   128,    12,    13,    14,    15,
+       0,     0,    17,     0,     0,    18,    19,    20,    21,    22,
+       0,     0,     0,    23,    24,    25,     0,    26,    27,    28,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    37,
+       0,     0,     0,    41,    42,     0,     0,     0,     0,     0,
+      46,     0,     0,     0,   129,     0,     0,     0,     0,     0,
+     130,     0,     0,    54,    55,     0,     0,     0,     0,     0,
+       0,     0,     0,    62,    63,     0,    64,    65,    66,    67,
+      68,    69,    70,    71,    72,   353,     0,   354,   355,   356,
+     357,   358,   359,   360,   361,   362,   363,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    73,    74,
+      75,    76,    77,    78,    79,    80,    81,     0,   364,   365,
+     366,     0,     0,     0,   367,     0,    82,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,    12,    13,     0,     0,     0,    14,     0,
-      15,    16,    17,    18,    19,    20,    21,    22,    23,     0,
-      24,     0,     0,     0,    25,    26,   128,    28,    29,    30,
-      31,     0,     0,    33,     0,     0,    34,    35,    36,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,    45,     0,     0,     0,
-      49,    50,     0,     0,     0,     0,     0,     0,     0,     0,
-     129,     0,     0,     0,     0,     0,   130,     0,     0,    61,
-      62,     0,     0,     0,     0,     0,     0,     0,     0,    69,
-      70,     0,    71,    72,    73,    74,    75,    76,    77,    78,
-      79,    80,    81,     4,     0,     5,     6,     7,     8,     0,
-       0,    82,     9,    10,     0,    11,     0,     0,     0,     0,
        0,     0,    83,     0,     0,     0,     0,    86,    87,    88,
-      89,   -47,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    12,    13,     0,     0,     0,    14,     0,    15,    16,
-      17,    18,    19,    20,    21,    22,    23,     0,    24,     0,
-       0,     0,    25,    26,   128,    28,    29,    30,    31,     0,
-       0,    33,     0,     0,    34,    35,    36,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    45,     0,     0,     0,    49,    50,
-       0,     0,     0,     0,     0,     0,     0,     0,   129,     0,
-       0,     0,     0,     0,   130,     0,     0,    61,    62,     0,
-       0,     0,     0,     0,     0,     0,     0,    69,    70,     0,
-      71,    72,    73,    74,    75,    76,    77,    78,    79,    80,
-      81,     4,     0,     5,     6,     7,     8,     0,     0,    82,
-       9,    10,     0,    11,     0,     0,     0,     0,     0,     0,
-      83,     0,     0,     0,     0,    86,    87,    88,    89,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,    12,
-      13,     0,     0,     0,    14,     0,    15,    16,    17,    18,
-      19,    20,    21,    22,    23,     0,    24,     0,     0,     0,
-      25,    26,   128,    28,    29,    30,    31,     0,     0,    33,
-       0,     0,    34,    35,    36,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,    45,     0,     0,     0,    49,    50,     0,     0,
-       0,     0,     0,     0,     0,     0,   129,     0,     0,     0,
-       0,     0,   130,     0,     0,    61,    62,     0,     0,     0,
-       0,     0,     0,     0,     0,    69,    70,     0,    71,    72,
-      73,    74,    75,    76,    77,    78,    79,    80,    81,     4,
-       0,     5,     6,     7,     8,     0,     0,    82,     9,    10,
-       0,    11,     0,     0,     0,     0,     0,     0,    83,   651,
-       0,     0,     0,    86,    87,    88,    89,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,    12,    13,     0,
-       0,     0,    14,     0,    15,    16,    17,    18,    19,    20,
-      21,    22,    23,     0,    24,     0,     0,     0,    25,    26,
-     128,    28,    29,    30,    31,     0,     0,    33,     0,     0,
-      34,    35,    36,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   826,
-      45,     0,     0,     0,    49,    50,     0,     0,     0,     0,
-       0,     0,     0,     0,   129,     0,     0,     0,     0,     0,
-     130,     0,     0,    61,    62,     0,     0,     0,     0,     0,
-       0,     0,     0,    69,    70,     0,    71,    72,    73,    74,
-      75,    76,    77,    78,    79,    80,    81,     4,     0,     5,
-       6,     7,     8,     0,     0,    82,     9,    10,     0,    11,
-       0,     0,     0,     0,     0,     0,    83,     0,     0,     0,
-       0,    86,    87,    88,    89,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,    12,    13,     0,     0,     0,
-      14,     0,    15,    16,    17,    18,    19,    20,    21,    22,
-      23,     0,    24,     0,     0,     0,    25,    26,   128,    28,
-      29,    30,    31,     0,     0,    33,     0,     0,    34,    35,
-      36,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,    45,     0,
-       0,     0,    49,    50,     0,     0,     0,     0,     0,     0,
-       0,     0,   129,     0,     0,     0,     0,     0,   130,     0,
-       0,    61,    62,     0,     0,     0,     0,     0,     0,     0,
-       0,    69,    70,     0,    71,    72,    73,    74,    75,    76,
-      77,    78,    79,    80,    81,     0,     0,     0,     0,     0,
-       0,     0,   219,    82,   220,   221,   222,   223,   224,   225,
-     226,   227,   228,     0,    83,     0,     0,     0,     0,    86,
-      87,    88,    89,   357,   358,   359,   360,   361,   362,   363,
-     364,   365,   366,   367,   368,   369,   370,   371,   372,   373,
-     374,   375,   376,   377,   378,   379,   380,     0,   381,     0,
-       0,     0,     0,     0,     0,     0,   229,     0,   382,     0,
-       0,     0,     0,     0,     0,     0,     0,   230,     0,   231,
-     232,     0,     0,   467,    28,    29,    30,     0,     0,     0,
-       0,     0,     0,   235,   236,   237,   238,   239,   240,   241,
-     242,   243,   244,   245,   246,   247,   248,   249,   250,   251,
-     252,   253,   254,   255,   256,   257,   258,   259,   260,   261,
-     262,   263,   264,   265,   266,   267,   268,  1048,   270,   271,
-     272,   273,   274,   275,   276,   277,   278,   279,     0,   280,
-     281,   282,   283,   284,   285,   286,   287,   288,   289,   290,
-     291,   292,   293,   294,   295,   296,   297,   219,     0,   220,
-     221,   222,   223,   224,   225,   226,   227,   228,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  1049,   359,   360,   361,   362,   363,   364,
-     365,   366,   367,   368,   369,   370,   371,   372,   373,   374,
-     375,   376,   377,   378,   379,   380,     0,   381,     0,     0,
-       0,   229,     0,     0,     0,     0,     0,   382,     0,     0,
-       0,     0,   230,     0,   231,   232,     0,     0,   467,    28,
-      29,    30,     0,     0,     0,     0,     0,     0,   235,   236,
-     237,   238,   239,   240,   241,   242,   243,   244,   245,   246,
-     247,   248,   249,   250,   251,   252,   253,   254,   255,   256,
-     257,   258,   259,   260,   261,   262,   263,   264,   265,   266,
-     267,   268,  1048,   270,   271,   272,   273,   274,   275,   276,
-     277,   278,   279,     0,   280,   281,   282,   283,   284,   285,
-     286,   287,   288,   289,   290,   291,   292,   293,   294,   295,
-     296,   297,   219,     0,   220,   221,   222,   223,   224,   225,
-     226,   227,   228,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  1082,   760,
-     361,   362,   363,   364,   365,   366,   367,   368,   369,   370,
-     371,   372,   373,   374,   375,   376,   377,   378,   379,   380,
-       0,   381,     0,     0,     0,     0,   229,     0,     0,     0,
-       0,   382,     0,     0,     0,     0,     0,   230,     0,   231,
-     232,     0,     0,  1022,    28,    29,    30,     0,     0,     0,
-       0,     0,     0,   235,   236,   237,   238,   239,   240,   241,
-     242,   243,   244,   245,   246,   247,   248,   249,   250,   251,
-     252,   253,   254,   255,   256,   257,   258,   259,   260,   261,
-     262,   263,   264,   265,   266,   267,   268,  1023,   270,   271,
-     272,   273,   274,   275,   276,   277,   278,   279,     0,   280,
-     281,   282,   283,   284,   285,   286,   287,  1024,  1025,   290,
-     291,   292,   293,   294,   295,   296,   297,   353,   354,   355,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   356,   764,
-     357,   358,   359,   360,   361,   362,   363,   364,   365,   366,
-     367,   368,   369,   370,   371,   372,   373,   374,   375,   376,
-     377,   378,   379,   380,     0,   381,   353,   354,   355,     0,
-       0,     0,     0,     0,     0,   382,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   356,     0,   357,
-     358,   359,   360,   361,   362,   363,   364,   365,   366,   367,
+      89,   353,     0,   354,   355,   356,   357,   358,   359,   360,
+     361,   362,   363,   353,     0,   354,   355,   356,   357,   358,
+     359,   360,   361,   362,   363,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   364,   365,   366,     0,     0,     0,
+     367,     0,     0,     0,     0,     0,   364,   365,   366,     0,
+       0,     0,   367,     0,     0,   368,   369,   370,   371,   372,
+     373,   374,   375,   376,   377,   378,     0,     0,     0,   353,
+       0,   354,   355,   356,   357,   358,   359,   360,   361,   362,
+     363,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   379,   380,     0,   381,   382,     0,     0,     0,     0,
+       0,   527,   364,   365,   366,     0,     0,     0,   367,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   368,   369,   370,   371,   372,   373,   374,   375,   376,
+     377,   378,     0,   368,   369,   370,   371,   372,   373,   374,
+     375,   376,   377,   378,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   379,   380,     0,
+     381,   382,     0,     0,     0,     0,     0,   617,     0,   379,
+     380,     0,   381,   382,     0,     0,     0,     0,     0,   619,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   368,
+     369,   370,   371,   372,   373,   374,   375,   376,   377,   378,
+       0,     0,     0,   353,     0,   354,   355,   356,   357,   358,
+     359,   360,   361,   362,   363,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   379,   380,     0,   381,   382,
+       0,     0,     0,     0,     0,   628,   364,   365,   366,     0,
+       0,     0,   367,     0,     0,     0,     0,     0,     0,     0,
+     353,     0,   354,   355,   356,   357,   358,   359,   360,   361,
+     362,   363,   353,     0,   354,   355,   356,   357,   358,   359,
+     360,   361,   362,   363,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   364,   365,   366,     0,     0,     0,   367,
+       0,     0,     0,     0,     0,   364,   365,   366,     0,     0,
+       0,   367,     0,     0,     0,     0,     0,     0,     0,   353,
+       0,   354,   355,   356,   357,   358,   359,   360,   361,   362,
+     363,     0,     0,   368,   369,   370,   371,   372,   373,   374,
+     375,   376,   377,   378,     0,     0,     0,     0,     0,     0,
+       0,     0,   364,   365,   366,     0,     0,     0,   367,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   379,
+     380,     0,   381,   382,     0,     0,     0,     0,     0,   631,
      368,   369,   370,   371,   372,   373,   374,   375,   376,   377,
-     378,   379,   380,     0,   381,   353,   354,   355,     0,     0,
-       0,     0,     0,     0,   382,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   356,     0,   357,   358,
-     359,   360,   361,   362,   363,   364,   365,   366,   367,   368,
+     378,     0,   368,   369,   370,   371,   372,   373,   374,   375,
+     376,   377,   378,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   379,   380,     0,   381,
+     382,     0,     0,     0,     0,     0,   636,     0,   379,   380,
+       0,   381,   382,     0,     0,     0,     0,     0,   637,   368,
      369,   370,   371,   372,   373,   374,   375,   376,   377,   378,
-     379,   380,     0,   381,   353,   354,   355,     0,     0,     0,
-       0,     0,     0,   382,     0,     0,     0,     0,     0,     0,
-       0,     0,   686,     0,     0,   356,     0,   357,   358,   359,
-     360,   361,   362,   363,   364,   365,   366,   367,   368,   369,
-     370,   371,   372,   373,   374,   375,   376,   377,   378,   379,
-     380,     0,   381,   353,   354,   355,     0,     0,     0,     0,
-       0,     0,   382,     0,     0,     0,     0,     0,     0,     0,
-       0,   696,     0,     0,   356,     0,   357,   358,   359,   360,
-     361,   362,   363,   364,   365,   366,   367,   368,   369,   370,
-     371,   372,   373,   374,   375,   376,   377,   378,   379,   380,
-       0,   381,   353,   354,   355,     0,     0,     0,     0,     0,
-       0,   382,     0,     0,     0,     0,     0,     0,     0,     0,
-     713,     0,     0,   356,     0,   357,   358,   359,   360,   361,
-     362,   363,   364,   365,   366,   367,   368,   369,   370,   371,
-     372,   373,   374,   375,   376,   377,   378,   379,   380,     0,
-     381,   353,   354,   355,     0,     0,     0,     0,     0,     0,
-     382,     0,     0,     0,     0,     0,     0,     0,     0,   717,
-       0,     0,   356,     0,   357,   358,   359,   360,   361,   362,
-     363,   364,   365,   366,   367,   368,   369,   370,   371,   372,
-     373,   374,   375,   376,   377,   378,   379,   380,     0,   381,
-     353,   354,   355,     0,     0,     0,     0,     0,     0,   382,
-       0,     0,     0,     0,     0,     0,     0,     0,   806,     0,
-       0,   356,   961,   357,   358,   359,   360,   361,   362,   363,
-     364,   365,   366,   367,   368,   369,   370,   371,   372,   373,
-     374,   375,   376,   377,   378,   379,   380,     0,   381,   353,
-     354,   355,     0,     0,     0,     0,     0,     0,   382,     0,
-       0,     0,     0,     0,     0,     0,     0,   807,     0,     0,
-     356,     0,   357,   358,   359,   360,   361,   362,   363,   364,
-     365,   366,   367,   368,   369,   370,   371,   372,   373,   374,
-     375,   376,   377,   378,   379,   380,     0,   381,   353,   354,
-     355,     0,     0,     0,     0,     0,     0,   382,     0,     0,
-       0,     0,     0,     0,     0,     0,   808,     0,     0,   356,
-       0,   357,   358,   359,   360,   361,   362,   363,   364,   365,
-     366,   367,   368,   369,   370,   371,   372,   373,   374,   375,
-     376,   377,   378,   379,   380,     0,   381,   353,   354,   355,
-       0,     0,     0,     0,     0,     0,   382,     0,     0,     0,
-       0,     0,     0,   962,     0,     0,     0,     0,   356,     0,
-     357,   358,   359,   360,   361,   362,   363,   364,   365,   366,
-     367,   368,   369,   370,   371,   372,   373,   374,   375,   376,
-     377,   378,   379,   380,     0,   381,   353,   354,   355,     0,
-       0,     0,     0,     0,     0,   382,     0,     0,     0,     0,
-       0,     0,   383,     0,     0,     0,     0,   356,     0,   357,
-     358,   359,   360,   361,   362,   363,   364,   365,   366,   367,
+       0,     0,     0,   353,     0,   354,   355,   356,   357,   358,
+     359,   360,   361,   362,   363,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   379,   380,     0,   381,   382,
+       0,     0,     0,     0,     0,   660,   364,   365,   366,     0,
+       0,     0,   367,     0,     0,     0,     0,     0,     0,     0,
+     353,     0,   354,   355,   356,   357,   358,   359,   360,   361,
+     362,   363,   353,     0,   354,   355,   356,   357,   358,   359,
+     360,   361,   362,   363,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   364,   365,   366,     0,     0,     0,   367,
+       0,     0,     0,     0,     0,   364,   365,   366,     0,     0,
+       0,   367,     0,     0,     0,     0,     0,     0,     0,   353,
+       0,   354,   355,   356,   357,   358,   359,   360,   361,   362,
+     363,     0,     0,   368,   369,   370,   371,   372,   373,   374,
+     375,   376,   377,   378,     0,     0,     0,     0,     0,     0,
+       0,     0,   364,   365,   366,     0,     0,     0,   367,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   379,
+     380,     0,   381,   382,     0,     0,     0,     0,     0,   675,
      368,   369,   370,   371,   372,   373,   374,   375,   376,   377,
-     378,   379,   380,     0,   381,   353,   354,   355,     0,     0,
-       0,     0,     0,     0,   382,     0,     0,     0,     0,     0,
-     618,     0,     0,     0,     0,     0,   356,     0,   357,   358,
-     359,   360,   361,   362,   363,   364,   365,   366,   367,   368,
+     378,     0,   368,   369,   370,   371,   372,   373,   374,   375,
+     376,   377,   378,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   379,   380,     0,   381,
+     382,     0,     0,     0,     0,     0,   785,     0,   379,   380,
+       0,   381,   382,     0,     0,     0,     0,     0,   786,   368,
      369,   370,   371,   372,   373,   374,   375,   376,   377,   378,
-     379,   380,     0,   381,   353,   354,   355,     0,     0,     0,
-       0,     0,     0,   382,     0,     0,     0,     0,     0,   619,
-       0,     0,     0,     0,     0,   356,     0,   357,   358,   359,
-     360,   361,   362,   363,   364,   365,   366,   367,   368,   369,
-     370,   371,   372,   373,   374,   375,   376,   377,   378,   379,
-     380,     0,   381,   353,   354,   355,     0,     0,     0,     0,
-       0,     0,   382,     0,     0,     0,     0,     0,   628,     0,
-       0,     0,     0,     0,   356,     0,   357,   358,   359,   360,
-     361,   362,   363,   364,   365,   366,   367,   368,   369,   370,
-     371,   372,   373,   374,   375,   376,   377,   378,   379,   380,
-       0,   381,   353,   354,   355,     0,     0,     0,     0,     0,
-       0,   382,     0,     0,     0,     0,     0,   631,     0,     0,
-       0,     0,     0,   356,     0,   357,   358,   359,   360,   361,
-     362,   363,   364,   365,   366,   367,   368,   369,   370,   371,
-     372,   373,   374,   375,   376,   377,   378,   379,   380,     0,
-     381,   353,   354,   355,     0,     0,     0,     0,     0,     0,
-     382,     0,     0,     0,     0,     0,   636,     0,     0,     0,
-       0,     0,   356,     0,   357,   358,   359,   360,   361,   362,
-     363,   364,   365,   366,   367,   368,   369,   370,   371,   372,
-     373,   374,   375,   376,   377,   378,   379,   380,     0,   381,
-     353,   354,   355,     0,     0,     0,     0,     0,     0,   382,
-       0,     0,     0,     0,     0,   637,     0,     0,     0,     0,
-       0,   356,     0,   357,   358,   359,   360,   361,   362,   363,
-     364,   365,   366,   367,   368,   369,   370,   371,   372,   373,
-     374,   375,   376,   377,   378,   379,   380,     0,   381,   353,
-     354,   355,     0,     0,     0,     0,     0,     0,   382,     0,
-       0,     0,     0,     0,   660,     0,     0,     0,     0,     0,
-     356,     0,   357,   358,   359,   360,   361,   362,   363,   364,
-     365,   366,   367,   368,   369,   370,   371,   372,   373,   374,
-     375,   376,   377,   378,   379,   380,     0,   381,   353,   354,
-     355,     0,     0,     0,     0,     0,     0,   382,     0,     0,
-       0,     0,     0,   675,     0,     0,     0,     0,     0,   356,
-       0,   357,   358,   359,   360,   361,   362,   363,   364,   365,
-     366,   367,   368,   369,   370,   371,   372,   373,   374,   375,
-     376,   377,   378,   379,   380,     0,   381,   353,   354,   355,
-     128,    28,    29,    30,    31,     0,   382,    33,     0,     0,
-       0,     0,   785,     0,     0,     0,     0,     0,   356,     0,
-     357,   358,   359,   360,   361,   362,   363,   364,   365,   366,
-     367,   368,   369,   370,   371,   372,   373,   374,   375,   376,
-     377,   378,   379,   380,   156,   381,     0,     0,     0,     0,
-     130,     0,     0,     0,     0,   382,     0,     0,     0,     0,
-       0,   786,     0,     0,    70,     0,    71,    72,    73,    74,
-      75,    76,    77,    78,     0,     0,     0,   219,     0,   220,
-     221,   222,   223,   224,   225,   226,   227,   228,     0,     0,
-       0,     0,     0,     0,     0,     0,   308,     0,     0,     0,
-       0,   309,     0,    88,    89,     0,     0,     0,     0,     0,
-     811,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   229,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   230,     0,   231,   232,     0,     0,   233,     0,
-       0,   234,     0,     0,     0,     0,     0,   857,   235,   236,
-     237,   238,   239,   240,   241,   242,   243,   244,   245,   246,
-     247,   248,   249,   250,   251,   252,   253,   254,   255,   256,
-     257,   258,   259,   260,   261,   262,   263,   264,   265,   266,
-     267,   268,   269,   270,   271,   272,   273,   274,   275,   276,
-     277,   278,   279,     0,   280,   281,   282,   283,   284,   285,
-     286,   287,   288,   289,   290,   291,   292,   293,   294,   295,
-     296,   297,   219,   355,   220,   221,   222,   223,   224,   225,
-     226,   227,   228,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   356,     0,   357,   358,   359,   360,   361,   362,
-     363,   364,   365,   366,   367,   368,   369,   370,   371,   372,
-     373,   374,   375,   376,   377,   378,   379,   380,     0,   381,
-       0,     0,     0,     0,     0,     0,   229,     0,     0,   382,
-       0,     0,     0,     0,     0,     0,     0,   230,     0,   231,
-     232,     0,     0,   233,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   235,   236,   237,   238,   239,   240,   241,
-     242,   243,   244,   245,   246,   247,   248,   249,   250,   251,
-     252,   253,   254,   255,   256,   257,   258,   259,   260,   261,
-     262,   263,   264,   265,   266,   267,   268,   269,   270,   271,
-     272,   273,   274,   275,   276,   277,   278,   279,     0,   280,
-     281,   282,   283,   284,   285,   286,   287,   288,   289,   290,
-     291,   292,   293,   294,   295,   296,   297,   219,     0,   220,
-     221,   222,   223,   224,   225,   226,   227,   228,   362,   363,
-     364,   365,   366,   367,   368,   369,   370,   371,   372,   373,
-     374,   375,   376,   377,   378,   379,   380,     0,   381,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   382,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   229,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   230,     0,   231,   232,     0,     0,  1065,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   235,   236,
-     237,   238,   239,   240,   241,   242,   243,   244,   245,   246,
-     247,   248,   249,   250,   251,   252,   253,   254,   255,   256,
-     257,   258,   259,   260,   261,   262,   263,   264,   265,   266,
-     267,   268,   269,   270,   271,   272,   273,   274,   275,   276,
-     277,   278,   279,     0,   280,   281,   282,   283,   284,   285,
-     286,   287,   288,   289,   290,   291,   292,   293,   294,   295,
-     296,   297,   219,     0,   220,   221,   222,   223,   224,   225,
-     226,   227,   228,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   760,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   379,   380,     0,   381,   382,
+    1022,    12,    13,    14,     0,   811,     0,     0,     0,     0,
+     214,   215,   216,   217,   218,   219,   220,   221,   222,   223,
+       0,   224,   225,   226,   227,   228,   229,   230,   231,   232,
+     233,   234,   235,   236,   237,   238,   239,   240,   241,   242,
+     243,   244,   245,   246,   247,   248,   249,   250,   251,   252,
+     253,   254,   255,   256,   257,   258,   259,   260,   261,  1023,
+     263,   264,   265,   266,   267,   268,   269,   270,   271,   272,
+       0,   273,   274,   275,   276,   277,   278,   279,   280,  1024,
+    1025,   283,   284,   285,   286,   287,   288,   289,   290,   353,
+       0,   354,   355,   356,   357,   358,   359,   360,   361,   362,
+     363,   353,     0,   354,   355,   356,   357,   358,   359,   360,
+     361,   362,   363,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   364,   365,   366,     0,     0,     0,   367,     0,
+       0,     0,     0,     0,   364,   365,   366,     0,     0,     0,
+     367,     0,     0,     0,     0,     0,   353,   764,   354,   355,
+     356,   357,   358,   359,   360,   361,   362,   363,   353,   702,
+     354,   355,   356,   357,   358,   359,   360,   361,   362,   363,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   364,
+     365,   366,     0,     0,     0,   367,     0,     0,     0,     0,
+       0,   364,   365,   366,     0,     0,     0,   367,     0,     0,
+       0,     0,     0,   634,     0,     0,     0,     0,     0,   368,
+     369,   370,   371,   372,   373,   374,   375,   376,   377,   378,
+       0,   368,   369,   370,   371,   372,   373,   374,   375,   376,
+     377,   378,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   537,     0,   379,   380,     0,   381,   382,
+       0,     0,     0,   857,     0,     0,     0,   379,   380,     0,
+     381,   382,     0,     0,     0,     0,   368,   369,   370,   371,
+     372,   373,   374,   375,   376,   377,   378,     0,   368,   369,
+     370,   371,   372,   373,   374,   375,   376,   377,   378,   353,
+       0,   354,   355,   356,   357,   358,   359,   360,   361,   362,
+     363,     0,   379,   380,     0,   381,   382,     0,     0,     0,
+       0,     0,     0,     0,   379,   380,     0,   381,   382,     0,
+       0,     0,   364,   365,   366,     0,     0,     0,   367,     0,
+     353,     0,   354,   355,   356,   357,   358,   359,   360,   361,
+     362,   363,   353,     0,   354,   355,   356,   357,   358,   359,
+     360,   361,   362,   363,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   365,   366,     0,     0,     0,   367,
+       0,     0,     0,     0,     0,     0,     0,   366,     0,     0,
+       0,   367,     0,   353,     0,   354,   355,   356,   357,   358,
+     359,   360,   361,   362,   363,   354,   355,   356,   357,   358,
+     359,   360,   361,   362,   363,     0,     0,     0,     0,   368,
+     369,   370,   371,   372,   373,   374,   375,   376,   377,   378,
+       0,     0,   367,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   367,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   379,   380,     0,   381,   382,
+     368,   369,   370,   371,   372,   373,   374,   375,   376,   377,
+     378,     0,   368,   369,   370,   371,   372,   373,   374,   375,
+     376,   377,   378,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   379,   380,     0,   381,
+     382,     0,     0,     0,     0,     0,     0,     0,   379,   380,
+       0,   381,   382,   368,   369,   370,   371,   372,   373,   374,
+     375,   376,   377,   378,   369,   370,   371,   372,   373,   374,
+     375,   376,   377,   378,   354,   355,   356,   357,   358,   359,
+     360,   361,   362,   363,     0,     0,     0,     0,     0,   379,
+     380,     0,   381,   382,     0,     0,     0,     0,     0,     0,
+     380,     0,   381,   382,     0,   128,    12,    13,    14,    15,
+       0,   367,    17,     0,   355,   356,   357,   358,   359,   360,
+     361,   362,   363,     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,
+     367,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   147,     0,     0,     0,     0,     0,
+     130,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   727,    63,     0,    64,    65,    66,    67,
+      68,    69,    70,    71,   370,   371,   372,   373,   374,   375,
+     376,   377,   378,     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,   380,
+       0,   381,   382,   370,   371,   372,   373,   374,   375,   376,
+     377,   378,     0,     0,     0,     0,   326,   327,     0,     0,
+       0,     0,   301,     0,     0,     0,     0,   728,     0,    88,
+      89,     0,   212,     0,     0,     0,    15,     0,   380,     0,
+     381,   382,   214,   215,   216,   217,   218,   219,   220,   221,
+     222,   223,     0,   224,   225,   226,   227,   228,   229,   230,
+     231,   232,   233,   234,   235,   236,   237,   238,   239,   240,
+     241,   242,   243,   244,   245,   246,   247,   248,   249,   250,
+     251,   252,   253,   254,   255,   256,   257,   258,   259,   260,
+     261,   262,   263,   264,   265,   266,   267,   268,   269,   270,
+     271,   272,     0,   273,   274,   275,   276,   277,   278,   279,
+     280,   281,   282,   283,   284,   285,   286,   287,   288,   289,
+     290,     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,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   356,   357,   358,   359,   360,   361,
+     362,   363,     0,     0,     0,     0,     0,     0,     0,   212,
+       0,     0,   586,    15,     0,     0,     0,    89,     0,   214,
+     215,   216,   217,   218,   219,   220,   221,   222,   223,   367,
+     224,   225,   226,   227,   228,   229,   230,   231,   232,   233,
+     234,   235,   236,   237,   238,   239,   240,   241,   242,   243,
+     244,   245,   246,   247,   248,   249,   250,   251,   252,   253,
+     254,   255,   256,   257,   258,   259,   260,   261,   262,   263,
+     264,   265,   266,   267,   268,   269,   270,   271,   272,     0,
+     273,   274,   275,   276,   277,   278,   279,   280,   281,   282,
+     283,   284,   285,   286,   287,   288,   289,   290,   128,    12,
+      13,    14,    15,     0,     0,    17,     0,     0,     0,     0,
+       0,     0,  -568,  -568,  -568,  -568,   374,   375,  -568,   377,
+     378,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   356,   357,   358,   359,
+     360,   361,   362,   363,     0,     0,     0,   380,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   147,     0,   590,
+       0,     0,     0,   130,    89,     0,     0,     0,     0,     0,
+       0,   367,     0,     0,     0,     0,     0,    63,     0,    64,
+      65,    66,    67,    68,    69,    70,    71,     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,     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,   229,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   230,     0,   231,
-     232,     0,     0,  1104,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   235,   236,   237,   238,   239,   240,   241,
+       0,     0,     0,     0,     0,   301,     0,     0,     0,     0,
+     302,     0,    88,    89,   370,   371,   372,   373,   374,   375,
+     376,   377,   378,     0,     0,     0,     0,     0,     0,   459,
+      12,    13,    14,     0,     0,     0,     0,     0,     0,   214,
+     215,   216,   217,   218,   219,   220,   221,   222,   223,   380,
+     224,   225,   226,   227,   228,   229,   230,   231,   232,   233,
+     234,   235,   236,   237,   238,   239,   240,   241,   242,   243,
+     244,   245,   246,   247,   248,   249,   250,   251,   252,   253,
+     254,   255,   256,   257,   258,   259,   260,   261,  1048,   263,
+     264,   265,   266,   267,   268,   269,   270,   271,   272,     0,
+     273,   274,   275,   276,   277,   278,   279,   280,   281,   282,
+     283,   284,   285,   286,   287,   288,   289,   290,     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,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     459,    12,    13,    14,     0,     0,     0,     0,     0,     0,
+     214,   215,   216,   217,   218,   219,   220,   221,   222,   223,
+    1049,   224,   225,   226,   227,   228,   229,   230,   231,   232,
+     233,   234,   235,   236,   237,   238,   239,   240,   241,   242,
+     243,   244,   245,   246,   247,   248,   249,   250,   251,   252,
+     253,   254,   255,   256,   257,   258,   259,   260,   261,  1048,
+     263,   264,   265,   266,   267,   268,   269,   270,   271,   272,
+       0,   273,   274,   275,   276,   277,   278,   279,   280,   281,
+     282,   283,   284,   285,   286,   287,   288,   289,   290,     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,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   212,     0,     0,   213,     0,     0,     0,     0,     0,
+       0,   214,   215,   216,   217,   218,   219,   220,   221,   222,
+     223,  1082,   224,   225,   226,   227,   228,   229,   230,   231,
+     232,   233,   234,   235,   236,   237,   238,   239,   240,   241,
      242,   243,   244,   245,   246,   247,   248,   249,   250,   251,
      252,   253,   254,   255,   256,   257,   258,   259,   260,   261,
-     262,   263,   264,   265,   266,   267,   268,   789,   790,   791,
-     792,   793,   794,   795,   276,   277,   278,   279,     0,   280,
+     262,   263,   264,   265,   266,   267,   268,   269,   270,   271,
+     272,     0,   273,   274,   275,   276,   277,   278,   279,   280,
      281,   282,   283,   284,   285,   286,   287,   288,   289,   290,
-     291,   292,   293,   294,   295,   296,   297,   324,   325,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   353,
-     354,   355,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   128,    28,    29,    30,    31,     0,
-     356,    33,   357,   358,   359,   360,   361,   362,   363,   364,
-     365,   366,   367,   368,   369,   370,   371,   372,   373,   374,
-     375,   376,   377,   378,   379,   380,     0,   381,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   382,   156,     0,
-       0,     0,     0,     0,   130,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   727,    70,     0,
-      71,    72,    73,    74,    75,    76,    77,    78,     0,   634,
-       0,     0,     0,     0,     0,     0,     0,     0,   353,   354,
-     355,     0,     0,   537,     0,     0,     0,     0,     0,     0,
-     308,     0,     0,     0,     0,   728,     0,    88,    89,   356,
-       0,   357,   358,   359,   360,   361,   362,   363,   364,   365,
-     366,   367,   368,   369,   370,   371,   372,   373,   374,   375,
-     376,   377,   378,   379,   380,     0,   381,   353,   354,   355,
-       0,     0,     0,     0,     0,     0,   382,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   356,   702,
-     357,   358,   359,   360,   361,   362,   363,   364,   365,   366,
-     367,   368,   369,   370,   371,   372,   373,   374,   375,   376,
-     377,   378,   379,   380,     0,   381,   353,   354,   355,     0,
-       0,     0,     0,     0,     0,   382,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   356,     0,   357,
-     358,   359,   360,   361,   362,   363,   364,   365,   366,   367,
-     368,   369,   370,   371,   372,   373,   374,   375,   376,   377,
-     378,   379,   380,     0,   381,   354,   355,     0,     0,     0,
-       0,     0,     0,     0,   382,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   356,     0,   357,   358,   359,
-     360,   361,   362,   363,   364,   365,   366,   367,   368,   369,
-     370,   371,   372,   373,   374,   375,   376,   377,   378,   379,
-     380,   411,   381,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   382,     0,     0,     0,     0,   356,     0,   357,
-     358,   359,   360,   361,   362,   363,   364,   365,   366,   367,
-     368,   369,   370,   371,   372,   373,   374,   375,   376,   377,
-     378,   379,   380,     0,   381,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   382
+     212,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     214,   215,   216,   217,   218,   219,   220,   221,   222,   223,
+       0,   224,   225,   226,   227,   228,   229,   230,   231,   232,
+     233,   234,   235,   236,   237,   238,   239,   240,   241,   242,
+     243,   244,   245,   246,   247,   248,   249,   250,   251,   252,
+     253,   254,   255,   256,   257,   258,   259,   260,   261,   262,
+     263,   264,   265,   266,   267,   268,   269,   270,   271,   272,
+       0,   273,   274,   275,   276,   277,   278,   279,   280,   281,
+     282,   283,   284,   285,   286,   287,   288,   289,   290,  1065,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   214,
+     215,   216,   217,   218,   219,   220,   221,   222,   223,     0,
+     224,   225,   226,   227,   228,   229,   230,   231,   232,   233,
+     234,   235,   236,   237,   238,   239,   240,   241,   242,   243,
+     244,   245,   246,   247,   248,   249,   250,   251,   252,   253,
+     254,   255,   256,   257,   258,   259,   260,   261,   262,   263,
+     264,   265,   266,   267,   268,   269,   270,   271,   272,     0,
+     273,   274,   275,   276,   277,   278,   279,   280,   281,   282,
+     283,   284,   285,   286,   287,   288,   289,   290,  1104,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   214,   215,
+     216,   217,   218,   219,   220,   221,   222,   223,     0,   224,
+     225,   226,   227,   228,   229,   230,   231,   232,   233,   234,
+     235,   236,   237,   238,   239,   240,   241,   242,   243,   244,
+     245,   246,   247,   248,   249,   250,   251,   252,   253,   254,
+     255,   256,   257,   258,   259,   260,   261,   789,   790,   791,
+     792,   793,   794,   795,   269,   270,   271,   272,     0,   273,
+     274,   275,   276,   277,   278,   279,   280,   281,   282,   283,
+     284,   285,   286,   287,   288,   289,   290
 };
 
 static const yytype_int16 yycheck =
 {
-       2,     2,     2,   112,   491,    68,   802,   494,   198,    80,
-      81,   498,    35,   111,   112,   754,   632,   740,   948,   385,
-     950,   744,   508,    14,   133,    80,    81,    47,   190,    14,
-     846,    14,    52,    35,     0,   133,    35,    80,    81,    14,
-     705,    90,    37,    54,    37,    92,     2,    31,   734,   668,
-      31,    99,    31,    80,    81,    99,    79,    78,    74,    56,
-     800,    31,     4,     5,     6,     7,     8,     9,    10,    11,
-      12,    13,    14,    15,    16,    17,    18,    19,    20,    21,
-      22,    23,    24,    39,   131,   168,   936,   303,   304,   172,
-      35,    92,    92,   309,   910,    92,    38,    31,   703,    98,
-     705,    30,    78,   170,    46,    47,   697,   163,   124,    57,
-      52,   980,   170,   160,   170,   931,   164,   166,    99,    67,
-     164,    35,   994,    37,   996,   716,   922,    74,   868,   869,
-     980,    78,   129,    78,   131,   170,   822,   503,   824,   804,
-     211,    83,   102,   103,    86,    74,    75,    76,    77,   169,
-      35,   168,   173,   102,   103,   172,   211,   178,  1027,    70,
-      71,   160,   161,    70,    71,   784,    78,   983,   211,    78,
-     168,    80,    74,   912,   172,    30,   171,    88,   171,   919,
-     171,   997,   170,   669,   211,   908,   171,   198,   171,   173,
-     809,   796,  1122,   172,    79,    78,   171,   813,  1067,   804,
-     170,    35,   178,    37,   944,   945,   946,   947,   170,   138,
-     139,   108,   109,   155,   174,    78,   158,    80,   584,    74,
-      75,    76,    77,    74,  1096,   174,   173,   169,    67,   171,
-      78,   178,    80,   168,   176,   177,   178,   172,   180,   181,
-     170,   170,   760,  1115,  1116,    78,   764,    80,   319,   161,
-     162,  1123,   161,   162,   741,  1127,    74,   328,   307,    77,
-     170,   866,   452,   118,   319,   168,   163,   209,   177,   172,
-     212,   213,   638,   328,    37,    38,   319,   160,   161,   162,
-      78,   170,    80,   138,   139,   328,    78,   168,    80,   168,
-    1086,   172,   319,   172,   173,   170,   394,   160,   161,   162,
-     666,   328,   151,   152,   173,    74,    75,    76,    77,    78,
-     170,   798,   160,   161,   162,   170,    37,    38,   534,   163,
-      74,   323,   323,    77,   387,   388,   175,   168,   161,   162,
-     170,   172,   850,   851,   852,   853,   168,   108,   109,   826,
-     172,   828,   168,   830,   393,   342,   172,   118,  1087,   118,
-     119,   120,   839,    78,   108,   124,   110,    78,   381,   108,
-     109,   303,   304,   161,   162,    52,   308,   309,   390,   161,
-     162,   170,   392,   119,   120,   170,   318,   148,   124,   148,
-     170,   151,   152,   108,   109,   327,   548,    74,   170,   755,
-     170,    78,   168,   349,   130,   171,    83,   339,   420,   421,
-      91,   170,   148,   173,   424,   175,   772,    74,    75,   178,
-      77,   353,   354,   355,   356,   357,   358,   359,   360,   361,
-     362,   363,   364,   365,   366,   367,   368,   369,   370,   371,
-     372,   373,   374,   375,   376,   377,   378,   379,   380,   537,
-     382,   452,   170,   445,   445,  1110,   469,   163,   168,   391,
-     392,   171,   394,   395,   396,   397,   398,   399,   400,   401,
-     402,   403,   404,   405,   406,   407,   163,   469,   163,   411,
-     469,   172,    35,    74,    75,    76,    77,   474,   151,   152,
-     172,   423,   424,   530,   172,   427,   119,   120,   511,    16,
-     163,   124,    55,   172,   860,   172,   381,   170,    16,   441,
-     173,   171,   175,   151,   152,  1110,   174,   175,    74,    75,
-      76,    77,   728,   879,   456,   163,    74,   459,   460,   461,
-     462,   463,   464,   465,   466,   173,    89,   175,    74,   530,
-     530,   602,    74,   530,   113,   114,   634,   138,   139,    74,
-     589,   172,   151,   152,   593,   911,   488,   602,   597,   598,
-    1037,   173,   118,    74,    75,    76,    77,   719,   168,   602,
-     722,   172,   173,   634,   173,   781,   175,   851,   852,   170,
-     170,   620,   138,   139,   170,   602,   101,   102,   103,   634,
-      74,    75,    76,    77,   469,   656,    74,    75,    76,    77,
-     168,   634,   534,   168,   169,   537,   171,   539,   814,   168,
-     169,   656,   171,   545,   170,   547,   176,   634,   169,    74,
-      75,   553,    77,   656,   119,   120,   170,   138,   139,   124,
-     170,   692,   945,   946,   118,   130,   511,    87,    88,   656,
-     118,    31,    74,    75,    76,    77,    78,   692,   172,   662,
-     171,   170,   665,   108,   586,   110,   172,    74,   590,   692,
-     138,   139,  1018,   595,   101,   102,   103,   819,   729,    53,
-      54,    55,   168,    57,   173,   692,    78,  1033,   670,   670,
-     670,   172,   628,    67,   729,   631,   118,   118,   119,   120,
-     121,   122,   123,   124,    31,    31,   729,    31,   630,    31,
-     632,   633,    31,   151,   152,    31,  1062,    31,   700,   700,
-     862,   703,   729,   705,    31,   163,    31,   148,    31,    31,
-     172,   653,   654,   168,   670,   173,   658,   175,   168,   817,
-     168,   134,    31,  1089,   886,   134,  1092,  1093,   170,   173,
-     171,   754,   171,   169,   171,   169,   178,    74,   170,    74,
-      16,   174,   904,   685,    74,   170,   817,   170,   170,   796,
-     170,   169,   694,   118,   119,   120,   121,   122,   123,   124,
-     702,   169,   817,   118,   119,   120,   121,   122,   123,   124,
-     173,   773,   773,   773,   817,   173,   732,   662,    99,   171,
-     665,   171,   667,   148,   171,   135,   728,   173,    16,   170,
-     817,   151,   152,   148,   736,    83,   169,   171,    99,   171,
-     170,   963,   804,   163,   746,   172,   171,   170,   810,   810,
-     812,   812,   170,   173,   168,   175,   172,   773,   381,   172,
-     172,    35,   845,   168,   387,   388,   389,   390,    35,   785,
-     102,    37,   173,   775,   172,    31,   998,   168,   110,   781,
-     172,   170,   844,  1005,   172,   171,   118,   119,   120,   121,
-     122,   123,   124,   125,   417,   171,   169,   420,   421,   422,
-     168,   168,   818,   174,   866,   168,   170,   173,   915,   754,
-     979,   813,   814,    74,   174,   760,   148,   168,   316,   764,
-     903,   979,   320,   151,   152,    37,   173,   889,   889,   912,
-     173,   454,   174,   171,    31,   163,   334,   995,   336,   337,
-     338,    35,   170,    38,    35,   173,   469,   175,    37,   171,
-    1072,   115,   975,   172,  1076,   800,   108,  1079,   110,   920,
-     171,   171,   924,   171,    14,   172,   118,   119,   120,   121,
-     122,   123,   124,   935,   935,    16,    17,    18,    19,    20,
-      21,    22,    23,    24,    25,    26,    27,    28,    29,    14,
-     892,   174,   108,  1016,   956,   956,   110,   899,  1021,   901,
-     845,   173,    14,   165,  1126,   850,   851,   852,   853,   971,
-     971,    37,   974,   170,   173,    78,  1074,   172,   172,    78,
-     982,   172,   171,   868,   869,    16,  1009,    16,  1051,    16,
-     108,   109,    16,  1016,    16,    16,    16,   953,   173,   955,
-     118,   119,   120,    78,  1006,  1006,   124,   168,   173,   173,
-     172,    99,   130,   131,   132,   133,   163,   172,   903,   172,
-     116,   163,    16,   965,   172,  1088,   968,   912,  1051,  1031,
-     148,   171,   170,  1086,   919,   171,   511,    54,  1040,  1041,
-    1041,  1043,  1043,  1106,   118,   119,   120,   121,   122,   123,
-     124,   936,   198,   837,   179,   452,   817,   656,   866,   944,
-     945,   946,   947,   955,  1087,   960,   796,   919,   149,   150,
-     151,   152,   899,    74,    75,    76,    77,    78,   764,   454,
-     869,   654,   163,  1051,   915,    49,    50,    51,    52,    53,
-      54,    55,   173,    57,   175,   980,  1098,  1098,   457,  1101,
-    1101,  1103,  1103,    67,  1046,  1060,  1027,   427,  1110,    51,
-      52,    53,    54,    55,  1067,    57,  1058,   118,   119,   120,
-     160,  1063,  1064,   124,  1009,    67,  1128,  1128,  1070,   130,
-     442,  1016,   381,  1074,   620,   388,     3,   539,     5,     6,
-       7,     8,     9,    10,    11,    12,    13,   148,    15,    -1,
-     658,    -1,    -1,    -1,    -1,  1097,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  1051,    -1,    -1,   170,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   178,    -1,    -1,
-      -1,    -1,    -1,    -1,    51,    52,    -1,    -1,    -1,    56,
-      57,    58,    59,    60,    61,    62,    63,    64,    65,    66,
-      -1,    68,  1087,    70,    71,    72,    73,    74,    75,    76,
-      77,    78,    -1,    -1,    81,    -1,    -1,    84,    85,    86,
-      87,    88,    89,    90,    91,    92,    93,    94,    95,    96,
-      97,    98,    99,   100,   101,   102,   103,   104,   105,   106,
-     107,   108,   109,   110,   111,   112,   113,   114,   115,   116,
-     117,   118,   119,   120,   121,   122,   123,   124,   125,   126,
-     127,   128,    -1,   130,   131,   132,   133,   134,   135,   136,
-     137,   138,   139,   140,   141,   142,   143,   144,   145,   146,
-     147,   148,   149,   150,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   159,    -1,    -1,    -1,    -1,    -1,   165,    -1,
-      -1,    -1,    -1,   170,   171,     9,    10,    11,   175,   176,
-     177,   178,     3,    -1,     5,     6,     7,     8,     9,    10,
-      11,    12,    13,    -1,    15,    -1,    30,    -1,    32,    33,
-      34,    35,    36,    37,    38,    39,    40,    41,    42,    43,
-      44,    45,    46,    47,    48,    49,    50,    51,    52,    53,
-      54,    55,    -1,    57,    -1,    -1,    -1,    -1,    -1,    -1,
-      51,    52,    -1,    67,    -1,    56,    57,    58,    59,    60,
-      61,    62,    63,    64,    65,    66,    -1,    68,    -1,    70,
-      71,    72,    73,    74,    75,    76,    77,    78,    -1,    -1,
-      81,    -1,    -1,    84,    85,    86,    87,    88,    89,    90,
-      91,    92,    93,    94,    95,    96,    97,    98,    99,   100,
-     101,   102,   103,   104,   105,   106,   107,   108,   109,   110,
-     111,   112,   113,   114,   115,   116,   117,   118,   119,   120,
-     121,   122,   123,   124,   125,   126,   127,   128,    -1,   130,
-     131,   132,   133,   134,   135,   136,   137,   138,   139,   140,
-     141,   142,   143,   144,   145,   146,   147,   148,   149,   150,
-       3,    -1,     5,     6,     7,     8,    -1,   171,   159,    12,
-      13,    -1,    15,    -1,   165,    -1,    -1,    -1,    -1,   170,
-      -1,   102,    -1,    -1,   175,   176,   177,   178,    -1,   110,
-      -1,    -1,    -1,    -1,   115,    -1,    -1,   118,   119,   120,
-     121,   122,   123,   124,   125,    -1,    -1,    -1,    51,    52,
-      -1,    -1,    -1,    56,    -1,    58,    59,    60,    61,    62,
-      63,    64,    65,    66,    -1,    68,    -1,   148,    -1,    72,
-      73,    74,    75,    76,    77,    78,    79,    -1,    81,    -1,
-      -1,    84,    85,    86,    87,    -1,    89,    90,    91,    -1,
-      93,    -1,    95,   174,    97,    -1,    -1,   100,    -1,    -1,
-      -1,   104,   105,   106,   107,   108,   109,   110,   111,   112,
-      -1,    -1,   115,    -1,   117,   118,   119,   120,    -1,    -1,
-      -1,   124,    -1,   126,   127,   128,   129,   130,   131,   132,
-     133,    -1,    -1,   136,   137,   138,    -1,   140,   141,   142,
-     143,   144,   145,   146,   147,   148,   149,   150,     3,    -1,
-       5,     6,     7,     8,    -1,    -1,   159,    12,    13,    -1,
-      15,    -1,    -1,    -1,    -1,    -1,    -1,   170,    -1,   172,
-     173,   174,   175,   176,   177,   178,    44,    45,    46,    47,
-      48,    49,    50,    51,    52,    53,    54,    55,    -1,    57,
-      -1,    -1,    -1,    -1,    -1,    -1,    51,    52,    -1,    67,
-      -1,    56,    -1,    58,    59,    60,    61,    62,    63,    64,
-      65,    66,    -1,    68,    -1,    -1,    -1,    72,    73,    74,
-      75,    76,    77,    78,    79,    -1,    81,    -1,    -1,    84,
-      85,    86,    87,    -1,    89,    90,    91,    -1,    93,    -1,
-      95,    -1,    97,    -1,    -1,   100,    -1,    -1,    -1,   104,
+       2,     2,   112,     2,   182,    73,    74,    73,    74,    26,
+      73,    74,   111,   112,    26,    92,   754,   802,    61,   191,
+     632,    73,    74,   133,    26,    47,     4,     5,     6,     7,
+       8,   705,     6,     6,   133,    49,   296,   297,     7,     6,
+      18,    19,   302,    21,    22,    23,    24,    25,   948,    27,
+     950,     5,    30,   508,   131,    72,    27,   703,   740,   705,
+      38,    39,   744,     2,    27,     7,    44,    27,    46,    23,
+      24,    25,    26,    62,   151,    23,     7,   668,    92,    27,
+      65,    66,    39,   936,     0,    44,    98,    44,   390,   170,
+      62,    92,    31,    92,   734,     6,    27,    75,    76,    77,
+      78,    79,    80,    81,     6,    83,    90,    27,    86,    29,
+      27,    71,    72,   846,    27,   129,    29,   131,   420,   421,
+      65,    66,    23,    24,    25,    26,    27,   980,    82,    27,
+     804,    14,    15,    16,    26,     5,   204,   922,   204,   151,
+     152,   204,    27,    12,    13,    14,    15,    16,   102,   103,
+     796,    62,   204,    23,    24,    25,    26,   170,   804,    71,
+      72,    44,    27,   141,    29,   491,   800,   697,   494,   191,
+     159,   149,   498,   157,   912,    44,   994,   910,   996,   170,
+      72,    82,   822,   161,   824,   163,   716,   159,   158,   174,
+     168,   169,   170,   784,   172,   173,   165,   170,   931,   173,
+     170,   813,   173,   162,   161,   172,   170,   178,   385,    12,
+      13,    14,    15,    16,   669,   178,   170,   168,   809,   980,
+     866,   172,  1122,   165,   202,   173,   908,   205,   206,   174,
+     178,    23,   102,   103,   868,   869,   156,   157,    27,   147,
+      29,    44,   155,   156,   157,   760,   158,   164,   165,   764,
+     983,   319,   170,   319,    23,   165,   319,   177,   156,   157,
+     328,   171,   328,   171,   997,   328,  1027,   319,    23,   170,
+     155,   156,   157,   170,   534,   147,   328,   178,  1096,   162,
+     452,   170,    27,   170,    29,   919,    23,    24,    25,    26,
+     155,   156,   157,   162,   170,   394,    88,  1115,  1116,   171,
+     170,  1086,   165,   170,    23,  1123,  1067,    26,   171,  1127,
+     944,   945,   946,   947,    23,    24,   300,    26,   296,   297,
+     173,   323,   323,   301,   302,   170,   503,    27,   342,    29,
+     170,   134,   135,   145,   146,   850,   851,   852,   853,   168,
+     318,   145,   146,   172,   387,   388,   170,   325,   147,  1087,
+     367,   170,    71,   168,    73,    83,    84,   172,   173,   162,
+      88,   339,    71,   175,    73,   102,   103,   156,   157,   173,
+     548,   175,   171,   164,   165,   353,   354,   355,   356,   357,
+     358,   359,   360,   361,   362,   363,   364,   365,   366,   170,
+     368,   369,   370,   371,   372,   373,   374,   375,   376,   377,
+     378,   379,   380,   381,   382,   147,   170,   584,   158,   393,
+     349,   156,   157,   391,   392,   741,   394,   395,   396,   397,
+     398,   399,   400,   401,   402,   403,   404,   405,   406,   171,
+     452,   409,   158,   170,   412,   392,  1110,   158,   537,    23,
+      24,    25,    26,   445,   445,   423,   424,    49,    50,   427,
+     467,    71,    72,   530,   168,   467,   156,   157,   172,   170,
+     474,   638,    82,   441,  1110,   467,   162,   424,   728,   145,
+     146,   168,   798,   168,   171,   367,   168,   172,   456,    94,
+     172,   168,   460,   461,   171,   463,   464,   465,   466,   666,
+     468,   158,   112,    23,   511,   473,    26,   173,    82,   175,
+     826,    13,   828,    54,   830,    23,    24,    25,    26,   172,
+     488,    23,   172,   839,   172,    27,   530,     4,   102,   103,
+      32,   781,    82,    83,    84,    85,    86,    87,    88,   530,
+     172,   530,   145,   146,   602,   634,   602,   172,   168,   602,
+       4,   719,   172,   168,   722,   158,    23,   172,    83,    84,
+     602,   168,   112,    88,   814,   172,   534,   170,   172,   537,
+     173,   539,   175,   171,    82,   168,   634,   545,   634,   547,
+     168,   634,   550,    23,   172,   467,    23,   112,   755,    23,
+      23,    24,   634,    26,   102,   103,   170,   173,   656,   170,
+     656,    83,    84,   656,   170,   772,    88,    23,    24,    25,
+      26,    27,    94,   169,   656,   589,    71,    72,   586,   593,
+     168,   171,   590,   597,   598,   168,   169,   595,   171,   511,
+      23,    24,    25,    26,   692,   170,   692,   174,   175,   692,
+      23,    24,    25,    26,    76,    77,   620,   145,   146,   176,
+     692,   819,   170,   168,   169,   662,   171,     6,   665,   172,
+     158,   171,   630,   170,   632,   633,    82,    83,    84,   172,
+     173,   729,    88,   729,   168,   173,   729,   175,   670,   670,
+     172,   670,    49,    50,    51,   653,   654,   729,    23,    82,
+     658,   851,   852,   860,   862,   173,   112,   145,   146,   628,
+     945,   946,   631,   145,   146,    64,    65,    66,   700,   700,
+     158,   703,   879,   705,    87,    88,   158,   685,   886,   102,
+     103,  1037,   170,   172,    27,   173,   694,   175,   817,   796,
+      26,   173,     6,   175,   702,   316,   904,   145,   146,   320,
+       6,   670,     6,     6,   911,     6,     6,   754,     6,     6,
+     158,     6,    48,   334,   170,   336,   337,   338,     6,   817,
+     728,   817,   178,     6,   817,   173,   168,   175,   736,    64,
+      65,    66,   168,   168,   172,   817,    98,    98,   746,     6,
+     662,   773,   773,   665,   773,   667,   173,   171,   169,   171,
+     169,    23,    23,    89,   174,   963,   170,     4,    23,    24,
+      25,    26,    27,   732,    23,   170,   170,   775,   170,   170,
+     173,   169,   804,   781,   169,    62,   173,   171,   810,   810,
+     812,   812,    99,    82,    83,    84,    85,    86,    87,    88,
+     998,   171,   171,     4,   170,   173,    32,  1005,   845,   169,
+     171,    62,   171,   170,   773,   813,   814,   170,   915,   168,
+     170,  1018,   844,   112,   172,   172,   785,    82,    83,    84,
+     172,   172,   168,    88,   173,     7,  1033,     7,   165,    94,
+     172,     6,   754,   172,   866,   168,   168,   171,   760,   979,
+     171,   170,   764,   169,   172,   170,   168,   112,   168,   818,
+     979,   174,   173,    23,   173,  1062,   903,   889,   889,   174,
+     168,   173,   171,   165,  1072,   912,   995,   174,  1076,     6,
+     164,  1079,   171,     7,     7,   165,    79,    71,   800,   171,
+      73,   172,  1089,   172,   892,  1092,  1093,   171,   174,   920,
+     171,   899,   924,   901,    82,    83,    84,    85,    86,    87,
+      88,   171,   975,   935,   935,   170,    82,    83,    84,    85,
+      86,    87,    88,   178,   147,   147,   173,   147,  1126,   165,
+     160,   170,   173,   845,   956,   956,    27,   172,   850,   851,
+     852,   853,    27,   172,   172,     4,   112,   171,     4,   971,
+     971,     4,   974,  1016,     4,  1074,   868,   869,  1021,     4,
+     982,     4,     4,   173,    27,   168,   173,   965,   173,   158,
+     968,    80,  1009,   172,   172,   172,    62,   158,     4,  1016,
+     171,  1086,   172,   170,  1006,  1006,   171,    47,  1051,   191,
+     511,   903,   837,   452,   953,   171,   955,   656,   955,   817,
+     912,   899,   960,   866,   796,   919,   764,   919,   869,  1031,
+     654,   454,   457,   915,  1051,  1051,  1060,  1027,  1040,  1041,
+    1041,  1043,  1043,   442,   936,  1088,  1067,   427,  1074,   151,
+     367,   620,   944,   945,   946,   947,   539,   658,    -1,    -1,
+      71,   367,    73,  1106,   388,    -1,    -1,    -1,  1046,    -1,
+    1087,    82,    83,    84,    85,    86,    87,    88,    -1,    -1,
+    1058,   387,   388,   389,   390,  1063,  1064,    -1,   980,    -1,
+      -1,    -1,  1070,    -1,    -1,    -1,  1098,  1098,    -1,  1101,
+    1101,  1103,  1103,    -1,    -1,    -1,    -1,    -1,  1110,    -1,
+      -1,   417,    -1,    65,   420,   421,   422,  1009,    -1,  1097,
+      -1,    73,    -1,    -1,  1016,    -1,  1128,  1128,    -1,    -1,
+      82,    83,    84,    85,    86,    87,    88,    89,    -1,     9,
+      10,    11,    12,    13,    14,    15,    16,    -1,   454,    -1,
+      -1,     6,    -1,    -1,    -1,    -1,    -1,    12,    13,  1051,
+     112,   467,    17,    18,    19,    -1,    21,    22,    23,    24,
+      25,    26,    27,    28,    44,    30,    -1,    -1,    33,    34,
+      35,    36,    37,    -1,    -1,    -1,    41,    42,    43,    -1,
+      45,    46,    47,    48,    -1,  1087,    -1,    52,    53,    54,
+      -1,    56,    -1,    58,    -1,    60,    -1,    -1,    63,    -1,
+      -1,    -1,    67,    68,    69,    70,    71,    72,    -1,    74,
+      75,    -1,    -1,    78,    -1,    -1,    81,    82,    -1,    -1,
+      -1,    -1,    -1,    88,    -1,    90,    91,    92,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   101,   102,    -1,   104,
      105,   106,   107,   108,   109,   110,   111,   112,    -1,    -1,
-     115,    -1,   117,   118,   119,   120,    -1,    -1,    -1,   124,
-      -1,   126,   127,   128,   129,   130,   131,   132,   133,    -1,
-      -1,   136,   137,   138,    -1,   140,   141,   142,   143,   144,
-     145,   146,   147,   148,   149,   150,     3,    -1,     5,     6,
-       7,     8,    -1,    -1,   159,    12,    13,    -1,    15,    -1,
-      -1,    -1,    -1,    -1,    -1,   170,    -1,   172,   173,   174,
-     175,   176,   177,   178,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   131,   132,    -1,   134,   135,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    51,    52,    -1,    -1,    -1,    56,
-      -1,    58,    59,    60,    61,    62,    63,    64,    65,    66,
-      -1,    68,    -1,    -1,    -1,    72,    73,    74,    75,    76,
-      77,    78,    79,    -1,    81,    -1,    -1,    84,    85,    86,
-      87,    -1,    89,    90,    91,    -1,    93,    -1,    95,    -1,
-      97,    -1,    -1,   100,    -1,    -1,    -1,   104,   105,   106,
-     107,   108,   109,   110,   111,   112,    -1,    -1,   115,    -1,
-     117,   118,   119,   120,    -1,    -1,    -1,   124,    -1,   126,
-     127,   128,   129,   130,   131,   132,   133,    -1,    -1,   136,
-     137,   138,    -1,   140,   141,   142,   143,   144,   145,   146,
-     147,   148,   149,   150,     3,    -1,     5,     6,     7,     8,
-      -1,    -1,   159,    12,    13,    -1,    15,    -1,    -1,    -1,
-      -1,    -1,    -1,   170,    -1,   172,   173,    -1,   175,   176,
-     177,   178,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   136,   137,   138,   139,   140,   141,   142,   143,   144,
+      -1,    -1,   162,    -1,    -1,    -1,    -1,    -1,    -1,   154,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   170,    -1,   172,   173,     6,
+     175,   176,   177,   178,    -1,    12,    13,    -1,    -1,    -1,
+      17,    18,    19,    -1,    21,    22,    23,    24,    25,    26,
+      27,    28,    -1,    30,    -1,    -1,    33,    34,    35,    36,
+      37,    -1,    -1,    -1,    41,    42,    43,    -1,    45,    46,
+      47,    48,    -1,    -1,    -1,    52,    53,    54,    -1,    56,
+      -1,    58,    -1,    60,    -1,    -1,    63,    -1,    -1,    -1,
+      67,    68,    69,    70,    71,    72,    -1,    74,    75,    -1,
+      -1,    78,    -1,    -1,    81,    82,    -1,    -1,    -1,    -1,
+      -1,    88,    -1,    90,    91,    92,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   101,   102,    -1,   104,   105,   106,
+     107,   108,   109,   110,   111,   112,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   136,
+     137,   138,   139,   140,   141,   142,   143,   144,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   154,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   170,    -1,   172,   173,     6,   175,   176,
+     177,   178,    -1,    12,    13,    -1,    -1,    -1,    17,    18,
+      19,    -1,    21,    22,    23,    24,    25,    26,    27,    28,
+      -1,    30,    -1,    -1,    33,    34,    35,    36,    37,    -1,
+      -1,    -1,    41,    42,    43,    -1,    45,    46,    47,    48,
+      -1,    -1,    -1,    52,    53,    54,    -1,    56,    -1,    58,
+      -1,    60,    -1,    -1,    63,    -1,    -1,    -1,    67,    68,
+      69,    70,    71,    72,    -1,    74,    75,    -1,    -1,    78,
+      -1,    -1,    81,    82,    -1,    -1,    -1,    -1,    -1,    88,
+      -1,    90,    91,    92,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   101,   102,    -1,   104,   105,   106,   107,   108,
+     109,   110,   111,   112,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   136,   137,   138,
+     139,   140,   141,   142,   143,   144,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   154,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   170,    -1,   172,   173,     6,   175,   176,   177,   178,
+      -1,    12,    13,    -1,    -1,    -1,    17,    18,    19,    -1,
+      21,    22,    23,    24,    25,    26,    27,    28,    -1,    30,
+      -1,    -1,    33,    34,    35,    36,    37,    -1,    -1,    -1,
+      41,    42,    43,    -1,    45,    46,    47,    48,    -1,    -1,
+      -1,    52,    53,    54,    -1,    56,    -1,    58,    -1,    60,
+      -1,    -1,    63,    -1,    -1,    -1,    67,    68,    69,    70,
+      71,    72,    -1,    74,    75,    -1,    -1,    78,    -1,    -1,
+      81,    82,    -1,    -1,    -1,    -1,    -1,    88,    -1,    90,
+      91,    92,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     101,   102,    -1,   104,   105,   106,   107,   108,   109,   110,
+     111,   112,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   136,   137,   138,   139,   140,
+     141,   142,   143,   144,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   154,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   170,
+      -1,   172,   173,     6,   175,   176,   177,   178,    -1,    12,
+      13,    -1,    -1,    -1,    17,    18,    19,    -1,    21,    22,
+      23,    24,    25,    26,    27,    28,    -1,    30,    -1,    -1,
+      33,    34,    35,    36,    37,    -1,    -1,    -1,    41,    42,
+      43,    -1,    45,    46,    47,    48,    -1,    -1,    -1,    52,
+      53,    54,    -1,    56,    -1,    58,    -1,    60,    -1,    -1,
+      63,    -1,    -1,    -1,    67,    68,    69,    70,    71,    72,
+      -1,    74,    75,    -1,    -1,    78,    -1,    -1,    81,    82,
+      -1,    -1,    -1,    -1,    -1,    88,    -1,    90,    91,    92,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   101,   102,
+      -1,   104,   105,   106,   107,   108,   109,   110,   111,   112,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   136,   137,   138,   139,   140,   141,   142,
+     143,   144,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   154,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   170,    -1,   172,
+     173,     6,   175,   176,   177,   178,    -1,    12,    13,    -1,
+      -1,    -1,    17,    18,    19,    -1,    21,    22,    23,    24,
+      25,    26,    27,    -1,    -1,    30,    -1,    -1,    33,    34,
+      35,    36,    37,    -1,    -1,    65,    41,    42,    43,    -1,
+      45,    46,    47,    73,    -1,    -1,    -1,    -1,    -1,    79,
+      -1,    -1,    82,    83,    84,    85,    86,    87,    88,    89,
+      -1,    -1,    67,    -1,    -1,    -1,    71,    72,    71,    72,
+      -1,    -1,    -1,    78,    -1,    -1,    -1,    82,    -1,    82,
+      83,    84,   112,    88,    -1,    88,    91,    92,    -1,    -1,
+      -1,    94,    95,    96,    97,    -1,   101,   102,    -1,   104,
+     105,   106,   107,   108,   109,   110,   111,   112,    -1,   112,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   136,   137,   138,   139,   140,   141,   142,   143,   144,
+      -1,    -1,    -1,    -1,   174,    -1,    -1,    -1,    -1,   154,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   170,    -1,    -1,     6,    -1,
+     175,   176,   177,   178,    12,    13,     4,    -1,    -1,    17,
+      18,    19,    -1,    21,    22,    23,    24,    25,    26,    27,
+      -1,    -1,    30,    -1,    -1,    33,    34,    35,    36,    37,
+      -1,    -1,    65,    41,    42,    43,    -1,    45,    46,    47,
+      73,    -1,    -1,    -1,    -1,    -1,    79,    -1,    -1,    82,
+      83,    84,    85,    86,    87,    88,    89,    -1,    -1,    67,
+      -1,    -1,    -1,    71,    72,    -1,    -1,    -1,    -1,    -1,
+      78,    -1,    -1,    -1,    82,    -1,    -1,    -1,    -1,   112,
+      88,    -1,    -1,    91,    92,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   101,   102,    -1,   104,   105,   106,   107,
+     108,   109,   110,   111,   112,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   113,   114,   115,   116,   117,
+     118,   119,   120,   121,   122,   123,   124,    -1,   136,   137,
+     138,   139,   140,   141,   142,   143,   144,    -1,   136,   137,
+      -1,   174,    -1,    -1,    -1,    -1,   154,   145,   146,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     158,    -1,   170,    -1,    -1,   163,    -1,   175,   176,   177,
+     178,    -1,    -1,    -1,    -1,   173,     5,   175,     7,     8,
+       9,    10,    11,    12,    13,    14,    15,    16,    -1,    -1,
+       5,    -1,     7,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    38,
+      39,    40,    -1,    -1,    -1,    44,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    38,    39,    40,    -1,    -1,    -1,    44,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       5,    -1,     7,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    -1,    -1,     5,    -1,     7,     8,     9,    10,
+      11,    12,    13,    14,    15,    16,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    38,    39,    40,    -1,    -1,    -1,    44,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    38,    39,    40,
+      -1,    -1,    -1,    44,    -1,    -1,   125,   126,   127,   128,
+     129,   130,   131,   132,   133,   134,   135,    -1,    -1,    -1,
+     125,   126,   127,   128,   129,   130,   131,   132,   133,   134,
+     135,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   161,   162,    -1,   164,   165,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   174,   161,   162,    -1,   164,
+     165,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   174,
+     125,   126,   127,   128,   129,   130,   131,   132,   133,   134,
+     135,    -1,    -1,    -1,   125,   126,   127,   128,   129,   130,
+     131,   132,   133,   134,   135,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   161,   162,    -1,   164,
+     165,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   174,
+     161,   162,    -1,   164,   165,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,     5,   174,     7,     8,     9,    10,    11,    12,
+      13,    14,    15,    16,    -1,    -1,     5,    -1,     7,     8,
+       9,    10,    11,    12,    13,    14,    15,    16,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    38,    39,    40,    -1,    -1,
+      -1,    44,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    38,
+      39,    40,    -1,    -1,    -1,    44,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,     5,    -1,     7,     8,
+       9,    10,    11,    12,    13,    14,    15,    16,    -1,    -1,
+       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    38,
+      39,    40,    -1,    -1,    -1,    44,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    38,    39,    40,    -1,    -1,    -1,    44,
+      -1,    -1,   125,   126,   127,   128,   129,   130,   131,   132,
+     133,   134,   135,    -1,    -1,    -1,   125,   126,   127,   128,
+     129,   130,   131,   132,   133,   134,   135,     7,     8,     9,
+      10,    11,    12,    13,    14,    15,    16,    -1,   161,   162,
+      -1,   164,   165,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   174,   161,   162,    -1,   164,   165,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    44,   174,   125,   126,   127,   128,
+     129,   130,   131,   132,   133,   134,   135,    -1,    -1,    -1,
+     125,   126,   127,   128,   129,   130,   131,   132,   133,   134,
+     135,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   161,   162,    -1,   164,   165,     9,    10,    11,
+      12,    13,    14,    15,    16,   174,   161,   162,    -1,   164,
+     165,    -1,    -1,    -1,    -1,    -1,     5,   172,     7,     8,
+       9,    10,    11,    12,    13,    14,    15,    16,    -1,    -1,
+      -1,    -1,    44,    -1,    -1,   125,   126,   127,   128,   129,
+     130,   131,   132,   133,   134,   135,    65,    -1,    -1,    38,
+      39,    40,    -1,    -1,    73,    44,    -1,    -1,    -1,    -1,
+      79,    -1,    -1,    82,    83,    84,    85,    86,    87,    88,
+      89,   161,   162,    -1,   164,   165,    -1,    -1,    65,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    73,    -1,    -1,    -1,
+      -1,    -1,    79,   112,    -1,    82,    83,    84,    85,    86,
+      87,    88,    89,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   127,   128,   129,   130,   131,
+     132,   133,   134,   135,    -1,   112,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   125,   126,   127,   128,
+     129,   130,   131,   132,   133,   134,   135,    -1,    -1,    -1,
+     162,    -1,   164,   165,    -1,   174,    -1,    -1,    -1,    -1,
+       5,    -1,     7,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,   161,   162,    -1,   164,   165,    -1,    -1,    12,
+      13,    -1,    -1,   172,    17,    18,    19,   174,    21,    22,
+      23,    24,    25,    26,    27,    -1,    -1,    30,    -1,    44,
+      33,    34,    35,    36,    37,    38,    39,    40,    41,    42,
+      43,    44,    45,    46,    47,    48,    49,    50,    51,    52,
+      53,    54,    55,    56,    57,    58,    59,    60,    61,    62,
+      63,    64,    65,    66,    67,    68,    69,    70,    71,    72,
+      73,    74,    75,    76,    77,    78,    79,    80,    81,    82,
+      83,    84,    85,    86,    87,    88,    89,    90,    91,    92,
+      -1,    94,    95,    96,    97,    98,    99,   100,   101,   102,
+     103,   104,   105,   106,   107,   108,   109,   110,   111,   112,
+     125,   126,   127,   128,   129,   130,   131,   132,   133,   134,
+     135,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   147,   136,   137,   138,   139,   140,   141,   142,
+     143,   144,    -1,    -1,    -1,    -1,   161,   162,    -1,   164,
+     165,   154,    -1,    -1,    -1,    -1,    -1,   160,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   170,   171,    -1,
+      -1,    -1,   175,   176,   177,   178,    12,    13,    -1,    -1,
+      -1,    17,    18,    19,    -1,    21,    22,    23,    24,    25,
+      26,    27,    -1,    -1,    30,    -1,    -1,    33,    34,    35,
+      36,    37,    38,    39,    40,    41,    42,    43,    44,    45,
+      46,    47,    48,    49,    50,    51,    52,    53,    54,    55,
+      56,    57,    58,    59,    60,    61,    62,    63,    64,    65,
+      66,    67,    68,    69,    70,    71,    72,    73,    74,    75,
+      76,    77,    78,    79,    80,    81,    82,    83,    84,    85,
+      86,    87,    88,    89,    90,    91,    92,    -1,    94,    95,
+      96,    97,    98,    99,   100,   101,   102,   103,   104,   105,
+     106,   107,   108,   109,   110,   111,   112,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     136,   137,   138,   139,   140,   141,   142,   143,   144,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   154,    -1,
+      -1,    -1,    -1,    -1,   160,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   170,    -1,    -1,    -1,    -1,   175,
+     176,   177,   178,    12,    13,    -1,    -1,    -1,    17,    18,
+      19,    -1,    21,    22,    23,    24,    25,    26,    27,    28,
+      -1,    30,    -1,    -1,    33,    34,    35,    36,    37,    -1,
+      -1,    -1,    41,    42,    43,    -1,    45,    46,    47,    48,
+      -1,    -1,    -1,    52,    53,    54,    -1,    56,    -1,    58,
+      -1,    60,    -1,    -1,    63,    -1,    -1,    -1,    67,    68,
+      69,    70,    71,    72,    73,    74,    75,    -1,    -1,    78,
+      79,    -1,    81,    82,    83,    84,    -1,    -1,    -1,    88,
+      -1,    90,    91,    92,    93,    94,    95,    96,    97,    -1,
+      -1,   100,   101,   102,    -1,   104,   105,   106,   107,   108,
+     109,   110,   111,   112,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   136,   137,   138,
+     139,   140,   141,   142,   143,   144,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   154,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    51,    52,    -1,    -1,    -1,    56,    -1,    58,
-      59,    60,    61,    62,    63,    64,    65,    66,    -1,    68,
-      -1,    -1,    -1,    72,    73,    74,    75,    76,    77,    78,
-      79,    -1,    81,    -1,    -1,    84,    85,    86,    87,    -1,
-      89,    90,    91,    -1,    93,    -1,    95,    -1,    97,    -1,
-      -1,   100,    -1,    -1,    -1,   104,   105,   106,   107,   108,
-     109,    -1,   111,   112,    -1,    -1,    -1,    -1,   117,   118,
-     119,   120,    -1,    -1,    -1,   124,    -1,   126,   127,   128,
-     129,   130,   131,   132,   133,    -1,    -1,    -1,   137,   138,
-      -1,   140,   141,   142,   143,   144,   145,   146,   147,   148,
-     149,   150,     3,    -1,     5,     6,     7,     8,    -1,    -1,
-     159,    12,    13,    -1,    15,    -1,    -1,    -1,    -1,    -1,
       -1,   170,    -1,   172,   173,   174,   175,   176,   177,   178,
+      12,    13,    -1,    -1,    -1,    17,    18,    19,    -1,    21,
+      22,    23,    24,    25,    26,    27,    28,    -1,    30,    -1,
+      -1,    33,    34,    35,    36,    37,    -1,    -1,    -1,    41,
+      42,    43,    -1,    45,    46,    47,    48,    -1,    -1,    -1,
+      52,    53,    54,    -1,    56,    -1,    58,    -1,    60,    -1,
+      -1,    63,    -1,    -1,    -1,    67,    68,    69,    70,    71,
+      72,    73,    74,    75,    -1,    -1,    78,    79,    -1,    81,
+      82,    83,    84,    -1,    -1,    -1,    88,    -1,    90,    91,
+      92,    93,    94,    95,    96,    97,    -1,    -1,   100,   101,
+     102,    -1,   104,   105,   106,   107,   108,   109,   110,   111,
+     112,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   136,   137,   138,   139,   140,   141,
+     142,   143,   144,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   154,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   170,    -1,
+     172,   173,   174,   175,   176,   177,   178,    12,    13,    -1,
+      -1,    -1,    17,    18,    19,    -1,    21,    22,    23,    24,
+      25,    26,    27,    28,    -1,    30,    -1,    -1,    33,    34,
+      35,    36,    37,    -1,    -1,    -1,    41,    42,    43,    -1,
+      45,    46,    47,    48,    -1,    -1,    -1,    52,    53,    54,
+      -1,    56,    -1,    58,    -1,    60,    -1,    -1,    63,    -1,
+      -1,    -1,    67,    68,    69,    70,    71,    72,    73,    74,
+      75,    -1,    -1,    78,    79,    -1,    81,    82,    83,    84,
+      -1,    -1,    -1,    88,    -1,    90,    91,    92,    93,    94,
+      95,    96,    97,    -1,    -1,   100,   101,   102,    -1,   104,
+     105,   106,   107,   108,   109,   110,   111,   112,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   136,   137,   138,   139,   140,   141,   142,   143,   144,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   154,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      51,    52,    -1,    -1,    -1,    56,    -1,    58,    59,    60,
-      61,    62,    63,    64,    65,    66,    -1,    68,    -1,    -1,
-      -1,    72,    73,    74,    75,    76,    77,    78,    79,    -1,
-      81,    -1,    -1,    84,    85,    86,    87,    -1,    89,    90,
-      91,    -1,    93,    -1,    95,    -1,    97,    -1,    -1,   100,
-      -1,    -1,    -1,   104,   105,   106,   107,   108,   109,    -1,
-     111,   112,    -1,    -1,    -1,    -1,   117,   118,   119,   120,
-      -1,    -1,    -1,   124,    -1,   126,   127,   128,   129,   130,
-     131,   132,   133,    -1,    -1,    -1,   137,   138,    -1,   140,
-     141,   142,   143,   144,   145,   146,   147,   148,   149,   150,
-       3,    -1,     5,     6,     7,     8,    -1,    -1,   159,    12,
-      13,    -1,    15,    -1,    -1,    -1,    -1,    -1,    -1,   170,
-      -1,   172,   173,   174,   175,   176,   177,   178,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    51,    52,
-      -1,    -1,    -1,    56,    -1,    58,    59,    60,    61,    62,
-      63,    64,    65,    66,    -1,    68,    -1,    -1,    -1,    72,
-      73,    74,    75,    76,    77,    78,    79,    -1,    81,    -1,
-      -1,    84,    85,    86,    87,    88,    89,    90,    91,    -1,
-      93,    -1,    95,    -1,    97,    -1,    -1,   100,    -1,    -1,
-      -1,   104,   105,   106,   107,   108,   109,    -1,   111,   112,
-      -1,    -1,    -1,    -1,   117,   118,   119,   120,    -1,    -1,
-      -1,   124,    -1,   126,   127,   128,   129,   130,   131,   132,
-     133,    -1,    -1,    -1,   137,   138,    -1,   140,   141,   142,
-     143,   144,   145,   146,   147,   148,   149,   150,     3,    -1,
-       5,     6,     7,     8,    -1,    -1,   159,    12,    13,    -1,
-      15,    -1,    -1,    -1,    -1,    -1,    -1,   170,    -1,   172,
-     173,    -1,   175,   176,   177,   178,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    51,    52,    -1,    -1,
-      -1,    56,    -1,    58,    59,    60,    61,    62,    63,    64,
-      65,    66,    -1,    68,    -1,    -1,    -1,    72,    73,    74,
-      75,    76,    77,    78,    79,    -1,    81,    -1,    -1,    84,
-      85,    86,    87,    -1,    89,    90,    91,    92,    93,    -1,
-      95,    -1,    97,    -1,    -1,   100,    -1,    -1,    -1,   104,
-     105,   106,   107,   108,   109,    -1,   111,   112,    -1,    -1,
-      -1,    -1,   117,   118,   119,   120,    -1,    -1,    -1,   124,
-      -1,   126,   127,   128,   129,   130,   131,   132,   133,    -1,
-      -1,    -1,   137,   138,    -1,   140,   141,   142,   143,   144,
-     145,   146,   147,   148,   149,   150,     3,    -1,     5,     6,
-       7,     8,    -1,    -1,   159,    12,    13,    -1,    15,    -1,
       -1,    -1,    -1,    -1,    -1,   170,    -1,   172,   173,    -1,
-     175,   176,   177,   178,    -1,    -1,    -1,    -1,    -1,    -1,
+     175,   176,   177,   178,    12,    13,    -1,    -1,    -1,    17,
+      18,    19,    -1,    21,    22,    23,    24,    25,    26,    27,
+      28,    -1,    30,    -1,    -1,    33,    34,    35,    36,    37,
+      -1,    -1,    -1,    41,    42,    43,    -1,    45,    46,    47,
+      48,    -1,    -1,    -1,    52,    53,    54,    -1,    56,    -1,
+      58,    -1,    60,    -1,    -1,    63,    -1,    -1,    -1,    67,
+      68,    69,    70,    71,    72,    -1,    74,    75,    -1,    -1,
+      78,    -1,    -1,    81,    82,    83,    84,    -1,    -1,    -1,
+      88,    -1,    90,    91,    92,    93,    94,    95,    96,    97,
+      -1,    -1,    -1,   101,   102,    -1,   104,   105,   106,   107,
+     108,   109,   110,   111,   112,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   136,   137,
+     138,   139,   140,   141,   142,   143,   144,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   154,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   170,    -1,   172,   173,   174,   175,   176,   177,
+     178,    12,    13,    -1,    -1,    -1,    17,    18,    19,    -1,
+      21,    22,    23,    24,    25,    26,    27,    28,    -1,    30,
+      -1,    -1,    33,    34,    35,    36,    37,    -1,    -1,    -1,
+      41,    42,    43,    -1,    45,    46,    47,    48,    -1,    -1,
+      -1,    52,    53,    54,    -1,    56,    -1,    58,    -1,    60,
+      -1,    -1,    63,    -1,    -1,    -1,    67,    68,    69,    70,
+      71,    72,    -1,    74,    75,    -1,    -1,    78,    -1,    -1,
+      81,    82,    83,    84,    -1,    -1,    -1,    88,    -1,    90,
+      91,    92,    93,    94,    95,    96,    97,    -1,    -1,    -1,
+     101,   102,    -1,   104,   105,   106,   107,   108,   109,   110,
+     111,   112,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   136,   137,   138,   139,   140,
+     141,   142,   143,   144,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   154,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   170,
+      -1,   172,   173,   174,   175,   176,   177,   178,    12,    13,
+      -1,    -1,    -1,    17,    18,    19,    -1,    21,    22,    23,
+      24,    25,    26,    27,    28,    -1,    30,    -1,    -1,    33,
+      34,    35,    36,    37,    -1,    -1,    -1,    41,    42,    43,
+      -1,    45,    46,    47,    48,    -1,    -1,    51,    52,    53,
+      54,    -1,    56,    -1,    58,    -1,    60,    -1,    -1,    63,
+      -1,    -1,    -1,    67,    68,    69,    70,    71,    72,    -1,
+      74,    75,    -1,    -1,    78,    -1,    -1,    81,    82,    83,
+      84,    -1,    -1,    -1,    88,    -1,    90,    91,    92,    93,
+      94,    95,    96,    97,    -1,    -1,    -1,   101,   102,    -1,
+     104,   105,   106,   107,   108,   109,   110,   111,   112,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   136,   137,   138,   139,   140,   141,   142,   143,
+     144,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     154,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   170,    -1,   172,   173,
+      -1,   175,   176,   177,   178,    12,    13,    -1,    -1,    -1,
+      17,    18,    19,    -1,    21,    22,    23,    24,    25,    26,
+      27,    28,    -1,    30,    -1,    -1,    33,    34,    35,    36,
+      37,    -1,    -1,    -1,    41,    42,    43,    -1,    45,    46,
+      47,    48,    -1,    -1,    -1,    52,    53,    54,    55,    56,
+      -1,    58,    -1,    60,    -1,    -1,    63,    -1,    -1,    -1,
+      67,    68,    69,    70,    71,    72,    -1,    74,    75,    -1,
+      -1,    78,    -1,    -1,    81,    82,    83,    84,    -1,    -1,
+      -1,    88,    -1,    90,    91,    92,    93,    94,    95,    96,
+      97,    -1,    -1,    -1,   101,   102,    -1,   104,   105,   106,
+     107,   108,   109,   110,   111,   112,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   136,
+     137,   138,   139,   140,   141,   142,   143,   144,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   154,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    51,    52,    -1,    -1,    -1,    56,
-      -1,    58,    59,    60,    61,    62,    63,    64,    65,    66,
-      -1,    68,    -1,    -1,    -1,    72,    73,    74,    75,    76,
-      77,    78,    79,    -1,    81,    -1,    -1,    84,    85,    86,
-      87,    -1,    89,    90,    91,    -1,    93,    -1,    95,    -1,
-      97,    98,    -1,   100,    -1,    -1,    -1,   104,   105,   106,
-     107,   108,   109,    -1,   111,   112,    -1,    -1,    -1,    -1,
-     117,   118,   119,   120,    -1,    -1,    -1,   124,    -1,   126,
-     127,   128,   129,   130,   131,   132,   133,    -1,    -1,    -1,
-     137,   138,    -1,   140,   141,   142,   143,   144,   145,   146,
-     147,   148,   149,   150,     3,    -1,     5,     6,     7,     8,
-      -1,    -1,   159,    12,    13,    -1,    15,    -1,    -1,    -1,
       -1,    -1,    -1,   170,    -1,   172,   173,    -1,   175,   176,
-     177,   178,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     177,   178,    12,    13,    -1,    -1,    -1,    17,    18,    19,
+      -1,    21,    22,    23,    24,    25,    26,    27,    28,    -1,
+      30,    -1,    -1,    33,    34,    35,    36,    37,    -1,    -1,
+      -1,    41,    42,    43,    -1,    45,    46,    47,    48,    -1,
+      -1,    -1,    52,    53,    54,    -1,    56,    -1,    58,    -1,
+      60,    61,    -1,    63,    -1,    -1,    -1,    67,    68,    69,
+      70,    71,    72,    -1,    74,    75,    -1,    -1,    78,    -1,
+      -1,    81,    82,    83,    84,    -1,    -1,    -1,    88,    -1,
+      90,    91,    92,    93,    94,    95,    96,    97,    -1,    -1,
+      -1,   101,   102,    -1,   104,   105,   106,   107,   108,   109,
+     110,   111,   112,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   136,   137,   138,   139,
+     140,   141,   142,   143,   144,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   154,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     170,    -1,   172,   173,    -1,   175,   176,   177,   178,    12,
+      13,    -1,    -1,    -1,    17,    18,    19,    -1,    21,    22,
+      23,    24,    25,    26,    27,    28,    -1,    30,    -1,    -1,
+      33,    34,    35,    36,    37,    -1,    -1,    -1,    41,    42,
+      43,    -1,    45,    46,    47,    48,    -1,    -1,    -1,    52,
+      53,    54,    -1,    56,    -1,    58,    59,    60,    -1,    -1,
+      63,    -1,    -1,    -1,    67,    68,    69,    70,    71,    72,
+      -1,    74,    75,    -1,    -1,    78,    -1,    -1,    81,    82,
+      83,    84,    -1,    -1,    -1,    88,    -1,    90,    91,    92,
+      93,    94,    95,    96,    97,    -1,    -1,    -1,   101,   102,
+      -1,   104,   105,   106,   107,   108,   109,   110,   111,   112,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   136,   137,   138,   139,   140,   141,   142,
+     143,   144,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   154,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   170,    -1,   172,
+     173,    -1,   175,   176,   177,   178,    12,    13,    -1,    -1,
+      -1,    17,    18,    19,    -1,    21,    22,    23,    24,    25,
+      26,    27,    28,    -1,    30,    -1,    -1,    33,    34,    35,
+      36,    37,    -1,    -1,    -1,    41,    42,    43,    -1,    45,
+      46,    47,    48,    -1,    -1,    -1,    52,    53,    54,    -1,
+      56,    -1,    58,    -1,    60,    -1,    -1,    63,    -1,    -1,
+      -1,    67,    68,    69,    70,    71,    72,    -1,    74,    75,
+      -1,    -1,    78,    -1,    -1,    81,    82,    83,    84,    -1,
+      -1,    -1,    88,    -1,    90,    91,    92,    93,    94,    95,
+      96,    97,    -1,    -1,    -1,   101,   102,    -1,   104,   105,
+     106,   107,   108,   109,   110,   111,   112,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     136,   137,   138,   139,   140,   141,   142,   143,   144,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   154,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   170,    -1,   172,   173,   174,   175,
+     176,   177,   178,    12,    13,    -1,    -1,    -1,    17,    18,
+      19,    -1,    21,    22,    23,    24,    25,    26,    27,    28,
+      -1,    30,    -1,    -1,    33,    34,    35,    36,    37,    -1,
+      -1,    -1,    41,    42,    43,    -1,    45,    46,    47,    48,
+      -1,    -1,    -1,    52,    53,    54,    -1,    56,    57,    58,
+      -1,    60,    -1,    -1,    63,    -1,    -1,    -1,    67,    68,
+      69,    70,    71,    72,    -1,    74,    75,    -1,    -1,    78,
+      -1,    -1,    81,    82,    83,    84,    -1,    -1,    -1,    88,
+      -1,    90,    91,    92,    93,    94,    95,    96,    97,    -1,
+      -1,    -1,   101,   102,    -1,   104,   105,   106,   107,   108,
+     109,   110,   111,   112,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   136,   137,   138,
+     139,   140,   141,   142,   143,   144,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   154,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    51,    52,    -1,    -1,    -1,    56,    -1,    58,
-      59,    60,    61,    62,    63,    64,    65,    66,    -1,    68,
-      -1,    -1,    -1,    72,    73,    74,    75,    76,    77,    78,
-      79,    -1,    81,    -1,    -1,    84,    85,    86,    87,    -1,
-      89,    90,    91,    -1,    93,    -1,    95,    96,    97,    -1,
-      -1,   100,    -1,    -1,    -1,   104,   105,   106,   107,   108,
-     109,    -1,   111,   112,    -1,    -1,    -1,    -1,   117,   118,
-     119,   120,    -1,    -1,    -1,   124,    -1,   126,   127,   128,
-     129,   130,   131,   132,   133,    -1,    -1,    -1,   137,   138,
-      -1,   140,   141,   142,   143,   144,   145,   146,   147,   148,
-     149,   150,     3,    -1,     5,     6,     7,     8,    -1,    -1,
-     159,    12,    13,    -1,    15,    -1,    -1,    -1,    -1,    -1,
       -1,   170,    -1,   172,   173,    -1,   175,   176,   177,   178,
+      12,    13,    -1,    -1,    -1,    17,    18,    19,    -1,    21,
+      22,    23,    24,    25,    26,    27,    28,    -1,    30,    -1,
+      -1,    33,    34,    35,    36,    37,    -1,    -1,    -1,    41,
+      42,    43,    -1,    45,    46,    47,    48,    -1,    -1,    -1,
+      52,    53,    54,    -1,    56,    -1,    58,    -1,    60,    -1,
+      -1,    63,    -1,    -1,    -1,    67,    68,    69,    70,    71,
+      72,    -1,    74,    75,    -1,    -1,    78,    -1,    -1,    81,
+      82,    83,    84,    -1,    -1,    -1,    88,    -1,    90,    91,
+      92,    93,    94,    95,    96,    97,    -1,    -1,    -1,   101,
+     102,    -1,   104,   105,   106,   107,   108,   109,   110,   111,
+     112,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   136,   137,   138,   139,   140,   141,
+     142,   143,   144,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   154,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   170,    -1,
+     172,   173,   174,   175,   176,   177,   178,    12,    13,    -1,
+      -1,    -1,    17,    18,    19,    -1,    21,    22,    23,    24,
+      25,    26,    27,    28,    -1,    30,    -1,    -1,    33,    34,
+      35,    36,    37,    -1,    -1,    -1,    41,    42,    43,    -1,
+      45,    46,    47,    48,    -1,    -1,    -1,    52,    53,    54,
+      -1,    56,    -1,    58,    -1,    60,    -1,    -1,    63,    -1,
+      -1,    -1,    67,    68,    69,    70,    71,    72,    -1,    74,
+      75,    -1,    -1,    78,    -1,    -1,    81,    82,    83,    84,
+      -1,    -1,    -1,    88,    -1,    90,    91,    92,    93,    94,
+      95,    96,    97,    -1,    -1,    -1,   101,   102,    -1,   104,
+     105,   106,   107,   108,   109,   110,   111,   112,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   136,   137,   138,   139,   140,   141,   142,   143,   144,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   154,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      51,    52,    -1,    -1,    -1,    56,    -1,    58,    59,    60,
-      61,    62,    63,    64,    65,    66,    -1,    68,    -1,    -1,
-      -1,    72,    73,    74,    75,    76,    77,    78,    79,    -1,
-      81,    -1,    -1,    84,    85,    86,    87,    -1,    89,    90,
-      91,    -1,    93,    -1,    95,    -1,    97,    -1,    -1,   100,
-      -1,    -1,    -1,   104,   105,   106,   107,   108,   109,    -1,
-     111,   112,    -1,    -1,    -1,    -1,   117,   118,   119,   120,
-      -1,    -1,    -1,   124,    -1,   126,   127,   128,   129,   130,
-     131,   132,   133,    -1,    -1,    -1,   137,   138,    -1,   140,
-     141,   142,   143,   144,   145,   146,   147,   148,   149,   150,
-       3,    -1,     5,     6,     7,     8,    -1,    -1,   159,    12,
-      13,    -1,    15,    -1,    -1,    -1,    -1,    -1,    -1,   170,
-      -1,   172,   173,   174,   175,   176,   177,   178,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    51,    52,
-      -1,    -1,    -1,    56,    -1,    58,    59,    60,    61,    62,
-      63,    64,    65,    66,    -1,    68,    -1,    -1,    -1,    72,
-      73,    74,    75,    76,    77,    78,    79,    -1,    81,    -1,
-      -1,    84,    85,    86,    87,    -1,    89,    90,    91,    -1,
-      93,    94,    95,    -1,    97,    -1,    -1,   100,    -1,    -1,
-      -1,   104,   105,   106,   107,   108,   109,    -1,   111,   112,
-      -1,    -1,    -1,    -1,   117,   118,   119,   120,    -1,    -1,
-      -1,   124,    -1,   126,   127,   128,   129,   130,   131,   132,
-     133,    -1,    -1,    -1,   137,   138,    -1,   140,   141,   142,
-     143,   144,   145,   146,   147,   148,   149,   150,     3,    -1,
-       5,     6,     7,     8,    -1,    -1,   159,    12,    13,    -1,
-      15,    -1,    -1,    -1,    -1,    -1,    -1,   170,    -1,   172,
-     173,    -1,   175,   176,   177,   178,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    51,    52,    -1,    -1,
-      -1,    56,    -1,    58,    59,    60,    61,    62,    63,    64,
-      65,    66,    -1,    68,    -1,    -1,    -1,    72,    73,    74,
-      75,    76,    77,    78,    79,    -1,    81,    -1,    -1,    84,
-      85,    86,    87,    -1,    89,    90,    91,    -1,    93,    -1,
-      95,    -1,    97,    -1,    -1,   100,    -1,    -1,    -1,   104,
-     105,   106,   107,   108,   109,    -1,   111,   112,    -1,    -1,
-      -1,    -1,   117,   118,   119,   120,    -1,    -1,    -1,   124,
-      -1,   126,   127,   128,   129,   130,   131,   132,   133,    -1,
-      -1,    -1,   137,   138,    -1,   140,   141,   142,   143,   144,
-     145,   146,   147,   148,   149,   150,     3,    -1,     5,     6,
-       7,     8,    -1,    -1,   159,    12,    13,    -1,    15,    -1,
       -1,    -1,    -1,    -1,    -1,   170,    -1,   172,   173,   174,
-     175,   176,   177,   178,    -1,    -1,    -1,    -1,    -1,    -1,
+     175,   176,   177,   178,    12,    13,    -1,    -1,    -1,    17,
+      18,    19,    -1,    21,    22,    23,    24,    25,    26,    27,
+      28,    -1,    30,    -1,    -1,    33,    34,    35,    36,    37,
+      -1,    -1,    -1,    41,    42,    43,    -1,    45,    46,    47,
+      48,    -1,    -1,    -1,    52,    53,    54,    -1,    56,    -1,
+      58,    -1,    60,    -1,    -1,    63,    -1,    -1,    -1,    67,
+      68,    69,    70,    71,    72,    -1,    74,    75,    -1,    -1,
+      78,    -1,    -1,    81,    82,    83,    84,    -1,    -1,    -1,
+      88,    -1,    90,    91,    92,    93,    94,    95,    96,    97,
+      -1,    -1,    -1,   101,   102,    -1,   104,   105,   106,   107,
+     108,   109,   110,   111,   112,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    51,    52,    -1,    -1,    -1,    56,
-      -1,    58,    59,    60,    61,    62,    63,    64,    65,    66,
-      -1,    68,    -1,    -1,    -1,    72,    73,    74,    75,    76,
-      77,    78,    79,    -1,    81,    -1,    -1,    84,    85,    86,
-      87,    -1,    89,    90,    91,    -1,    93,    -1,    95,    -1,
-      97,    -1,    -1,   100,    -1,    -1,    -1,   104,   105,   106,
-     107,   108,   109,    -1,   111,   112,    -1,    -1,    -1,    -1,
-     117,   118,   119,   120,    -1,    -1,    -1,   124,    -1,   126,
-     127,   128,   129,   130,   131,   132,   133,    -1,    -1,    -1,
-     137,   138,    -1,   140,   141,   142,   143,   144,   145,   146,
-     147,   148,   149,   150,     3,    -1,     5,     6,     7,     8,
-      -1,    -1,   159,    12,    13,    -1,    15,    -1,    -1,    -1,
-      -1,    -1,    -1,   170,    -1,   172,   173,   174,   175,   176,
-     177,   178,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    51,    52,    -1,    -1,    -1,    56,    -1,    58,
-      59,    60,    61,    62,    63,    64,    65,    66,    -1,    68,
-      -1,    -1,    -1,    72,    73,    74,    75,    76,    77,    78,
-      79,    -1,    81,    -1,    -1,    84,    85,    86,    87,    -1,
-      89,    90,    91,    -1,    93,    -1,    95,    -1,    97,    -1,
-      -1,   100,    -1,    -1,    -1,   104,   105,   106,   107,   108,
-     109,    -1,   111,   112,    -1,    -1,    -1,    -1,   117,   118,
-     119,   120,    -1,    -1,    -1,   124,    -1,   126,   127,   128,
-     129,   130,   131,   132,   133,    -1,    -1,    -1,   137,   138,
-      -1,   140,   141,   142,   143,   144,   145,   146,   147,   148,
-     149,   150,     3,    -1,     5,     6,     7,     8,    -1,    -1,
-     159,    12,    13,    -1,    15,    -1,    -1,    -1,    -1,    -1,
-      -1,   170,    -1,   172,   173,   174,   175,   176,   177,   178,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   136,   137,
+     138,   139,   140,   141,   142,   143,   144,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   154,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   170,    -1,   172,   173,   174,   175,   176,   177,
+     178,    12,    13,    -1,    -1,    -1,    17,    18,    19,    -1,
+      21,    22,    23,    24,    25,    26,    27,    28,    -1,    30,
+      -1,    -1,    33,    34,    35,    36,    37,    -1,    -1,    -1,
+      41,    42,    43,    -1,    45,    46,    47,    48,    -1,    -1,
+      -1,    52,    53,    54,    -1,    56,    -1,    58,    -1,    60,
+      -1,    -1,    63,    -1,    -1,    -1,    67,    68,    69,    70,
+      71,    72,    -1,    74,    75,    -1,    -1,    78,    -1,    -1,
+      81,    82,    83,    84,    -1,    -1,    -1,    88,    -1,    90,
+      91,    92,    93,    94,    95,    96,    97,    -1,    -1,    -1,
+     101,   102,    -1,   104,   105,   106,   107,   108,   109,   110,
+     111,   112,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      51,    52,    -1,    -1,    -1,    56,    -1,    58,    59,    60,
-      61,    62,    63,    64,    65,    66,    -1,    68,    -1,    -1,
-      -1,    72,    73,    74,    75,    76,    77,    78,    79,    -1,
-      81,    -1,    -1,    84,    85,    86,    87,    -1,    89,    90,
-      91,    -1,    93,    -1,    95,    -1,    97,    -1,    -1,   100,
-      -1,    -1,    -1,   104,   105,   106,   107,   108,   109,    -1,
-     111,   112,    -1,    -1,    -1,    -1,   117,   118,   119,   120,
-      -1,    -1,    -1,   124,    -1,   126,   127,   128,   129,   130,
-     131,   132,   133,    -1,    -1,    -1,   137,   138,    -1,   140,
-     141,   142,   143,   144,   145,   146,   147,   148,   149,   150,
-       3,    -1,     5,     6,     7,     8,    -1,    -1,   159,    12,
-      13,    -1,    15,    -1,    -1,    -1,    -1,    -1,    -1,   170,
-      -1,   172,   173,   174,   175,   176,   177,   178,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    51,    52,
-      -1,    -1,    -1,    56,    -1,    58,    59,    60,    61,    62,
-      63,    64,    65,    66,    -1,    68,    -1,    -1,    -1,    72,
-      73,    74,    75,    76,    77,    78,    79,    -1,    81,    -1,
-      -1,    84,    85,    86,    87,    -1,    89,    90,    91,    -1,
-      93,    -1,    95,    -1,    97,    -1,    -1,   100,    -1,    -1,
-      -1,   104,   105,   106,   107,   108,   109,    -1,   111,   112,
-      -1,    -1,    -1,    -1,   117,   118,   119,   120,    -1,    -1,
-      -1,   124,    -1,   126,   127,   128,   129,   130,   131,   132,
-     133,    -1,    -1,    -1,   137,   138,    -1,   140,   141,   142,
-     143,   144,   145,   146,   147,   148,   149,   150,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,     3,   159,     5,     6,     7,
-       8,     9,    10,    11,    12,    13,    -1,   170,    -1,   172,
-     173,    -1,   175,   176,   177,   178,    30,    -1,    32,    33,
-      34,    35,    36,    37,    38,    39,    40,    41,    42,    43,
-      44,    45,    46,    47,    48,    49,    50,    51,    52,    53,
-      54,    55,    -1,    57,    -1,    -1,    -1,    -1,    -1,    57,
-      -1,    -1,    -1,    67,    -1,    -1,    -1,    -1,    -1,    -1,
-      68,    -1,    70,    71,    -1,    -1,    74,    -1,    -1,    -1,
-      78,    -1,    -1,    -1,    -1,    -1,    84,    85,    86,    87,
-      88,    89,    90,    91,    92,    93,    94,    95,    96,    97,
-      98,    99,   100,   101,   102,   103,   104,   105,   106,   107,
-     108,   109,   110,   111,   112,   113,   114,   115,   116,   117,
-     118,   119,   120,   121,   122,   123,   124,   125,   126,   127,
-     128,    -1,   130,   131,   132,   133,   134,   135,   136,   137,
-     138,   139,   140,   141,   142,   143,   144,   145,   146,   147,
-       3,    -1,     5,     6,     7,     8,     9,    10,    11,    12,
-      13,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   173,    -1,    -1,    -1,    -1,
-     178,    35,    36,    37,    38,    39,    40,    41,    42,    43,
-      44,    45,    46,    47,    48,    49,    50,    51,    52,    53,
-      54,    55,    -1,    57,    57,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    67,    -1,    68,    -1,    70,    71,    -1,
-      -1,    74,    -1,    -1,    -1,    78,    -1,    -1,    -1,    -1,
-      -1,    84,    85,    86,    87,    88,    89,    90,    91,    92,
-      93,    94,    95,    96,    97,    98,    99,   100,   101,   102,
-     103,   104,   105,   106,   107,   108,   109,   110,   111,   112,
-     113,   114,   115,   116,   117,   118,   119,   120,   121,   122,
-     123,   124,   125,   126,   127,   128,    -1,   130,   131,   132,
-     133,   134,   135,   136,   137,   138,   139,   140,   141,   142,
-     143,   144,   145,   146,   147,     3,    -1,     5,     6,     7,
-       8,    -1,    -1,    -1,    12,    13,    -1,    15,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   102,    -1,    -1,    -1,
-     173,    -1,    -1,    31,   110,   178,    -1,    -1,    -1,   115,
-      -1,    -1,   118,   119,   120,   121,   122,   123,   124,   125,
-      -1,    -1,    -1,    51,    52,    -1,    -1,    -1,    56,    -1,
-      58,    59,    60,    61,    62,    63,    64,    65,    66,    -1,
-      68,    -1,   148,    -1,    72,    73,    74,    75,    76,    77,
-      78,    79,    -1,    81,    -1,    -1,    84,    85,    86,    87,
-      -1,    89,    90,    91,    -1,    93,    -1,    95,   174,    97,
-      -1,    -1,   100,    -1,    -1,    -1,   104,   105,   106,   107,
-     108,   109,    -1,   111,   112,    -1,    -1,    -1,    -1,   117,
-     118,    -1,    -1,    -1,    -1,    -1,   124,    -1,   126,   127,
-     128,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   137,
-     138,    -1,   140,   141,   142,   143,   144,   145,   146,   147,
-     148,   149,   150,     3,    -1,     5,     6,     7,     8,    -1,
-      -1,   159,    12,    13,    -1,    15,    -1,    -1,    -1,    -1,
-      -1,    -1,   170,    -1,   172,   173,    -1,   175,   176,   177,
-     178,    31,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    51,    52,    -1,    -1,    -1,    56,    -1,    58,    59,
-      60,    61,    62,    63,    64,    65,    66,    -1,    68,    -1,
-      -1,    -1,    72,    73,    74,    75,    76,    77,    78,    79,
-      -1,    81,    -1,    -1,    84,    85,    86,    87,    -1,    89,
-      90,    91,    -1,    93,    -1,    95,    -1,    97,    -1,    -1,
-     100,    -1,    -1,    -1,   104,   105,   106,   107,   108,   109,
-      -1,   111,   112,    -1,    -1,    -1,    -1,   117,   118,    -1,
-      -1,    -1,    -1,    -1,   124,    -1,   126,   127,   128,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   137,   138,    -1,
-     140,   141,   142,   143,   144,   145,   146,   147,   148,   149,
-     150,     3,    -1,     5,     6,     7,     8,    -1,    -1,   159,
-      12,    13,    -1,    15,    -1,    -1,    -1,    -1,    -1,    -1,
-     170,    -1,   172,   173,    -1,   175,   176,   177,   178,    31,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    51,
-      52,    -1,    -1,    -1,    56,    -1,    58,    59,    60,    61,
-      62,    63,    64,    65,    66,    -1,    68,    -1,    -1,    -1,
-      72,    73,    74,    75,    76,    77,    78,    79,    -1,    81,
-      -1,    -1,    84,    85,    86,    87,    -1,    89,    90,    91,
-      -1,    93,    -1,    95,    -1,    97,    -1,    -1,   100,    -1,
-      -1,    -1,   104,   105,   106,   107,   108,   109,    -1,   111,
-     112,    -1,    -1,    -1,    -1,   117,   118,    -1,    -1,    -1,
-      -1,    -1,   124,    -1,   126,   127,   128,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   137,   138,    -1,   140,   141,
-     142,   143,   144,   145,   146,   147,   148,   149,   150,     3,
-      -1,     5,     6,     7,     8,    -1,    -1,   159,    12,    13,
-      -1,    15,    -1,    -1,    -1,    -1,    -1,    -1,   170,    -1,
-     172,   173,    -1,   175,   176,   177,   178,    31,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    51,    52,    -1,
-      -1,    -1,    56,    -1,    58,    59,    60,    61,    62,    63,
-      64,    65,    66,    -1,    68,    -1,    -1,    -1,    72,    73,
-      74,    75,    76,    77,    78,    79,    -1,    81,    -1,    -1,
-      84,    85,    86,    87,    -1,    89,    90,    91,    -1,    93,
-      -1,    95,    -1,    97,    -1,    -1,   100,    -1,    -1,    -1,
-     104,   105,   106,   107,   108,   109,    -1,   111,   112,    -1,
-      -1,    -1,    -1,   117,   118,    -1,    -1,    -1,    -1,    -1,
-     124,    -1,   126,   127,   128,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   137,   138,    -1,   140,   141,   142,   143,
-     144,   145,   146,   147,   148,   149,   150,     3,    -1,     5,
-       6,     7,     8,    -1,    -1,   159,    12,    13,    -1,    15,
+      -1,    -1,    -1,    -1,    -1,   136,   137,   138,   139,   140,
+     141,   142,   143,   144,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   154,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   170,
+      -1,   172,   173,   174,   175,   176,   177,   178,    12,    13,
+      -1,    -1,    -1,    17,    18,    19,    -1,    21,    22,    23,
+      24,    25,    26,    27,    28,    -1,    30,    -1,    -1,    33,
+      34,    35,    36,    37,    -1,    -1,    -1,    41,    42,    43,
+      -1,    45,    46,    47,    48,    -1,    -1,    -1,    52,    53,
+      54,    -1,    56,    -1,    58,    -1,    60,    -1,    -1,    63,
+      -1,    -1,    -1,    67,    68,    69,    70,    71,    72,    -1,
+      74,    75,    -1,    -1,    78,    -1,    -1,    81,    82,    83,
+      84,    -1,    -1,    -1,    88,    -1,    90,    91,    92,    93,
+      94,    95,    96,    97,    -1,    -1,    -1,   101,   102,    -1,
+     104,   105,   106,   107,   108,   109,   110,   111,   112,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   136,   137,   138,   139,   140,   141,   142,   143,
+     144,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     154,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,   170,    -1,   172,   173,
-      -1,   175,   176,   177,   178,    31,    -1,    -1,    -1,    -1,
+      -1,   175,   176,   177,   178,    12,    13,    -1,    -1,    -1,
+      17,    18,    19,    -1,    21,    22,    23,    24,    25,    26,
+      27,    28,    -1,    30,    -1,    -1,    33,    34,    35,    36,
+      37,    -1,    -1,    -1,    41,    42,    43,    -1,    45,    46,
+      47,    48,    -1,    -1,    -1,    52,    53,    54,    -1,    56,
+      -1,    58,    -1,    60,    -1,    -1,    63,    -1,    -1,    -1,
+      67,    68,    69,    70,    71,    72,    -1,    74,    75,    -1,
+      -1,    78,    -1,    -1,    81,    82,    -1,    -1,    -1,    -1,
+      -1,    88,    -1,    90,    91,    92,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   101,   102,    -1,   104,   105,   106,
+     107,   108,   109,   110,   111,   112,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    51,    52,    -1,    -1,    -1,
-      56,    -1,    58,    59,    60,    61,    62,    63,    64,    65,
-      66,    -1,    68,    -1,    -1,    -1,    72,    73,    74,    75,
-      76,    77,    78,    79,    -1,    81,    -1,    -1,    84,    85,
-      86,    87,    -1,    89,    90,    91,    -1,    93,    -1,    95,
-      -1,    97,    -1,    -1,   100,    -1,    -1,    -1,   104,   105,
-     106,   107,   108,   109,    -1,   111,   112,    -1,    -1,    -1,
-      -1,   117,   118,    -1,    -1,    -1,    -1,    -1,   124,    -1,
-     126,   127,   128,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   137,   138,    -1,   140,   141,   142,   143,   144,   145,
-     146,   147,   148,   149,   150,     3,    -1,     5,     6,     7,
-       8,    -1,    -1,   159,    12,    13,    -1,    15,    -1,    -1,
-      -1,    -1,    -1,    -1,   170,    -1,   172,   173,    -1,   175,
-     176,   177,   178,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    51,    52,    -1,    -1,    -1,    56,    -1,
-      58,    59,    60,    61,    62,    63,    64,    65,    66,    -1,
-      68,    -1,    -1,    -1,    72,    73,    74,    75,    76,    77,
-      78,    79,    -1,    81,    -1,    -1,    84,    85,    86,    87,
-      -1,    89,    90,    91,    -1,    93,    -1,    95,    -1,    97,
-      -1,    -1,   100,    -1,    -1,    -1,   104,   105,   106,   107,
-     108,   109,    -1,   111,   112,    -1,    -1,    -1,    -1,   117,
-     118,    -1,    -1,    -1,    -1,    -1,   124,    -1,   126,   127,
-     128,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   137,
-     138,    -1,   140,   141,   142,   143,   144,   145,   146,   147,
-     148,   149,   150,     3,    -1,     5,     6,     7,     8,    -1,
-      -1,   159,    12,    13,    -1,    15,    -1,    -1,    -1,    -1,
-      -1,    -1,   170,   102,   172,   173,    -1,   175,   176,   177,
-     178,   110,    -1,    -1,    -1,    -1,   115,    37,    38,   118,
-     119,   120,   121,   122,   123,   124,   125,    -1,    -1,    -1,
-      -1,    51,    52,    -1,    -1,    -1,    56,    -1,    58,    59,
-      60,    61,    62,    63,    64,    65,    66,    -1,    68,   148,
-      -1,    -1,    72,    73,    74,    75,    76,    77,    78,    -1,
-     102,    81,    -1,    -1,    84,    85,    86,    -1,   110,    -1,
-      -1,    -1,    -1,   115,    -1,   174,   118,   119,   120,   121,
-     122,   123,   124,   125,   104,    -1,    -1,    -1,   108,   109,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   118,    -1,
-      -1,    -1,    -1,    -1,   124,    -1,   148,   127,   128,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   137,   138,    -1,
-     140,   141,   142,   143,   144,   145,   146,   147,   148,   149,
-     150,     3,   174,     5,     6,     7,     8,    -1,    -1,   159,
-      12,    13,    -1,    15,    -1,   165,    -1,    -1,    -1,    -1,
-     170,   102,    -1,    -1,    -1,   175,   176,   177,   178,   110,
-      -1,    -1,    -1,    -1,   115,    37,    38,   118,   119,   120,
-     121,   122,   123,   124,   125,    -1,    -1,    -1,    -1,    51,
-      52,    -1,    -1,    -1,    56,    -1,    58,    59,    60,    61,
-      62,    63,    64,    65,    66,    -1,    68,   148,    -1,    -1,
-      72,    73,    74,    75,    76,    77,    78,    -1,   102,    81,
-      -1,    -1,    84,    85,    86,    -1,   110,    -1,    -1,    -1,
-      -1,   115,    -1,   174,   118,   119,   120,   121,   122,   123,
-     124,   125,   104,    -1,    -1,    -1,   108,   109,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   118,    -1,    -1,    -1,
-      -1,    -1,   124,    -1,   148,   127,   128,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   137,   138,    -1,   140,   141,
-     142,   143,   144,   145,   146,   147,   148,   149,   150,     3,
-     174,     5,     6,     7,     8,    -1,    -1,   159,    12,    13,
-      -1,    15,    -1,    -1,    -1,    -1,    -1,    -1,   170,    -1,
-      -1,    -1,    -1,   175,   176,   177,   178,    -1,    -1,    -1,
-      -1,    -1,    -1,    37,    38,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    51,    52,    -1,
-      -1,    -1,    56,    -1,    58,    59,    60,    61,    62,    63,
-      64,    65,    66,    -1,    68,    -1,    -1,    -1,    72,    73,
-      74,    75,    76,    77,    78,    -1,    -1,    81,    -1,    -1,
-      84,    85,    86,    39,    40,    41,    42,    43,    44,    45,
-      46,    47,    48,    49,    50,    51,    52,    53,    54,    55,
-     104,    57,    -1,    -1,   108,   109,    -1,    -1,    -1,    -1,
-      -1,    67,    -1,    -1,   118,    -1,    -1,    -1,    -1,    -1,
-     124,    -1,    -1,   127,   128,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   137,   138,    -1,   140,   141,   142,   143,
-     144,   145,   146,   147,   148,   149,   150,     3,    -1,     5,
-       6,     7,     8,    -1,    -1,   159,    12,    13,    -1,    15,
-      -1,    -1,    -1,    -1,    -1,    -1,   170,    -1,    -1,    -1,
-      -1,   175,   176,   177,   178,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    51,    52,    -1,    -1,    -1,
-      56,    -1,    58,    59,    60,    61,    62,    63,    64,    65,
-      66,    -1,    68,    -1,    -1,    -1,    72,    73,    74,    75,
-      76,    77,    78,    -1,    -1,    81,    82,    -1,    84,    85,
-      86,    39,    40,    41,    42,    43,    44,    45,    46,    47,
-      48,    49,    50,    51,    52,    53,    54,    55,   104,    57,
-      -1,    -1,   108,   109,    -1,    -1,    -1,    -1,    -1,    67,
-      -1,    -1,   118,    -1,    -1,    -1,    -1,    -1,   124,    -1,
-      -1,   127,   128,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   137,   138,    -1,   140,   141,   142,   143,   144,   145,
-     146,   147,   148,   149,   150,     3,    -1,     5,     6,     7,
-       8,    -1,    -1,   159,    12,    13,    -1,    15,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   136,
+     137,   138,   139,   140,   141,   142,   143,   144,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   154,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   170,    -1,   172,   173,    -1,   175,   176,
+     177,   178,    12,    13,    -1,    -1,    -1,    17,    18,    19,
+      -1,    21,    22,    23,    24,    25,    26,    27,    -1,    -1,
+      30,    -1,    -1,    33,    34,    35,    36,    37,    -1,    -1,
+      65,    41,    42,    43,    -1,    45,    46,    47,    73,    -1,
+      -1,    -1,    -1,    -1,    79,    -1,    -1,    82,    83,    84,
+      85,    86,    87,    88,    89,    -1,    -1,    67,    -1,    -1,
+      -1,    71,    72,    -1,    -1,    -1,    -1,    -1,    78,    -1,
+      -1,    -1,    82,    -1,    -1,    -1,    -1,   112,    88,    -1,
+      -1,    91,    92,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   101,   102,    -1,   104,   105,   106,   107,   108,   109,
+     110,   111,   112,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   136,   137,   138,   139,
+     140,   141,   142,   143,   144,    -1,    -1,    -1,    -1,   174,
+      -1,    -1,    -1,    -1,   154,    -1,    -1,    -1,    -1,    -1,
+     160,    -1,    -1,    -1,   164,   165,    -1,    -1,    -1,    -1,
+     170,    -1,    -1,    -1,    -1,   175,   176,   177,   178,    12,
+      13,    -1,    -1,    -1,    17,    18,    19,    -1,    21,    22,
+      23,    24,    25,    26,    27,    -1,    -1,    30,    -1,    -1,
+      33,    34,    35,    36,    37,    -1,    -1,    65,    41,    42,
+      43,    -1,    45,    46,    47,    73,    -1,    -1,    -1,    -1,
+      -1,    79,    -1,    -1,    82,    83,    84,    85,    86,    87,
+      88,    89,    -1,    -1,    67,    -1,    -1,    -1,    71,    72,
+      -1,    -1,    -1,    -1,    -1,    78,    -1,    -1,    -1,    82,
+      -1,    -1,    -1,    -1,   112,    88,    -1,    -1,    91,    92,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   101,   102,
+      -1,   104,   105,   106,   107,   108,   109,   110,   111,   112,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   136,   137,   138,   139,   140,   141,   142,
+     143,   144,    -1,    -1,    -1,    -1,   174,    -1,    -1,    -1,
+      -1,   154,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   164,   165,    -1,    -1,    -1,    -1,   170,    -1,    -1,
+      -1,    -1,   175,   176,   177,   178,    12,    13,    -1,    -1,
+      -1,    17,    18,    19,    -1,    21,    22,    23,    24,    25,
+      26,    27,    -1,    -1,    30,    -1,    -1,    33,    34,    35,
+      36,    37,    -1,    -1,    -1,    41,    42,    43,    -1,    45,
+      46,    47,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    67,    -1,    -1,    -1,    71,    72,    -1,    -1,    -1,
+      -1,    -1,    78,    -1,    -1,    -1,    82,    -1,    -1,    -1,
+      -1,    -1,    88,    -1,    -1,    91,    92,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   101,   102,    -1,   104,   105,
+     106,   107,   108,   109,   110,   111,   112,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     136,   137,   138,   139,   140,   141,   142,   143,   144,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   154,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   164,   165,
       -1,    -1,    -1,    -1,   170,    -1,    -1,    -1,    -1,   175,
-     176,   177,   178,    31,    -1,    -1,    -1,    -1,    -1,    -1,
+     176,   177,   178,    12,    13,    -1,    -1,    -1,    17,    18,
+      19,    -1,    21,    22,    23,    24,    25,    26,    27,    -1,
+      -1,    30,    31,    -1,    33,    34,    35,    36,    37,    -1,
+      -1,    -1,    41,    42,    43,    -1,    45,    46,    47,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    67,    -1,
+      -1,    -1,    71,    72,    -1,    -1,    -1,    -1,    -1,    78,
+      -1,    -1,    -1,    82,    -1,    -1,    -1,    -1,    -1,    88,
+      -1,    -1,    91,    92,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   101,   102,    -1,   104,   105,   106,   107,   108,
+     109,   110,   111,   112,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   136,   137,   138,
+     139,   140,   141,   142,   143,   144,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   154,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   170,    -1,    -1,    -1,    -1,   175,   176,   177,   178,
+      12,    13,    -1,    -1,    -1,    17,    18,    19,    -1,    21,
+      22,    23,    24,    25,    26,    27,    -1,    -1,    30,    -1,
+      -1,    33,    34,    35,    36,    37,    -1,    -1,    -1,    41,
+      42,    43,    -1,    45,    46,    47,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    67,    -1,    -1,    -1,    71,
+      72,    -1,    -1,    -1,    -1,    -1,    78,    -1,    -1,    -1,
+      82,    -1,    -1,    -1,    -1,    -1,    88,    -1,    -1,    91,
+      92,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   101,
+     102,    -1,   104,   105,   106,   107,   108,   109,   110,   111,
+     112,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   136,   137,   138,   139,   140,   141,
+     142,   143,   144,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   154,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   170,   171,
+      -1,    -1,    -1,   175,   176,   177,   178,    12,    13,    -1,
+      -1,    -1,    17,    18,    19,    -1,    21,    22,    23,    24,
+      25,    26,    27,    -1,    -1,    30,    -1,    -1,    33,    34,
+      35,    36,    37,    -1,    -1,    -1,    41,    42,    43,    -1,
+      45,    46,    47,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    66,    67,    -1,    -1,    -1,    71,    72,    -1,    -1,
+      -1,    -1,    -1,    78,    -1,    -1,    -1,    82,    -1,    -1,
+      -1,    -1,    -1,    88,    -1,    -1,    91,    92,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   101,   102,    -1,   104,
+     105,   106,   107,   108,   109,   110,   111,   112,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   136,   137,   138,   139,   140,   141,   142,   143,   144,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   154,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   170,    -1,    -1,    -1,    -1,
+     175,   176,   177,   178,    12,    13,    -1,    -1,    -1,    17,
+      18,    19,    -1,    21,    22,    23,    24,    25,    26,    27,
+      -1,    -1,    30,    -1,    -1,    33,    34,    35,    36,    37,
+      -1,    -1,    -1,    41,    42,    43,    -1,    45,    46,    47,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    67,
+      -1,    -1,    -1,    71,    72,    -1,    -1,    -1,    -1,    -1,
+      78,    -1,    -1,    -1,    82,    -1,    -1,    -1,    -1,    -1,
+      88,    -1,    -1,    91,    92,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   101,   102,    -1,   104,   105,   106,   107,
+     108,   109,   110,   111,   112,     5,    -1,     7,     8,     9,
+      10,    11,    12,    13,    14,    15,    16,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   136,   137,
+     138,   139,   140,   141,   142,   143,   144,    -1,    38,    39,
+      40,    -1,    -1,    -1,    44,    -1,   154,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    51,    52,    -1,    -1,    -1,    56,    -1,
-      58,    59,    60,    61,    62,    63,    64,    65,    66,    -1,
-      68,    -1,    -1,    -1,    72,    73,    74,    75,    76,    77,
-      78,    -1,    -1,    81,    -1,    -1,    84,    85,    86,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   104,    -1,    -1,    -1,
-     108,   109,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     118,    -1,    -1,    -1,    -1,    -1,   124,    -1,    -1,   127,
-     128,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   137,
-     138,    -1,   140,   141,   142,   143,   144,   145,   146,   147,
-     148,   149,   150,     3,    -1,     5,     6,     7,     8,    -1,
-      -1,   159,    12,    13,    -1,    15,    -1,    -1,    -1,    -1,
       -1,    -1,   170,    -1,    -1,    -1,    -1,   175,   176,   177,
-     178,    31,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     178,     5,    -1,     7,     8,     9,    10,    11,    12,    13,
+      14,    15,    16,     5,    -1,     7,     8,     9,    10,    11,
+      12,    13,    14,    15,    16,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    38,    39,    40,    -1,    -1,    -1,
+      44,    -1,    -1,    -1,    -1,    -1,    38,    39,    40,    -1,
+      -1,    -1,    44,    -1,    -1,   125,   126,   127,   128,   129,
+     130,   131,   132,   133,   134,   135,    -1,    -1,    -1,     5,
+      -1,     7,     8,     9,    10,    11,    12,    13,    14,    15,
+      16,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   161,   162,    -1,   164,   165,    -1,    -1,    -1,    -1,
+      -1,   171,    38,    39,    40,    -1,    -1,    -1,    44,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    51,    52,    -1,    -1,    -1,    56,    -1,    58,    59,
-      60,    61,    62,    63,    64,    65,    66,    -1,    68,    -1,
-      -1,    -1,    72,    73,    74,    75,    76,    77,    78,    -1,
-      -1,    81,    -1,    -1,    84,    85,    86,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   104,    -1,    -1,    -1,   108,   109,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   118,    -1,
-      -1,    -1,    -1,    -1,   124,    -1,    -1,   127,   128,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   137,   138,    -1,
-     140,   141,   142,   143,   144,   145,   146,   147,   148,   149,
-     150,     3,    -1,     5,     6,     7,     8,    -1,    -1,   159,
-      12,    13,    -1,    15,    -1,    -1,    -1,    -1,    -1,    -1,
-     170,    -1,    -1,    -1,    -1,   175,   176,   177,   178,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    51,
-      52,    -1,    -1,    -1,    56,    -1,    58,    59,    60,    61,
-      62,    63,    64,    65,    66,    -1,    68,    -1,    -1,    -1,
-      72,    73,    74,    75,    76,    77,    78,    -1,    -1,    81,
-      -1,    -1,    84,    85,    86,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   104,    -1,    -1,    -1,   108,   109,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   118,    -1,    -1,    -1,
-      -1,    -1,   124,    -1,    -1,   127,   128,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   137,   138,    -1,   140,   141,
-     142,   143,   144,   145,   146,   147,   148,   149,   150,     3,
-      -1,     5,     6,     7,     8,    -1,    -1,   159,    12,    13,
-      -1,    15,    -1,    -1,    -1,    -1,    -1,    -1,   170,   171,
-      -1,    -1,    -1,   175,   176,   177,   178,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    51,    52,    -1,
-      -1,    -1,    56,    -1,    58,    59,    60,    61,    62,    63,
-      64,    65,    66,    -1,    68,    -1,    -1,    -1,    72,    73,
-      74,    75,    76,    77,    78,    -1,    -1,    81,    -1,    -1,
-      84,    85,    86,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   103,
-     104,    -1,    -1,    -1,   108,   109,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   118,    -1,    -1,    -1,    -1,    -1,
-     124,    -1,    -1,   127,   128,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   137,   138,    -1,   140,   141,   142,   143,
-     144,   145,   146,   147,   148,   149,   150,     3,    -1,     5,
-       6,     7,     8,    -1,    -1,   159,    12,    13,    -1,    15,
-      -1,    -1,    -1,    -1,    -1,    -1,   170,    -1,    -1,    -1,
-      -1,   175,   176,   177,   178,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    51,    52,    -1,    -1,    -1,
-      56,    -1,    58,    59,    60,    61,    62,    63,    64,    65,
-      66,    -1,    68,    -1,    -1,    -1,    72,    73,    74,    75,
-      76,    77,    78,    -1,    -1,    81,    -1,    -1,    84,    85,
-      86,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   104,    -1,
-      -1,    -1,   108,   109,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   118,    -1,    -1,    -1,    -1,    -1,   124,    -1,
-      -1,   127,   128,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   137,   138,    -1,   140,   141,   142,   143,   144,   145,
-     146,   147,   148,   149,   150,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,     3,   159,     5,     6,     7,     8,     9,    10,
-      11,    12,    13,    -1,   170,    -1,    -1,    -1,    -1,   175,
-     176,   177,   178,    32,    33,    34,    35,    36,    37,    38,
-      39,    40,    41,    42,    43,    44,    45,    46,    47,    48,
-      49,    50,    51,    52,    53,    54,    55,    -1,    57,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    57,    -1,    67,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    68,    -1,    70,
-      71,    -1,    -1,    74,    75,    76,    77,    -1,    -1,    -1,
-      -1,    -1,    -1,    84,    85,    86,    87,    88,    89,    90,
-      91,    92,    93,    94,    95,    96,    97,    98,    99,   100,
-     101,   102,   103,   104,   105,   106,   107,   108,   109,   110,
-     111,   112,   113,   114,   115,   116,   117,   118,   119,   120,
-     121,   122,   123,   124,   125,   126,   127,   128,    -1,   130,
-     131,   132,   133,   134,   135,   136,   137,   138,   139,   140,
-     141,   142,   143,   144,   145,   146,   147,     3,    -1,     5,
-       6,     7,     8,     9,    10,    11,    12,    13,    -1,    -1,
+      -1,   125,   126,   127,   128,   129,   130,   131,   132,   133,
+     134,   135,    -1,   125,   126,   127,   128,   129,   130,   131,
+     132,   133,   134,   135,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   161,   162,    -1,
+     164,   165,    -1,    -1,    -1,    -1,    -1,   171,    -1,   161,
+     162,    -1,   164,   165,    -1,    -1,    -1,    -1,    -1,   171,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   125,
+     126,   127,   128,   129,   130,   131,   132,   133,   134,   135,
+      -1,    -1,    -1,     5,    -1,     7,     8,     9,    10,    11,
+      12,    13,    14,    15,    16,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   161,   162,    -1,   164,   165,
+      -1,    -1,    -1,    -1,    -1,   171,    38,    39,    40,    -1,
+      -1,    -1,    44,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       5,    -1,     7,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,     5,    -1,     7,     8,     9,    10,    11,    12,
+      13,    14,    15,    16,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    38,    39,    40,    -1,    -1,    -1,    44,
+      -1,    -1,    -1,    -1,    -1,    38,    39,    40,    -1,    -1,
+      -1,    44,    -1,    -1,    -1,    -1,    -1,    -1,    -1,     5,
+      -1,     7,     8,     9,    10,    11,    12,    13,    14,    15,
+      16,    -1,    -1,   125,   126,   127,   128,   129,   130,   131,
+     132,   133,   134,   135,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    38,    39,    40,    -1,    -1,    -1,    44,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   161,
+     162,    -1,   164,   165,    -1,    -1,    -1,    -1,    -1,   171,
+     125,   126,   127,   128,   129,   130,   131,   132,   133,   134,
+     135,    -1,   125,   126,   127,   128,   129,   130,   131,   132,
+     133,   134,   135,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   161,   162,    -1,   164,
+     165,    -1,    -1,    -1,    -1,    -1,   171,    -1,   161,   162,
+      -1,   164,   165,    -1,    -1,    -1,    -1,    -1,   171,   125,
+     126,   127,   128,   129,   130,   131,   132,   133,   134,   135,
+      -1,    -1,    -1,     5,    -1,     7,     8,     9,    10,    11,
+      12,    13,    14,    15,    16,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   161,   162,    -1,   164,   165,
+      -1,    -1,    -1,    -1,    -1,   171,    38,    39,    40,    -1,
+      -1,    -1,    44,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       5,    -1,     7,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,     5,    -1,     7,     8,     9,    10,    11,    12,
+      13,    14,    15,    16,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    38,    39,    40,    -1,    -1,    -1,    44,
+      -1,    -1,    -1,    -1,    -1,    38,    39,    40,    -1,    -1,
+      -1,    44,    -1,    -1,    -1,    -1,    -1,    -1,    -1,     5,
+      -1,     7,     8,     9,    10,    11,    12,    13,    14,    15,
+      16,    -1,    -1,   125,   126,   127,   128,   129,   130,   131,
+     132,   133,   134,   135,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    38,    39,    40,    -1,    -1,    -1,    44,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   161,
+     162,    -1,   164,   165,    -1,    -1,    -1,    -1,    -1,   171,
+     125,   126,   127,   128,   129,   130,   131,   132,   133,   134,
+     135,    -1,   125,   126,   127,   128,   129,   130,   131,   132,
+     133,   134,   135,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   161,   162,    -1,   164,
+     165,    -1,    -1,    -1,    -1,    -1,   171,    -1,   161,   162,
+      -1,   164,   165,    -1,    -1,    -1,    -1,    -1,   171,   125,
+     126,   127,   128,   129,   130,   131,   132,   133,   134,   135,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   174,    34,    35,    36,    37,    38,    39,
-      40,    41,    42,    43,    44,    45,    46,    47,    48,    49,
-      50,    51,    52,    53,    54,    55,    -1,    57,    -1,    -1,
-      -1,    57,    -1,    -1,    -1,    -1,    -1,    67,    -1,    -1,
-      -1,    -1,    68,    -1,    70,    71,    -1,    -1,    74,    75,
-      76,    77,    -1,    -1,    -1,    -1,    -1,    -1,    84,    85,
-      86,    87,    88,    89,    90,    91,    92,    93,    94,    95,
-      96,    97,    98,    99,   100,   101,   102,   103,   104,   105,
-     106,   107,   108,   109,   110,   111,   112,   113,   114,   115,
-     116,   117,   118,   119,   120,   121,   122,   123,   124,   125,
-     126,   127,   128,    -1,   130,   131,   132,   133,   134,   135,
-     136,   137,   138,   139,   140,   141,   142,   143,   144,   145,
-     146,   147,     3,    -1,     5,     6,     7,     8,     9,    10,
-      11,    12,    13,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   174,    30,
-      36,    37,    38,    39,    40,    41,    42,    43,    44,    45,
-      46,    47,    48,    49,    50,    51,    52,    53,    54,    55,
-      -1,    57,    -1,    -1,    -1,    -1,    57,    -1,    -1,    -1,
-      -1,    67,    -1,    -1,    -1,    -1,    -1,    68,    -1,    70,
-      71,    -1,    -1,    74,    75,    76,    77,    -1,    -1,    -1,
-      -1,    -1,    -1,    84,    85,    86,    87,    88,    89,    90,
-      91,    92,    93,    94,    95,    96,    97,    98,    99,   100,
+      -1,    -1,     5,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   161,   162,    -1,   164,   165,
+      23,    24,    25,    26,    -1,   171,    -1,    -1,    -1,    -1,
+      33,    34,    35,    36,    37,    38,    39,    40,    41,    42,
+      -1,    44,    45,    46,    47,    48,    49,    50,    51,    52,
+      53,    54,    55,    56,    57,    58,    59,    60,    61,    62,
+      63,    64,    65,    66,    67,    68,    69,    70,    71,    72,
+      73,    74,    75,    76,    77,    78,    79,    80,    81,    82,
+      83,    84,    85,    86,    87,    88,    89,    90,    91,    92,
+      -1,    94,    95,    96,    97,    98,    99,   100,   101,   102,
+     103,   104,   105,   106,   107,   108,   109,   110,   111,     5,
+      -1,     7,     8,     9,    10,    11,    12,    13,    14,    15,
+      16,     5,    -1,     7,     8,     9,    10,    11,    12,    13,
+      14,    15,    16,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    38,    39,    40,    -1,    -1,    -1,    44,    -1,
+      -1,    -1,    -1,    -1,    38,    39,    40,    -1,    -1,    -1,
+      44,    -1,    -1,    -1,    -1,    -1,     5,   170,     7,     8,
+       9,    10,    11,    12,    13,    14,    15,    16,     5,     6,
+       7,     8,     9,    10,    11,    12,    13,    14,    15,    16,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    38,
+      39,    40,    -1,    -1,    -1,    44,    -1,    -1,    -1,    -1,
+      -1,    38,    39,    40,    -1,    -1,    -1,    44,    -1,    -1,
+      -1,    -1,    -1,    62,    -1,    -1,    -1,    -1,    -1,   125,
+     126,   127,   128,   129,   130,   131,   132,   133,   134,   135,
+      -1,   125,   126,   127,   128,   129,   130,   131,   132,   133,
+     134,   135,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   147,    -1,   161,   162,    -1,   164,   165,
+      -1,    -1,    -1,   169,    -1,    -1,    -1,   161,   162,    -1,
+     164,   165,    -1,    -1,    -1,    -1,   125,   126,   127,   128,
+     129,   130,   131,   132,   133,   134,   135,    -1,   125,   126,
+     127,   128,   129,   130,   131,   132,   133,   134,   135,     5,
+      -1,     7,     8,     9,    10,    11,    12,    13,    14,    15,
+      16,    -1,   161,   162,    -1,   164,   165,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   161,   162,    -1,   164,   165,    -1,
+      -1,    -1,    38,    39,    40,    -1,    -1,    -1,    44,    -1,
+       5,    -1,     7,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,     5,    -1,     7,     8,     9,    10,    11,    12,
+      13,    14,    15,    16,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    39,    40,    -1,    -1,    -1,    44,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    40,    -1,    -1,
+      -1,    44,    -1,     5,    -1,     7,     8,     9,    10,    11,
+      12,    13,    14,    15,    16,     7,     8,     9,    10,    11,
+      12,    13,    14,    15,    16,    -1,    -1,    -1,    -1,   125,
+     126,   127,   128,   129,   130,   131,   132,   133,   134,   135,
+      -1,    -1,    44,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    44,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   161,   162,    -1,   164,   165,
+     125,   126,   127,   128,   129,   130,   131,   132,   133,   134,
+     135,    -1,   125,   126,   127,   128,   129,   130,   131,   132,
+     133,   134,   135,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   161,   162,    -1,   164,
+     165,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   161,   162,
+      -1,   164,   165,   125,   126,   127,   128,   129,   130,   131,
+     132,   133,   134,   135,   126,   127,   128,   129,   130,   131,
+     132,   133,   134,   135,     7,     8,     9,    10,    11,    12,
+      13,    14,    15,    16,    -1,    -1,    -1,    -1,    -1,   161,
+     162,    -1,   164,   165,    -1,    -1,    -1,    -1,    -1,    -1,
+     162,    -1,   164,   165,    -1,    23,    24,    25,    26,    27,
+      -1,    44,    30,    -1,     8,     9,    10,    11,    12,    13,
+      14,    15,    16,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      44,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    82,    -1,    -1,    -1,    -1,    -1,
+      88,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   101,   102,    -1,   104,   105,   106,   107,
+     108,   109,   110,   111,   127,   128,   129,   130,   131,   132,
+     133,   134,   135,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   162,
+      -1,   164,   165,   127,   128,   129,   130,   131,   132,   133,
+     134,   135,    -1,    -1,    -1,    -1,   164,   165,    -1,    -1,
+      -1,    -1,   170,    -1,    -1,    -1,    -1,   175,    -1,   177,
+     178,    -1,    23,    -1,    -1,    -1,    27,    -1,   162,    -1,
+     164,   165,    33,    34,    35,    36,    37,    38,    39,    40,
+      41,    42,    -1,    44,    45,    46,    47,    48,    49,    50,
+      51,    52,    53,    54,    55,    56,    57,    58,    59,    60,
+      61,    62,    63,    64,    65,    66,    67,    68,    69,    70,
+      71,    72,    73,    74,    75,    76,    77,    78,    79,    80,
+      81,    82,    83,    84,    85,    86,    87,    88,    89,    90,
+      91,    92,    -1,    94,    95,    96,    97,    98,    99,   100,
      101,   102,   103,   104,   105,   106,   107,   108,   109,   110,
-     111,   112,   113,   114,   115,   116,   117,   118,   119,   120,
-     121,   122,   123,   124,   125,   126,   127,   128,    -1,   130,
-     131,   132,   133,   134,   135,   136,   137,   138,   139,   140,
-     141,   142,   143,   144,   145,   146,   147,     9,    10,    11,
+     111,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    30,   170,
-      32,    33,    34,    35,    36,    37,    38,    39,    40,    41,
-      42,    43,    44,    45,    46,    47,    48,    49,    50,    51,
-      52,    53,    54,    55,    -1,    57,     9,    10,    11,    -1,
-      -1,    -1,    -1,    -1,    -1,    67,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    30,    -1,    32,
-      33,    34,    35,    36,    37,    38,    39,    40,    41,    42,
-      43,    44,    45,    46,    47,    48,    49,    50,    51,    52,
-      53,    54,    55,    -1,    57,     9,    10,    11,    -1,    -1,
-      -1,    -1,    -1,    -1,    67,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    30,    -1,    32,    33,
-      34,    35,    36,    37,    38,    39,    40,    41,    42,    43,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,     9,    10,    11,    12,    13,    14,
+      15,    16,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    23,
+      -1,    -1,   173,    27,    -1,    -1,    -1,   178,    -1,    33,
+      34,    35,    36,    37,    38,    39,    40,    41,    42,    44,
       44,    45,    46,    47,    48,    49,    50,    51,    52,    53,
-      54,    55,    -1,    57,     9,    10,    11,    -1,    -1,    -1,
-      -1,    -1,    -1,    67,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   174,    -1,    -1,    30,    -1,    32,    33,    34,
-      35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
-      45,    46,    47,    48,    49,    50,    51,    52,    53,    54,
-      55,    -1,    57,     9,    10,    11,    -1,    -1,    -1,    -1,
-      -1,    -1,    67,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   174,    -1,    -1,    30,    -1,    32,    33,    34,    35,
-      36,    37,    38,    39,    40,    41,    42,    43,    44,    45,
-      46,    47,    48,    49,    50,    51,    52,    53,    54,    55,
-      -1,    57,     9,    10,    11,    -1,    -1,    -1,    -1,    -1,
-      -1,    67,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     174,    -1,    -1,    30,    -1,    32,    33,    34,    35,    36,
-      37,    38,    39,    40,    41,    42,    43,    44,    45,    46,
-      47,    48,    49,    50,    51,    52,    53,    54,    55,    -1,
-      57,     9,    10,    11,    -1,    -1,    -1,    -1,    -1,    -1,
-      67,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   174,
-      -1,    -1,    30,    -1,    32,    33,    34,    35,    36,    37,
-      38,    39,    40,    41,    42,    43,    44,    45,    46,    47,
-      48,    49,    50,    51,    52,    53,    54,    55,    -1,    57,
-       9,    10,    11,    -1,    -1,    -1,    -1,    -1,    -1,    67,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   174,    -1,
-      -1,    30,    31,    32,    33,    34,    35,    36,    37,    38,
-      39,    40,    41,    42,    43,    44,    45,    46,    47,    48,
-      49,    50,    51,    52,    53,    54,    55,    -1,    57,     9,
-      10,    11,    -1,    -1,    -1,    -1,    -1,    -1,    67,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   174,    -1,    -1,
-      30,    -1,    32,    33,    34,    35,    36,    37,    38,    39,
-      40,    41,    42,    43,    44,    45,    46,    47,    48,    49,
-      50,    51,    52,    53,    54,    55,    -1,    57,     9,    10,
-      11,    -1,    -1,    -1,    -1,    -1,    -1,    67,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   174,    -1,    -1,    30,
-      -1,    32,    33,    34,    35,    36,    37,    38,    39,    40,
-      41,    42,    43,    44,    45,    46,    47,    48,    49,    50,
-      51,    52,    53,    54,    55,    -1,    57,     9,    10,    11,
-      -1,    -1,    -1,    -1,    -1,    -1,    67,    -1,    -1,    -1,
-      -1,    -1,    -1,   172,    -1,    -1,    -1,    -1,    30,    -1,
-      32,    33,    34,    35,    36,    37,    38,    39,    40,    41,
-      42,    43,    44,    45,    46,    47,    48,    49,    50,    51,
-      52,    53,    54,    55,    -1,    57,     9,    10,    11,    -1,
-      -1,    -1,    -1,    -1,    -1,    67,    -1,    -1,    -1,    -1,
-      -1,    -1,   172,    -1,    -1,    -1,    -1,    30,    -1,    32,
-      33,    34,    35,    36,    37,    38,    39,    40,    41,    42,
-      43,    44,    45,    46,    47,    48,    49,    50,    51,    52,
-      53,    54,    55,    -1,    57,     9,    10,    11,    -1,    -1,
-      -1,    -1,    -1,    -1,    67,    -1,    -1,    -1,    -1,    -1,
-     171,    -1,    -1,    -1,    -1,    -1,    30,    -1,    32,    33,
-      34,    35,    36,    37,    38,    39,    40,    41,    42,    43,
+      54,    55,    56,    57,    58,    59,    60,    61,    62,    63,
+      64,    65,    66,    67,    68,    69,    70,    71,    72,    73,
+      74,    75,    76,    77,    78,    79,    80,    81,    82,    83,
+      84,    85,    86,    87,    88,    89,    90,    91,    92,    -1,
+      94,    95,    96,    97,    98,    99,   100,   101,   102,   103,
+     104,   105,   106,   107,   108,   109,   110,   111,    23,    24,
+      25,    26,    27,    -1,    -1,    30,    -1,    -1,    -1,    -1,
+      -1,    -1,   127,   128,   129,   130,   131,   132,   133,   134,
+     135,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,     9,    10,    11,    12,
+      13,    14,    15,    16,    -1,    -1,    -1,   162,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    82,    -1,   173,
+      -1,    -1,    -1,    88,   178,    -1,    -1,    -1,    -1,    -1,
+      -1,    44,    -1,    -1,    -1,    -1,    -1,   102,    -1,   104,
+     105,   106,   107,   108,   109,   110,   111,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   170,    -1,    -1,    -1,    -1,
+     175,    -1,   177,   178,   127,   128,   129,   130,   131,   132,
+     133,   134,   135,    -1,    -1,    -1,    -1,    -1,    -1,    23,
+      24,    25,    26,    -1,    -1,    -1,    -1,    -1,    -1,    33,
+      34,    35,    36,    37,    38,    39,    40,    41,    42,   162,
       44,    45,    46,    47,    48,    49,    50,    51,    52,    53,
-      54,    55,    -1,    57,     9,    10,    11,    -1,    -1,    -1,
-      -1,    -1,    -1,    67,    -1,    -1,    -1,    -1,    -1,   171,
-      -1,    -1,    -1,    -1,    -1,    30,    -1,    32,    33,    34,
-      35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
-      45,    46,    47,    48,    49,    50,    51,    52,    53,    54,
-      55,    -1,    57,     9,    10,    11,    -1,    -1,    -1,    -1,
-      -1,    -1,    67,    -1,    -1,    -1,    -1,    -1,   171,    -1,
-      -1,    -1,    -1,    -1,    30,    -1,    32,    33,    34,    35,
-      36,    37,    38,    39,    40,    41,    42,    43,    44,    45,
-      46,    47,    48,    49,    50,    51,    52,    53,    54,    55,
-      -1,    57,     9,    10,    11,    -1,    -1,    -1,    -1,    -1,
-      -1,    67,    -1,    -1,    -1,    -1,    -1,   171,    -1,    -1,
-      -1,    -1,    -1,    30,    -1,    32,    33,    34,    35,    36,
-      37,    38,    39,    40,    41,    42,    43,    44,    45,    46,
-      47,    48,    49,    50,    51,    52,    53,    54,    55,    -1,
-      57,     9,    10,    11,    -1,    -1,    -1,    -1,    -1,    -1,
-      67,    -1,    -1,    -1,    -1,    -1,   171,    -1,    -1,    -1,
-      -1,    -1,    30,    -1,    32,    33,    34,    35,    36,    37,
-      38,    39,    40,    41,    42,    43,    44,    45,    46,    47,
-      48,    49,    50,    51,    52,    53,    54,    55,    -1,    57,
-       9,    10,    11,    -1,    -1,    -1,    -1,    -1,    -1,    67,
-      -1,    -1,    -1,    -1,    -1,   171,    -1,    -1,    -1,    -1,
-      -1,    30,    -1,    32,    33,    34,    35,    36,    37,    38,
-      39,    40,    41,    42,    43,    44,    45,    46,    47,    48,
-      49,    50,    51,    52,    53,    54,    55,    -1,    57,     9,
-      10,    11,    -1,    -1,    -1,    -1,    -1,    -1,    67,    -1,
-      -1,    -1,    -1,    -1,   171,    -1,    -1,    -1,    -1,    -1,
-      30,    -1,    32,    33,    34,    35,    36,    37,    38,    39,
-      40,    41,    42,    43,    44,    45,    46,    47,    48,    49,
-      50,    51,    52,    53,    54,    55,    -1,    57,     9,    10,
-      11,    -1,    -1,    -1,    -1,    -1,    -1,    67,    -1,    -1,
-      -1,    -1,    -1,   171,    -1,    -1,    -1,    -1,    -1,    30,
-      -1,    32,    33,    34,    35,    36,    37,    38,    39,    40,
-      41,    42,    43,    44,    45,    46,    47,    48,    49,    50,
-      51,    52,    53,    54,    55,    -1,    57,     9,    10,    11,
-      74,    75,    76,    77,    78,    -1,    67,    81,    -1,    -1,
-      -1,    -1,   171,    -1,    -1,    -1,    -1,    -1,    30,    -1,
-      32,    33,    34,    35,    36,    37,    38,    39,    40,    41,
-      42,    43,    44,    45,    46,    47,    48,    49,    50,    51,
-      52,    53,    54,    55,   118,    57,    -1,    -1,    -1,    -1,
-     124,    -1,    -1,    -1,    -1,    67,    -1,    -1,    -1,    -1,
-      -1,   171,    -1,    -1,   138,    -1,   140,   141,   142,   143,
-     144,   145,   146,   147,    -1,    -1,    -1,     3,    -1,     5,
-       6,     7,     8,     9,    10,    11,    12,    13,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   170,    -1,    -1,    -1,
-      -1,   175,    -1,   177,   178,    -1,    -1,    -1,    -1,    -1,
-     171,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    57,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    68,    -1,    70,    71,    -1,    -1,    74,    -1,
-      -1,    77,    -1,    -1,    -1,    -1,    -1,   169,    84,    85,
-      86,    87,    88,    89,    90,    91,    92,    93,    94,    95,
-      96,    97,    98,    99,   100,   101,   102,   103,   104,   105,
-     106,   107,   108,   109,   110,   111,   112,   113,   114,   115,
-     116,   117,   118,   119,   120,   121,   122,   123,   124,   125,
-     126,   127,   128,    -1,   130,   131,   132,   133,   134,   135,
-     136,   137,   138,   139,   140,   141,   142,   143,   144,   145,
-     146,   147,     3,    11,     5,     6,     7,     8,     9,    10,
-      11,    12,    13,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    30,    -1,    32,    33,    34,    35,    36,    37,
-      38,    39,    40,    41,    42,    43,    44,    45,    46,    47,
-      48,    49,    50,    51,    52,    53,    54,    55,    -1,    57,
-      -1,    -1,    -1,    -1,    -1,    -1,    57,    -1,    -1,    67,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    68,    -1,    70,
-      71,    -1,    -1,    74,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    84,    85,    86,    87,    88,    89,    90,
-      91,    92,    93,    94,    95,    96,    97,    98,    99,   100,
-     101,   102,   103,   104,   105,   106,   107,   108,   109,   110,
-     111,   112,   113,   114,   115,   116,   117,   118,   119,   120,
-     121,   122,   123,   124,   125,   126,   127,   128,    -1,   130,
-     131,   132,   133,   134,   135,   136,   137,   138,   139,   140,
-     141,   142,   143,   144,   145,   146,   147,     3,    -1,     5,
-       6,     7,     8,     9,    10,    11,    12,    13,    37,    38,
-      39,    40,    41,    42,    43,    44,    45,    46,    47,    48,
-      49,    50,    51,    52,    53,    54,    55,    -1,    57,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    67,    -1,
+      54,    55,    56,    57,    58,    59,    60,    61,    62,    63,
+      64,    65,    66,    67,    68,    69,    70,    71,    72,    73,
+      74,    75,    76,    77,    78,    79,    80,    81,    82,    83,
+      84,    85,    86,    87,    88,    89,    90,    91,    92,    -1,
+      94,    95,    96,    97,    98,    99,   100,   101,   102,   103,
+     104,   105,   106,   107,   108,   109,   110,   111,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    57,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    68,    -1,    70,    71,    -1,    -1,    74,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    84,    85,
-      86,    87,    88,    89,    90,    91,    92,    93,    94,    95,
-      96,    97,    98,    99,   100,   101,   102,   103,   104,   105,
-     106,   107,   108,   109,   110,   111,   112,   113,   114,   115,
-     116,   117,   118,   119,   120,   121,   122,   123,   124,   125,
-     126,   127,   128,    -1,   130,   131,   132,   133,   134,   135,
-     136,   137,   138,   139,   140,   141,   142,   143,   144,   145,
-     146,   147,     3,    -1,     5,     6,     7,     8,     9,    10,
-      11,    12,    13,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    57,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    68,    -1,    70,
-      71,    -1,    -1,    74,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    84,    85,    86,    87,    88,    89,    90,
-      91,    92,    93,    94,    95,    96,    97,    98,    99,   100,
-     101,   102,   103,   104,   105,   106,   107,   108,   109,   110,
-     111,   112,   113,   114,   115,   116,   117,   118,   119,   120,
-     121,   122,   123,   124,   125,   126,   127,   128,    -1,   130,
-     131,   132,   133,   134,   135,   136,   137,   138,   139,   140,
-     141,   142,   143,   144,   145,   146,   147,    37,    38,    -1,
+      23,    24,    25,    26,    -1,    -1,    -1,    -1,    -1,    -1,
+      33,    34,    35,    36,    37,    38,    39,    40,    41,    42,
+     174,    44,    45,    46,    47,    48,    49,    50,    51,    52,
+      53,    54,    55,    56,    57,    58,    59,    60,    61,    62,
+      63,    64,    65,    66,    67,    68,    69,    70,    71,    72,
+      73,    74,    75,    76,    77,    78,    79,    80,    81,    82,
+      83,    84,    85,    86,    87,    88,    89,    90,    91,    92,
+      -1,    94,    95,    96,    97,    98,    99,   100,   101,   102,
+     103,   104,   105,   106,   107,   108,   109,   110,   111,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,     9,
-      10,    11,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    74,    75,    76,    77,    78,    -1,
-      30,    81,    32,    33,    34,    35,    36,    37,    38,    39,
-      40,    41,    42,    43,    44,    45,    46,    47,    48,    49,
-      50,    51,    52,    53,    54,    55,    -1,    57,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    67,   118,    -1,
-      -1,    -1,    -1,    -1,   124,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   137,   138,    -1,
-     140,   141,   142,   143,   144,   145,   146,   147,    -1,    99,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,     9,    10,
-      11,    -1,    -1,    14,    -1,    -1,    -1,    -1,    -1,    -1,
-     170,    -1,    -1,    -1,    -1,   175,    -1,   177,   178,    30,
-      -1,    32,    33,    34,    35,    36,    37,    38,    39,    40,
-      41,    42,    43,    44,    45,    46,    47,    48,    49,    50,
-      51,    52,    53,    54,    55,    -1,    57,     9,    10,    11,
-      -1,    -1,    -1,    -1,    -1,    -1,    67,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    30,    31,
-      32,    33,    34,    35,    36,    37,    38,    39,    40,    41,
-      42,    43,    44,    45,    46,    47,    48,    49,    50,    51,
-      52,    53,    54,    55,    -1,    57,     9,    10,    11,    -1,
-      -1,    -1,    -1,    -1,    -1,    67,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    30,    -1,    32,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    23,    -1,    -1,    26,    -1,    -1,    -1,    -1,    -1,
+      -1,    33,    34,    35,    36,    37,    38,    39,    40,    41,
+      42,   174,    44,    45,    46,    47,    48,    49,    50,    51,
+      52,    53,    54,    55,    56,    57,    58,    59,    60,    61,
+      62,    63,    64,    65,    66,    67,    68,    69,    70,    71,
+      72,    73,    74,    75,    76,    77,    78,    79,    80,    81,
+      82,    83,    84,    85,    86,    87,    88,    89,    90,    91,
+      92,    -1,    94,    95,    96,    97,    98,    99,   100,   101,
+     102,   103,   104,   105,   106,   107,   108,   109,   110,   111,
+      23,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       33,    34,    35,    36,    37,    38,    39,    40,    41,    42,
-      43,    44,    45,    46,    47,    48,    49,    50,    51,    52,
-      53,    54,    55,    -1,    57,    10,    11,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    67,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    30,    -1,    32,    33,    34,
-      35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
+      -1,    44,    45,    46,    47,    48,    49,    50,    51,    52,
+      53,    54,    55,    56,    57,    58,    59,    60,    61,    62,
+      63,    64,    65,    66,    67,    68,    69,    70,    71,    72,
+      73,    74,    75,    76,    77,    78,    79,    80,    81,    82,
+      83,    84,    85,    86,    87,    88,    89,    90,    91,    92,
+      -1,    94,    95,    96,    97,    98,    99,   100,   101,   102,
+     103,   104,   105,   106,   107,   108,   109,   110,   111,    23,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    33,
+      34,    35,    36,    37,    38,    39,    40,    41,    42,    -1,
+      44,    45,    46,    47,    48,    49,    50,    51,    52,    53,
+      54,    55,    56,    57,    58,    59,    60,    61,    62,    63,
+      64,    65,    66,    67,    68,    69,    70,    71,    72,    73,
+      74,    75,    76,    77,    78,    79,    80,    81,    82,    83,
+      84,    85,    86,    87,    88,    89,    90,    91,    92,    -1,
+      94,    95,    96,    97,    98,    99,   100,   101,   102,   103,
+     104,   105,   106,   107,   108,   109,   110,   111,    23,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    33,    34,
+      35,    36,    37,    38,    39,    40,    41,    42,    -1,    44,
       45,    46,    47,    48,    49,    50,    51,    52,    53,    54,
-      55,    14,    57,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    67,    -1,    -1,    -1,    -1,    30,    -1,    32,
-      33,    34,    35,    36,    37,    38,    39,    40,    41,    42,
-      43,    44,    45,    46,    47,    48,    49,    50,    51,    52,
-      53,    54,    55,    -1,    57,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    67
+      55,    56,    57,    58,    59,    60,    61,    62,    63,    64,
+      65,    66,    67,    68,    69,    70,    71,    72,    73,    74,
+      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
+      85,    86,    87,    88,    89,    90,    91,    92,    -1,    94,
+      95,    96,    97,    98,    99,   100,   101,   102,   103,   104,
+     105,   106,   107,   108,   109,   110,   111
 };
 
-  /* YYSTOSSTATE-NUM -- The (internal number of the) accessing
-     symbol of state STATE-NUM.  */
-static const yytype_uint16 yystos =
+/* YYSTOSSTATE-NUM -- The symbol kind of the accessing symbol of
+   state STATE-NUM.  */
+static const yytype_int16 yystos =
 {
-       0,   180,   185,     0,     3,     5,     6,     7,     8,    12,
-      13,    15,    51,    52,    56,    58,    59,    60,    61,    62,
-      63,    64,    65,    66,    68,    72,    73,    74,    75,    76,
-      77,    78,    79,    81,    84,    85,    86,    87,    89,    90,
-      91,    93,    95,    97,   100,   104,   105,   106,   107,   108,
-     109,   110,   111,   112,   115,   117,   118,   119,   120,   124,
-     126,   127,   128,   129,   130,   131,   132,   133,   136,   137,
-     138,   140,   141,   142,   143,   144,   145,   146,   147,   148,
-     149,   150,   159,   170,   172,   173,   175,   176,   177,   178,
+       0,   180,   185,     0,    12,    13,    17,    18,    19,    21,
+      22,    23,    24,    25,    26,    27,    28,    30,    33,    34,
+      35,    36,    37,    41,    42,    43,    45,    46,    47,    48,
+      52,    53,    54,    56,    58,    60,    63,    67,    68,    69,
+      70,    71,    72,    73,    74,    75,    78,    79,    81,    82,
+      83,    84,    88,    90,    91,    92,    93,    94,    95,    96,
+      97,   100,   101,   102,   104,   105,   106,   107,   108,   109,
+     110,   111,   112,   136,   137,   138,   139,   140,   141,   142,
+     143,   144,   154,   170,   172,   173,   175,   176,   177,   178,
      189,   192,   193,   194,   195,   211,   220,   223,   226,   229,
      230,   232,   234,   249,   255,   256,   257,   258,   311,   312,
      313,   314,   315,   323,   325,   330,   331,   332,   333,   335,
-     336,   337,   338,   339,   340,   341,   342,   353,    74,   118,
-     124,   193,   312,   315,   312,   312,   312,   312,   312,   312,
-     312,   312,   312,   312,   312,   312,   312,   312,   312,   312,
-     312,   312,   312,   312,    31,   170,   118,   124,   170,   189,
-     193,   227,   228,   229,   309,   325,   326,   341,   343,   170,
-     327,   170,   305,   306,   312,   211,   170,   170,   170,   170,
-     170,   170,   312,   334,   334,    74,    74,   208,   304,   334,
-     173,    74,    75,    77,   108,   110,   187,   188,   198,   200,
-     204,   207,   279,   280,   341,    78,   281,   282,   313,   170,
-     276,   170,   170,   170,   170,   225,   231,   233,   235,     3,
-       5,     6,     7,     8,     9,    10,    11,    12,    13,    57,
-      68,    70,    71,    74,    77,    84,    85,    86,    87,    88,
-      89,    90,    91,    92,    93,    94,    95,    96,    97,    98,
-      99,   100,   101,   102,   103,   104,   105,   106,   107,   108,
-     109,   110,   111,   112,   113,   114,   115,   116,   117,   118,
-     119,   120,   121,   122,   123,   124,   125,   126,   127,   128,
-     130,   131,   132,   133,   134,   135,   136,   137,   138,   139,
-     140,   141,   142,   143,   144,   145,   146,   147,   181,   182,
-     184,   186,   197,   170,   170,   190,   191,   325,   170,   175,
-     330,   332,   333,   340,   340,    78,    80,   160,   161,   162,
-     350,   351,   312,   209,    37,    38,   137,   165,   183,   312,
-     346,   347,   348,   349,    80,   328,   350,    80,   350,   173,
-     341,   276,   118,   192,   194,   313,   130,   229,    70,    71,
-      70,    71,    88,     9,    10,    11,    30,    32,    33,    34,
-      35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
-      45,    46,    47,    48,    49,    50,    51,    52,    53,    54,
-      55,    57,    67,   172,   183,   319,   319,   163,   163,   151,
-     152,   173,   175,   324,    16,    17,    18,    19,    20,    21,
-      22,    23,    24,    25,    26,    27,    28,    29,   149,   150,
-     319,    14,   312,   312,   309,   229,   130,   163,   276,   329,
-     151,   152,   163,   173,   175,   334,   312,   168,   172,    91,
+     336,   337,   338,   339,   340,   341,   342,   353,    23,    82,
+      88,   193,   312,   315,   312,   312,   312,   312,     6,   312,
+     312,   170,   312,   312,   312,   312,   312,    82,    88,   170,
+     189,   193,   227,   228,   229,   309,   325,   326,   341,   343,
+     312,   170,   327,   170,   305,   306,   312,   211,   170,   170,
+     170,   170,   170,   170,   312,   334,   334,    23,    23,   208,
+     304,   334,   173,   312,    23,    24,    26,    71,    73,   187,
+     188,   198,   200,   204,   207,   279,   280,   341,    27,   281,
+     282,   313,   170,   276,   170,   170,   170,   170,   225,   231,
+     233,   235,    23,    26,    33,    34,    35,    36,    37,    38,
+      39,    40,    41,    42,    44,    45,    46,    47,    48,    49,
+      50,    51,    52,    53,    54,    55,    56,    57,    58,    59,
+      60,    61,    62,    63,    64,    65,    66,    67,    68,    69,
+      70,    71,    72,    73,    74,    75,    76,    77,    78,    79,
+      80,    81,    82,    83,    84,    85,    86,    87,    88,    89,
+      90,    91,    92,    94,    95,    96,    97,    98,    99,   100,
+     101,   102,   103,   104,   105,   106,   107,   108,   109,   110,
+     111,   181,   182,   184,   186,   197,   170,   170,   190,   191,
+     325,   170,   175,   330,   332,   333,   340,   340,   312,   312,
+     312,   312,   312,   312,   312,    27,    29,   155,   156,   157,
+     350,   351,   312,   209,   101,   160,   164,   165,   183,   312,
+     346,   347,   348,   349,    29,   328,   350,    29,   350,   173,
+     341,   276,    82,   192,   194,   313,    94,   229,    49,    50,
+      49,    50,    51,     5,     7,     8,     9,    10,    11,    12,
+      13,    14,    15,    16,    38,    39,    40,    44,   125,   126,
+     127,   128,   129,   130,   131,   132,   133,   134,   135,   161,
+     162,   164,   165,   172,   183,   319,   319,   158,   158,   145,
+     146,   173,   175,   324,     4,   113,   114,   115,   116,   117,
+     118,   119,   120,   121,   122,   123,   124,   136,   137,   163,
+     319,   312,   147,   312,   309,   229,    94,   158,   276,   329,
+     145,   146,   158,   173,   175,   334,   312,   168,   172,    54,
      312,   307,   308,   312,   312,   208,   312,   312,   172,   172,
-     172,    16,   168,   172,   172,   209,    99,   164,   188,   199,
-     204,   172,   168,   172,   168,   172,    16,   168,   172,     3,
-       5,     6,     7,     8,    12,    13,    68,    74,    84,    85,
-      86,   104,   108,   109,   118,   124,   127,   128,   137,   138,
-     140,   141,   142,   143,   144,   145,   146,   147,   165,   171,
+     172,     4,   168,   172,   172,   209,    62,   159,   188,   199,
+     204,   172,   168,   172,   168,   172,     4,   168,   172,    23,
+      33,    34,    35,    36,    37,    41,    42,    45,    46,    47,
+      67,    71,    72,    78,    82,    88,    91,    92,   101,   102,
+     104,   105,   106,   107,   108,   109,   110,   111,   160,   171,
      184,   277,   278,   312,   217,   218,   340,   312,   354,   355,
-     312,   171,    74,    74,    74,    74,   172,   196,   173,   346,
-     346,   168,   201,   276,   312,   346,   151,   152,   175,   160,
-     351,    82,   312,   340,    80,   160,   351,   171,   129,   174,
-     193,   194,   210,   211,   170,   312,   340,    14,   169,   168,
-     176,   177,   312,   313,   224,   170,   211,   170,    31,   172,
-     312,   312,   312,    31,   312,   312,   312,   312,   312,   312,
+     312,   171,    23,    23,    23,    23,   172,   196,   173,   346,
+     346,   168,   201,   276,   312,   346,   145,   146,   175,   155,
+     351,    31,   312,   340,    29,   155,   351,   171,    93,   174,
+     193,   194,   210,   211,   170,   312,   340,   147,   169,   168,
+     176,   177,   312,   313,   224,   170,   211,   170,     6,   172,
+       6,   312,   312,   312,   312,   312,   312,   312,   312,   312,
+     312,   312,   312,   312,   312,   326,   312,   312,   312,   312,
      312,   312,   312,   312,   312,   312,   312,   312,   312,   312,
-     312,   312,   312,   312,   312,   312,   312,   312,   312,   326,
-     312,   316,    74,   124,   219,   316,   173,   184,   341,   344,
-     173,   184,   341,   344,    74,   173,   341,   345,   345,   312,
+     312,   316,    23,    88,   219,   316,   173,   184,   341,   344,
+     173,   184,   341,   344,    23,   173,   341,   345,   345,   312,
      334,   276,   183,   312,   312,   312,   312,   312,   312,   312,
-     312,   312,   312,   312,   312,   312,   312,   312,   171,   171,
+     312,   312,   312,   312,   312,   312,   312,   171,   312,   171,
      310,   341,   345,   345,   341,   312,   334,   171,   171,   306,
-     170,   171,   172,   168,    99,   171,   171,   171,   312,   304,
-     174,    74,   173,   164,   172,   172,   188,   207,   280,   312,
-     282,   171,   312,    31,   168,   201,   168,   201,   168,   201,
-     171,   172,   134,   239,   316,   134,   240,    31,   236,   173,
-     185,   171,   171,   190,   169,   171,   169,    74,    74,    52,
-      74,    78,    83,   352,   174,   175,   174,   174,   170,   194,
-     346,   137,   183,   312,    16,   347,   174,    74,   312,   312,
-     209,   312,    31,   170,   316,   170,   312,   276,   312,   276,
-     312,   276,   276,   174,   169,   340,   329,   174,   169,    31,
-     211,   312,    31,   211,   254,   307,   312,   137,   175,   183,
-     242,   340,   212,    31,   173,   246,   173,   316,   213,   187,
-     198,   202,   205,   206,   173,   312,   165,   278,   171,   218,
-     171,   355,   171,   325,   135,   241,   173,   286,   325,   316,
-      30,   118,   138,   139,   170,   189,   265,   266,   267,   268,
-     269,   271,   241,   185,   174,    16,    83,   169,   312,   171,
-     171,   170,   340,   312,   239,   171,   171,    88,   312,   118,
-     119,   120,   121,   122,   123,   124,   193,   259,   260,   261,
+     170,   171,   172,   168,    62,   171,   171,   171,   312,   304,
+     174,    23,   173,   159,   172,   172,   188,   207,   280,   312,
+     282,   171,   312,     6,   168,   201,   168,   201,   168,   201,
+     171,   172,    98,   239,   316,    98,   240,     6,   236,   173,
+     185,   171,   171,   190,   169,   171,   169,    23,    23,    13,
+      23,    27,    32,   352,   174,   175,   174,   174,   170,   194,
+     346,   101,   183,   312,     4,   347,   174,    23,   312,   312,
+     209,   312,     6,   170,   316,   170,   312,   276,   312,   276,
+     312,   276,   276,   174,   169,   340,   329,   174,   169,     6,
+     211,   312,     6,   211,   254,   307,   312,   101,   175,   183,
+     242,   340,   212,     6,   173,   246,   173,   316,   213,   187,
+     198,   202,   205,   206,   173,   312,   160,   278,   171,   218,
+     171,   355,   171,   325,    99,   241,   173,   286,   325,   316,
+       5,    82,   102,   103,   170,   189,   265,   266,   267,   268,
+     269,   271,   241,   185,   174,     4,    32,   169,   312,   171,
+     171,   170,   340,   312,   239,   171,   171,    51,   312,    82,
+      83,    84,    85,    86,    87,    88,   193,   259,   260,   261,
      262,   263,   298,   299,   170,   259,   174,   174,   174,   239,
-     209,   171,   209,   172,   170,   346,   340,    14,   171,    31,
-     211,   245,   172,   247,   172,   247,   103,   250,   251,   252,
-     253,   312,   113,   114,   216,    99,   206,   168,   201,   203,
+     209,   171,   209,   172,   170,   346,   340,   147,   171,     6,
+     211,   245,   172,   247,   172,   247,    66,   250,   251,   252,
+     253,   312,    76,    77,   216,    62,   206,   168,   201,   203,
      206,   172,   286,   316,   283,   168,   173,   266,   266,   269,
-      37,    35,    35,    37,   316,   174,   312,   169,   172,   346,
-     241,   211,    31,   172,   263,   171,   168,   201,    30,   170,
+     165,     7,     7,   165,   316,   174,   312,   169,   172,   346,
+     241,   211,     6,   172,   263,   171,   168,   201,     5,   170,
      264,   270,   271,   272,   273,   274,   299,   259,   171,   241,
-     172,    92,   307,   346,   169,   242,    31,   211,   244,   209,
-     247,   101,   102,   103,   247,   174,   168,   201,   174,   168,
-     201,   168,   201,   170,   173,    74,   205,   174,   168,   201,
-     173,   102,   115,   125,   174,   193,   237,   284,   285,   295,
+     172,    55,   307,   346,   169,   242,     6,   211,   244,   209,
+     247,    64,    65,    66,   247,   174,   168,   201,   174,   168,
+     201,   168,   201,   170,   173,    23,   205,   174,   168,   201,
+     173,    65,    79,    89,   174,   193,   237,   284,   285,   295,
      296,   297,   298,   325,   283,   171,   266,   266,   267,   267,
-     266,   173,   174,   171,   316,   209,    31,   275,   261,   271,
-     271,   274,    38,   221,    37,    35,    35,    37,   171,   115,
-     320,   316,   172,   171,   171,   171,   209,    98,   101,   172,
-     312,    31,   172,   248,   174,    14,   252,   312,    14,   214,
+     266,   173,   174,   171,   316,   209,     6,   275,   261,   271,
+     271,   274,   164,   221,   165,     7,     7,   165,   171,    79,
+     320,   316,   172,   171,   171,   171,   209,    61,    64,   172,
+     312,     6,   172,   248,   174,   147,   252,   312,   147,   214,
      325,   209,   206,   174,   283,   316,   286,   284,   264,   315,
-     110,   174,   283,   173,   265,    14,   171,   165,   222,   271,
-     271,   272,   272,   271,   275,   170,   275,   173,    31,   211,
-     243,   244,    96,   172,   172,   248,   209,   312,   312,    35,
-      78,   215,   174,   174,   184,   172,   173,   287,    78,   300,
-     301,   319,    74,   118,   138,   139,   182,   265,   302,   303,
-     174,   283,   317,    78,   317,    78,   183,   321,   322,   317,
-     283,   209,   172,   209,   325,   171,    16,   238,   118,   174,
-     184,   288,   289,   290,   291,   292,   293,   325,    16,   316,
-     168,   172,   184,    16,    16,    74,   302,   168,   172,   174,
-     318,   316,   173,    78,   168,   201,   173,   174,    94,   173,
-     312,   172,   174,   289,   172,   172,    99,   116,   163,   312,
-     301,   316,   312,   312,   172,   303,   312,    16,   209,   322,
-     171,   209,   172,   209,    74,   181,   299,   286,   184,   316,
+      73,   174,   283,   173,   265,   147,   171,   160,   222,   271,
+     271,   272,   272,   271,   275,   170,   275,   173,     6,   211,
+     243,   244,    59,   172,   172,   248,   209,   312,   312,     7,
+      27,   215,   174,   174,   184,   172,   173,   287,    27,   300,
+     301,   319,    23,    82,   102,   103,   182,   265,   302,   303,
+     174,   283,   317,    27,   317,    27,   183,   321,   322,   317,
+     283,   209,   172,   209,   325,   171,     4,   238,    82,   174,
+     184,   288,   289,   290,   291,   292,   293,   325,     4,   316,
+     168,   172,   184,     4,     4,    23,   302,   168,   172,   174,
+     318,   316,   173,    27,   168,   201,   173,   174,    57,   173,
+     312,   172,   174,   289,   172,   172,    62,    80,   158,   312,
+     301,   316,   312,   312,   172,   303,   312,     4,   209,   322,
+     171,   209,   172,   209,    23,   181,   299,   286,   184,   316,
      170,   316,   316,   317,   312,   174,   174,   174,   184,   259,
      317,   317,   171,   275,   317,   172,   173,   294,   209,   317,
      174
 };
 
-  /* YYR1YYN -- Symbol number of symbol that rule YYN derives.  */
-static const yytype_uint16 yyr1 =
+/* YYR1RULE-NUM -- Symbol kind of the left-hand side of rule RULE-NUM.  */
+static const yytype_int16 yyr1 =
 {
        0,   179,   180,   181,   181,   181,   181,   181,   181,   181,
      181,   181,   181,   181,   181,   181,   181,   181,   181,   181,
@@ -3064,8 +3501,8 @@
      353,   353,   353,   353,   354,   354,   355
 };
 
-  /* YYR2YYN -- Number of symbols on the right hand side of rule YYN.  */
-static const yytype_uint8 yyr2 =
+/* YYR2RULE-NUM -- Number of symbols on the right-hand side of rule RULE-NUM.  */
+static const yytype_int8 yyr2 =
 {
        0,     2,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
@@ -3130,39 +3567,39 @@
 };
 
 
+enum { YYENOMEM = -2 };
+
 #define yyerrok         (yyerrstatus = 0)
-#define yyclearin       (yychar = YYEMPTY)
-#define YYEMPTY         (-2)
-#define YYEOF           0
+#define yyclearin       (yychar = ZENDEMPTY)
 
 #define YYACCEPT        goto yyacceptlab
 #define YYABORT         goto yyabortlab
 #define YYERROR         goto yyerrorlab
+#define YYNOMEM         goto yyexhaustedlab
 
 
 #define YYRECOVERING()  (!!yyerrstatus)
 
-#define YYBACKUP(Token, Value)                                  \
-do                                                              \
-  if (yychar == YYEMPTY)                                        \
-    {                                                           \
-      yychar = (Token);                                         \
-      yylval = (Value);                                         \
-      YYPOPSTACK (yylen);                                       \
-      yystate = *yyssp;                                         \
-      goto yybackup;                                            \
-    }                                                           \
-  else                                                          \
-    {                                                           \
-      yyerror (YY_("syntax error: cannot back up")); \
-      YYERROR;                                                  \
-    }                                                           \
-while (0)
-
-/* Error token number */
-#define YYTERROR        1
-#define YYERRCODE       256
-
+#define YYBACKUP(Token, Value)                                    \
+  do                                                              \
+    if (yychar == ZENDEMPTY)                                        \
+      {                                                           \
+        yychar = (Token);                                         \
+        yylval = (Value);                                         \
+        YYPOPSTACK (yylen);                                       \
+        yystate = *yyssp;                                         \
+        goto yybackup;                                            \
+      }                                                           \
+    else                                                          \
+      {                                                           \
+        yyerror (YY_("syntax error: cannot back up")); \
+        YYERROR;                                                  \
+      }                                                           \
+  while (0)
+
+/* Backward compatibility with an undocumented macro.
+   Use ZENDerror or ZENDUNDEF. */
+#define YYERRCODE ZENDUNDEF
 
 
 /* Enable debugging if requested.  */
@@ -3179,55 +3616,52 @@
     YYFPRINTF Args;                             \
 } while (0)
 
-/* This macro is provided for backward compatibility. */
-#ifndef YY_LOCATION_PRINT
-# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
-#endif
 
 
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)                    \
+
+# define YY_SYMBOL_PRINT(Title, Kind, Value, Location)                    \
 do {                                                                      \
   if (yydebug)                                                            \
     {                                                                     \
       YYFPRINTF (stderr, "%s ", Title);                                   \
       yy_symbol_print (stderr,                                            \
-                  Type, Value); \
+                  Kind, Value); \
       YYFPRINTF (stderr, "\n");                                           \
     }                                                                     \
 } while (0)
 
 
-/*----------------------------------------.
-| Print this symbol's value on YYOUTPUT.  |
-`----------------------------------------*/
+/*-----------------------------------.
+| Print this symbol's value on YYO.  |
+`-----------------------------------*/
 
 static void
-yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
+yy_symbol_value_print (FILE *yyo,
+                       yysymbol_kind_t yykind, YYSTYPE const * const yyvaluep)
 {
-  FILE *yyo = yyoutput;
-  YYUSE (yyo);
+  FILE *yyoutput = yyo;
+  YY_USE (yyoutput);
   if (!yyvaluep)
     return;
-# ifdef YYPRINT
-  if (yytype < YYNTOKENS)
-    YYPRINT (yyoutput, yytoknumyytype, *yyvaluep);
-# endif
-  YYUSE (yytype);
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+  YY_USE (yykind);
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
 }
 
 
-/*--------------------------------.
-| Print this symbol on YYOUTPUT.  |
-`--------------------------------*/
+/*---------------------------.
+| Print this symbol on YYO.  |
+`---------------------------*/
 
 static void
-yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
+yy_symbol_print (FILE *yyo,
+                 yysymbol_kind_t yykind, YYSTYPE const * const yyvaluep)
 {
-  YYFPRINTF (yyoutput, "%s %s (",
-             yytype < YYNTOKENS ? "token" : "nterm", yytnameyytype);
+  YYFPRINTF (yyo, "%s %s (",
+             yykind < YYNTOKENS ? "token" : "nterm", yysymbol_name (yykind));
 
-  yy_symbol_value_print (yyoutput, yytype, yyvaluep);
-  YYFPRINTF (yyoutput, ")");
+  yy_symbol_value_print (yyo, yykind, yyvaluep);
+  YYFPRINTF (yyo, ")");
 }
 
 /*------------------------------------------------------------------.
@@ -3236,7 +3670,7 @@
 `------------------------------------------------------------------*/
 
 static void
-yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
+yy_stack_print (yy_state_t *yybottom, yy_state_t *yytop)
 {
   YYFPRINTF (stderr, "Stack now");
   for (; yybottom <= yytop; yybottom++)
@@ -3259,21 +3693,21 @@
 `------------------------------------------------*/
 
 static void
-yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule)
+yy_reduce_print (yy_state_t *yyssp, YYSTYPE *yyvsp,
+                 int yyrule)
 {
-  unsigned long int yylno = yyrlineyyrule;
+  int yylno = yyrlineyyrule;
   int yynrhs = yyr2yyrule;
   int yyi;
-  YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
+  YYFPRINTF (stderr, "Reducing stack by rule %d (line %d):\n",
              yyrule - 1, yylno);
   /* The symbols being reduced.  */
   for (yyi = 0; yyi < yynrhs; yyi++)
     {
       YYFPRINTF (stderr, "   $%d = ", yyi + 1);
       yy_symbol_print (stderr,
-                       yystosyysspyyi + 1 - yynrhs,
-                       &(yyvsp(yyi + 1) - (yynrhs))
-                                              );
+                       YY_ACCESSING_SYMBOL (+yysspyyi + 1 - yynrhs),
+                       &yyvsp(yyi + 1) - (yynrhs));
       YYFPRINTF (stderr, "\n");
     }
 }
@@ -3288,8 +3722,8 @@
    multiple parsers can coexist.  */
 int yydebug;
 #else /* !ZENDDEBUG */
-# define YYDPRINTF(Args)
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
+# define YYDPRINTF(Args) ((void) 0)
+# define YY_SYMBOL_PRINT(Title, Kind, Value, Location)
 # define YY_STACK_PRINT(Bottom, Top)
 # define YY_REDUCE_PRINT(Rule)
 #endif /* !ZENDDEBUG */
@@ -3312,28 +3746,76 @@
 #endif
 
 
-#if YYERROR_VERBOSE
+/* Context of a parse error.  */
+typedef struct
+{
+  yy_state_t *yyssp;
+  yysymbol_kind_t yytoken;
+} yypcontext_t;
+
+/* Put in YYARG at most YYARGN of the expected tokens given the
+   current YYCTX, and return the number of tokens stored in YYARG.  If
+   YYARG is null, return the number of expected tokens (guaranteed to
+   be less than YYNTOKENS).  Return YYENOMEM on memory exhaustion.
+   Return 0 if there are more than YYARGN expected tokens, yet fill
+   YYARG up to YYARGN. */
+static int
+yypcontext_expected_tokens (const yypcontext_t *yyctx,
+                            yysymbol_kind_t yyarg, int yyargn)
+{
+  /* Actual size of YYARG. */
+  int yycount = 0;
+  int yyn = yypact+*yyctx->yyssp;
+  if (!yypact_value_is_default (yyn))
+    {
+      /* Start YYX at -YYN if negative to avoid negative indexes in
+         YYCHECK.  In other words, skip the first -YYN actions for
+         this state because they are default actions.  */
+      int yyxbegin = yyn < 0 ? -yyn : 0;
+      /* Stay within bounds of both yycheck and yytname.  */
+      int yychecklim = YYLAST - yyn + 1;
+      int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+      int yyx;
+      for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+        if (yycheckyyx + yyn == yyx && yyx != YYSYMBOL_YYerror
+            && !yytable_value_is_error (yytableyyx + yyn))
+          {
+            if (!yyarg)
+              ++yycount;
+            else if (yycount == yyargn)
+              return 0;
+            else
+              yyargyycount++ = YY_CAST (yysymbol_kind_t, yyx);
+          }
+    }
+  if (yyarg && yycount == 0 && 0 < yyargn)
+    yyarg0 = YYSYMBOL_YYEMPTY;
+  return yycount;
+}
 
-# ifndef yystrlen
-#  if defined __GLIBC__ && defined _STRING_H
-#   define yystrlen strlen
-#  else
+
+
+
+#ifndef yystrlen
+# if defined __GLIBC__ && defined _STRING_H
+#  define yystrlen(S) (YY_CAST (YYPTRDIFF_T, strlen (S)))
+# else
 /* Return the length of YYSTR.  */
-static YYSIZE_T
+static YYPTRDIFF_T
 yystrlen (const char *yystr)
 {
-  YYSIZE_T yylen;
+  YYPTRDIFF_T yylen;
   for (yylen = 0; yystryylen; yylen++)
     continue;
   return yylen;
 }
-#  endif
 # endif
+#endif
 
-# ifndef yystpcpy
-#  if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
-#   define yystpcpy stpcpy
-#  else
+#ifndef yystpcpy
+# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
+#  define yystpcpy stpcpy
+# else
 /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
    YYDEST.  */
 static char *
@@ -3347,10 +3829,10 @@
 
   return yyd - 1;
 }
-#  endif
 # endif
+#endif
 
-# ifndef yytnamerr
+#ifndef yytnamerr
 /* Copy to YYRES the contents of YYSTR after stripping away unnecessary
    quotes and backslashes, so that it's suitable for yyerror.  The
    heuristic is that double-quoting is unnecessary unless the string
@@ -3358,14 +3840,13 @@
    backslash-backslash).  YYSTR is taken from yytname.  If YYRES is
    null, do not copy; instead, return the length of what the result
    would have been.  */
-static YYSIZE_T
+static YYPTRDIFF_T
 yytnamerr (char *yyres, const char *yystr)
 {
   if (*yystr == '"')
     {
-      YYSIZE_T yyn = 0;
+      YYPTRDIFF_T yyn = 0;
       char const *yyp = yystr;
-
       for (;;)
         switch (*++yyp)
           {
@@ -3376,7 +3857,10 @@
           case '\\':
             if (*++yyp != '\\')
               goto do_not_strip_quotes;
-            /* Fall through.  */
+            else
+              goto append;
+
+          append:
           default:
             if (yyres)
               yyresyyn = *yyp;
@@ -3391,36 +3875,20 @@
     do_not_strip_quotes: ;
     }
 
-  if (! yyres)
+  if (yyres)
+    return yystpcpy (yyres, yystr) - yyres;
+  else
     return yystrlen (yystr);
-
-  return yystpcpy (yyres, yystr) - yyres;
 }
-# endif
+#endif
 
-/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
-   about the unexpected token YYTOKEN for the state stack whose top is
-   YYSSP.
 
-   Return 0 if *YYMSG was successfully written.  Return 1 if *YYMSG is
-   not large enough to hold the message.  In that case, also set
-   *YYMSG_ALLOC to the required number of bytes.  Return 2 if the
-   required number of bytes is too large to store.  */
 static int
-yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
-                yytype_int16 *yyssp, int yytoken)
+yy_syntax_error_arguments (const yypcontext_t *yyctx,
+                           yysymbol_kind_t yyarg, int yyargn)
 {
-  YYSIZE_T yysize0 = yytnamerr (YY_NULLPTR, yytnameyytoken);
-  YYSIZE_T yysize = yysize0;
-  enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
-  /* Internationalized format string. */
-  const char *yyformat = YY_NULLPTR;
-  /* Arguments of yyformat. */
-  char const *yyargYYERROR_VERBOSE_ARGS_MAXIMUM;
-  /* Number of reported tokens (one for the "unexpected", one per
-     "expected"). */
+  /* Actual size of YYARG. */
   int yycount = 0;
-
   /* There are many possibilities here to consider:
      - If this state is a consistent state with a default action, then
        the only way this function was invoked is if the default action
@@ -3444,63 +3912,78 @@
        one exception: it will still contain any token that will not be
        accepted due to an error action in a later state.
   */
-  if (yytoken != YYEMPTY)
+  if (yyctx->yytoken != YYSYMBOL_YYEMPTY)
     {
-      int yyn = yypact*yyssp;
-      yyargyycount++ = yytnameyytoken;
-      if (!yypact_value_is_default (yyn))
-        {
-          /* Start YYX at -YYN if negative to avoid negative indexes in
-             YYCHECK.  In other words, skip the first -YYN actions for
-             this state because they are default actions.  */
-          int yyxbegin = yyn < 0 ? -yyn : 0;
-          /* Stay within bounds of both yycheck and yytname.  */
-          int yychecklim = YYLAST - yyn + 1;
-          int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
-          int yyx;
-
-          for (yyx = yyxbegin; yyx < yyxend; ++yyx)
-            if (yycheckyyx + yyn == yyx && yyx != YYTERROR
-                && !yytable_value_is_error (yytableyyx + yyn))
-              {
-                if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
-                  {
-                    yycount = 1;
-                    yysize = yysize0;
-                    break;
-                  }
-                yyargyycount++ = yytnameyyx;
-                {
-                  YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytnameyyx);
-                  if (! (yysize <= yysize1
-                         && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
-                    return 2;
-                  yysize = yysize1;
-                }
-              }
-        }
+      int yyn;
+      if (yyarg)
+        yyargyycount = yyctx->yytoken;
+      ++yycount;
+      yyn = yypcontext_expected_tokens (yyctx,
+                                        yyarg ? yyarg + 1 : yyarg, yyargn - 1);
+      if (yyn == YYENOMEM)
+        return YYENOMEM;
+      else
+        yycount += yyn;
     }
+  return yycount;
+}
+
+/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
+   about the unexpected token YYTOKEN for the state stack whose top is
+   YYSSP.
+
+   Return 0 if *YYMSG was successfully written.  Return -1 if *YYMSG is
+   not large enough to hold the message.  In that case, also set
+   *YYMSG_ALLOC to the required number of bytes.  Return YYENOMEM if the
+   required number of bytes is too large to store.  */
+static int
+yysyntax_error (YYPTRDIFF_T *yymsg_alloc, char **yymsg,
+                const yypcontext_t *yyctx)
+{
+  enum { YYARGS_MAX = 5 };
+  /* Internationalized format string. */
+  const char *yyformat = YY_NULLPTR;
+  /* Arguments of yyformat: reported tokens (one for the "unexpected",
+     one per "expected"). */
+  yysymbol_kind_t yyargYYARGS_MAX;
+  /* Cumulated lengths of YYARG.  */
+  YYPTRDIFF_T yysize = 0;
+
+  /* Actual size of YYARG. */
+  int yycount = yy_syntax_error_arguments (yyctx, yyarg, YYARGS_MAX);
+  if (yycount == YYENOMEM)
+    return YYENOMEM;
 
   switch (yycount)
     {
-# define YYCASE_(N, S)                      \
+#define YYCASE_(N, S)                       \
       case N:                               \
         yyformat = S;                       \
-      break
+        break
+    default: /* Avoid compiler warnings. */
       YYCASE_(0, YY_("syntax error"));
       YYCASE_(1, YY_("syntax error, unexpected %s"));
       YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
       YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
       YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
       YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
-# undef YYCASE_
+#undef YYCASE_
     }
 
+  /* Compute error message size.  Don't count the "%s"s, but reserve
+     room for the terminator.  */
+  yysize = yystrlen (yyformat) - 2 * yycount + 1;
   {
-    YYSIZE_T yysize1 = yysize + yystrlen (yyformat);
-    if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
-      return 2;
-    yysize = yysize1;
+    int yyi;
+    for (yyi = 0; yyi < yycount; ++yyi)
+      {
+        YYPTRDIFF_T yysize1
+          = yysize + yytnamerr (YY_NULLPTR, yytnameyyargyyi);
+        if (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)
+          yysize = yysize1;
+        else
+          return YYENOMEM;
+      }
   }
 
   if (*yymsg_alloc < yysize)
@@ -3509,7 +3992,7 @@
       if (! (yysize <= *yymsg_alloc
              && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
         *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
-      return 1;
+      return -1;
     }
 
   /* Avoid sprintf, as that infringes on the user's name space.
@@ -3521,965 +4004,655 @@
     while ((*yyp = *yyformat) != '\0')
       if (*yyp == '%' && yyformat1 == 's' && yyi < yycount)
         {
-          yyp += yytnamerr (yyp, yyargyyi++);
+          yyp += yytnamerr (yyp, yytnameyyargyyi++);
           yyformat += 2;
         }
       else
         {
-          yyp++;
-          yyformat++;
+          ++yyp;
+          ++yyformat;
         }
   }
   return 0;
 }
-#endif /* YYERROR_VERBOSE */
+
 
 /*-----------------------------------------------.
 | Release the memory associated to this symbol.  |
 `-----------------------------------------------*/
 
 static void
-yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
+yydestruct (const char *yymsg,
+            yysymbol_kind_t yykind, YYSTYPE *yyvaluep)
 {
-  YYUSE (yyvaluep);
+  YY_USE (yyvaluep);
   if (!yymsg)
     yymsg = "Deleting";
-  YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
+  YY_SYMBOL_PRINT (yymsg, yykind, yyvaluep, yylocationp);
 
   YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-  switch (yytype)
+  switch (yykind)
     {
-          case 72: /* "integer"  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_T_LNUMBER: /* "integer"  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 73: /* "floating-point number"  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_T_DNUMBER: /* "floating-point number"  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 74: /* "identifier"  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_T_STRING: /* "identifier"  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 75: /* "fully qualified name"  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_T_NAME_FULLY_QUALIFIED: /* "fully qualified name"  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 76: /* "namespace-relative name"  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_T_NAME_RELATIVE: /* "namespace-relative name"  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 77: /* "namespaced name"  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_T_NAME_QUALIFIED: /* "namespaced name"  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 78: /* "variable"  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_T_VARIABLE: /* "variable"  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 79: /* T_INLINE_HTML  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_T_INLINE_HTML: /* T_INLINE_HTML  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 80: /* "string content"  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_T_ENCAPSED_AND_WHITESPACE: /* "string content"  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 81: /* "quoted string"  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_T_CONSTANT_ENCAPSED_STRING: /* "quoted string"  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 82: /* "variable name"  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_T_STRING_VARNAME: /* "variable name"  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 83: /* "number"  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_T_NUM_STRING: /* "number"  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 184: /* identifier  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_identifier: /* identifier  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 185: /* top_statement_list  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_top_statement_list: /* top_statement_list  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 186: /* namespace_declaration_name  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_namespace_declaration_name: /* namespace_declaration_name  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 187: /* namespace_name  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_namespace_name: /* namespace_name  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 188: /* legacy_namespace_name  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_legacy_namespace_name: /* legacy_namespace_name  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 189: /* name  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_name: /* name  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 190: /* attribute_decl  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_attribute_decl: /* attribute_decl  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 191: /* attribute_group  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_attribute_group: /* attribute_group  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 192: /* attribute  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_attribute: /* attribute  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 193: /* attributes  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_attributes: /* attributes  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 194: /* attributed_statement  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_attributed_statement: /* attributed_statement  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 195: /* top_statement  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_top_statement: /* top_statement  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 199: /* group_use_declaration  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_group_use_declaration: /* group_use_declaration  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 200: /* mixed_group_use_declaration  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_mixed_group_use_declaration: /* mixed_group_use_declaration  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 202: /* inline_use_declarations  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_inline_use_declarations: /* inline_use_declarations  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 203: /* unprefixed_use_declarations  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_unprefixed_use_declarations: /* unprefixed_use_declarations  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 204: /* use_declarations  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_use_declarations: /* use_declarations  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 205: /* inline_use_declaration  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_inline_use_declaration: /* inline_use_declaration  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 206: /* unprefixed_use_declaration  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_unprefixed_use_declaration: /* unprefixed_use_declaration  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 207: /* use_declaration  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_use_declaration: /* use_declaration  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 208: /* const_list  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_const_list: /* const_list  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 209: /* inner_statement_list  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_inner_statement_list: /* inner_statement_list  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 210: /* inner_statement  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_inner_statement: /* inner_statement  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 211: /* statement  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_statement: /* statement  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 213: /* catch_list  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_catch_list: /* catch_list  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 214: /* catch_name_list  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_catch_name_list: /* catch_name_list  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 215: /* optional_variable  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_optional_variable: /* optional_variable  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 216: /* finally_statement  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_finally_statement: /* finally_statement  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 217: /* unset_variables  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_unset_variables: /* unset_variables  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 218: /* unset_variable  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_unset_variable: /* unset_variable  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 219: /* function_name  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_function_name: /* function_name  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 220: /* function_declaration_statement  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_function_declaration_statement: /* function_declaration_statement  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 223: /* class_declaration_statement  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_class_declaration_statement: /* class_declaration_statement  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 230: /* trait_declaration_statement  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_trait_declaration_statement: /* trait_declaration_statement  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 232: /* interface_declaration_statement  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_interface_declaration_statement: /* interface_declaration_statement  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 234: /* enum_declaration_statement  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_enum_declaration_statement: /* enum_declaration_statement  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 236: /* enum_backing_type  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_enum_backing_type: /* enum_backing_type  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 237: /* enum_case  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_enum_case: /* enum_case  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 238: /* enum_case_expr  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_enum_case_expr: /* enum_case_expr  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 239: /* extends_from  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_extends_from: /* extends_from  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 240: /* interface_extends_list  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_interface_extends_list: /* interface_extends_list  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 241: /* implements_list  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_implements_list: /* implements_list  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 242: /* foreach_variable  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_foreach_variable: /* foreach_variable  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 243: /* for_statement  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_for_statement: /* for_statement  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 244: /* foreach_statement  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_foreach_statement: /* foreach_statement  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 245: /* declare_statement  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_declare_statement: /* declare_statement  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 246: /* switch_case_list  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_switch_case_list: /* switch_case_list  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 247: /* case_list  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_case_list: /* case_list  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 249: /* match  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_match: /* match  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 250: /* match_arm_list  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_match_arm_list: /* match_arm_list  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 251: /* non_empty_match_arm_list  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_non_empty_match_arm_list: /* non_empty_match_arm_list  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 252: /* match_arm  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_match_arm: /* match_arm  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 253: /* match_arm_cond_list  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_match_arm_cond_list: /* match_arm_cond_list  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 254: /* while_statement  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_while_statement: /* while_statement  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 255: /* if_stmt_without_else  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_if_stmt_without_else: /* if_stmt_without_else  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 256: /* if_stmt  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_if_stmt: /* if_stmt  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 257: /* alt_if_stmt_without_else  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_alt_if_stmt_without_else: /* alt_if_stmt_without_else  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 258: /* alt_if_stmt  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_alt_if_stmt: /* alt_if_stmt  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 259: /* parameter_list  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_parameter_list: /* parameter_list  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 260: /* non_empty_parameter_list  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_non_empty_parameter_list: /* non_empty_parameter_list  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 261: /* attributed_parameter  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_attributed_parameter: /* attributed_parameter  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 263: /* parameter  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_parameter: /* parameter  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 264: /* optional_type_without_static  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_optional_type_without_static: /* optional_type_without_static  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 265: /* type_expr  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_type_expr: /* type_expr  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 266: /* type  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_type: /* type  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 267: /* union_type_element  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_union_type_element: /* union_type_element  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 268: /* union_type  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_union_type: /* union_type  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 269: /* intersection_type  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_intersection_type: /* intersection_type  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 270: /* type_expr_without_static  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_type_expr_without_static: /* type_expr_without_static  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 271: /* type_without_static  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_type_without_static: /* type_without_static  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 272: /* union_type_without_static_element  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_union_type_without_static_element: /* union_type_without_static_element  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 273: /* union_type_without_static  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_union_type_without_static: /* union_type_without_static  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 274: /* intersection_type_without_static  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_intersection_type_without_static: /* intersection_type_without_static  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 275: /* return_type  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_return_type: /* return_type  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 276: /* argument_list  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_argument_list: /* argument_list  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 277: /* non_empty_argument_list  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_non_empty_argument_list: /* non_empty_argument_list  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 278: /* argument  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_argument: /* argument  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 279: /* global_var_list  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_global_var_list: /* global_var_list  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 280: /* global_var  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_global_var: /* global_var  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 281: /* static_var_list  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_static_var_list: /* static_var_list  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 282: /* static_var  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_static_var: /* static_var  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 283: /* class_statement_list  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_class_statement_list: /* class_statement_list  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 284: /* attributed_class_statement  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_attributed_class_statement: /* attributed_class_statement  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 285: /* class_statement  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_class_statement: /* class_statement  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 286: /* class_name_list  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_class_name_list: /* class_name_list  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 287: /* trait_adaptations  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_trait_adaptations: /* trait_adaptations  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 288: /* trait_adaptation_list  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_trait_adaptation_list: /* trait_adaptation_list  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 289: /* trait_adaptation  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_trait_adaptation: /* trait_adaptation  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 290: /* trait_precedence  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_trait_precedence: /* trait_precedence  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 291: /* trait_alias  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_trait_alias: /* trait_alias  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 292: /* trait_method_reference  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_trait_method_reference: /* trait_method_reference  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 293: /* absolute_trait_method_reference  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_absolute_trait_method_reference: /* absolute_trait_method_reference  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 294: /* method_body  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_method_body: /* method_body  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 298: /* non_empty_member_modifiers  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_non_empty_member_modifiers: /* non_empty_member_modifiers  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 300: /* property_list  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_property_list: /* property_list  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 301: /* property  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_property: /* property  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 302: /* class_const_list  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_class_const_list: /* class_const_list  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 303: /* class_const_decl  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_class_const_decl: /* class_const_decl  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 304: /* const_decl  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_const_decl: /* const_decl  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 305: /* echo_expr_list  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_echo_expr_list: /* echo_expr_list  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 306: /* echo_expr  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_echo_expr: /* echo_expr  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 307: /* for_exprs  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_for_exprs: /* for_exprs  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 308: /* non_empty_for_exprs  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_non_empty_for_exprs: /* non_empty_for_exprs  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 309: /* anonymous_class  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_anonymous_class: /* anonymous_class  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 311: /* new_expr  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_new_expr: /* new_expr  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 312: /* expr  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_expr: /* expr  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 313: /* inline_function  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_inline_function: /* inline_function  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 316: /* backup_doc_comment  */
-
-      { if (((*yyvaluep).str)) zend_string_release_ex(((*yyvaluep).str), 0); }
-
+    case YYSYMBOL_backup_doc_comment: /* backup_doc_comment  */
+            { if (((*yyvaluep).str)) zend_string_release_ex(((*yyvaluep).str), 0); }
         break;
 
-    case 320: /* lexical_vars  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_lexical_vars: /* lexical_vars  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 321: /* lexical_var_list  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_lexical_var_list: /* lexical_var_list  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 322: /* lexical_var  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_lexical_var: /* lexical_var  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 323: /* function_call  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_function_call: /* function_call  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 325: /* class_name  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_class_name: /* class_name  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 326: /* class_name_reference  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_class_name_reference: /* class_name_reference  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 327: /* exit_expr  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_exit_expr: /* exit_expr  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 328: /* backticks_expr  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_backticks_expr: /* backticks_expr  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 329: /* ctor_arguments  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_ctor_arguments: /* ctor_arguments  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 330: /* dereferenceable_scalar  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_dereferenceable_scalar: /* dereferenceable_scalar  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 331: /* scalar  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_scalar: /* scalar  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 332: /* constant  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_constant: /* constant  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 333: /* class_constant  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_class_constant: /* class_constant  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 334: /* optional_expr  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_optional_expr: /* optional_expr  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 335: /* variable_class_name  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_variable_class_name: /* variable_class_name  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 336: /* fully_dereferenceable  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_fully_dereferenceable: /* fully_dereferenceable  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 337: /* array_object_dereferenceable  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_array_object_dereferenceable: /* array_object_dereferenceable  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 338: /* callable_expr  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_callable_expr: /* callable_expr  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 339: /* callable_variable  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_callable_variable: /* callable_variable  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 340: /* variable  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_variable: /* variable  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 341: /* simple_variable  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_simple_variable: /* simple_variable  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 342: /* static_member  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_static_member: /* static_member  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 343: /* new_variable  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_new_variable: /* new_variable  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 344: /* member_name  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_member_name: /* member_name  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 345: /* property_name  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_property_name: /* property_name  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 346: /* array_pair_list  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_array_pair_list: /* array_pair_list  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 347: /* possible_array_pair  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_possible_array_pair: /* possible_array_pair  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 348: /* non_empty_array_pair_list  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_non_empty_array_pair_list: /* non_empty_array_pair_list  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 349: /* array_pair  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_array_pair: /* array_pair  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 350: /* encaps_list  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_encaps_list: /* encaps_list  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 351: /* encaps_var  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_encaps_var: /* encaps_var  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 352: /* encaps_var_offset  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_encaps_var_offset: /* encaps_var_offset  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 353: /* internal_functions_in_yacc  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_internal_functions_in_yacc: /* internal_functions_in_yacc  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 354: /* isset_variables  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_isset_variables: /* isset_variables  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-    case 355: /* isset_variable  */
-
-      { zend_ast_destroy(((*yyvaluep).ast)); }
-
+    case YYSYMBOL_isset_variable: /* isset_variable  */
+            { zend_ast_destroy(((*yyvaluep).ast)); }
         break;
 
-
       default:
         break;
     }
@@ -4489,6 +4662,8 @@
 
 
 
+
+
 /*----------.
 | yyparse.  |
 `----------*/
@@ -4496,7 +4671,7 @@
 int
 yyparse (void)
 {
-/* The lookahead symbol.  */
+/* Lookahead token kind.  */
 int yychar;
 
 
@@ -4507,45 +4682,41 @@
 YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
 
     /* Number of syntax errors so far.  */
-    int yynerrs;
+    int yynerrs = 0;
 
-    int yystate;
+    yy_state_fast_t yystate = 0;
     /* Number of tokens to shift before error messages enabled.  */
-    int yyerrstatus;
+    int yyerrstatus = 0;
 
-    /* The stacks and their tools:
-       'yyss': related to states.
-       'yyvs': related to semantic values.
-
-       Refer to the stacks through separate pointers, to allow yyoverflow
+    /* Refer to the stacks through separate pointers, to allow yyoverflow
        to reallocate them elsewhere.  */
 
-    /* The state stack.  */
-    yytype_int16 yyssaYYINITDEPTH;
-    yytype_int16 *yyss;
-    yytype_int16 *yyssp;
+    /* Their size.  */
+    YYPTRDIFF_T yystacksize = YYINITDEPTH;
 
-    /* The semantic value stack.  */
-    YYSTYPE yyvsaYYINITDEPTH;
-    YYSTYPE *yyvs;
-    YYSTYPE *yyvsp;
+    /* The state stack: array, bottom, top.  */
+    yy_state_t yyssaYYINITDEPTH;
+    yy_state_t *yyss = yyssa;
+    yy_state_t *yyssp = yyss;
 
-    YYSIZE_T yystacksize;
+    /* The semantic value stack: array, bottom, top.  */
+    YYSTYPE yyvsaYYINITDEPTH;
+    YYSTYPE *yyvs = yyvsa;
+    YYSTYPE *yyvsp = yyvs;
 
   int yyn;
+  /* The return value of yyparse.  */
   int yyresult;
-  /* Lookahead token as an internal (translated) token number.  */
-  int yytoken = 0;
+  /* Lookahead symbol kind.  */
+  yysymbol_kind_t yytoken = YYSYMBOL_YYEMPTY;
   /* The variables used to return semantic value and location from the
      action routines.  */
   YYSTYPE yyval;
 
-#if YYERROR_VERBOSE
   /* Buffer for error messages, and its allocated size.  */
   char yymsgbuf128;
   char *yymsg = yymsgbuf;
-  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
-#endif
+  YYPTRDIFF_T yymsg_alloc = sizeof yymsgbuf;
 
 #define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
 
@@ -4553,71 +4724,75 @@
      Keep to zero when no symbol should be popped.  */
   int yylen = 0;
 
-  yyssp = yyss = yyssa;
-  yyvsp = yyvs = yyvsa;
-  yystacksize = YYINITDEPTH;
-
   YYDPRINTF ((stderr, "Starting parse\n"));
 
-  yystate = 0;
-  yyerrstatus = 0;
-  yynerrs = 0;
-  yychar = YYEMPTY; /* Cause a token to be read.  */
+  yychar = ZENDEMPTY; /* Cause a token to be read.  */
+
   goto yysetstate;
 
+
 /*------------------------------------------------------------.
-| yynewstate -- Push a new state, which is found in yystate.  |
+| yynewstate -- push a new state, which is found in yystate.  |
 `------------------------------------------------------------*/
- yynewstate:
+yynewstate:
   /* In all cases, when you get here, the value and location stacks
      have just been pushed.  So pushing a state here evens the stacks.  */
   yyssp++;
 
- yysetstate:
-  *yyssp = yystate;
+
+/*--------------------------------------------------------------------.
+| yysetstate -- set current state (the top of the stack) to yystate.  |
+`--------------------------------------------------------------------*/
+yysetstate:
+  YYDPRINTF ((stderr, "Entering state %d\n", yystate));
+  YY_ASSERT (0 <= yystate && yystate < YYNSTATES);
+  YY_IGNORE_USELESS_CAST_BEGIN
+  *yyssp = YY_CAST (yy_state_t, yystate);
+  YY_IGNORE_USELESS_CAST_END
+  YY_STACK_PRINT (yyss, yyssp);
 
   if (yyss + yystacksize - 1 <= yyssp)
+#if !defined yyoverflow && !defined YYSTACK_RELOCATE
+    YYNOMEM;
+#else
     {
       /* Get the current used size of the three stacks, in elements.  */
-      YYSIZE_T yysize = yyssp - yyss + 1;
+      YYPTRDIFF_T yysize = yyssp - yyss + 1;
 
-#ifdef yyoverflow
+# if defined yyoverflow
       {
         /* Give user a chance to reallocate the stack.  Use copies of
            these so that the &'s don't force the real ones into
            memory.  */
+        yy_state_t *yyss1 = yyss;
         YYSTYPE *yyvs1 = yyvs;
-        yytype_int16 *yyss1 = yyss;
 
         /* Each stack pointer address is followed by the size of the
            data in use in that stack, in bytes.  This used to be a
            conditional around just the two extra args, but that might
            be undefined if yyoverflow is a macro.  */
         yyoverflow (YY_("memory exhausted"),
-                    &yyss1, yysize * sizeof (*yyssp),
-                    &yyvs1, yysize * sizeof (*yyvsp),
+                    &yyss1, yysize * YYSIZEOF (*yyssp),
+                    &yyvs1, yysize * YYSIZEOF (*yyvsp),
                     &yystacksize);
-
         yyss = yyss1;
         yyvs = yyvs1;
       }
-#else /* no yyoverflow */
-# ifndef YYSTACK_RELOCATE
-      goto yyexhaustedlab;
-# else
+# else /* defined YYSTACK_RELOCATE */
       /* Extend the stack our own way.  */
       if (YYMAXDEPTH <= yystacksize)
-        goto yyexhaustedlab;
+        YYNOMEM;
       yystacksize *= 2;
       if (YYMAXDEPTH < yystacksize)
         yystacksize = YYMAXDEPTH;
 
       {
-        yytype_int16 *yyss1 = yyss;
+        yy_state_t *yyss1 = yyss;
         union yyalloc *yyptr =
-          (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
+          YY_CAST (union yyalloc *,
+                   YYSTACK_ALLOC (YY_CAST (YYSIZE_T, YYSTACK_BYTES (yystacksize))));
         if (! yyptr)
-          goto yyexhaustedlab;
+          YYNOMEM;
         YYSTACK_RELOCATE (yyss_alloc, yyss);
         YYSTACK_RELOCATE (yyvs_alloc, yyvs);
 #  undef YYSTACK_RELOCATE
@@ -4625,30 +4800,31 @@
           YYSTACK_FREE (yyss1);
       }
 # endif
-#endif /* no yyoverflow */
 
       yyssp = yyss + yysize - 1;
       yyvsp = yyvs + yysize - 1;
 
-      YYDPRINTF ((stderr, "Stack size increased to %lu\n",
-                  (unsigned long int) yystacksize));
+      YY_IGNORE_USELESS_CAST_BEGIN
+      YYDPRINTF ((stderr, "Stack size increased to %ld\n",
+                  YY_CAST (long, yystacksize)));
+      YY_IGNORE_USELESS_CAST_END
 
       if (yyss + yystacksize - 1 <= yyssp)
         YYABORT;
     }
+#endif /* !defined yyoverflow && !defined YYSTACK_RELOCATE */
 
-  YYDPRINTF ((stderr, "Entering state %d\n", yystate));
 
   if (yystate == YYFINAL)
     YYACCEPT;
 
   goto yybackup;
 
+
 /*-----------.
 | yybackup.  |
 `-----------*/
 yybackup:
-
   /* Do appropriate processing given the current state.  Read a
      lookahead token if we need one and don't already have one.  */
 
@@ -4659,18 +4835,29 @@
 
   /* Not known => get a lookahead token if don't already have one.  */
 
-  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */
-  if (yychar == YYEMPTY)
+  /* YYCHAR is either empty, or end-of-input, or a valid lookahead.  */
+  if (yychar == ZENDEMPTY)
     {
-      YYDPRINTF ((stderr, "Reading a token: "));
+      YYDPRINTF ((stderr, "Reading a token\n"));
       yychar = yylex (&yylval);
     }
 
-  if (yychar <= YYEOF)
+  if (yychar <= END)
     {
-      yychar = yytoken = YYEOF;
+      yychar = END;
+      yytoken = YYSYMBOL_YYEOF;
       YYDPRINTF ((stderr, "Now at end of input.\n"));
     }
+  else if (yychar == ZENDerror)
+    {
+      /* The scanner already issued an error message, process directly
+         to error recovery.  But do not keep the error token as
+         lookahead, it is too special and may lead us to an endless
+         loop in error recovery. */
+      yychar = ZENDUNDEF;
+      yytoken = YYSYMBOL_YYerror;
+      goto yyerrlab1;
+    }
   else
     {
       yytoken = YYTRANSLATE (yychar);
@@ -4698,15 +4885,13 @@
 
   /* Shift the lookahead token.  */
   YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
-
-  /* Discard the shifted token.  */
-  yychar = YYEMPTY;
-
   yystate = yyn;
   YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
   *++yyvsp = yylval;
   YY_IGNORE_MAYBE_UNINITIALIZED_END
 
+  /* Discard the shifted token.  */
+  yychar = ZENDEMPTY;
   goto yynewstate;
 
 
@@ -4721,7 +4906,7 @@
 
 
 /*-----------------------------.
-| yyreduce -- Do a reduction.  |
+| yyreduce -- do a reduction.  |
 `-----------------------------*/
 yyreduce:
   /* yyn is the number of a rule to reduce with.  */
@@ -4741,3138 +4926,2116 @@
   YY_REDUCE_PRINT (yyn);
   switch (yyn)
     {
-        case 2:
-
-    { CG(ast) = (yyvsp0.ast); (void) zendnerrs; }
-
+  case 2: /* start: top_statement_list  */
+                                { CG(ast) = (yyvsp0.ast); (void) zendnerrs; }
     break;
 
-  case 83:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 83: /* identifier: "identifier"  */
+                         { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 84:
-
-    {
+  case 84: /* identifier: semi_reserved  */
+                               {
 			zval zv;
 			if (zend_lex_tstring(&zv, (yyvsp0.ident)) == FAILURE) { YYABORT; }
 			(yyval.ast) = zend_ast_create_zval(&zv);
 		}
-
     break;
 
-  case 85:
-
-    { (yyval.ast) = zend_ast_list_add((yyvsp-1.ast), (yyvsp0.ast)); }
-
+  case 85: /* top_statement_list: top_statement_list top_statement  */
+                                                 { (yyval.ast) = zend_ast_list_add((yyvsp-1.ast), (yyvsp0.ast)); }
     break;
 
-  case 86:
-
-    { (yyval.ast) = zend_ast_create_list(0, ZEND_AST_STMT_LIST); }
-
+  case 86: /* top_statement_list: %empty  */
+                       { (yyval.ast) = zend_ast_create_list(0, ZEND_AST_STMT_LIST); }
     break;
 
-  case 87:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 87: /* namespace_declaration_name: identifier  */
+                                                                                        { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 88:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 88: /* namespace_declaration_name: "namespaced name"  */
+                                                                                { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 89:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 89: /* namespace_name: "identifier"  */
+                                                                                        { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 90:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 90: /* namespace_name: "namespaced name"  */
+                                                                                { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 91:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 91: /* legacy_namespace_name: namespace_name  */
+                                                                                { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 92:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 92: /* legacy_namespace_name: "fully qualified name"  */
+                                                                        { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 93:
-
-    { (yyval.ast) = (yyvsp0.ast); (yyval.ast)->attr = ZEND_NAME_NOT_FQ; }
-
+  case 93: /* name: "identifier"  */
+                                                                                                { (yyval.ast) = (yyvsp0.ast); (yyval.ast)->attr = ZEND_NAME_NOT_FQ; }
     break;
 
-  case 94:
-
-    { (yyval.ast) = (yyvsp0.ast); (yyval.ast)->attr = ZEND_NAME_NOT_FQ; }
-
+  case 94: /* name: "namespaced name"  */
+                                                                                        { (yyval.ast) = (yyvsp0.ast); (yyval.ast)->attr = ZEND_NAME_NOT_FQ; }
     break;
 
-  case 95:
-
-    { (yyval.ast) = (yyvsp0.ast); (yyval.ast)->attr = ZEND_NAME_FQ; }
-
+  case 95: /* name: "fully qualified name"  */
+                                                                                { (yyval.ast) = (yyvsp0.ast); (yyval.ast)->attr = ZEND_NAME_FQ; }
     break;
 
-  case 96:
-
-    { (yyval.ast) = (yyvsp0.ast); (yyval.ast)->attr = ZEND_NAME_RELATIVE; }
-
+  case 96: /* name: "namespace-relative name"  */
+                                                                                        { (yyval.ast) = (yyvsp0.ast); (yyval.ast)->attr = ZEND_NAME_RELATIVE; }
     break;
 
-  case 97:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_ATTRIBUTE, (yyvsp0.ast), NULL); }
-
+  case 97: /* attribute_decl: class_name  */
+                        { (yyval.ast) = zend_ast_create(ZEND_AST_ATTRIBUTE, (yyvsp0.ast), NULL); }
     break;
 
-  case 98:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_ATTRIBUTE, (yyvsp-1.ast), (yyvsp0.ast)); }
-
+  case 98: /* attribute_decl: class_name argument_list  */
+                        { (yyval.ast) = zend_ast_create(ZEND_AST_ATTRIBUTE, (yyvsp-1.ast), (yyvsp0.ast)); }
     break;
 
-  case 99:
-
-    { (yyval.ast) = zend_ast_create_list(1, ZEND_AST_ATTRIBUTE_GROUP, (yyvsp0.ast)); }
-
+  case 99: /* attribute_group: attribute_decl  */
+                        { (yyval.ast) = zend_ast_create_list(1, ZEND_AST_ATTRIBUTE_GROUP, (yyvsp0.ast)); }
     break;
 
-  case 100:
-
-    { (yyval.ast) = zend_ast_list_add((yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 100: /* attribute_group: attribute_group ',' attribute_decl  */
+                        { (yyval.ast) = zend_ast_list_add((yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 101:
-
-    { (yyval.ast) = (yyvsp-2.ast); }
-
+  case 101: /* attribute: "'#'" attribute_group possible_comma ''  */
+                                                                { (yyval.ast) = (yyvsp-2.ast); }
     break;
 
-  case 102:
-
-    { (yyval.ast) = zend_ast_create_list(1, ZEND_AST_ATTRIBUTE_LIST, (yyvsp0.ast)); }
-
+  case 102: /* attributes: attribute  */
+                                                        { (yyval.ast) = zend_ast_create_list(1, ZEND_AST_ATTRIBUTE_LIST, (yyvsp0.ast)); }
     break;
 
-  case 103:
-
-    { (yyval.ast) = zend_ast_list_add((yyvsp-1.ast), (yyvsp0.ast)); }
-
+  case 103: /* attributes: attributes attribute  */
+                                        { (yyval.ast) = zend_ast_list_add((yyvsp-1.ast), (yyvsp0.ast)); }
     break;
 
-  case 104:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 104: /* attributed_statement: function_declaration_statement  */
+                                                        { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 105:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 105: /* attributed_statement: class_declaration_statement  */
+                                                                { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 106:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 106: /* attributed_statement: trait_declaration_statement  */
+                                                                { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 107:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 107: /* attributed_statement: interface_declaration_statement  */
+                                                        { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 108:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 108: /* attributed_statement: enum_declaration_statement  */
+                                                                { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 109:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 109: /* top_statement: statement  */
+                                                                                { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 110:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 110: /* top_statement: attributed_statement  */
+                                                                        { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 111:
-
-    { (yyval.ast) = zend_ast_with_attributes((yyvsp0.ast), (yyvsp-1.ast)); }
-
+  case 111: /* top_statement: attributes attributed_statement  */
+                                                        { (yyval.ast) = zend_ast_with_attributes((yyvsp0.ast), (yyvsp-1.ast)); }
     break;
 
-  case 112:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_HALT_COMPILER,
+  case 112: /* top_statement: "'__halt_compiler'" '(' ')' ';'  */
+                        { (yyval.ast) = zend_ast_create(ZEND_AST_HALT_COMPILER,
 			      zend_ast_create_zval_from_long(zend_get_scanned_file_offset()));
 			  zend_stop_lexing(); }
-
     break;
 
-  case 113:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_NAMESPACE, (yyvsp-1.ast), NULL);
+  case 113: /* top_statement: "'namespace'" namespace_declaration_name ';'  */
+                        { (yyval.ast) = zend_ast_create(ZEND_AST_NAMESPACE, (yyvsp-1.ast), NULL);
 			  RESET_DOC_COMMENT(); }
-
     break;
 
-  case 114:
-
-    { RESET_DOC_COMMENT(); }
-
+  case 114: /* $@1: %empty  */
+                                                       { RESET_DOC_COMMENT(); }
     break;
 
-  case 115:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_NAMESPACE, (yyvsp-4.ast), (yyvsp-1.ast)); }
-
+  case 115: /* top_statement: "'namespace'" namespace_declaration_name $@1 '{' top_statement_list '}'  */
+                        { (yyval.ast) = zend_ast_create(ZEND_AST_NAMESPACE, (yyvsp-4.ast), (yyvsp-1.ast)); }
     break;
 
-  case 116:
-
-    { RESET_DOC_COMMENT(); }
-
+  case 116: /* $@2: %empty  */
+                            { RESET_DOC_COMMENT(); }
     break;
 
-  case 117:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_NAMESPACE, NULL, (yyvsp-1.ast)); }
-
+  case 117: /* top_statement: "'namespace'" $@2 '{' top_statement_list '}'  */
+                        { (yyval.ast) = zend_ast_create(ZEND_AST_NAMESPACE, NULL, (yyvsp-1.ast)); }
     break;
 
-  case 118:
-
-    { (yyval.ast) = (yyvsp-1.ast); }
-
+  case 118: /* top_statement: "'use'" mixed_group_use_declaration ';'  */
+                                                                { (yyval.ast) = (yyvsp-1.ast); }
     break;
 
-  case 119:
-
-    { (yyval.ast) = (yyvsp-1.ast); (yyval.ast)->attr = (yyvsp-2.num); }
-
+  case 119: /* top_statement: "'use'" use_type group_use_declaration ';'  */
+                                                                { (yyval.ast) = (yyvsp-1.ast); (yyval.ast)->attr = (yyvsp-2.num); }
     break;
 
-  case 120:
-
-    { (yyval.ast) = (yyvsp-1.ast); (yyval.ast)->attr = ZEND_SYMBOL_CLASS; }
-
+  case 120: /* top_statement: "'use'" use_declarations ';'  */
+                                                                                { (yyval.ast) = (yyvsp-1.ast); (yyval.ast)->attr = ZEND_SYMBOL_CLASS; }
     break;
 
-  case 121:
-
-    { (yyval.ast) = (yyvsp-1.ast); (yyval.ast)->attr = (yyvsp-2.num); }
-
+  case 121: /* top_statement: "'use'" use_type use_declarations ';'  */
+                                                                        { (yyval.ast) = (yyvsp-1.ast); (yyval.ast)->attr = (yyvsp-2.num); }
     break;
 
-  case 122:
-
-    { (yyval.ast) = (yyvsp-1.ast); }
-
+  case 122: /* top_statement: "'const'" const_list ';'  */
+                                                                                { (yyval.ast) = (yyvsp-1.ast); }
     break;
 
-  case 123:
-
-    { (yyval.num) = ZEND_SYMBOL_FUNCTION; }
-
+  case 123: /* use_type: "'function'"  */
+                                        { (yyval.num) = ZEND_SYMBOL_FUNCTION; }
     break;
 
-  case 124:
-
-    { (yyval.num) = ZEND_SYMBOL_CONST; }
-
+  case 124: /* use_type: "'const'"  */
+                                        { (yyval.num) = ZEND_SYMBOL_CONST; }
     break;
 
-  case 125:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_GROUP_USE, (yyvsp-5.ast), (yyvsp-2.ast)); }
-
+  case 125: /* group_use_declaration: legacy_namespace_name "'\\'" '{' unprefixed_use_declarations possible_comma '}'  */
+                        { (yyval.ast) = zend_ast_create(ZEND_AST_GROUP_USE, (yyvsp-5.ast), (yyvsp-2.ast)); }
     break;
 
-  case 126:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_GROUP_USE, (yyvsp-5.ast), (yyvsp-2.ast));}
-
+  case 126: /* mixed_group_use_declaration: legacy_namespace_name "'\\'" '{' inline_use_declarations possible_comma '}'  */
+                        { (yyval.ast) = zend_ast_create(ZEND_AST_GROUP_USE, (yyvsp-5.ast), (yyvsp-2.ast));}
     break;
 
-  case 129:
-
-    { (yyval.ast) = zend_ast_list_add((yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 129: /* inline_use_declarations: inline_use_declarations ',' inline_use_declaration  */
+                        { (yyval.ast) = zend_ast_list_add((yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 130:
-
-    { (yyval.ast) = zend_ast_create_list(1, ZEND_AST_USE, (yyvsp0.ast)); }
-
+  case 130: /* inline_use_declarations: inline_use_declaration  */
+                        { (yyval.ast) = zend_ast_create_list(1, ZEND_AST_USE, (yyvsp0.ast)); }
     break;
 
-  case 131:
-
-    { (yyval.ast) = zend_ast_list_add((yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 131: /* unprefixed_use_declarations: unprefixed_use_declarations ',' unprefixed_use_declaration  */
+                        { (yyval.ast) = zend_ast_list_add((yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 132:
-
-    { (yyval.ast) = zend_ast_create_list(1, ZEND_AST_USE, (yyvsp0.ast)); }
-
+  case 132: /* unprefixed_use_declarations: unprefixed_use_declaration  */
+                        { (yyval.ast) = zend_ast_create_list(1, ZEND_AST_USE, (yyvsp0.ast)); }
     break;
 
-  case 133:
-
-    { (yyval.ast) = zend_ast_list_add((yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 133: /* use_declarations: use_declarations ',' use_declaration  */
+                        { (yyval.ast) = zend_ast_list_add((yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 134:
-
-    { (yyval.ast) = zend_ast_create_list(1, ZEND_AST_USE, (yyvsp0.ast)); }
-
+  case 134: /* use_declarations: use_declaration  */
+                        { (yyval.ast) = zend_ast_create_list(1, ZEND_AST_USE, (yyvsp0.ast)); }
     break;
 
-  case 135:
-
-    { (yyval.ast) = (yyvsp0.ast); (yyval.ast)->attr = ZEND_SYMBOL_CLASS; }
-
+  case 135: /* inline_use_declaration: unprefixed_use_declaration  */
+                                           { (yyval.ast) = (yyvsp0.ast); (yyval.ast)->attr = ZEND_SYMBOL_CLASS; }
     break;
 
-  case 136:
-
-    { (yyval.ast) = (yyvsp0.ast); (yyval.ast)->attr = (yyvsp-1.num); }
-
+  case 136: /* inline_use_declaration: use_type unprefixed_use_declaration  */
+                                                    { (yyval.ast) = (yyvsp0.ast); (yyval.ast)->attr = (yyvsp-1.num); }
     break;
 
-  case 137:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_USE_ELEM, (yyvsp0.ast), NULL); }
-
+  case 137: /* unprefixed_use_declaration: namespace_name  */
+                        { (yyval.ast) = zend_ast_create(ZEND_AST_USE_ELEM, (yyvsp0.ast), NULL); }
     break;
 
-  case 138:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_USE_ELEM, (yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 138: /* unprefixed_use_declaration: namespace_name "'as'" "identifier"  */
+                        { (yyval.ast) = zend_ast_create(ZEND_AST_USE_ELEM, (yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 139:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_USE_ELEM, (yyvsp0.ast), NULL); }
-
+  case 139: /* use_declaration: legacy_namespace_name  */
+                        { (yyval.ast) = zend_ast_create(ZEND_AST_USE_ELEM, (yyvsp0.ast), NULL); }
     break;
 
-  case 140:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_USE_ELEM, (yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 140: /* use_declaration: legacy_namespace_name "'as'" "identifier"  */
+                        { (yyval.ast) = zend_ast_create(ZEND_AST_USE_ELEM, (yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 141:
-
-    { (yyval.ast) = zend_ast_list_add((yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 141: /* const_list: const_list ',' const_decl  */
+                                          { (yyval.ast) = zend_ast_list_add((yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 142:
-
-    { (yyval.ast) = zend_ast_create_list(1, ZEND_AST_CONST_DECL, (yyvsp0.ast)); }
-
+  case 142: /* const_list: const_decl  */
+                           { (yyval.ast) = zend_ast_create_list(1, ZEND_AST_CONST_DECL, (yyvsp0.ast)); }
     break;
 
-  case 143:
-
-    { (yyval.ast) = zend_ast_list_add((yyvsp-1.ast), (yyvsp0.ast)); }
-
+  case 143: /* inner_statement_list: inner_statement_list inner_statement  */
+                        { (yyval.ast) = zend_ast_list_add((yyvsp-1.ast), (yyvsp0.ast)); }
     break;
 
-  case 144:
-
-    { (yyval.ast) = zend_ast_create_list(0, ZEND_AST_STMT_LIST); }
-
+  case 144: /* inner_statement_list: %empty  */
+                        { (yyval.ast) = zend_ast_create_list(0, ZEND_AST_STMT_LIST); }
     break;
 
-  case 145:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 145: /* inner_statement: statement  */
+                          { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 146:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 146: /* inner_statement: attributed_statement  */
+                                                                        { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 147:
-
-    { (yyval.ast) = zend_ast_with_attributes((yyvsp0.ast), (yyvsp-1.ast)); }
-
+  case 147: /* inner_statement: attributes attributed_statement  */
+                                                        { (yyval.ast) = zend_ast_with_attributes((yyvsp0.ast), (yyvsp-1.ast)); }
     break;
 
-  case 148:
-
-    { (yyval.ast) = NULL; zend_throw_exception(zend_ce_compile_error,
+  case 148: /* inner_statement: "'__halt_compiler'" '(' ')' ';'  */
+                        { (yyval.ast) = NULL; zend_throw_exception(zend_ce_compile_error,
 			      "__HALT_COMPILER() can only be used from the outermost scope", 0); YYERROR; }
-
     break;
 
-  case 149:
-
-    { (yyval.ast) = (yyvsp-1.ast); }
-
+  case 149: /* statement: '{' inner_statement_list '}'  */
+                                             { (yyval.ast) = (yyvsp-1.ast); }
     break;
 
-  case 150:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 150: /* statement: if_stmt  */
+                        { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 151:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 151: /* statement: alt_if_stmt  */
+                            { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 152:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_WHILE, (yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 152: /* statement: "'while'" '(' expr ')' while_statement  */
+                        { (yyval.ast) = zend_ast_create(ZEND_AST_WHILE, (yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 153:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_DO_WHILE, (yyvsp-5.ast), (yyvsp-2.ast)); }
-
+  case 153: /* statement: "'do'" statement "'while'" '(' expr ')' ';'  */
+                        { (yyval.ast) = zend_ast_create(ZEND_AST_DO_WHILE, (yyvsp-5.ast), (yyvsp-2.ast)); }
     break;
 
-  case 154:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_FOR, (yyvsp-6.ast), (yyvsp-4.ast), (yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 154: /* statement: "'for'" '(' for_exprs ';' for_exprs ';' for_exprs ')' for_statement  */
+                        { (yyval.ast) = zend_ast_create(ZEND_AST_FOR, (yyvsp-6.ast), (yyvsp-4.ast), (yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 155:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_SWITCH, (yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 155: /* statement: "'switch'" '(' expr ')' switch_case_list  */
+                        { (yyval.ast) = zend_ast_create(ZEND_AST_SWITCH, (yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 156:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_BREAK, (yyvsp-1.ast)); }
-
+  case 156: /* statement: "'break'" optional_expr ';'  */
+                                                        { (yyval.ast) = zend_ast_create(ZEND_AST_BREAK, (yyvsp-1.ast)); }
     break;
 
-  case 157:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_CONTINUE, (yyvsp-1.ast)); }
-
+  case 157: /* statement: "'continue'" optional_expr ';'  */
+                                                { (yyval.ast) = zend_ast_create(ZEND_AST_CONTINUE, (yyvsp-1.ast)); }
     break;
 
-  case 158:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_RETURN, (yyvsp-1.ast)); }
-
+  case 158: /* statement: "'return'" optional_expr ';'  */
+                                                        { (yyval.ast) = zend_ast_create(ZEND_AST_RETURN, (yyvsp-1.ast)); }
     break;
 
-  case 159:
-
-    { (yyval.ast) = (yyvsp-1.ast); }
-
+  case 159: /* statement: "'global'" global_var_list ';'  */
+                                                { (yyval.ast) = (yyvsp-1.ast); }
     break;
 
-  case 160:
-
-    { (yyval.ast) = (yyvsp-1.ast); }
-
+  case 160: /* statement: "'static'" static_var_list ';'  */
+                                                { (yyval.ast) = (yyvsp-1.ast); }
     break;
 
-  case 161:
-
-    { (yyval.ast) = (yyvsp-1.ast); }
-
+  case 161: /* statement: "'echo'" echo_expr_list ';'  */
+                                                        { (yyval.ast) = (yyvsp-1.ast); }
     break;
 
-  case 162:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_ECHO, (yyvsp0.ast)); }
-
+  case 162: /* statement: T_INLINE_HTML  */
+                              { (yyval.ast) = zend_ast_create(ZEND_AST_ECHO, (yyvsp0.ast)); }
     break;
 
-  case 163:
-
-    { (yyval.ast) = (yyvsp-1.ast); }
-
+  case 163: /* statement: expr ';'  */
+                         { (yyval.ast) = (yyvsp-1.ast); }
     break;
 
-  case 164:
-
-    { (yyval.ast) = (yyvsp-3.ast); }
-
+  case 164: /* statement: "'unset'" '(' unset_variables possible_comma ')' ';'  */
+                                                                   { (yyval.ast) = (yyvsp-3.ast); }
     break;
 
-  case 165:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_FOREACH, (yyvsp-4.ast), (yyvsp-2.ast), NULL, (yyvsp0.ast)); }
-
+  case 165: /* statement: "'foreach'" '(' expr "'as'" foreach_variable ')' foreach_statement  */
+                        { (yyval.ast) = zend_ast_create(ZEND_AST_FOREACH, (yyvsp-4.ast), (yyvsp-2.ast), NULL, (yyvsp0.ast)); }
     break;
 
-  case 166:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_FOREACH, (yyvsp-6.ast), (yyvsp-2.ast), (yyvsp-4.ast), (yyvsp0.ast)); }
-
+  case 166: /* statement: "'foreach'" '(' expr "'as'" foreach_variable "'=>'" foreach_variable ')' foreach_statement  */
+                        { (yyval.ast) = zend_ast_create(ZEND_AST_FOREACH, (yyvsp-6.ast), (yyvsp-2.ast), (yyvsp-4.ast), (yyvsp0.ast)); }
     break;
 
-  case 167:
-
-    { if (!zend_handle_encoding_declaration((yyvsp-1.ast))) { YYERROR; } }
-
+  case 167: /* $@3: %empty  */
+                        { if (!zend_handle_encoding_declaration((yyvsp-1.ast))) { YYERROR; } }
     break;
 
-  case 168:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_DECLARE, (yyvsp-3.ast), (yyvsp0.ast)); }
-
+  case 168: /* statement: "'declare'" '(' const_list ')' $@3 declare_statement  */
+                        { (yyval.ast) = zend_ast_create(ZEND_AST_DECLARE, (yyvsp-3.ast), (yyvsp0.ast)); }
     break;
 
-  case 169:
-
-    { (yyval.ast) = NULL; }
-
+  case 169: /* statement: ';'  */
+                                              { (yyval.ast) = NULL; }
     break;
 
-  case 170:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_TRY, (yyvsp-3.ast), (yyvsp-1.ast), (yyvsp0.ast)); }
-
+  case 170: /* statement: "'try'" '{' inner_statement_list '}' catch_list finally_statement  */
+                        { (yyval.ast) = zend_ast_create(ZEND_AST_TRY, (yyvsp-3.ast), (yyvsp-1.ast), (yyvsp0.ast)); }
     break;
 
-  case 171:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_GOTO, (yyvsp-1.ast)); }
-
+  case 171: /* statement: "'goto'" "identifier" ';'  */
+                                    { (yyval.ast) = zend_ast_create(ZEND_AST_GOTO, (yyvsp-1.ast)); }
     break;
 
-  case 172:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_LABEL, (yyvsp-1.ast)); }
-
+  case 172: /* statement: "identifier" ':'  */
+                             { (yyval.ast) = zend_ast_create(ZEND_AST_LABEL, (yyvsp-1.ast)); }
     break;
 
-  case 173:
-
-    { (yyval.ast) = zend_ast_create_list(0, ZEND_AST_CATCH_LIST); }
-
+  case 173: /* catch_list: %empty  */
+                        { (yyval.ast) = zend_ast_create_list(0, ZEND_AST_CATCH_LIST); }
     break;
 
-  case 174:
-
-    { (yyval.ast) = zend_ast_list_add((yyvsp-8.ast), zend_ast_create(ZEND_AST_CATCH, (yyvsp-5.ast), (yyvsp-4.ast), (yyvsp-1.ast))); }
-
+  case 174: /* catch_list: catch_list "'catch'" '(' catch_name_list optional_variable ')' '{' inner_statement_list '}'  */
+                        { (yyval.ast) = zend_ast_list_add((yyvsp-8.ast), zend_ast_create(ZEND_AST_CATCH, (yyvsp-5.ast), (yyvsp-4.ast), (yyvsp-1.ast))); }
     break;
 
-  case 175:
-
-    { (yyval.ast) = zend_ast_create_list(1, ZEND_AST_NAME_LIST, (yyvsp0.ast)); }
-
+  case 175: /* catch_name_list: class_name  */
+                           { (yyval.ast) = zend_ast_create_list(1, ZEND_AST_NAME_LIST, (yyvsp0.ast)); }
     break;
 
-  case 176:
-
-    { (yyval.ast) = zend_ast_list_add((yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 176: /* catch_name_list: catch_name_list '|' class_name  */
+                                               { (yyval.ast) = zend_ast_list_add((yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 177:
-
-    { (yyval.ast) = NULL; }
-
+  case 177: /* optional_variable: %empty  */
+                       { (yyval.ast) = NULL; }
     break;
 
-  case 178:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 178: /* optional_variable: "variable"  */
+                           { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 179:
-
-    { (yyval.ast) = NULL; }
-
+  case 179: /* finally_statement: %empty  */
+                       { (yyval.ast) = NULL; }
     break;
 
-  case 180:
-
-    { (yyval.ast) = (yyvsp-1.ast); }
-
+  case 180: /* finally_statement: "'finally'" '{' inner_statement_list '}'  */
+                                                       { (yyval.ast) = (yyvsp-1.ast); }
     break;
 
-  case 181:
-
-    { (yyval.ast) = zend_ast_create_list(1, ZEND_AST_STMT_LIST, (yyvsp0.ast)); }
-
+  case 181: /* unset_variables: unset_variable  */
+                               { (yyval.ast) = zend_ast_create_list(1, ZEND_AST_STMT_LIST, (yyvsp0.ast)); }
     break;
 
-  case 182:
-
-    { (yyval.ast) = zend_ast_list_add((yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 182: /* unset_variables: unset_variables ',' unset_variable  */
+                                                   { (yyval.ast) = zend_ast_list_add((yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 183:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_UNSET, (yyvsp0.ast)); }
-
+  case 183: /* unset_variable: variable  */
+                         { (yyval.ast) = zend_ast_create(ZEND_AST_UNSET, (yyvsp0.ast)); }
     break;
 
-  case 184:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 184: /* function_name: "identifier"  */
+                         { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 185:
-
-    {
+  case 185: /* function_name: "'readonly'"  */
+                           {
 			zval zv;
 			if (zend_lex_tstring(&zv, (yyvsp0.ident)) == FAILURE) { YYABORT; }
 			(yyval.ast) = zend_ast_create_zval(&zv);
 		}
-
     break;
 
-  case 186:
-
-    { (yyval.ast) = zend_ast_create_decl(ZEND_AST_FUNC_DECL, (yyvsp-11.num) | (yyvsp0.num), (yyvsp-12.num), (yyvsp-9.str),
+  case 186: /* function_declaration_statement: function returns_ref function_name backup_doc_comment '(' parameter_list ')' return_type backup_fn_flags '{' inner_statement_list '}' backup_fn_flags  */
+                { (yyval.ast) = zend_ast_create_decl(ZEND_AST_FUNC_DECL, (yyvsp-11.num) | (yyvsp0.num), (yyvsp-12.num), (yyvsp-9.str),
 		      zend_ast_get_str((yyvsp-10.ast)), (yyvsp-7.ast), NULL, (yyvsp-2.ast), (yyvsp-5.ast), NULL); CG(extra_fn_flags) = (yyvsp-4.num); }
-
     break;
 
-  case 187:
-
-    { (yyval.num) = 0; }
-
+  case 187: /* is_reference: %empty  */
+                        { (yyval.num) = 0; }
     break;
 
-  case 188:
-
-    { (yyval.num) = ZEND_PARAM_REF; }
-
+  case 188: /* is_reference: "'&'"  */
+                                                        { (yyval.num) = ZEND_PARAM_REF; }
     break;
 
-  case 189:
-
-    { (yyval.num) = 0; }
-
+  case 189: /* is_variadic: %empty  */
+                       { (yyval.num) = 0; }
     break;
 
-  case 190:
-
-    { (yyval.num) = ZEND_PARAM_VARIADIC; }
-
+  case 190: /* is_variadic: "'...'"  */
+                            { (yyval.num) = ZEND_PARAM_VARIADIC; }
     break;
 
-  case 191:
-
-    { (yyval.num) = CG(zend_lineno); }
-
+  case 191: /* @4: %empty  */
+                                        { (yyval.num) = CG(zend_lineno); }
     break;
 
-  case 192:
-
-    { (yyval.ast) = zend_ast_create_decl(ZEND_AST_CLASS, (yyvsp-9.num), (yyvsp-7.num), (yyvsp-3.str), zend_ast_get_str((yyvsp-6.ast)), (yyvsp-5.ast), (yyvsp-4.ast), (yyvsp-1.ast), NULL, NULL); }
-
+  case 192: /* class_declaration_statement: class_modifiers "'class'" @4 "identifier" extends_from implements_list backup_doc_comment '{' class_statement_list '}'  */
+                        { (yyval.ast) = zend_ast_create_decl(ZEND_AST_CLASS, (yyvsp-9.num), (yyvsp-7.num), (yyvsp-3.str), zend_ast_get_str((yyvsp-6.ast)), (yyvsp-5.ast), (yyvsp-4.ast), (yyvsp-1.ast), NULL, NULL); }
     break;
 
-  case 193:
-
-    { (yyval.num) = CG(zend_lineno); }
-
+  case 193: /* @5: %empty  */
+                        { (yyval.num) = CG(zend_lineno); }
     break;
 
-  case 194:
-
-    { (yyval.ast) = zend_ast_create_decl(ZEND_AST_CLASS, 0, (yyvsp-7.num), (yyvsp-3.str), zend_ast_get_str((yyvsp-6.ast)), (yyvsp-5.ast), (yyvsp-4.ast), (yyvsp-1.ast), NULL, NULL); }
-
+  case 194: /* class_declaration_statement: "'class'" @5 "identifier" extends_from implements_list backup_doc_comment '{' class_statement_list '}'  */
+                        { (yyval.ast) = zend_ast_create_decl(ZEND_AST_CLASS, 0, (yyvsp-7.num), (yyvsp-3.str), zend_ast_get_str((yyvsp-6.ast)), (yyvsp-5.ast), (yyvsp-4.ast), (yyvsp-1.ast), NULL, NULL); }
     break;
 
-  case 195:
-
-    { (yyval.num) = (yyvsp0.num); }
-
+  case 195: /* class_modifiers: class_modifier  */
+                                                                { (yyval.num) = (yyvsp0.num); }
     break;
 
-  case 196:
-
-    { (yyval.num) = zend_add_class_modifier((yyvsp-1.num), (yyvsp0.num)); if (!(yyval.num)) { YYERROR; } }
-
+  case 196: /* class_modifiers: class_modifiers class_modifier  */
+                        { (yyval.num) = zend_add_class_modifier((yyvsp-1.num), (yyvsp0.num)); if (!(yyval.num)) { YYERROR; } }
     break;
 
-  case 197:
-
-    { (yyval.num) = zend_add_anonymous_class_modifier(0, (yyvsp0.num)); if (!(yyval.num)) { YYERROR; } }
-
+  case 197: /* anonymous_class_modifiers: class_modifier  */
+                        { (yyval.num) = zend_add_anonymous_class_modifier(0, (yyvsp0.num)); if (!(yyval.num)) { YYERROR; } }
     break;
 
-  case 198:
-
-    { (yyval.num) = zend_add_anonymous_class_modifier((yyvsp-1.num), (yyvsp0.num)); if (!(yyval.num)) { YYERROR; } }
-
+  case 198: /* anonymous_class_modifiers: anonymous_class_modifiers class_modifier  */
+                        { (yyval.num) = zend_add_anonymous_class_modifier((yyvsp-1.num), (yyvsp0.num)); if (!(yyval.num)) { YYERROR; } }
     break;
 
-  case 199:
-
-    { (yyval.num) = 0; }
-
+  case 199: /* anonymous_class_modifiers_optional: %empty  */
+                                                { (yyval.num) = 0; }
     break;
 
-  case 200:
-
-    { (yyval.num) = (yyvsp0.num); }
-
+  case 200: /* anonymous_class_modifiers_optional: anonymous_class_modifiers  */
+                                                { (yyval.num) = (yyvsp0.num); }
     break;
 
-  case 201:
-
-    { (yyval.num) = ZEND_ACC_EXPLICIT_ABSTRACT_CLASS; }
-
+  case 201: /* class_modifier: "'abstract'"  */
+                                        { (yyval.num) = ZEND_ACC_EXPLICIT_ABSTRACT_CLASS; }
     break;
 
-  case 202:
-
-    { (yyval.num) = ZEND_ACC_FINAL; }
-
+  case 202: /* class_modifier: "'final'"  */
+                                        { (yyval.num) = ZEND_ACC_FINAL; }
     break;
 
-  case 203:
-
-    { (yyval.num) = ZEND_ACC_READONLY_CLASS|ZEND_ACC_NO_DYNAMIC_PROPERTIES; }
-
+  case 203: /* class_modifier: "'readonly'"  */
+                                        { (yyval.num) = ZEND_ACC_READONLY_CLASS|ZEND_ACC_NO_DYNAMIC_PROPERTIES; }
     break;
 
-  case 204:
-
-    { (yyval.num) = CG(zend_lineno); }
-
+  case 204: /* @6: %empty  */
+                        { (yyval.num) = CG(zend_lineno); }
     break;
 
-  case 205:
-
-    { (yyval.ast) = zend_ast_create_decl(ZEND_AST_CLASS, ZEND_ACC_TRAIT, (yyvsp-5.num), (yyvsp-3.str), zend_ast_get_str((yyvsp-4.ast)), NULL, NULL, (yyvsp-1.ast), NULL, NULL); }
-
+  case 205: /* trait_declaration_statement: "'trait'" @6 "identifier" backup_doc_comment '{' class_statement_list '}'  */
+                        { (yyval.ast) = zend_ast_create_decl(ZEND_AST_CLASS, ZEND_ACC_TRAIT, (yyvsp-5.num), (yyvsp-3.str), zend_ast_get_str((yyvsp-4.ast)), NULL, NULL, (yyvsp-1.ast), NULL, NULL); }
     break;
 
-  case 206:
-
-    { (yyval.num) = CG(zend_lineno); }
-
+  case 206: /* @7: %empty  */
+                            { (yyval.num) = CG(zend_lineno); }
     break;
 
-  case 207:
-
-    { (yyval.ast) = zend_ast_create_decl(ZEND_AST_CLASS, ZEND_ACC_INTERFACE, (yyvsp-6.num), (yyvsp-3.str), zend_ast_get_str((yyvsp-5.ast)), NULL, (yyvsp-4.ast), (yyvsp-1.ast), NULL, NULL); }
-
+  case 207: /* interface_declaration_statement: "'interface'" @7 "identifier" interface_extends_list backup_doc_comment '{' class_statement_list '}'  */
+                        { (yyval.ast) = zend_ast_create_decl(ZEND_AST_CLASS, ZEND_ACC_INTERFACE, (yyvsp-6.num), (yyvsp-3.str), zend_ast_get_str((yyvsp-5.ast)), NULL, (yyvsp-4.ast), (yyvsp-1.ast), NULL, NULL); }
     break;
 
-  case 208:
-
-    { (yyval.num) = CG(zend_lineno); }
-
+  case 208: /* @8: %empty  */
+                       { (yyval.num) = CG(zend_lineno); }
     break;
 
-  case 209:
-
-    { (yyval.ast) = zend_ast_create_decl(ZEND_AST_CLASS, ZEND_ACC_ENUM|ZEND_ACC_FINAL, (yyvsp-7.num), (yyvsp-3.str), zend_ast_get_str((yyvsp-6.ast)), NULL, (yyvsp-4.ast), (yyvsp-1.ast), NULL, (yyvsp-5.ast)); }
-
+  case 209: /* enum_declaration_statement: "'enum'" @8 "identifier" enum_backing_type implements_list backup_doc_comment '{' class_statement_list '}'  */
+                        { (yyval.ast) = zend_ast_create_decl(ZEND_AST_CLASS, ZEND_ACC_ENUM|ZEND_ACC_FINAL, (yyvsp-7.num), (yyvsp-3.str), zend_ast_get_str((yyvsp-6.ast)), NULL, (yyvsp-4.ast), (yyvsp-1.ast), NULL, (yyvsp-5.ast)); }
     break;
 
-  case 210:
-
-    { (yyval.ast) = NULL; }
-
+  case 210: /* enum_backing_type: %empty  */
+                        { (yyval.ast) = NULL; }
     break;
 
-  case 211:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 211: /* enum_backing_type: ':' type_expr  */
+                              { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 212:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_ENUM_CASE, (yyvsp-2.ast), (yyvsp-1.ast), ((yyvsp-3.str) ? zend_ast_create_zval_from_str((yyvsp-3.str)) : NULL), NULL); }
-
+  case 212: /* enum_case: "'case'" backup_doc_comment identifier enum_case_expr ';'  */
+                        { (yyval.ast) = zend_ast_create(ZEND_AST_ENUM_CASE, (yyvsp-2.ast), (yyvsp-1.ast), ((yyvsp-3.str) ? zend_ast_create_zval_from_str((yyvsp-3.str)) : NULL), NULL); }
     break;
 
-  case 213:
-
-    { (yyval.ast) = NULL; }
-
+  case 213: /* enum_case_expr: %empty  */
+                        { (yyval.ast) = NULL; }
     break;
 
-  case 214:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 214: /* enum_case_expr: '=' expr  */
+                         { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 215:
-
-    { (yyval.ast) = NULL; }
-
+  case 215: /* extends_from: %empty  */
+                                                { (yyval.ast) = NULL; }
     break;
 
-  case 216:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 216: /* extends_from: "'extends'" class_name  */
+                                        { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 217:
-
-    { (yyval.ast) = NULL; }
-
+  case 217: /* interface_extends_list: %empty  */
+                                                { (yyval.ast) = NULL; }
     break;
 
-  case 218:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 218: /* interface_extends_list: "'extends'" class_name_list  */
+                                                { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 219:
-
-    { (yyval.ast) = NULL; }
-
+  case 219: /* implements_list: %empty  */
+                                                        { (yyval.ast) = NULL; }
     break;
 
-  case 220:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 220: /* implements_list: "'implements'" class_name_list  */
+                                                { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 221:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 221: /* foreach_variable: variable  */
+                                                { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 222:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_REF, (yyvsp0.ast)); }
-
+  case 222: /* foreach_variable: ampersand variable  */
+                                        { (yyval.ast) = zend_ast_create(ZEND_AST_REF, (yyvsp0.ast)); }
     break;
 
-  case 223:
-
-    { (yyval.ast) = (yyvsp-1.ast); (yyval.ast)->attr = ZEND_ARRAY_SYNTAX_LIST; }
-
+  case 223: /* foreach_variable: "'list'" '(' array_pair_list ')'  */
+                                               { (yyval.ast) = (yyvsp-1.ast); (yyval.ast)->attr = ZEND_ARRAY_SYNTAX_LIST; }
     break;
 
-  case 224:
-
-    { (yyval.ast) = (yyvsp-1.ast); (yyval.ast)->attr = ZEND_ARRAY_SYNTAX_SHORT; }
-
+  case 224: /* foreach_variable: '' array_pair_list ''  */
+                                        { (yyval.ast) = (yyvsp-1.ast); (yyval.ast)->attr = ZEND_ARRAY_SYNTAX_SHORT; }
     break;
 
-  case 225:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 225: /* for_statement: statement  */
+                          { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 226:
-
-    { (yyval.ast) = (yyvsp-2.ast); }
-
+  case 226: /* for_statement: ':' inner_statement_list "'endfor'" ';'  */
+                                                      { (yyval.ast) = (yyvsp-2.ast); }
     break;
 
-  case 227:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 227: /* foreach_statement: statement  */
+                          { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 228:
-
-    { (yyval.ast) = (yyvsp-2.ast); }
-
+  case 228: /* foreach_statement: ':' inner_statement_list "'endforeach'" ';'  */
+                                                          { (yyval.ast) = (yyvsp-2.ast); }
     break;
 
-  case 229:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 229: /* declare_statement: statement  */
+                          { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 230:
-
-    { (yyval.ast) = (yyvsp-2.ast); }
-
+  case 230: /* declare_statement: ':' inner_statement_list "'enddeclare'" ';'  */
+                                                          { (yyval.ast) = (yyvsp-2.ast); }
     break;
 
-  case 231:
-
-    { (yyval.ast) = (yyvsp-1.ast); }
-
+  case 231: /* switch_case_list: '{' case_list '}'  */
+                                                                        { (yyval.ast) = (yyvsp-1.ast); }
     break;
 
-  case 232:
-
-    { (yyval.ast) = (yyvsp-1.ast); }
-
+  case 232: /* switch_case_list: '{' ';' case_list '}'  */
+                                                                { (yyval.ast) = (yyvsp-1.ast); }
     break;
 
-  case 233:
-
-    { (yyval.ast) = (yyvsp-2.ast); }
-
+  case 233: /* switch_case_list: ':' case_list "'endswitch'" ';'  */
+                                                        { (yyval.ast) = (yyvsp-2.ast); }
     break;
 
-  case 234:
-
-    { (yyval.ast) = (yyvsp-2.ast); }
-
+  case 234: /* switch_case_list: ':' ';' case_list "'endswitch'" ';'  */
+                                                        { (yyval.ast) = (yyvsp-2.ast); }
     break;
 
-  case 235:
-
-    { (yyval.ast) = zend_ast_create_list(0, ZEND_AST_SWITCH_LIST); }
-
+  case 235: /* case_list: %empty  */
+                       { (yyval.ast) = zend_ast_create_list(0, ZEND_AST_SWITCH_LIST); }
     break;
 
-  case 236:
-
-    { (yyval.ast) = zend_ast_list_add((yyvsp-4.ast), zend_ast_create(ZEND_AST_SWITCH_CASE, (yyvsp-2.ast), (yyvsp0.ast))); }
-
+  case 236: /* case_list: case_list "'case'" expr case_separator inner_statement_list  */
+                        { (yyval.ast) = zend_ast_list_add((yyvsp-4.ast), zend_ast_create(ZEND_AST_SWITCH_CASE, (yyvsp-2.ast), (yyvsp0.ast))); }
     break;
 
-  case 237:
-
-    { (yyval.ast) = zend_ast_list_add((yyvsp-3.ast), zend_ast_create(ZEND_AST_SWITCH_CASE, NULL, (yyvsp0.ast))); }
-
+  case 237: /* case_list: case_list "'default'" case_separator inner_statement_list  */
+                        { (yyval.ast) = zend_ast_list_add((yyvsp-3.ast), zend_ast_create(ZEND_AST_SWITCH_CASE, NULL, (yyvsp0.ast))); }
     break;
 
-  case 240:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_MATCH, (yyvsp-4.ast), (yyvsp-1.ast)); }
-
+  case 240: /* match: "'match'" '(' expr ')' '{' match_arm_list '}'  */
+                        { (yyval.ast) = zend_ast_create(ZEND_AST_MATCH, (yyvsp-4.ast), (yyvsp-1.ast)); }
     break;
 
-  case 241:
-
-    { (yyval.ast) = zend_ast_create_list(0, ZEND_AST_MATCH_ARM_LIST); }
-
+  case 241: /* match_arm_list: %empty  */
+                       { (yyval.ast) = zend_ast_create_list(0, ZEND_AST_MATCH_ARM_LIST); }
     break;
 
-  case 242:
-
-    { (yyval.ast) = (yyvsp-1.ast); }
-
+  case 242: /* match_arm_list: non_empty_match_arm_list possible_comma  */
+                                                        { (yyval.ast) = (yyvsp-1.ast); }
     break;
 
-  case 243:
-
-    { (yyval.ast) = zend_ast_create_list(1, ZEND_AST_MATCH_ARM_LIST, (yyvsp0.ast)); }
-
+  case 243: /* non_empty_match_arm_list: match_arm  */
+                          { (yyval.ast) = zend_ast_create_list(1, ZEND_AST_MATCH_ARM_LIST, (yyvsp0.ast)); }
     break;
 
-  case 244:
-
-    { (yyval.ast) = zend_ast_list_add((yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 244: /* non_empty_match_arm_list: non_empty_match_arm_list ',' match_arm  */
+                                                       { (yyval.ast) = zend_ast_list_add((yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 245:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_MATCH_ARM, (yyvsp-3.ast), (yyvsp0.ast)); }
-
+  case 245: /* match_arm: match_arm_cond_list possible_comma "'=>'" expr  */
+                        { (yyval.ast) = zend_ast_create(ZEND_AST_MATCH_ARM, (yyvsp-3.ast), (yyvsp0.ast)); }
     break;
 
-  case 246:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_MATCH_ARM, NULL, (yyvsp0.ast)); }
-
+  case 246: /* match_arm: "'default'" possible_comma "'=>'" expr  */
+                        { (yyval.ast) = zend_ast_create(ZEND_AST_MATCH_ARM, NULL, (yyvsp0.ast)); }
     break;
 
-  case 247:
-
-    { (yyval.ast) = zend_ast_create_list(1, ZEND_AST_EXPR_LIST, (yyvsp0.ast)); }
-
+  case 247: /* match_arm_cond_list: expr  */
+                     { (yyval.ast) = zend_ast_create_list(1, ZEND_AST_EXPR_LIST, (yyvsp0.ast)); }
     break;
 
-  case 248:
-
-    { (yyval.ast) = zend_ast_list_add((yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 248: /* match_arm_cond_list: match_arm_cond_list ',' expr  */
+                                             { (yyval.ast) = zend_ast_list_add((yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 249:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 249: /* while_statement: statement  */
+                          { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 250:
-
-    { (yyval.ast) = (yyvsp-2.ast); }
-
+  case 250: /* while_statement: ':' inner_statement_list "'endwhile'" ';'  */
+                                                        { (yyval.ast) = (yyvsp-2.ast); }
     break;
 
-  case 251:
-
-    { (yyval.ast) = zend_ast_create_list(1, ZEND_AST_IF,
+  case 251: /* if_stmt_without_else: "'if'" '(' expr ')' statement  */
+                        { (yyval.ast) = zend_ast_create_list(1, ZEND_AST_IF,
 			      zend_ast_create(ZEND_AST_IF_ELEM, (yyvsp-2.ast), (yyvsp0.ast))); }
-
     break;
 
-  case 252:
-
-    { (yyval.ast) = zend_ast_list_add((yyvsp-5.ast),
+  case 252: /* if_stmt_without_else: if_stmt_without_else "'elseif'" '(' expr ')' statement  */
+                        { (yyval.ast) = zend_ast_list_add((yyvsp-5.ast),
 			      zend_ast_create(ZEND_AST_IF_ELEM, (yyvsp-2.ast), (yyvsp0.ast))); }
-
     break;
 
-  case 253:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 253: /* if_stmt: if_stmt_without_else  */
+                                                    { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 254:
-
-    { (yyval.ast) = zend_ast_list_add((yyvsp-2.ast), zend_ast_create(ZEND_AST_IF_ELEM, NULL, (yyvsp0.ast))); }
-
+  case 254: /* if_stmt: if_stmt_without_else "'else'" statement  */
+                        { (yyval.ast) = zend_ast_list_add((yyvsp-2.ast), zend_ast_create(ZEND_AST_IF_ELEM, NULL, (yyvsp0.ast))); }
     break;
 
-  case 255:
-
-    { (yyval.ast) = zend_ast_create_list(1, ZEND_AST_IF,
+  case 255: /* alt_if_stmt_without_else: "'if'" '(' expr ')' ':' inner_statement_list  */
+                        { (yyval.ast) = zend_ast_create_list(1, ZEND_AST_IF,
 			      zend_ast_create(ZEND_AST_IF_ELEM, (yyvsp-3.ast), (yyvsp0.ast))); }
-
     break;
 
-  case 256:
-
-    { (yyval.ast) = zend_ast_list_add((yyvsp-6.ast),
+  case 256: /* alt_if_stmt_without_else: alt_if_stmt_without_else "'elseif'" '(' expr ')' ':' inner_statement_list  */
+                        { (yyval.ast) = zend_ast_list_add((yyvsp-6.ast),
 			      zend_ast_create(ZEND_AST_IF_ELEM, (yyvsp-3.ast), (yyvsp0.ast))); }
-
     break;
 
-  case 257:
-
-    { (yyval.ast) = (yyvsp-2.ast); }
-
+  case 257: /* alt_if_stmt: alt_if_stmt_without_else "'endif'" ';'  */
+                                                     { (yyval.ast) = (yyvsp-2.ast); }
     break;
 
-  case 258:
-
-    { (yyval.ast) = zend_ast_list_add((yyvsp-5.ast),
+  case 258: /* alt_if_stmt: alt_if_stmt_without_else "'else'" ':' inner_statement_list "'endif'" ';'  */
+                        { (yyval.ast) = zend_ast_list_add((yyvsp-5.ast),
 			      zend_ast_create(ZEND_AST_IF_ELEM, NULL, (yyvsp-2.ast))); }
-
     break;
 
-  case 259:
-
-    { (yyval.ast) = (yyvsp-1.ast); }
-
+  case 259: /* parameter_list: non_empty_parameter_list possible_comma  */
+                                                        { (yyval.ast) = (yyvsp-1.ast); }
     break;
 
-  case 260:
-
-    { (yyval.ast) = zend_ast_create_list(0, ZEND_AST_PARAM_LIST); }
-
+  case 260: /* parameter_list: %empty  */
+                        { (yyval.ast) = zend_ast_create_list(0, ZEND_AST_PARAM_LIST); }
     break;
 
-  case 261:
-
-    { (yyval.ast) = zend_ast_create_list(1, ZEND_AST_PARAM_LIST, (yyvsp0.ast)); }
-
+  case 261: /* non_empty_parameter_list: attributed_parameter  */
+                        { (yyval.ast) = zend_ast_create_list(1, ZEND_AST_PARAM_LIST, (yyvsp0.ast)); }
     break;
 
-  case 262:
-
-    { (yyval.ast) = zend_ast_list_add((yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 262: /* non_empty_parameter_list: non_empty_parameter_list ',' attributed_parameter  */
+                        { (yyval.ast) = zend_ast_list_add((yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 263:
-
-    { (yyval.ast) = zend_ast_with_attributes((yyvsp0.ast), (yyvsp-1.ast)); }
-
+  case 263: /* attributed_parameter: attributes parameter  */
+                                        { (yyval.ast) = zend_ast_with_attributes((yyvsp0.ast), (yyvsp-1.ast)); }
     break;
 
-  case 264:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 264: /* attributed_parameter: parameter  */
+                                                        { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 265:
-
-    { (yyval.num) = 0; }
-
+  case 265: /* optional_cpp_modifiers: %empty  */
+                        { (yyval.num) = 0; }
     break;
 
-  case 266:
-
-    { (yyval.num) = zend_modifier_list_to_flags(ZEND_MODIFIER_TARGET_CPP, (yyvsp0.ast));
+  case 266: /* optional_cpp_modifiers: non_empty_member_modifiers  */
+                        { (yyval.num) = zend_modifier_list_to_flags(ZEND_MODIFIER_TARGET_CPP, (yyvsp0.ast));
 			  if (!(yyval.num)) { YYERROR; } }
-
     break;
 
-  case 267:
-
-    { (yyval.ast) = zend_ast_create_ex(ZEND_AST_PARAM, (yyvsp-5.num) | (yyvsp-3.num) | (yyvsp-2.num), (yyvsp-4.ast), (yyvsp-1.ast), NULL,
+  case 267: /* parameter: optional_cpp_modifiers optional_type_without_static is_reference is_variadic "variable" backup_doc_comment  */
+                        { (yyval.ast) = zend_ast_create_ex(ZEND_AST_PARAM, (yyvsp-5.num) | (yyvsp-3.num) | (yyvsp-2.num), (yyvsp-4.ast), (yyvsp-1.ast), NULL,
 					NULL, (yyvsp0.str) ? zend_ast_create_zval_from_str((yyvsp0.str)) : NULL); }
-
     break;
 
-  case 268:
-
-    { (yyval.ast) = zend_ast_create_ex(ZEND_AST_PARAM, (yyvsp-7.num) | (yyvsp-5.num) | (yyvsp-4.num), (yyvsp-6.ast), (yyvsp-3.ast), (yyvsp0.ast),
+  case 268: /* parameter: optional_cpp_modifiers optional_type_without_static is_reference is_variadic "variable" backup_doc_comment '=' expr  */
+                        { (yyval.ast) = zend_ast_create_ex(ZEND_AST_PARAM, (yyvsp-7.num) | (yyvsp-5.num) | (yyvsp-4.num), (yyvsp-6.ast), (yyvsp-3.ast), (yyvsp0.ast),
 					NULL, (yyvsp-2.str) ? zend_ast_create_zval_from_str((yyvsp-2.str)) : NULL); }
-
     break;
 
-  case 269:
-
-    { (yyval.ast) = NULL; }
-
+  case 269: /* optional_type_without_static: %empty  */
+                        { (yyval.ast) = NULL; }
     break;
 
-  case 270:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 270: /* optional_type_without_static: type_expr_without_static  */
+                                                { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 271:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 271: /* type_expr: type  */
+                                                { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 272:
-
-    { (yyval.ast) = (yyvsp0.ast); (yyval.ast)->attr |= ZEND_TYPE_NULLABLE; }
-
+  case 272: /* type_expr: '?' type  */
+                                                { (yyval.ast) = (yyvsp0.ast); (yyval.ast)->attr |= ZEND_TYPE_NULLABLE; }
     break;
 
-  case 273:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 273: /* type_expr: union_type  */
+                                                { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 274:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 274: /* type_expr: intersection_type  */
+                                        { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 275:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 275: /* type: type_without_static  */
+                                        { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 276:
-
-    { (yyval.ast) = zend_ast_create_ex(ZEND_AST_TYPE, IS_STATIC); }
-
+  case 276: /* type: "'static'"  */
+                                                { (yyval.ast) = zend_ast_create_ex(ZEND_AST_TYPE, IS_STATIC); }
     break;
 
-  case 277:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 277: /* union_type_element: type  */
+                     { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 278:
-
-    { (yyval.ast) = (yyvsp-1.ast); }
-
+  case 278: /* union_type_element: '(' intersection_type ')'  */
+                                           { (yyval.ast) = (yyvsp-1.ast); }
     break;
 
-  case 279:
-
-    { (yyval.ast) = zend_ast_create_list(2, ZEND_AST_TYPE_UNION, (yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 279: /* union_type: union_type_element '|' union_type_element  */
+                        { (yyval.ast) = zend_ast_create_list(2, ZEND_AST_TYPE_UNION, (yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 280:
-
-    { (yyval.ast) = zend_ast_list_add((yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 280: /* union_type: union_type '|' union_type_element  */
+                        { (yyval.ast) = zend_ast_list_add((yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 281:
-
-    { (yyval.ast) = zend_ast_create_list(2, ZEND_AST_TYPE_INTERSECTION, (yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 281: /* intersection_type: type "amp" type  */
+                                                                          { (yyval.ast) = zend_ast_create_list(2, ZEND_AST_TYPE_INTERSECTION, (yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 282:
-
-    { (yyval.ast) = zend_ast_list_add((yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 282: /* intersection_type: intersection_type "amp" type  */
+                                                                                 { (yyval.ast) = zend_ast_list_add((yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 283:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 283: /* type_expr_without_static: type_without_static  */
+                                                        { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 284:
-
-    { (yyval.ast) = (yyvsp0.ast); (yyval.ast)->attr |= ZEND_TYPE_NULLABLE; }
-
+  case 284: /* type_expr_without_static: '?' type_without_static  */
+                                                { (yyval.ast) = (yyvsp0.ast); (yyval.ast)->attr |= ZEND_TYPE_NULLABLE; }
     break;
 
-  case 285:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 285: /* type_expr_without_static: union_type_without_static  */
+                                                { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 286:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 286: /* type_expr_without_static: intersection_type_without_static  */
+                                                        { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 287:
-
-    { (yyval.ast) = zend_ast_create_ex(ZEND_AST_TYPE, IS_ARRAY); }
-
+  case 287: /* type_without_static: "'array'"  */
+                                { (yyval.ast) = zend_ast_create_ex(ZEND_AST_TYPE, IS_ARRAY); }
     break;
 
-  case 288:
-
-    { (yyval.ast) = zend_ast_create_ex(ZEND_AST_TYPE, IS_CALLABLE); }
-
+  case 288: /* type_without_static: "'callable'"  */
+                                { (yyval.ast) = zend_ast_create_ex(ZEND_AST_TYPE, IS_CALLABLE); }
     break;
 
-  case 289:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 289: /* type_without_static: name  */
+                                { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 290:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 290: /* union_type_without_static_element: type_without_static  */
+                                    { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 291:
-
-    { (yyval.ast) = (yyvsp-1.ast); }
-
+  case 291: /* union_type_without_static_element: '(' intersection_type_without_static ')'  */
+                                                          { (yyval.ast) = (yyvsp-1.ast); }
     break;
 
-  case 292:
-
-    { (yyval.ast) = zend_ast_create_list(2, ZEND_AST_TYPE_UNION, (yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 292: /* union_type_without_static: union_type_without_static_element '|' union_type_without_static_element  */
+                        { (yyval.ast) = zend_ast_create_list(2, ZEND_AST_TYPE_UNION, (yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 293:
-
-    { (yyval.ast) = zend_ast_list_add((yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 293: /* union_type_without_static: union_type_without_static '|' union_type_without_static_element  */
+                        { (yyval.ast) = zend_ast_list_add((yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 294:
-
-    { (yyval.ast) = zend_ast_create_list(2, ZEND_AST_TYPE_INTERSECTION, (yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 294: /* intersection_type_without_static: type_without_static "amp" type_without_static  */
+                        { (yyval.ast) = zend_ast_create_list(2, ZEND_AST_TYPE_INTERSECTION, (yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 295:
-
-    { (yyval.ast) = zend_ast_list_add((yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 295: /* intersection_type_without_static: intersection_type_without_static "amp" type_without_static  */
+                        { (yyval.ast) = zend_ast_list_add((yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 296:
-
-    { (yyval.ast) = NULL; }
-
+  case 296: /* return_type: %empty  */
+                        { (yyval.ast) = NULL; }
     break;
 
-  case 297:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 297: /* return_type: ':' type_expr  */
+                                { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 298:
-
-    { (yyval.ast) = zend_ast_create_list(0, ZEND_AST_ARG_LIST); }
-
+  case 298: /* argument_list: '(' ')'  */
+                        { (yyval.ast) = zend_ast_create_list(0, ZEND_AST_ARG_LIST); }
     break;
 
-  case 299:
-
-    { (yyval.ast) = (yyvsp-2.ast); }
-
+  case 299: /* argument_list: '(' non_empty_argument_list possible_comma ')'  */
+                                                               { (yyval.ast) = (yyvsp-2.ast); }
     break;
 
-  case 300:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_CALLABLE_CONVERT); }
-
+  case 300: /* argument_list: '(' "'...'" ')'  */
+                                   { (yyval.ast) = zend_ast_create(ZEND_AST_CALLABLE_CONVERT); }
     break;
 
-  case 301:
-
-    { (yyval.ast) = zend_ast_create_list(1, ZEND_AST_ARG_LIST, (yyvsp0.ast)); }
-
+  case 301: /* non_empty_argument_list: argument  */
+                        { (yyval.ast) = zend_ast_create_list(1, ZEND_AST_ARG_LIST, (yyvsp0.ast)); }
     break;
 
-  case 302:
-
-    { (yyval.ast) = zend_ast_list_add((yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 302: /* non_empty_argument_list: non_empty_argument_list ',' argument  */
+                        { (yyval.ast) = zend_ast_list_add((yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 303:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 303: /* argument: expr  */
+                                                { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 304:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_NAMED_ARG, (yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 304: /* argument: identifier ':' expr  */
+                        { (yyval.ast) = zend_ast_create(ZEND_AST_NAMED_ARG, (yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 305:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_UNPACK, (yyvsp0.ast)); }
-
+  case 305: /* argument: "'...'" expr  */
+                                { (yyval.ast) = zend_ast_create(ZEND_AST_UNPACK, (yyvsp0.ast)); }
     break;
 
-  case 306:
-
-    { (yyval.ast) = zend_ast_list_add((yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 306: /* global_var_list: global_var_list ',' global_var  */
+                                               { (yyval.ast) = zend_ast_list_add((yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 307:
-
-    { (yyval.ast) = zend_ast_create_list(1, ZEND_AST_STMT_LIST, (yyvsp0.ast)); }
-
+  case 307: /* global_var_list: global_var  */
+                           { (yyval.ast) = zend_ast_create_list(1, ZEND_AST_STMT_LIST, (yyvsp0.ast)); }
     break;
 
-  case 308:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_GLOBAL, zend_ast_create(ZEND_AST_VAR, (yyvsp0.ast))); }
-
+  case 308: /* global_var: simple_variable  */
+                { (yyval.ast) = zend_ast_create(ZEND_AST_GLOBAL, zend_ast_create(ZEND_AST_VAR, (yyvsp0.ast))); }
     break;
 
-  case 309:
-
-    { (yyval.ast) = zend_ast_list_add((yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 309: /* static_var_list: static_var_list ',' static_var  */
+                                               { (yyval.ast) = zend_ast_list_add((yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 310:
-
-    { (yyval.ast) = zend_ast_create_list(1, ZEND_AST_STMT_LIST, (yyvsp0.ast)); }
-
+  case 310: /* static_var_list: static_var  */
+                           { (yyval.ast) = zend_ast_create_list(1, ZEND_AST_STMT_LIST, (yyvsp0.ast)); }
     break;
 
-  case 311:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_STATIC, (yyvsp0.ast), NULL); }
-
+  case 311: /* static_var: "variable"  */
+                                                { (yyval.ast) = zend_ast_create(ZEND_AST_STATIC, (yyvsp0.ast), NULL); }
     break;
 
-  case 312:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_STATIC, (yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 312: /* static_var: "variable" '=' expr  */
+                                        { (yyval.ast) = zend_ast_create(ZEND_AST_STATIC, (yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 313:
-
-    { (yyval.ast) = zend_ast_list_add((yyvsp-1.ast), (yyvsp0.ast)); }
-
+  case 313: /* class_statement_list: class_statement_list class_statement  */
+                        { (yyval.ast) = zend_ast_list_add((yyvsp-1.ast), (yyvsp0.ast)); }
     break;
 
-  case 314:
-
-    { (yyval.ast) = zend_ast_create_list(0, ZEND_AST_STMT_LIST); }
-
+  case 314: /* class_statement_list: %empty  */
+                        { (yyval.ast) = zend_ast_create_list(0, ZEND_AST_STMT_LIST); }
     break;
 
-  case 315:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_PROP_GROUP, (yyvsp-2.ast), (yyvsp-1.ast), NULL);
+  case 315: /* attributed_class_statement: property_modifiers optional_type_without_static property_list ';'  */
+                        { (yyval.ast) = zend_ast_create(ZEND_AST_PROP_GROUP, (yyvsp-2.ast), (yyvsp-1.ast), NULL);
 			  (yyval.ast)->attr = (yyvsp-3.num); }
-
     break;
 
-  case 316:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_CLASS_CONST_GROUP, (yyvsp-1.ast), NULL, NULL);
+  case 316: /* attributed_class_statement: class_const_modifiers "'const'" class_const_list ';'  */
+                        { (yyval.ast) = zend_ast_create(ZEND_AST_CLASS_CONST_GROUP, (yyvsp-1.ast), NULL, NULL);
 			  (yyval.ast)->attr = (yyvsp-3.num); }
-
     break;
 
-  case 317:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_CLASS_CONST_GROUP, (yyvsp-1.ast), NULL, (yyvsp-2.ast));
+  case 317: /* attributed_class_statement: class_const_modifiers "'const'" type_expr class_const_list ';'  */
+                        { (yyval.ast) = zend_ast_create(ZEND_AST_CLASS_CONST_GROUP, (yyvsp-1.ast), NULL, (yyvsp-2.ast));
 			  (yyval.ast)->attr = (yyvsp-4.num); }
-
     break;
 
-  case 318:
-
-    { (yyval.ast) = zend_ast_create_decl(ZEND_AST_METHOD, (yyvsp-9.num) | (yyvsp-11.num) | (yyvsp0.num), (yyvsp-10.num), (yyvsp-7.str),
+  case 318: /* attributed_class_statement: method_modifiers function returns_ref identifier backup_doc_comment '(' parameter_list ')' return_type backup_fn_flags method_body backup_fn_flags  */
+                        { (yyval.ast) = zend_ast_create_decl(ZEND_AST_METHOD, (yyvsp-9.num) | (yyvsp-11.num) | (yyvsp0.num), (yyvsp-10.num), (yyvsp-7.str),
 				  zend_ast_get_str((yyvsp-8.ast)), (yyvsp-5.ast), NULL, (yyvsp-1.ast), (yyvsp-3.ast), NULL); CG(extra_fn_flags) = (yyvsp-2.num); }
-
     break;
 
-  case 319:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 319: /* attributed_class_statement: enum_case  */
+                          { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 320:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 320: /* class_statement: attributed_class_statement  */
+                                           { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 321:
-
-    { (yyval.ast) = zend_ast_with_attributes((yyvsp0.ast), (yyvsp-1.ast)); }
-
+  case 321: /* class_statement: attributes attributed_class_statement  */
+                                                      { (yyval.ast) = zend_ast_with_attributes((yyvsp0.ast), (yyvsp-1.ast)); }
     break;
 
-  case 322:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_USE_TRAIT, (yyvsp-1.ast), (yyvsp0.ast)); }
-
+  case 322: /* class_statement: "'use'" class_name_list trait_adaptations  */
+                        { (yyval.ast) = zend_ast_create(ZEND_AST_USE_TRAIT, (yyvsp-1.ast), (yyvsp0.ast)); }
     break;
 
-  case 323:
-
-    { (yyval.ast) = zend_ast_create_list(1, ZEND_AST_NAME_LIST, (yyvsp0.ast)); }
-
+  case 323: /* class_name_list: class_name  */
+                           { (yyval.ast) = zend_ast_create_list(1, ZEND_AST_NAME_LIST, (yyvsp0.ast)); }
     break;
 
-  case 324:
-
-    { (yyval.ast) = zend_ast_list_add((yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 324: /* class_name_list: class_name_list ',' class_name  */
+                                               { (yyval.ast) = zend_ast_list_add((yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 325:
-
-    { (yyval.ast) = NULL; }
-
+  case 325: /* trait_adaptations: ';'  */
+                                                                                { (yyval.ast) = NULL; }
     break;
 
-  case 326:
-
-    { (yyval.ast) = NULL; }
-
+  case 326: /* trait_adaptations: '{' '}'  */
+                                                                        { (yyval.ast) = NULL; }
     break;
 
-  case 327:
-
-    { (yyval.ast) = (yyvsp-1.ast); }
-
+  case 327: /* trait_adaptations: '{' trait_adaptation_list '}'  */
+                                                { (yyval.ast) = (yyvsp-1.ast); }
     break;
 
-  case 328:
-
-    { (yyval.ast) = zend_ast_create_list(1, ZEND_AST_TRAIT_ADAPTATIONS, (yyvsp0.ast)); }
-
+  case 328: /* trait_adaptation_list: trait_adaptation  */
+                        { (yyval.ast) = zend_ast_create_list(1, ZEND_AST_TRAIT_ADAPTATIONS, (yyvsp0.ast)); }
     break;
 
-  case 329:
-
-    { (yyval.ast) = zend_ast_list_add((yyvsp-1.ast), (yyvsp0.ast)); }
-
+  case 329: /* trait_adaptation_list: trait_adaptation_list trait_adaptation  */
+                        { (yyval.ast) = zend_ast_list_add((yyvsp-1.ast), (yyvsp0.ast)); }
     break;
 
-  case 330:
-
-    { (yyval.ast) = (yyvsp-1.ast); }
-
+  case 330: /* trait_adaptation: trait_precedence ';'  */
+                                        { (yyval.ast) = (yyvsp-1.ast); }
     break;
 
-  case 331:
-
-    { (yyval.ast) = (yyvsp-1.ast); }
-
+  case 331: /* trait_adaptation: trait_alias ';'  */
+                                                { (yyval.ast) = (yyvsp-1.ast); }
     break;
 
-  case 332:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_TRAIT_PRECEDENCE, (yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 332: /* trait_precedence: absolute_trait_method_reference "'insteadof'" class_name_list  */
+                { (yyval.ast) = zend_ast_create(ZEND_AST_TRAIT_PRECEDENCE, (yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 333:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_TRAIT_ALIAS, (yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 333: /* trait_alias: trait_method_reference "'as'" "identifier"  */
+                        { (yyval.ast) = zend_ast_create(ZEND_AST_TRAIT_ALIAS, (yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 334:
-
-    { zval zv;
+  case 334: /* trait_alias: trait_method_reference "'as'" reserved_non_modifiers  */
+                        { zval zv;
 			  if (zend_lex_tstring(&zv, (yyvsp0.ident)) == FAILURE) { YYABORT; }
 			  (yyval.ast) = zend_ast_create(ZEND_AST_TRAIT_ALIAS, (yyvsp-2.ast), zend_ast_create_zval(&zv)); }
-
     break;
 
-  case 335:
-
-    { uint32_t modifiers = zend_modifier_token_to_flag(ZEND_MODIFIER_TARGET_METHOD, (yyvsp-1.num));
+  case 335: /* trait_alias: trait_method_reference "'as'" member_modifier identifier  */
+                        { uint32_t modifiers = zend_modifier_token_to_flag(ZEND_MODIFIER_TARGET_METHOD, (yyvsp-1.num));
 			  (yyval.ast) = zend_ast_create_ex(ZEND_AST_TRAIT_ALIAS, modifiers, (yyvsp-3.ast), (yyvsp0.ast));
 			  /* identifier nonterminal can cause allocations, so we need to free the node */
 			  if (!modifiers) { zend_ast_destroy((yyval.ast)); YYERROR; } }
-
     break;
 
-  case 336:
-
-    { uint32_t modifiers = zend_modifier_token_to_flag(ZEND_MODIFIER_TARGET_METHOD, (yyvsp0.num));
+  case 336: /* trait_alias: trait_method_reference "'as'" member_modifier  */
+                        { uint32_t modifiers = zend_modifier_token_to_flag(ZEND_MODIFIER_TARGET_METHOD, (yyvsp0.num));
 			  (yyval.ast) = zend_ast_create_ex(ZEND_AST_TRAIT_ALIAS, modifiers, (yyvsp-2.ast), NULL);
 			  /* identifier nonterminal can cause allocations, so we need to free the node */
 			  if (!modifiers) { zend_ast_destroy((yyval.ast)); YYERROR; } }
-
     break;
 
-  case 337:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_METHOD_REFERENCE, NULL, (yyvsp0.ast)); }
-
+  case 337: /* trait_method_reference: identifier  */
+                        { (yyval.ast) = zend_ast_create(ZEND_AST_METHOD_REFERENCE, NULL, (yyvsp0.ast)); }
     break;
 
-  case 338:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 338: /* trait_method_reference: absolute_trait_method_reference  */
+                                                { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 339:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_METHOD_REFERENCE, (yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 339: /* absolute_trait_method_reference: class_name "'::'" identifier  */
+                { (yyval.ast) = zend_ast_create(ZEND_AST_METHOD_REFERENCE, (yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 340:
-
-    { (yyval.ast) = NULL; }
-
+  case 340: /* method_body: ';'  */
+                                                        { (yyval.ast) = NULL; }
     break;
 
-  case 341:
-
-    { (yyval.ast) = (yyvsp-1.ast); }
-
+  case 341: /* method_body: '{' inner_statement_list '}'  */
+                                                { (yyval.ast) = (yyvsp-1.ast); }
     break;
 
-  case 342:
-
-    { (yyval.num) = zend_modifier_list_to_flags(ZEND_MODIFIER_TARGET_PROPERTY, (yyvsp0.ast));
+  case 342: /* property_modifiers: non_empty_member_modifiers  */
+                        { (yyval.num) = zend_modifier_list_to_flags(ZEND_MODIFIER_TARGET_PROPERTY, (yyvsp0.ast));
 			  if (!(yyval.num)) { YYERROR; } }
-
     break;
 
-  case 343:
-
-    { (yyval.num) = ZEND_ACC_PUBLIC; }
-
+  case 343: /* property_modifiers: "'var'"  */
+                        { (yyval.num) = ZEND_ACC_PUBLIC; }
     break;
 
-  case 344:
-
-    { (yyval.num) = ZEND_ACC_PUBLIC; }
-
+  case 344: /* method_modifiers: %empty  */
+                        { (yyval.num) = ZEND_ACC_PUBLIC; }
     break;
 
-  case 345:
-
-    { (yyval.num) = zend_modifier_list_to_flags(ZEND_MODIFIER_TARGET_METHOD, (yyvsp0.ast));
+  case 345: /* method_modifiers: non_empty_member_modifiers  */
+                        { (yyval.num) = zend_modifier_list_to_flags(ZEND_MODIFIER_TARGET_METHOD, (yyvsp0.ast));
 			  if (!(yyval.num)) { YYERROR; }
 			  if (!((yyval.num) & ZEND_ACC_PPP_MASK)) { (yyval.num) |= ZEND_ACC_PUBLIC; } }
-
     break;
 
-  case 346:
-
-    { (yyval.num) = ZEND_ACC_PUBLIC; }
-
+  case 346: /* class_const_modifiers: %empty  */
+                        { (yyval.num) = ZEND_ACC_PUBLIC; }
     break;
 
-  case 347:
-
-    { (yyval.num) = zend_modifier_list_to_flags(ZEND_MODIFIER_TARGET_CONSTANT, (yyvsp0.ast));
+  case 347: /* class_const_modifiers: non_empty_member_modifiers  */
+                        { (yyval.num) = zend_modifier_list_to_flags(ZEND_MODIFIER_TARGET_CONSTANT, (yyvsp0.ast));
 			  if (!(yyval.num)) { YYERROR; }
 			  if (!((yyval.num) & ZEND_ACC_PPP_MASK)) { (yyval.num) |= ZEND_ACC_PUBLIC; } }
-
     break;
 
-  case 348:
-
-    { (yyval.ast) = zend_ast_create_list(1, ZEND_AST_MODIFIER_LIST, zend_ast_create_zval_from_long((yyvsp0.num))); }
-
+  case 348: /* non_empty_member_modifiers: member_modifier  */
+                        { (yyval.ast) = zend_ast_create_list(1, ZEND_AST_MODIFIER_LIST, zend_ast_create_zval_from_long((yyvsp0.num))); }
     break;
 
-  case 349:
-
-    { (yyval.ast) = zend_ast_list_add((yyvsp-1.ast), zend_ast_create_zval_from_long((yyvsp0.num))); }
-
+  case 349: /* non_empty_member_modifiers: non_empty_member_modifiers member_modifier  */
+                        { (yyval.ast) = zend_ast_list_add((yyvsp-1.ast), zend_ast_create_zval_from_long((yyvsp0.num))); }
     break;
 
-  case 350:
-
-    { (yyval.num) = T_PUBLIC; }
-
+  case 350: /* member_modifier: "'public'"  */
+                                                        { (yyval.num) = T_PUBLIC; }
     break;
 
-  case 351:
-
-    { (yyval.num) = T_PROTECTED; }
-
+  case 351: /* member_modifier: "'protected'"  */
+                                                        { (yyval.num) = T_PROTECTED; }
     break;
 
-  case 352:
-
-    { (yyval.num) = T_PRIVATE; }
-
+  case 352: /* member_modifier: "'private'"  */
+                                                        { (yyval.num) = T_PRIVATE; }
     break;
 
-  case 353:
-
-    { (yyval.num) = T_STATIC; }
-
+  case 353: /* member_modifier: "'static'"  */
+                                                        { (yyval.num) = T_STATIC; }
     break;
 
-  case 354:
-
-    { (yyval.num) = T_ABSTRACT; }
-
+  case 354: /* member_modifier: "'abstract'"  */
+                                                        { (yyval.num) = T_ABSTRACT; }
     break;
 
-  case 355:
-
-    { (yyval.num) = T_FINAL; }
-
+  case 355: /* member_modifier: "'final'"  */
+                                                        { (yyval.num) = T_FINAL; }
     break;
 
-  case 356:
-
-    { (yyval.num) = T_READONLY; }
-
+  case 356: /* member_modifier: "'readonly'"  */
+                                                        { (yyval.num) = T_READONLY; }
     break;
 
-  case 357:
-
-    { (yyval.ast) = zend_ast_list_add((yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 357: /* property_list: property_list ',' property  */
+                                           { (yyval.ast) = zend_ast_list_add((yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 358:
-
-    { (yyval.ast) = zend_ast_create_list(1, ZEND_AST_PROP_DECL, (yyvsp0.ast)); }
-
+  case 358: /* property_list: property  */
+                         { (yyval.ast) = zend_ast_create_list(1, ZEND_AST_PROP_DECL, (yyvsp0.ast)); }
     break;
 
-  case 359:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_PROP_ELEM, (yyvsp-1.ast), NULL, ((yyvsp0.str) ? zend_ast_create_zval_from_str((yyvsp0.str)) : NULL)); }
-
+  case 359: /* property: "variable" backup_doc_comment  */
+                        { (yyval.ast) = zend_ast_create(ZEND_AST_PROP_ELEM, (yyvsp-1.ast), NULL, ((yyvsp0.str) ? zend_ast_create_zval_from_str((yyvsp0.str)) : NULL)); }
     break;
 
-  case 360:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_PROP_ELEM, (yyvsp-3.ast), (yyvsp-1.ast), ((yyvsp0.str) ? zend_ast_create_zval_from_str((yyvsp0.str)) : NULL)); }
-
+  case 360: /* property: "variable" '=' expr backup_doc_comment  */
+                        { (yyval.ast) = zend_ast_create(ZEND_AST_PROP_ELEM, (yyvsp-3.ast), (yyvsp-1.ast), ((yyvsp0.str) ? zend_ast_create_zval_from_str((yyvsp0.str)) : NULL)); }
     break;
 
-  case 361:
-
-    { (yyval.ast) = zend_ast_list_add((yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 361: /* class_const_list: class_const_list ',' class_const_decl  */
+                                                      { (yyval.ast) = zend_ast_list_add((yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 362:
-
-    { (yyval.ast) = zend_ast_create_list(1, ZEND_AST_CLASS_CONST_DECL, (yyvsp0.ast)); }
-
+  case 362: /* class_const_list: class_const_decl  */
+                                 { (yyval.ast) = zend_ast_create_list(1, ZEND_AST_CLASS_CONST_DECL, (yyvsp0.ast)); }
     break;
 
-  case 363:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_CONST_ELEM, (yyvsp-3.ast), (yyvsp-1.ast), ((yyvsp0.str) ? zend_ast_create_zval_from_str((yyvsp0.str)) : NULL)); }
-
+  case 363: /* class_const_decl: "identifier" '=' expr backup_doc_comment  */
+                                                     { (yyval.ast) = zend_ast_create(ZEND_AST_CONST_ELEM, (yyvsp-3.ast), (yyvsp-1.ast), ((yyvsp0.str) ? zend_ast_create_zval_from_str((yyvsp0.str)) : NULL)); }
     break;
 
-  case 364:
-
-    {
+  case 364: /* class_const_decl: semi_reserved '=' expr backup_doc_comment  */
+                                                          {
 			zval zv;
 			if (zend_lex_tstring(&zv, (yyvsp-3.ident)) == FAILURE) { YYABORT; }
 			(yyval.ast) = zend_ast_create(ZEND_AST_CONST_ELEM, zend_ast_create_zval(&zv), (yyvsp-1.ast), ((yyvsp0.str) ? zend_ast_create_zval_from_str((yyvsp0.str)) : NULL));
 		}
-
     break;
 
-  case 365:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_CONST_ELEM, (yyvsp-3.ast), (yyvsp-1.ast), ((yyvsp0.str) ? zend_ast_create_zval_from_str((yyvsp0.str)) : NULL)); }
-
+  case 365: /* const_decl: "identifier" '=' expr backup_doc_comment  */
+                                             { (yyval.ast) = zend_ast_create(ZEND_AST_CONST_ELEM, (yyvsp-3.ast), (yyvsp-1.ast), ((yyvsp0.str) ? zend_ast_create_zval_from_str((yyvsp0.str)) : NULL)); }
     break;
 
-  case 366:
-
-    { (yyval.ast) = zend_ast_list_add((yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 366: /* echo_expr_list: echo_expr_list ',' echo_expr  */
+                                             { (yyval.ast) = zend_ast_list_add((yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 367:
-
-    { (yyval.ast) = zend_ast_create_list(1, ZEND_AST_STMT_LIST, (yyvsp0.ast)); }
-
+  case 367: /* echo_expr_list: echo_expr  */
+                          { (yyval.ast) = zend_ast_create_list(1, ZEND_AST_STMT_LIST, (yyvsp0.ast)); }
     break;
 
-  case 368:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_ECHO, (yyvsp0.ast)); }
-
+  case 368: /* echo_expr: expr  */
+             { (yyval.ast) = zend_ast_create(ZEND_AST_ECHO, (yyvsp0.ast)); }
     break;
 
-  case 369:
-
-    { (yyval.ast) = NULL; }
-
+  case 369: /* for_exprs: %empty  */
+                                        { (yyval.ast) = NULL; }
     break;
 
-  case 370:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 370: /* for_exprs: non_empty_for_exprs  */
+                                        { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 371:
-
-    { (yyval.ast) = zend_ast_list_add((yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 371: /* non_empty_for_exprs: non_empty_for_exprs ',' expr  */
+                                             { (yyval.ast) = zend_ast_list_add((yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 372:
-
-    { (yyval.ast) = zend_ast_create_list(1, ZEND_AST_EXPR_LIST, (yyvsp0.ast)); }
-
+  case 372: /* non_empty_for_exprs: expr  */
+                     { (yyval.ast) = zend_ast_create_list(1, ZEND_AST_EXPR_LIST, (yyvsp0.ast)); }
     break;
 
-  case 373:
-
-    { (yyval.num) = CG(zend_lineno); }
-
+  case 373: /* @9: %empty  */
+                                                           { (yyval.num) = CG(zend_lineno); }
     break;
 
-  case 374:
-
-    {
+  case 374: /* anonymous_class: anonymous_class_modifiers_optional "'class'" @9 ctor_arguments extends_from implements_list backup_doc_comment '{' class_statement_list '}'  */
+                                                                                             {
 			zend_ast *decl = zend_ast_create_decl(
 				ZEND_AST_CLASS, ZEND_ACC_ANON_CLASS | (yyvsp-9.num), (yyvsp-7.num), (yyvsp-3.str), NULL,
 				(yyvsp-5.ast), (yyvsp-4.ast), (yyvsp-1.ast), NULL, NULL);
 			(yyval.ast) = zend_ast_create(ZEND_AST_NEW, decl, (yyvsp-6.ast));
 		}
-
     break;
 
-  case 375:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_NEW, (yyvsp-1.ast), (yyvsp0.ast)); }
-
+  case 375: /* new_expr: "'new'" class_name_reference ctor_arguments  */
+                        { (yyval.ast) = zend_ast_create(ZEND_AST_NEW, (yyvsp-1.ast), (yyvsp0.ast)); }
     break;
 
-  case 376:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 376: /* new_expr: "'new'" anonymous_class  */
+                        { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 377:
-
-    { zend_ast_with_attributes((yyvsp0.ast)->child0, (yyvsp-1.ast)); (yyval.ast) = (yyvsp0.ast); }
-
+  case 377: /* new_expr: "'new'" attributes anonymous_class  */
+                        { zend_ast_with_attributes((yyvsp0.ast)->child0, (yyvsp-1.ast)); (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 378:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 378: /* expr: variable  */
+                        { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 379:
-
-    { (yyvsp-3.ast)->attr = ZEND_ARRAY_SYNTAX_LIST; (yyval.ast) = zend_ast_create(ZEND_AST_ASSIGN, (yyvsp-3.ast), (yyvsp0.ast)); }
-
+  case 379: /* expr: "'list'" '(' array_pair_list ')' '=' expr  */
+                        { (yyvsp-3.ast)->attr = ZEND_ARRAY_SYNTAX_LIST; (yyval.ast) = zend_ast_create(ZEND_AST_ASSIGN, (yyvsp-3.ast), (yyvsp0.ast)); }
     break;
 
-  case 380:
-
-    { (yyvsp-3.ast)->attr = ZEND_ARRAY_SYNTAX_SHORT; (yyval.ast) = zend_ast_create(ZEND_AST_ASSIGN, (yyvsp-3.ast), (yyvsp0.ast)); }
-
+  case 380: /* expr: '' array_pair_list '' '=' expr  */
+                        { (yyvsp-3.ast)->attr = ZEND_ARRAY_SYNTAX_SHORT; (yyval.ast) = zend_ast_create(ZEND_AST_ASSIGN, (yyvsp-3.ast), (yyvsp0.ast)); }
     break;
 
-  case 381:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_ASSIGN, (yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 381: /* expr: variable '=' expr  */
+                        { (yyval.ast) = zend_ast_create(ZEND_AST_ASSIGN, (yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 382:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_ASSIGN_REF, (yyvsp-3.ast), (yyvsp0.ast)); }
-
+  case 382: /* expr: variable '=' ampersand variable  */
+                        { (yyval.ast) = zend_ast_create(ZEND_AST_ASSIGN_REF, (yyvsp-3.ast), (yyvsp0.ast)); }
     break;
 
-  case 383:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_CLONE, (yyvsp0.ast)); }
-
+  case 383: /* expr: "'clone'" expr  */
+                             { (yyval.ast) = zend_ast_create(ZEND_AST_CLONE, (yyvsp0.ast)); }
     break;
 
-  case 384:
-
-    { (yyval.ast) = zend_ast_create_assign_op(ZEND_ADD, (yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 384: /* expr: variable "'+='" expr  */
+                        { (yyval.ast) = zend_ast_create_assign_op(ZEND_ADD, (yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 385:
-
-    { (yyval.ast) = zend_ast_create_assign_op(ZEND_SUB, (yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 385: /* expr: variable "'-='" expr  */
+                        { (yyval.ast) = zend_ast_create_assign_op(ZEND_SUB, (yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 386:
-
-    { (yyval.ast) = zend_ast_create_assign_op(ZEND_MUL, (yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 386: /* expr: variable "'*='" expr  */
+                        { (yyval.ast) = zend_ast_create_assign_op(ZEND_MUL, (yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 387:
-
-    { (yyval.ast) = zend_ast_create_assign_op(ZEND_POW, (yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 387: /* expr: variable "'**='" expr  */
+                        { (yyval.ast) = zend_ast_create_assign_op(ZEND_POW, (yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 388:
-
-    { (yyval.ast) = zend_ast_create_assign_op(ZEND_DIV, (yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 388: /* expr: variable "'/='" expr  */
+                        { (yyval.ast) = zend_ast_create_assign_op(ZEND_DIV, (yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 389:
-
-    { (yyval.ast) = zend_ast_create_assign_op(ZEND_CONCAT, (yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 389: /* expr: variable "'.='" expr  */
+                        { (yyval.ast) = zend_ast_create_assign_op(ZEND_CONCAT, (yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 390:
-
-    { (yyval.ast) = zend_ast_create_assign_op(ZEND_MOD, (yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 390: /* expr: variable "'%='" expr  */
+                        { (yyval.ast) = zend_ast_create_assign_op(ZEND_MOD, (yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 391:
-
-    { (yyval.ast) = zend_ast_create_assign_op(ZEND_BW_AND, (yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 391: /* expr: variable "'&='" expr  */
+                        { (yyval.ast) = zend_ast_create_assign_op(ZEND_BW_AND, (yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 392:
-
-    { (yyval.ast) = zend_ast_create_assign_op(ZEND_BW_OR, (yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 392: /* expr: variable "'|='" expr  */
+                        { (yyval.ast) = zend_ast_create_assign_op(ZEND_BW_OR, (yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 393:
-
-    { (yyval.ast) = zend_ast_create_assign_op(ZEND_BW_XOR, (yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 393: /* expr: variable "'^='" expr  */
+                        { (yyval.ast) = zend_ast_create_assign_op(ZEND_BW_XOR, (yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 394:
-
-    { (yyval.ast) = zend_ast_create_assign_op(ZEND_SL, (yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 394: /* expr: variable "'<<='" expr  */
+                        { (yyval.ast) = zend_ast_create_assign_op(ZEND_SL, (yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 395:
-
-    { (yyval.ast) = zend_ast_create_assign_op(ZEND_SR, (yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 395: /* expr: variable "'>>='" expr  */
+                        { (yyval.ast) = zend_ast_create_assign_op(ZEND_SR, (yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 396:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_ASSIGN_COALESCE, (yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 396: /* expr: variable "'??='" expr  */
+                        { (yyval.ast) = zend_ast_create(ZEND_AST_ASSIGN_COALESCE, (yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 397:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_POST_INC, (yyvsp-1.ast)); }
-
+  case 397: /* expr: variable "'++'"  */
+                               { (yyval.ast) = zend_ast_create(ZEND_AST_POST_INC, (yyvsp-1.ast)); }
     break;
 
-  case 398:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_PRE_INC, (yyvsp0.ast)); }
-
+  case 398: /* expr: "'++'" variable  */
+                               { (yyval.ast) = zend_ast_create(ZEND_AST_PRE_INC, (yyvsp0.ast)); }
     break;
 
-  case 399:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_POST_DEC, (yyvsp-1.ast)); }
-
+  case 399: /* expr: variable "'--'"  */
+                               { (yyval.ast) = zend_ast_create(ZEND_AST_POST_DEC, (yyvsp-1.ast)); }
     break;
 
-  case 400:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_PRE_DEC, (yyvsp0.ast)); }
-
+  case 400: /* expr: "'--'" variable  */
+                               { (yyval.ast) = zend_ast_create(ZEND_AST_PRE_DEC, (yyvsp0.ast)); }
     break;
 
-  case 401:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_OR, (yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 401: /* expr: expr "'||'" expr  */
+                        { (yyval.ast) = zend_ast_create(ZEND_AST_OR, (yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 402:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_AND, (yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 402: /* expr: expr "'&&'" expr  */
+                        { (yyval.ast) = zend_ast_create(ZEND_AST_AND, (yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 403:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_OR, (yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 403: /* expr: expr "'or'" expr  */
+                        { (yyval.ast) = zend_ast_create(ZEND_AST_OR, (yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 404:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_AND, (yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 404: /* expr: expr "'and'" expr  */
+                        { (yyval.ast) = zend_ast_create(ZEND_AST_AND, (yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 405:
-
-    { (yyval.ast) = zend_ast_create_binary_op(ZEND_BOOL_XOR, (yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 405: /* expr: expr "'xor'" expr  */
+                        { (yyval.ast) = zend_ast_create_binary_op(ZEND_BOOL_XOR, (yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 406:
-
-    { (yyval.ast) = zend_ast_create_binary_op(ZEND_BW_OR, (yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 406: /* expr: expr '|' expr  */
+                                { (yyval.ast) = zend_ast_create_binary_op(ZEND_BW_OR, (yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 407:
-
-    { (yyval.ast) = zend_ast_create_binary_op(ZEND_BW_AND, (yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 407: /* expr: expr "amp" expr  */
+                                                                        { (yyval.ast) = zend_ast_create_binary_op(ZEND_BW_AND, (yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 408:
-
-    { (yyval.ast) = zend_ast_create_binary_op(ZEND_BW_AND, (yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 408: /* expr: expr "'&'" expr  */
+                                                                { (yyval.ast) = zend_ast_create_binary_op(ZEND_BW_AND, (yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 409:
-
-    { (yyval.ast) = zend_ast_create_binary_op(ZEND_BW_XOR, (yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 409: /* expr: expr '^' expr  */
+                                { (yyval.ast) = zend_ast_create_binary_op(ZEND_BW_XOR, (yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 410:
-
-    { (yyval.ast) = zend_ast_create_concat_op((yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 410: /* expr: expr '.' expr  */
+                                { (yyval.ast) = zend_ast_create_concat_op((yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 411:
-
-    { (yyval.ast) = zend_ast_create_binary_op(ZEND_ADD, (yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 411: /* expr: expr '+' expr  */
+                                { (yyval.ast) = zend_ast_create_binary_op(ZEND_ADD, (yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 412:
-
-    { (yyval.ast) = zend_ast_create_binary_op(ZEND_SUB, (yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 412: /* expr: expr '-' expr  */
+                                { (yyval.ast) = zend_ast_create_binary_op(ZEND_SUB, (yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 413:
-
-    { (yyval.ast) = zend_ast_create_binary_op(ZEND_MUL, (yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 413: /* expr: expr '*' expr  */
+                                { (yyval.ast) = zend_ast_create_binary_op(ZEND_MUL, (yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 414:
-
-    { (yyval.ast) = zend_ast_create_binary_op(ZEND_POW, (yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 414: /* expr: expr "'**'" expr  */
+                                { (yyval.ast) = zend_ast_create_binary_op(ZEND_POW, (yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 415:
-
-    { (yyval.ast) = zend_ast_create_binary_op(ZEND_DIV, (yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 415: /* expr: expr '/' expr  */
+                                { (yyval.ast) = zend_ast_create_binary_op(ZEND_DIV, (yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 416:
-
-    { (yyval.ast) = zend_ast_create_binary_op(ZEND_MOD, (yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 416: /* expr: expr '%' expr  */
+                                { (yyval.ast) = zend_ast_create_binary_op(ZEND_MOD, (yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 417:
-
-    { (yyval.ast) = zend_ast_create_binary_op(ZEND_SL, (yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 417: /* expr: expr "'<<'" expr  */
+                                { (yyval.ast) = zend_ast_create_binary_op(ZEND_SL, (yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 418:
-
-    { (yyval.ast) = zend_ast_create_binary_op(ZEND_SR, (yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 418: /* expr: expr "'>>'" expr  */
+                                { (yyval.ast) = zend_ast_create_binary_op(ZEND_SR, (yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 419:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_UNARY_PLUS, (yyvsp0.ast)); }
-
+  case 419: /* expr: '+' expr  */
+                                   { (yyval.ast) = zend_ast_create(ZEND_AST_UNARY_PLUS, (yyvsp0.ast)); }
     break;
 
-  case 420:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_UNARY_MINUS, (yyvsp0.ast)); }
-
+  case 420: /* expr: '-' expr  */
+                                   { (yyval.ast) = zend_ast_create(ZEND_AST_UNARY_MINUS, (yyvsp0.ast)); }
     break;
 
-  case 421:
-
-    { (yyval.ast) = zend_ast_create_ex(ZEND_AST_UNARY_OP, ZEND_BOOL_NOT, (yyvsp0.ast)); }
-
+  case 421: /* expr: '!' expr  */
+                         { (yyval.ast) = zend_ast_create_ex(ZEND_AST_UNARY_OP, ZEND_BOOL_NOT, (yyvsp0.ast)); }
     break;
 
-  case 422:
-
-    { (yyval.ast) = zend_ast_create_ex(ZEND_AST_UNARY_OP, ZEND_BW_NOT, (yyvsp0.ast)); }
-
+  case 422: /* expr: '~' expr  */
+                         { (yyval.ast) = zend_ast_create_ex(ZEND_AST_UNARY_OP, ZEND_BW_NOT, (yyvsp0.ast)); }
     break;
 
-  case 423:
-
-    { (yyval.ast) = zend_ast_create_binary_op(ZEND_IS_IDENTICAL, (yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 423: /* expr: expr "'==='" expr  */
+                        { (yyval.ast) = zend_ast_create_binary_op(ZEND_IS_IDENTICAL, (yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 424:
-
-    { (yyval.ast) = zend_ast_create_binary_op(ZEND_IS_NOT_IDENTICAL, (yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 424: /* expr: expr "'!=='" expr  */
+                        { (yyval.ast) = zend_ast_create_binary_op(ZEND_IS_NOT_IDENTICAL, (yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 425:
-
-    { (yyval.ast) = zend_ast_create_binary_op(ZEND_IS_EQUAL, (yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 425: /* expr: expr "'=='" expr  */
+                        { (yyval.ast) = zend_ast_create_binary_op(ZEND_IS_EQUAL, (yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 426:
-
-    { (yyval.ast) = zend_ast_create_binary_op(ZEND_IS_NOT_EQUAL, (yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 426: /* expr: expr "'!='" expr  */
+                        { (yyval.ast) = zend_ast_create_binary_op(ZEND_IS_NOT_EQUAL, (yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 427:
-
-    { (yyval.ast) = zend_ast_create_binary_op(ZEND_IS_SMALLER, (yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 427: /* expr: expr '<' expr  */
+                        { (yyval.ast) = zend_ast_create_binary_op(ZEND_IS_SMALLER, (yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 428:
-
-    { (yyval.ast) = zend_ast_create_binary_op(ZEND_IS_SMALLER_OR_EQUAL, (yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 428: /* expr: expr "'<='" expr  */
+                        { (yyval.ast) = zend_ast_create_binary_op(ZEND_IS_SMALLER_OR_EQUAL, (yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 429:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_GREATER, (yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 429: /* expr: expr '>' expr  */
+                        { (yyval.ast) = zend_ast_create(ZEND_AST_GREATER, (yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 430:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_GREATER_EQUAL, (yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 430: /* expr: expr "'>='" expr  */
+                        { (yyval.ast) = zend_ast_create(ZEND_AST_GREATER_EQUAL, (yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 431:
-
-    { (yyval.ast) = zend_ast_create_binary_op(ZEND_SPACESHIP, (yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 431: /* expr: expr "'<=>'" expr  */
+                        { (yyval.ast) = zend_ast_create_binary_op(ZEND_SPACESHIP, (yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 432:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_INSTANCEOF, (yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 432: /* expr: expr "'instanceof'" class_name_reference  */
+                        { (yyval.ast) = zend_ast_create(ZEND_AST_INSTANCEOF, (yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 433:
-
-    {
+  case 433: /* expr: '(' expr ')'  */
+                             {
 			(yyval.ast) = (yyvsp-1.ast);
 			if ((yyval.ast)->kind == ZEND_AST_CONDITIONAL) (yyval.ast)->attr = ZEND_PARENTHESIZED_CONDITIONAL;
 		}
-
     break;
 
-  case 434:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 434: /* expr: new_expr  */
+                         { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 435:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_CONDITIONAL, (yyvsp-4.ast), (yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 435: /* expr: expr '?' expr ':' expr  */
+                        { (yyval.ast) = zend_ast_create(ZEND_AST_CONDITIONAL, (yyvsp-4.ast), (yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 436:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_CONDITIONAL, (yyvsp-3.ast), NULL, (yyvsp0.ast)); }
-
+  case 436: /* expr: expr '?' ':' expr  */
+                        { (yyval.ast) = zend_ast_create(ZEND_AST_CONDITIONAL, (yyvsp-3.ast), NULL, (yyvsp0.ast)); }
     break;
 
-  case 437:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_COALESCE, (yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 437: /* expr: expr "'??'" expr  */
+                        { (yyval.ast) = zend_ast_create(ZEND_AST_COALESCE, (yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 438:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 438: /* expr: internal_functions_in_yacc  */
+                                           { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 439:
-
-    { (yyval.ast) = zend_ast_create_cast(IS_LONG, (yyvsp0.ast)); }
-
+  case 439: /* expr: "'(int)'" expr  */
+                                        { (yyval.ast) = zend_ast_create_cast(IS_LONG, (yyvsp0.ast)); }
     break;
 
-  case 440:
-
-    { (yyval.ast) = zend_ast_create_cast(IS_DOUBLE, (yyvsp0.ast)); }
-
+  case 440: /* expr: "'(double)'" expr  */
+                                        { (yyval.ast) = zend_ast_create_cast(IS_DOUBLE, (yyvsp0.ast)); }
     break;
 
-  case 441:
-
-    { (yyval.ast) = zend_ast_create_cast(IS_STRING, (yyvsp0.ast)); }
-
+  case 441: /* expr: "'(string)'" expr  */
+                                        { (yyval.ast) = zend_ast_create_cast(IS_STRING, (yyvsp0.ast)); }
     break;
 
-  case 442:
-
-    { (yyval.ast) = zend_ast_create_cast(IS_ARRAY, (yyvsp0.ast)); }
-
+  case 442: /* expr: "'(array)'" expr  */
+                                        { (yyval.ast) = zend_ast_create_cast(IS_ARRAY, (yyvsp0.ast)); }
     break;
 
-  case 443:
-
-    { (yyval.ast) = zend_ast_create_cast(IS_OBJECT, (yyvsp0.ast)); }
-
+  case 443: /* expr: "'(object)'" expr  */
+                                        { (yyval.ast) = zend_ast_create_cast(IS_OBJECT, (yyvsp0.ast)); }
     break;
 
-  case 444:
-
-    { (yyval.ast) = zend_ast_create_cast(_IS_BOOL, (yyvsp0.ast)); }
-
+  case 444: /* expr: "'(bool)'" expr  */
+                                        { (yyval.ast) = zend_ast_create_cast(_IS_BOOL, (yyvsp0.ast)); }
     break;
 
-  case 445:
-
-    { (yyval.ast) = zend_ast_create_cast(IS_NULL, (yyvsp0.ast)); }
-
+  case 445: /* expr: "'(unset)'" expr  */
+                                        { (yyval.ast) = zend_ast_create_cast(IS_NULL, (yyvsp0.ast)); }
     break;
 
-  case 446:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_EXIT, (yyvsp0.ast)); }
-
+  case 446: /* expr: "'exit'" exit_expr  */
+                                        { (yyval.ast) = zend_ast_create(ZEND_AST_EXIT, (yyvsp0.ast)); }
     break;
 
-  case 447:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_SILENCE, (yyvsp0.ast)); }
-
+  case 447: /* expr: '@' expr  */
+                                                { (yyval.ast) = zend_ast_create(ZEND_AST_SILENCE, (yyvsp0.ast)); }
     break;
 
-  case 448:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 448: /* expr: scalar  */
+                       { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 449:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_SHELL_EXEC, (yyvsp-1.ast)); }
-
+  case 449: /* expr: '`' backticks_expr '`'  */
+                                       { (yyval.ast) = zend_ast_create(ZEND_AST_SHELL_EXEC, (yyvsp-1.ast)); }
     break;
 
-  case 450:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_PRINT, (yyvsp0.ast)); }
-
+  case 450: /* expr: "'print'" expr  */
+                             { (yyval.ast) = zend_ast_create(ZEND_AST_PRINT, (yyvsp0.ast)); }
     break;
 
-  case 451:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_YIELD, NULL, NULL); CG(extra_fn_flags) |= ZEND_ACC_GENERATOR; }
-
+  case 451: /* expr: "'yield'"  */
+                        { (yyval.ast) = zend_ast_create(ZEND_AST_YIELD, NULL, NULL); CG(extra_fn_flags) |= ZEND_ACC_GENERATOR; }
     break;
 
-  case 452:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_YIELD, (yyvsp0.ast), NULL); CG(extra_fn_flags) |= ZEND_ACC_GENERATOR; }
-
+  case 452: /* expr: "'yield'" expr  */
+                             { (yyval.ast) = zend_ast_create(ZEND_AST_YIELD, (yyvsp0.ast), NULL); CG(extra_fn_flags) |= ZEND_ACC_GENERATOR; }
     break;
 
-  case 453:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_YIELD, (yyvsp0.ast), (yyvsp-2.ast)); CG(extra_fn_flags) |= ZEND_ACC_GENERATOR; }
-
+  case 453: /* expr: "'yield'" expr "'=>'" expr  */
+                                                 { (yyval.ast) = zend_ast_create(ZEND_AST_YIELD, (yyvsp0.ast), (yyvsp-2.ast)); CG(extra_fn_flags) |= ZEND_ACC_GENERATOR; }
     break;
 
-  case 454:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_YIELD_FROM, (yyvsp0.ast)); CG(extra_fn_flags) |= ZEND_ACC_GENERATOR; }
-
+  case 454: /* expr: "'yield from'" expr  */
+                                  { (yyval.ast) = zend_ast_create(ZEND_AST_YIELD_FROM, (yyvsp0.ast)); CG(extra_fn_flags) |= ZEND_ACC_GENERATOR; }
     break;
 
-  case 455:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_THROW, (yyvsp0.ast)); }
-
+  case 455: /* expr: "'throw'" expr  */
+                             { (yyval.ast) = zend_ast_create(ZEND_AST_THROW, (yyvsp0.ast)); }
     break;
 
-  case 456:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 456: /* expr: inline_function  */
+                                { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 457:
-
-    { (yyval.ast) = zend_ast_with_attributes((yyvsp0.ast), (yyvsp-1.ast)); }
-
+  case 457: /* expr: attributes inline_function  */
+                                           { (yyval.ast) = zend_ast_with_attributes((yyvsp0.ast), (yyvsp-1.ast)); }
     break;
 
-  case 458:
-
-    { (yyval.ast) = (yyvsp0.ast); ((zend_ast_decl *) (yyval.ast))->flags |= ZEND_ACC_STATIC; }
-
+  case 458: /* expr: "'static'" inline_function  */
+                                         { (yyval.ast) = (yyvsp0.ast); ((zend_ast_decl *) (yyval.ast))->flags |= ZEND_ACC_STATIC; }
     break;
 
-  case 459:
-
-    { (yyval.ast) = zend_ast_with_attributes((yyvsp0.ast), (yyvsp-2.ast)); ((zend_ast_decl *) (yyval.ast))->flags |= ZEND_ACC_STATIC; }
-
+  case 459: /* expr: attributes "'static'" inline_function  */
+                        { (yyval.ast) = zend_ast_with_attributes((yyvsp0.ast), (yyvsp-2.ast)); ((zend_ast_decl *) (yyval.ast))->flags |= ZEND_ACC_STATIC; }
     break;
 
-  case 460:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 460: /* expr: match  */
+                      { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 461:
-
-    { (yyval.ast) = zend_ast_create_decl(ZEND_AST_CLOSURE, (yyvsp-11.num) | (yyvsp0.num), (yyvsp-12.num), (yyvsp-10.str),
+  case 461: /* inline_function: function returns_ref backup_doc_comment '(' parameter_list ')' lexical_vars return_type backup_fn_flags '{' inner_statement_list '}' backup_fn_flags  */
+                        { (yyval.ast) = zend_ast_create_decl(ZEND_AST_CLOSURE, (yyvsp-11.num) | (yyvsp0.num), (yyvsp-12.num), (yyvsp-10.str),
 				  ZSTR_INIT_LITERAL("{closure}", 0),
 				  (yyvsp-8.ast), (yyvsp-6.ast), (yyvsp-2.ast), (yyvsp-5.ast), NULL); CG(extra_fn_flags) = (yyvsp-4.num); }
-
     break;
 
-  case 462:
-
-    { (yyval.ast) = zend_ast_create_decl(ZEND_AST_ARROW_FUNC, (yyvsp-10.num) | (yyvsp0.num), (yyvsp-11.num), (yyvsp-9.str),
+  case 462: /* inline_function: fn returns_ref backup_doc_comment '(' parameter_list ')' return_type "'=>'" backup_fn_flags backup_lex_pos expr backup_fn_flags  */
+                        { (yyval.ast) = zend_ast_create_decl(ZEND_AST_ARROW_FUNC, (yyvsp-10.num) | (yyvsp0.num), (yyvsp-11.num), (yyvsp-9.str),
 				  ZSTR_INIT_LITERAL("{closure}", 0), (yyvsp-7.ast), NULL, (yyvsp-1.ast), (yyvsp-5.ast), NULL);
 				  CG(extra_fn_flags) = (yyvsp-3.num); }
-
     break;
 
-  case 463:
-
-    { (yyval.num) = CG(zend_lineno); }
-
+  case 463: /* fn: "'fn'"  */
+             { (yyval.num) = CG(zend_lineno); }
     break;
 
-  case 464:
-
-    { (yyval.num) = CG(zend_lineno); }
-
+  case 464: /* function: "'function'"  */
+                   { (yyval.num) = CG(zend_lineno); }
     break;
 
-  case 465:
-
-    { (yyval.str) = CG(doc_comment); CG(doc_comment) = NULL; }
-
+  case 465: /* backup_doc_comment: %empty  */
+               { (yyval.str) = CG(doc_comment); CG(doc_comment) = NULL; }
     break;
 
-  case 466:
-
-    { (yyval.num) = CG(extra_fn_flags); CG(extra_fn_flags) = 0; }
-
+  case 466: /* backup_fn_flags: %empty  */
+                                         { (yyval.num) = CG(extra_fn_flags); CG(extra_fn_flags) = 0; }
     break;
 
-  case 467:
-
-    { (yyval.ptr) = LANG_SCNG(yy_text); }
-
+  case 467: /* backup_lex_pos: %empty  */
+               { (yyval.ptr) = LANG_SCNG(yy_text); }
     break;
 
-  case 468:
-
-    { (yyval.num) = 0; }
-
+  case 468: /* returns_ref: %empty  */
+                        { (yyval.num) = 0; }
     break;
 
-  case 469:
-
-    { (yyval.num) = ZEND_ACC_RETURN_REFERENCE; }
-
+  case 469: /* returns_ref: ampersand  */
+                                { (yyval.num) = ZEND_ACC_RETURN_REFERENCE; }
     break;
 
-  case 470:
-
-    { (yyval.ast) = NULL; }
-
+  case 470: /* lexical_vars: %empty  */
+                       { (yyval.ast) = NULL; }
     break;
 
-  case 471:
-
-    { (yyval.ast) = (yyvsp-2.ast); }
-
+  case 471: /* lexical_vars: "'use'" '(' lexical_var_list possible_comma ')'  */
+                                                              { (yyval.ast) = (yyvsp-2.ast); }
     break;
 
-  case 472:
-
-    { (yyval.ast) = zend_ast_list_add((yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 472: /* lexical_var_list: lexical_var_list ',' lexical_var  */
+                                                 { (yyval.ast) = zend_ast_list_add((yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 473:
-
-    { (yyval.ast) = zend_ast_create_list(1, ZEND_AST_CLOSURE_USES, (yyvsp0.ast)); }
-
+  case 473: /* lexical_var_list: lexical_var  */
+                            { (yyval.ast) = zend_ast_create_list(1, ZEND_AST_CLOSURE_USES, (yyvsp0.ast)); }
     break;
 
-  case 474:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 474: /* lexical_var: "variable"  */
+                                        { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 475:
-
-    { (yyval.ast) = (yyvsp0.ast); (yyval.ast)->attr = ZEND_BIND_REF; }
-
+  case 475: /* lexical_var: ampersand "variable"  */
+                                        { (yyval.ast) = (yyvsp0.ast); (yyval.ast)->attr = ZEND_BIND_REF; }
     break;
 
-  case 476:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_CALL, (yyvsp-1.ast), (yyvsp0.ast)); }
-
+  case 476: /* function_call: name argument_list  */
+                        { (yyval.ast) = zend_ast_create(ZEND_AST_CALL, (yyvsp-1.ast), (yyvsp0.ast)); }
     break;
 
-  case 477:
-
-    {
+  case 477: /* function_call: "'readonly'" argument_list  */
+                                         {
 			zval zv;
 			if (zend_lex_tstring(&zv, (yyvsp-1.ident)) == FAILURE) { YYABORT; }
 			(yyval.ast) = zend_ast_create(ZEND_AST_CALL, zend_ast_create_zval(&zv), (yyvsp0.ast));
 		}
-
     break;
 
-  case 478:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_STATIC_CALL, (yyvsp-3.ast), (yyvsp-1.ast), (yyvsp0.ast)); }
-
+  case 478: /* function_call: class_name "'::'" member_name argument_list  */
+                        { (yyval.ast) = zend_ast_create(ZEND_AST_STATIC_CALL, (yyvsp-3.ast), (yyvsp-1.ast), (yyvsp0.ast)); }
     break;
 
-  case 479:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_STATIC_CALL, (yyvsp-3.ast), (yyvsp-1.ast), (yyvsp0.ast)); }
-
+  case 479: /* function_call: variable_class_name "'::'" member_name argument_list  */
+                        { (yyval.ast) = zend_ast_create(ZEND_AST_STATIC_CALL, (yyvsp-3.ast), (yyvsp-1.ast), (yyvsp0.ast)); }
     break;
 
-  case 480:
-
-    { (yyval.num) = CG(zend_lineno); }
-
+  case 480: /* @10: %empty  */
+                              { (yyval.num) = CG(zend_lineno); }
     break;
 
-  case 481:
-
-    {
+  case 481: /* function_call: callable_expr @10 argument_list  */
+                                                                           {
 			(yyval.ast) = zend_ast_create(ZEND_AST_CALL, (yyvsp-2.ast), (yyvsp0.ast));
 			(yyval.ast)->lineno = (yyvsp-1.num);
 		}
-
     break;
 
-  case 482:
-
-    { zval zv; ZVAL_INTERNED_STR(&zv, ZSTR_KNOWN(ZEND_STR_STATIC));
+  case 482: /* class_name: "'static'"  */
+                        { zval zv; ZVAL_INTERNED_STR(&zv, ZSTR_KNOWN(ZEND_STR_STATIC));
 			  (yyval.ast) = zend_ast_create_zval_ex(&zv, ZEND_NAME_NOT_FQ); }
-
     break;
 
-  case 483:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 483: /* class_name: name  */
+                     { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 484:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 484: /* class_name_reference: class_name  */
+                                        { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 485:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 485: /* class_name_reference: new_variable  */
+                                { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 486:
-
-    { (yyval.ast) = (yyvsp-1.ast); }
-
+  case 486: /* class_name_reference: '(' expr ')'  */
+                                { (yyval.ast) = (yyvsp-1.ast); }
     break;
 
-  case 487:
-
-    { (yyval.ast) = NULL; }
-
+  case 487: /* exit_expr: %empty  */
+                                                { (yyval.ast) = NULL; }
     break;
 
-  case 488:
-
-    { (yyval.ast) = (yyvsp-1.ast); }
-
+  case 488: /* exit_expr: '(' optional_expr ')'  */
+                                        { (yyval.ast) = (yyvsp-1.ast); }
     break;
 
-  case 489:
-
-    { (yyval.ast) = zend_ast_create_zval_from_str(ZSTR_EMPTY_ALLOC()); }
-
+  case 489: /* backticks_expr: %empty  */
+                        { (yyval.ast) = zend_ast_create_zval_from_str(ZSTR_EMPTY_ALLOC()); }
     break;
 
-  case 490:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 490: /* backticks_expr: "string content"  */
+                                          { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 491:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 491: /* backticks_expr: encaps_list  */
+                            { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 492:
-
-    { (yyval.ast) = zend_ast_create_list(0, ZEND_AST_ARG_LIST); }
-
+  case 492: /* ctor_arguments: %empty  */
+                        { (yyval.ast) = zend_ast_create_list(0, ZEND_AST_ARG_LIST); }
     break;
 
-  case 493:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 493: /* ctor_arguments: argument_list  */
+                              { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 494:
-
-    { (yyval.ast) = (yyvsp-1.ast); (yyval.ast)->attr = ZEND_ARRAY_SYNTAX_LONG; }
-
+  case 494: /* dereferenceable_scalar: "'array'" '(' array_pair_list ')'  */
+                                                { (yyval.ast) = (yyvsp-1.ast); (yyval.ast)->attr = ZEND_ARRAY_SYNTAX_LONG; }
     break;
 
-  case 495:
-
-    { (yyval.ast) = (yyvsp-1.ast); (yyval.ast)->attr = ZEND_ARRAY_SYNTAX_SHORT; }
-
+  case 495: /* dereferenceable_scalar: '' array_pair_list ''  */
+                                                        { (yyval.ast) = (yyvsp-1.ast); (yyval.ast)->attr = ZEND_ARRAY_SYNTAX_SHORT; }
     break;
 
-  case 496:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 496: /* dereferenceable_scalar: "quoted string"  */
+                                                        { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 497:
-
-    { (yyval.ast) = (yyvsp-1.ast); }
-
+  case 497: /* dereferenceable_scalar: '"' encaps_list '"'  */
+                                                                { (yyval.ast) = (yyvsp-1.ast); }
     break;
 
-  case 498:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 498: /* scalar: "integer"  */
+                                { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 499:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 499: /* scalar: "floating-point number"  */
+                                { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 500:
-
-    { (yyval.ast) = (yyvsp-1.ast); }
-
+  case 500: /* scalar: "heredoc start" "string content" "heredoc end"  */
+                                                                        { (yyval.ast) = (yyvsp-1.ast); }
     break;
 
-  case 501:
-
-    { (yyval.ast) = zend_ast_create_zval_from_str(ZSTR_EMPTY_ALLOC()); }
-
+  case 501: /* scalar: "heredoc start" "heredoc end"  */
+                        { (yyval.ast) = zend_ast_create_zval_from_str(ZSTR_EMPTY_ALLOC()); }
     break;
 
-  case 502:
-
-    { (yyval.ast) = (yyvsp-1.ast); }
-
+  case 502: /* scalar: "heredoc start" encaps_list "heredoc end"  */
+                                                          { (yyval.ast) = (yyvsp-1.ast); }
     break;
 
-  case 503:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 503: /* scalar: dereferenceable_scalar  */
+                                        { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 504:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 504: /* scalar: constant  */
+                                                        { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 505:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 505: /* scalar: class_constant  */
+                                                { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 506:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_CONST, (yyvsp0.ast)); }
-
+  case 506: /* constant: name  */
+                                { (yyval.ast) = zend_ast_create(ZEND_AST_CONST, (yyvsp0.ast)); }
     break;
 
-  case 507:
-
-    { (yyval.ast) = zend_ast_create_ex(ZEND_AST_MAGIC_CONST, T_LINE); }
-
+  case 507: /* constant: "'__LINE__'"  */
+                                { (yyval.ast) = zend_ast_create_ex(ZEND_AST_MAGIC_CONST, T_LINE); }
     break;
 
-  case 508:
-
-    { (yyval.ast) = zend_ast_create_ex(ZEND_AST_MAGIC_CONST, T_FILE); }
-
+  case 508: /* constant: "'__FILE__'"  */
+                                { (yyval.ast) = zend_ast_create_ex(ZEND_AST_MAGIC_CONST, T_FILE); }
     break;
 
-  case 509:
-
-    { (yyval.ast) = zend_ast_create_ex(ZEND_AST_MAGIC_CONST, T_DIR); }
-
+  case 509: /* constant: "'__DIR__'"  */
+                                { (yyval.ast) = zend_ast_create_ex(ZEND_AST_MAGIC_CONST, T_DIR); }
     break;
 
-  case 510:
-
-    { (yyval.ast) = zend_ast_create_ex(ZEND_AST_MAGIC_CONST, T_TRAIT_C); }
-
+  case 510: /* constant: "'__TRAIT__'"  */
+                                { (yyval.ast) = zend_ast_create_ex(ZEND_AST_MAGIC_CONST, T_TRAIT_C); }
     break;
 
-  case 511:
-
-    { (yyval.ast) = zend_ast_create_ex(ZEND_AST_MAGIC_CONST, T_METHOD_C); }
-
+  case 511: /* constant: "'__METHOD__'"  */
+                                { (yyval.ast) = zend_ast_create_ex(ZEND_AST_MAGIC_CONST, T_METHOD_C); }
     break;
 
-  case 512:
-
-    { (yyval.ast) = zend_ast_create_ex(ZEND_AST_MAGIC_CONST, T_FUNC_C); }
-
+  case 512: /* constant: "'__FUNCTION__'"  */
+                                { (yyval.ast) = zend_ast_create_ex(ZEND_AST_MAGIC_CONST, T_FUNC_C); }
     break;
 
-  case 513:
-
-    { (yyval.ast) = zend_ast_create_ex(ZEND_AST_MAGIC_CONST, T_NS_C); }
-
+  case 513: /* constant: "'__NAMESPACE__'"  */
+                                { (yyval.ast) = zend_ast_create_ex(ZEND_AST_MAGIC_CONST, T_NS_C); }
     break;
 
-  case 514:
-
-    { (yyval.ast) = zend_ast_create_ex(ZEND_AST_MAGIC_CONST, T_CLASS_C); }
-
+  case 514: /* constant: "'__CLASS__'"  */
+                                { (yyval.ast) = zend_ast_create_ex(ZEND_AST_MAGIC_CONST, T_CLASS_C); }
     break;
 
-  case 515:
-
-    { (yyval.ast) = zend_ast_create_class_const_or_name((yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 515: /* class_constant: class_name "'::'" identifier  */
+                        { (yyval.ast) = zend_ast_create_class_const_or_name((yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 516:
-
-    { (yyval.ast) = zend_ast_create_class_const_or_name((yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 516: /* class_constant: variable_class_name "'::'" identifier  */
+                        { (yyval.ast) = zend_ast_create_class_const_or_name((yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 517:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_CLASS_CONST, (yyvsp-4.ast), (yyvsp-1.ast)); }
-
+  case 517: /* class_constant: class_name "'::'" '{' expr '}'  */
+                        { (yyval.ast) = zend_ast_create(ZEND_AST_CLASS_CONST, (yyvsp-4.ast), (yyvsp-1.ast)); }
     break;
 
-  case 518:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_CLASS_CONST, (yyvsp-4.ast), (yyvsp-1.ast)); }
-
+  case 518: /* class_constant: variable_class_name "'::'" '{' expr '}'  */
+                        { (yyval.ast) = zend_ast_create(ZEND_AST_CLASS_CONST, (yyvsp-4.ast), (yyvsp-1.ast)); }
     break;
 
-  case 519:
-
-    { (yyval.ast) = NULL; }
-
+  case 519: /* optional_expr: %empty  */
+                        { (yyval.ast) = NULL; }
     break;
 
-  case 520:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 520: /* optional_expr: expr  */
+                                { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 521:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 521: /* variable_class_name: fully_dereferenceable  */
+                                      { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 522:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 522: /* fully_dereferenceable: variable  */
+                                                        { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 523:
-
-    { (yyval.ast) = (yyvsp-1.ast); }
-
+  case 523: /* fully_dereferenceable: '(' expr ')'  */
+                                                { (yyval.ast) = (yyvsp-1.ast); }
     break;
 
-  case 524:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 524: /* fully_dereferenceable: dereferenceable_scalar  */
+                                        { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 525:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 525: /* fully_dereferenceable: class_constant  */
+                                                { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 526:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 526: /* array_object_dereferenceable: fully_dereferenceable  */
+                                        { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 527:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 527: /* array_object_dereferenceable: constant  */
+                                                        { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 528:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 528: /* callable_expr: callable_variable  */
+                                                { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 529:
-
-    { (yyval.ast) = (yyvsp-1.ast); }
-
+  case 529: /* callable_expr: '(' expr ')'  */
+                                                { (yyval.ast) = (yyvsp-1.ast); }
     break;
 
-  case 530:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 530: /* callable_expr: dereferenceable_scalar  */
+                                        { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 531:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_VAR, (yyvsp0.ast)); }
-
+  case 531: /* callable_variable: simple_variable  */
+                        { (yyval.ast) = zend_ast_create(ZEND_AST_VAR, (yyvsp0.ast)); }
     break;
 
-  case 532:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_DIM, (yyvsp-3.ast), (yyvsp-1.ast)); }
-
+  case 532: /* callable_variable: array_object_dereferenceable '' optional_expr ''  */
+                        { (yyval.ast) = zend_ast_create(ZEND_AST_DIM, (yyvsp-3.ast), (yyvsp-1.ast)); }
     break;
 
-  case 533:
-
-    { (yyval.ast) = zend_ast_create_ex(ZEND_AST_DIM, ZEND_DIM_ALTERNATIVE_SYNTAX, (yyvsp-3.ast), (yyvsp-1.ast)); }
-
+  case 533: /* callable_variable: array_object_dereferenceable '{' expr '}'  */
+                        { (yyval.ast) = zend_ast_create_ex(ZEND_AST_DIM, ZEND_DIM_ALTERNATIVE_SYNTAX, (yyvsp-3.ast), (yyvsp-1.ast)); }
     break;
 
-  case 534:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_METHOD_CALL, (yyvsp-3.ast), (yyvsp-1.ast), (yyvsp0.ast)); }
-
+  case 534: /* callable_variable: array_object_dereferenceable "'->'" property_name argument_list  */
+                        { (yyval.ast) = zend_ast_create(ZEND_AST_METHOD_CALL, (yyvsp-3.ast), (yyvsp-1.ast), (yyvsp0.ast)); }
     break;
 
-  case 535:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_NULLSAFE_METHOD_CALL, (yyvsp-3.ast), (yyvsp-1.ast), (yyvsp0.ast)); }
-
+  case 535: /* callable_variable: array_object_dereferenceable "'?->'" property_name argument_list  */
+                        { (yyval.ast) = zend_ast_create(ZEND_AST_NULLSAFE_METHOD_CALL, (yyvsp-3.ast), (yyvsp-1.ast), (yyvsp0.ast)); }
     break;
 
-  case 536:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 536: /* callable_variable: function_call  */
+                              { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 537:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 537: /* variable: callable_variable  */
+                        { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 538:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 538: /* variable: static_member  */
+                        { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 539:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_PROP, (yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 539: /* variable: array_object_dereferenceable "'->'" property_name  */
+                        { (yyval.ast) = zend_ast_create(ZEND_AST_PROP, (yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 540:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_NULLSAFE_PROP, (yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 540: /* variable: array_object_dereferenceable "'?->'" property_name  */
+                        { (yyval.ast) = zend_ast_create(ZEND_AST_NULLSAFE_PROP, (yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 541:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 541: /* simple_variable: "variable"  */
+                                                { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 542:
-
-    { (yyval.ast) = (yyvsp-1.ast); }
-
+  case 542: /* simple_variable: '$' '{' expr '}'  */
+                                        { (yyval.ast) = (yyvsp-1.ast); }
     break;
 
-  case 543:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_VAR, (yyvsp0.ast)); }
-
+  case 543: /* simple_variable: '$' simple_variable  */
+                                        { (yyval.ast) = zend_ast_create(ZEND_AST_VAR, (yyvsp0.ast)); }
     break;
 
-  case 544:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_STATIC_PROP, (yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 544: /* static_member: class_name "'::'" simple_variable  */
+                        { (yyval.ast) = zend_ast_create(ZEND_AST_STATIC_PROP, (yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 545:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_STATIC_PROP, (yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 545: /* static_member: variable_class_name "'::'" simple_variable  */
+                        { (yyval.ast) = zend_ast_create(ZEND_AST_STATIC_PROP, (yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 546:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_VAR, (yyvsp0.ast)); }
-
+  case 546: /* new_variable: simple_variable  */
+                        { (yyval.ast) = zend_ast_create(ZEND_AST_VAR, (yyvsp0.ast)); }
     break;
 
-  case 547:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_DIM, (yyvsp-3.ast), (yyvsp-1.ast)); }
-
+  case 547: /* new_variable: new_variable '' optional_expr ''  */
+                        { (yyval.ast) = zend_ast_create(ZEND_AST_DIM, (yyvsp-3.ast), (yyvsp-1.ast)); }
     break;
 
-  case 548:
-
-    { (yyval.ast) = zend_ast_create_ex(ZEND_AST_DIM, ZEND_DIM_ALTERNATIVE_SYNTAX, (yyvsp-3.ast), (yyvsp-1.ast)); }
-
+  case 548: /* new_variable: new_variable '{' expr '}'  */
+                        { (yyval.ast) = zend_ast_create_ex(ZEND_AST_DIM, ZEND_DIM_ALTERNATIVE_SYNTAX, (yyvsp-3.ast), (yyvsp-1.ast)); }
     break;
 
-  case 549:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_PROP, (yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 549: /* new_variable: new_variable "'->'" property_name  */
+                        { (yyval.ast) = zend_ast_create(ZEND_AST_PROP, (yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 550:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_NULLSAFE_PROP, (yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 550: /* new_variable: new_variable "'?->'" property_name  */
+                        { (yyval.ast) = zend_ast_create(ZEND_AST_NULLSAFE_PROP, (yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 551:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_STATIC_PROP, (yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 551: /* new_variable: class_name "'::'" simple_variable  */
+                        { (yyval.ast) = zend_ast_create(ZEND_AST_STATIC_PROP, (yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 552:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_STATIC_PROP, (yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 552: /* new_variable: new_variable "'::'" simple_variable  */
+                        { (yyval.ast) = zend_ast_create(ZEND_AST_STATIC_PROP, (yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 553:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 553: /* member_name: identifier  */
+                           { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 554:
-
-    { (yyval.ast) = (yyvsp-1.ast); }
-
+  case 554: /* member_name: '{' expr '}'  */
+                                { (yyval.ast) = (yyvsp-1.ast); }
     break;
 
-  case 555:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_VAR, (yyvsp0.ast)); }
-
+  case 555: /* member_name: simple_variable  */
+                                { (yyval.ast) = zend_ast_create(ZEND_AST_VAR, (yyvsp0.ast)); }
     break;
 
-  case 556:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 556: /* property_name: "identifier"  */
+                         { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 557:
-
-    { (yyval.ast) = (yyvsp-1.ast); }
-
+  case 557: /* property_name: '{' expr '}'  */
+                                { (yyval.ast) = (yyvsp-1.ast); }
     break;
 
-  case 558:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_VAR, (yyvsp0.ast)); }
-
+  case 558: /* property_name: simple_variable  */
+                                { (yyval.ast) = zend_ast_create(ZEND_AST_VAR, (yyvsp0.ast)); }
     break;
 
-  case 559:
-
-    { /* allow single trailing comma */ (yyval.ast) = zend_ast_list_rtrim((yyvsp0.ast)); }
-
+  case 559: /* array_pair_list: non_empty_array_pair_list  */
+                        { /* allow single trailing comma */ (yyval.ast) = zend_ast_list_rtrim((yyvsp0.ast)); }
     break;
 
-  case 560:
-
-    { (yyval.ast) = NULL; }
-
+  case 560: /* possible_array_pair: %empty  */
+                       { (yyval.ast) = NULL; }
     break;
 
-  case 561:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 561: /* possible_array_pair: array_pair  */
+                            { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 562:
-
-    { (yyval.ast) = zend_ast_list_add((yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 562: /* non_empty_array_pair_list: non_empty_array_pair_list ',' possible_array_pair  */
+                        { (yyval.ast) = zend_ast_list_add((yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 563:
-
-    { (yyval.ast) = zend_ast_create_list(1, ZEND_AST_ARRAY, (yyvsp0.ast)); }
-
+  case 563: /* non_empty_array_pair_list: possible_array_pair  */
+                        { (yyval.ast) = zend_ast_create_list(1, ZEND_AST_ARRAY, (yyvsp0.ast)); }
     break;
 
-  case 564:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_ARRAY_ELEM, (yyvsp0.ast), (yyvsp-2.ast)); }
-
+  case 564: /* array_pair: expr "'=>'" expr  */
+                        { (yyval.ast) = zend_ast_create(ZEND_AST_ARRAY_ELEM, (yyvsp0.ast), (yyvsp-2.ast)); }
     break;
 
-  case 565:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_ARRAY_ELEM, (yyvsp0.ast), NULL); }
-
+  case 565: /* array_pair: expr  */
+                        { (yyval.ast) = zend_ast_create(ZEND_AST_ARRAY_ELEM, (yyvsp0.ast), NULL); }
     break;
 
-  case 566:
-
-    { (yyval.ast) = zend_ast_create_ex(ZEND_AST_ARRAY_ELEM, 1, (yyvsp0.ast), (yyvsp-3.ast)); }
-
+  case 566: /* array_pair: expr "'=>'" ampersand variable  */
+                        { (yyval.ast) = zend_ast_create_ex(ZEND_AST_ARRAY_ELEM, 1, (yyvsp0.ast), (yyvsp-3.ast)); }
     break;
 
-  case 567:
-
-    { (yyval.ast) = zend_ast_create_ex(ZEND_AST_ARRAY_ELEM, 1, (yyvsp0.ast), NULL); }
-
+  case 567: /* array_pair: ampersand variable  */
+                        { (yyval.ast) = zend_ast_create_ex(ZEND_AST_ARRAY_ELEM, 1, (yyvsp0.ast), NULL); }
     break;
 
-  case 568:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_UNPACK, (yyvsp0.ast)); }
-
+  case 568: /* array_pair: "'...'" expr  */
+                        { (yyval.ast) = zend_ast_create(ZEND_AST_UNPACK, (yyvsp0.ast)); }
     break;
 
-  case 569:
-
-    { (yyvsp-1.ast)->attr = ZEND_ARRAY_SYNTAX_LIST;
+  case 569: /* array_pair: expr "'=>'" "'list'" '(' array_pair_list ')'  */
+                        { (yyvsp-1.ast)->attr = ZEND_ARRAY_SYNTAX_LIST;
 			  (yyval.ast) = zend_ast_create(ZEND_AST_ARRAY_ELEM, (yyvsp-1.ast), (yyvsp-5.ast)); }
-
     break;
 
-  case 570:
-
-    { (yyvsp-1.ast)->attr = ZEND_ARRAY_SYNTAX_LIST;
+  case 570: /* array_pair: "'list'" '(' array_pair_list ')'  */
+                        { (yyvsp-1.ast)->attr = ZEND_ARRAY_SYNTAX_LIST;
 			  (yyval.ast) = zend_ast_create(ZEND_AST_ARRAY_ELEM, (yyvsp-1.ast), NULL); }
-
     break;
 
-  case 571:
-
-    { (yyval.ast) = zend_ast_list_add((yyvsp-1.ast), (yyvsp0.ast)); }
-
+  case 571: /* encaps_list: encaps_list encaps_var  */
+                        { (yyval.ast) = zend_ast_list_add((yyvsp-1.ast), (yyvsp0.ast)); }
     break;
 
-  case 572:
-
-    { (yyval.ast) = zend_ast_list_add((yyvsp-1.ast), (yyvsp0.ast)); }
-
+  case 572: /* encaps_list: encaps_list "string content"  */
+                        { (yyval.ast) = zend_ast_list_add((yyvsp-1.ast), (yyvsp0.ast)); }
     break;
 
-  case 573:
-
-    { (yyval.ast) = zend_ast_create_list(1, ZEND_AST_ENCAPS_LIST, (yyvsp0.ast)); }
-
+  case 573: /* encaps_list: encaps_var  */
+                        { (yyval.ast) = zend_ast_create_list(1, ZEND_AST_ENCAPS_LIST, (yyvsp0.ast)); }
     break;
 
-  case 574:
-
-    { (yyval.ast) = zend_ast_create_list(2, ZEND_AST_ENCAPS_LIST, (yyvsp-1.ast), (yyvsp0.ast)); }
-
+  case 574: /* encaps_list: "string content" encaps_var  */
+                        { (yyval.ast) = zend_ast_create_list(2, ZEND_AST_ENCAPS_LIST, (yyvsp-1.ast), (yyvsp0.ast)); }
     break;
 
-  case 575:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_VAR, (yyvsp0.ast)); }
-
+  case 575: /* encaps_var: "variable"  */
+                        { (yyval.ast) = zend_ast_create(ZEND_AST_VAR, (yyvsp0.ast)); }
     break;
 
-  case 576:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_DIM,
+  case 576: /* encaps_var: "variable" '' encaps_var_offset ''  */
+                        { (yyval.ast) = zend_ast_create(ZEND_AST_DIM,
 			      zend_ast_create(ZEND_AST_VAR, (yyvsp-3.ast)), (yyvsp-1.ast)); }
-
     break;
 
-  case 577:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_PROP,
+  case 577: /* encaps_var: "variable" "'->'" "identifier"  */
+                        { (yyval.ast) = zend_ast_create(ZEND_AST_PROP,
 			      zend_ast_create(ZEND_AST_VAR, (yyvsp-2.ast)), (yyvsp0.ast)); }
-
     break;
 
-  case 578:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_NULLSAFE_PROP,
+  case 578: /* encaps_var: "variable" "'?->'" "identifier"  */
+                        { (yyval.ast) = zend_ast_create(ZEND_AST_NULLSAFE_PROP,
 			      zend_ast_create(ZEND_AST_VAR, (yyvsp-2.ast)), (yyvsp0.ast)); }
-
     break;
 
-  case 579:
-
-    { (yyval.ast) = zend_ast_create_ex(ZEND_AST_VAR, ZEND_ENCAPS_VAR_DOLLAR_CURLY_VAR_VAR, (yyvsp-1.ast)); }
-
+  case 579: /* encaps_var: "'${'" expr '}'  */
+                        { (yyval.ast) = zend_ast_create_ex(ZEND_AST_VAR, ZEND_ENCAPS_VAR_DOLLAR_CURLY_VAR_VAR, (yyvsp-1.ast)); }
     break;
 
-  case 580:
-
-    { (yyval.ast) = zend_ast_create_ex(ZEND_AST_VAR, ZEND_ENCAPS_VAR_DOLLAR_CURLY, (yyvsp-1.ast)); }
-
+  case 580: /* encaps_var: "'${'" "variable name" '}'  */
+                        { (yyval.ast) = zend_ast_create_ex(ZEND_AST_VAR, ZEND_ENCAPS_VAR_DOLLAR_CURLY, (yyvsp-1.ast)); }
     break;
 
-  case 581:
-
-    { (yyval.ast) = zend_ast_create_ex(ZEND_AST_DIM, ZEND_ENCAPS_VAR_DOLLAR_CURLY,
+  case 581: /* encaps_var: "'${'" "variable name" '' expr '' '}'  */
+                        { (yyval.ast) = zend_ast_create_ex(ZEND_AST_DIM, ZEND_ENCAPS_VAR_DOLLAR_CURLY,
 			      zend_ast_create(ZEND_AST_VAR, (yyvsp-4.ast)), (yyvsp-2.ast)); }
-
     break;
 
-  case 582:
-
-    { (yyval.ast) = (yyvsp-1.ast); }
-
+  case 582: /* encaps_var: "'{$'" variable '}'  */
+                                          { (yyval.ast) = (yyvsp-1.ast); }
     break;
 
-  case 583:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 583: /* encaps_var_offset: "identifier"  */
+                                                { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 584:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 584: /* encaps_var_offset: "number"  */
+                                        { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 585:
-
-    { (yyval.ast) = zend_negate_num_string((yyvsp0.ast)); }
-
+  case 585: /* encaps_var_offset: '-' "number"  */
+                                        { (yyval.ast) = zend_negate_num_string((yyvsp0.ast)); }
     break;
 
-  case 586:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_VAR, (yyvsp0.ast)); }
-
+  case 586: /* encaps_var_offset: "variable"  */
+                                                { (yyval.ast) = zend_ast_create(ZEND_AST_VAR, (yyvsp0.ast)); }
     break;
 
-  case 587:
-
-    { (yyval.ast) = (yyvsp-2.ast); }
-
+  case 587: /* internal_functions_in_yacc: "'isset'" '(' isset_variables possible_comma ')'  */
+                                                               { (yyval.ast) = (yyvsp-2.ast); }
     break;
 
-  case 588:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_EMPTY, (yyvsp-1.ast)); }
-
+  case 588: /* internal_functions_in_yacc: "'empty'" '(' expr ')'  */
+                                     { (yyval.ast) = zend_ast_create(ZEND_AST_EMPTY, (yyvsp-1.ast)); }
     break;
 
-  case 589:
-
-    { (yyval.ast) = zend_ast_create_ex(ZEND_AST_INCLUDE_OR_EVAL, ZEND_INCLUDE, (yyvsp0.ast)); }
-
+  case 589: /* internal_functions_in_yacc: "'include'" expr  */
+                        { (yyval.ast) = zend_ast_create_ex(ZEND_AST_INCLUDE_OR_EVAL, ZEND_INCLUDE, (yyvsp0.ast)); }
     break;
 
-  case 590:
-
-    { (yyval.ast) = zend_ast_create_ex(ZEND_AST_INCLUDE_OR_EVAL, ZEND_INCLUDE_ONCE, (yyvsp0.ast)); }
-
+  case 590: /* internal_functions_in_yacc: "'include_once'" expr  */
+                        { (yyval.ast) = zend_ast_create_ex(ZEND_AST_INCLUDE_OR_EVAL, ZEND_INCLUDE_ONCE, (yyvsp0.ast)); }
     break;
 
-  case 591:
-
-    { (yyval.ast) = zend_ast_create_ex(ZEND_AST_INCLUDE_OR_EVAL, ZEND_EVAL, (yyvsp-1.ast)); }
-
+  case 591: /* internal_functions_in_yacc: "'eval'" '(' expr ')'  */
+                        { (yyval.ast) = zend_ast_create_ex(ZEND_AST_INCLUDE_OR_EVAL, ZEND_EVAL, (yyvsp-1.ast)); }
     break;
 
-  case 592:
-
-    { (yyval.ast) = zend_ast_create_ex(ZEND_AST_INCLUDE_OR_EVAL, ZEND_REQUIRE, (yyvsp0.ast)); }
-
+  case 592: /* internal_functions_in_yacc: "'require'" expr  */
+                        { (yyval.ast) = zend_ast_create_ex(ZEND_AST_INCLUDE_OR_EVAL, ZEND_REQUIRE, (yyvsp0.ast)); }
     break;
 
-  case 593:
-
-    { (yyval.ast) = zend_ast_create_ex(ZEND_AST_INCLUDE_OR_EVAL, ZEND_REQUIRE_ONCE, (yyvsp0.ast)); }
-
+  case 593: /* internal_functions_in_yacc: "'require_once'" expr  */
+                        { (yyval.ast) = zend_ast_create_ex(ZEND_AST_INCLUDE_OR_EVAL, ZEND_REQUIRE_ONCE, (yyvsp0.ast)); }
     break;
 
-  case 594:
-
-    { (yyval.ast) = (yyvsp0.ast); }
-
+  case 594: /* isset_variables: isset_variable  */
+                               { (yyval.ast) = (yyvsp0.ast); }
     break;
 
-  case 595:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_AND, (yyvsp-2.ast), (yyvsp0.ast)); }
-
+  case 595: /* isset_variables: isset_variables ',' isset_variable  */
+                        { (yyval.ast) = zend_ast_create(ZEND_AST_AND, (yyvsp-2.ast), (yyvsp0.ast)); }
     break;
 
-  case 596:
-
-    { (yyval.ast) = zend_ast_create(ZEND_AST_ISSET, (yyvsp0.ast)); }
-
+  case 596: /* isset_variable: expr  */
+                     { (yyval.ast) = zend_ast_create(ZEND_AST_ISSET, (yyvsp0.ast)); }
     break;
 
 
@@ -7890,25 +7053,23 @@
      case of YYERROR or YYBACKUP, subsequent parser actions might lead
      to an incorrect destructor call or verbose syntax error message
      before the lookahead is translated.  */
-  YY_SYMBOL_PRINT ("-> $$ =", yyr1yyn, &yyval, &yyloc);
+  YY_SYMBOL_PRINT ("-> $$ =", YY_CAST (yysymbol_kind_t, yyr1yyn), &yyval, &yyloc);
 
   YYPOPSTACK (yylen);
   yylen = 0;
-  YY_STACK_PRINT (yyss, yyssp);
 
   *++yyvsp = yyval;
 
   /* Now 'shift' the result of the reduction.  Determine what state
      that goes to, based on the state we popped back to and the rule
      number reduced by.  */
-
-  yyn = yyr1yyn;
-
-  yystate = yypgotoyyn - YYNTOKENS + *yyssp;
-  if (0 <= yystate && yystate <= YYLAST && yycheckyystate == *yyssp)
-    yystate = yytableyystate;
-  else
-    yystate = yydefgotoyyn - YYNTOKENS;
+  {
+    const int yylhs = yyr1yyn - YYNTOKENS;
+    const int yyi = yypgotoyylhs + *yyssp;
+    yystate = (0 <= yyi && yyi <= YYLAST && yycheckyyi == *yyssp
+               ? yytableyyi
+               : yydefgotoyylhs);
+  }
 
   goto yynewstate;
 
@@ -7919,66 +7080,60 @@
 yyerrlab:
   /* Make sure we have latest lookahead translation.  See comments at
      user semantic actions for why this is necessary.  */
-  yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar);
-
+  yytoken = yychar == ZENDEMPTY ? YYSYMBOL_YYEMPTY : YYTRANSLATE (yychar);
   /* If not already recovering from an error, report this error.  */
   if (!yyerrstatus)
     {
       ++yynerrs;
-#if ! YYERROR_VERBOSE
-      yyerror (YY_("syntax error"));
-#else
-# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
-                                        yyssp, yytoken)
       {
+        yypcontext_t yyctx
+          = {yyssp, yytoken};
         char const *yymsgp = YY_("syntax error");
         int yysyntax_error_status;
-        yysyntax_error_status = YYSYNTAX_ERROR;
+        yysyntax_error_status = yysyntax_error (&yymsg_alloc, &yymsg, &yyctx);
         if (yysyntax_error_status == 0)
           yymsgp = yymsg;
-        else if (yysyntax_error_status == 1)
+        else if (yysyntax_error_status == -1)
           {
             if (yymsg != yymsgbuf)
               YYSTACK_FREE (yymsg);
-            yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc);
-            if (!yymsg)
+            yymsg = YY_CAST (char *,
+                             YYSTACK_ALLOC (YY_CAST (YYSIZE_T, yymsg_alloc)));
+            if (yymsg)
               {
-                yymsg = yymsgbuf;
-                yymsg_alloc = sizeof yymsgbuf;
-                yysyntax_error_status = 2;
+                yysyntax_error_status
+                  = yysyntax_error (&yymsg_alloc, &yymsg, &yyctx);
+                yymsgp = yymsg;
               }
             else
               {
-                yysyntax_error_status = YYSYNTAX_ERROR;
-                yymsgp = yymsg;
+                yymsg = yymsgbuf;
+                yymsg_alloc = sizeof yymsgbuf;
+                yysyntax_error_status = YYENOMEM;
               }
           }
         yyerror (yymsgp);
-        if (yysyntax_error_status == 2)
-          goto yyexhaustedlab;
+        if (yysyntax_error_status == YYENOMEM)
+          YYNOMEM;
       }
-# undef YYSYNTAX_ERROR
-#endif
     }
 
-
-
   if (yyerrstatus == 3)
     {
       /* If just tried and failed to reuse lookahead token after an
          error, discard it.  */
 
-      if (yychar <= YYEOF)
+      if (yychar <= END)
         {
           /* Return failure if at end of input.  */
-          if (yychar == YYEOF)
+          if (yychar == END)
             YYABORT;
         }
       else
         {
           yydestruct ("Error: discarding",
                       yytoken, &yylval);
-          yychar = YYEMPTY;
+          yychar = ZENDEMPTY;
         }
     }
 
@@ -7991,12 +7146,11 @@
 | yyerrorlab -- error raised explicitly by YYERROR.  |
 `---------------------------------------------------*/
 yyerrorlab:
-
-  /* Pacify compilers like GCC when the user code never invokes
-     YYERROR and the label yyerrorlab therefore never appears in user
-     code.  */
-  if (/*CONSTCOND*/ 0)
-     goto yyerrorlab;
+  /* Pacify compilers when the user code never invokes YYERROR and the
+     label yyerrorlab therefore never appears in user code.  */
+  if (0)
+    YYERROR;
+  ++yynerrs;
 
   /* Do not reclaim the symbols of the rule whose action triggered
      this YYERROR.  */
@@ -8013,13 +7167,14 @@
 yyerrlab1:
   yyerrstatus = 3;      /* Each real token shifted decrements this.  */
 
+  /* Pop stack until we find a state that shifts the error token.  */
   for (;;)
     {
       yyn = yypactyystate;
       if (!yypact_value_is_default (yyn))
         {
-          yyn += YYTERROR;
-          if (0 <= yyn && yyn <= YYLAST && yycheckyyn == YYTERROR)
+          yyn += YYSYMBOL_YYerror;
+          if (0 <= yyn && yyn <= YYLAST && yycheckyyn == YYSYMBOL_YYerror)
             {
               yyn = yytableyyn;
               if (0 < yyn)
@@ -8033,7 +7188,7 @@
 
 
       yydestruct ("Error: popping",
-                  yystosyystate, yyvsp);
+                  YY_ACCESSING_SYMBOL (yystate), yyvsp);
       YYPOPSTACK (1);
       yystate = *yyssp;
       YY_STACK_PRINT (yyss, yyssp);
@@ -8045,7 +7200,7 @@
 
 
   /* Shift the error token.  */
-  YY_SYMBOL_PRINT ("Shifting", yystosyyn, yyvsp, yylsp);
+  YY_SYMBOL_PRINT ("Shifting", YY_ACCESSING_SYMBOL (yyn), yyvsp, yylsp);
 
   yystate = yyn;
   goto yynewstate;
@@ -8056,27 +7211,31 @@
 `-------------------------------------*/
 yyacceptlab:
   yyresult = 0;
-  goto yyreturn;
+  goto yyreturnlab;
+
 
 /*-----------------------------------.
 | yyabortlab -- YYABORT comes here.  |
 `-----------------------------------*/
 yyabortlab:
   yyresult = 1;
-  goto yyreturn;
+  goto yyreturnlab;
 
-#if !defined yyoverflow || YYERROR_VERBOSE
-/*-------------------------------------------------.
-| yyexhaustedlab -- memory exhaustion comes here.  |
-`-------------------------------------------------*/
+
+/*-----------------------------------------------------------.
+| yyexhaustedlab -- YYNOMEM (memory exhaustion) comes here.  |
+`-----------------------------------------------------------*/
 yyexhaustedlab:
   yyerror (YY_("memory exhausted"));
   yyresult = 2;
-  /* Fall through.  */
-#endif
+  goto yyreturnlab;
+
 
-yyreturn:
-  if (yychar != YYEMPTY)
+/*----------------------------------------------------------.
+| yyreturnlab -- parsing is finished, clean up and return.  |
+`----------------------------------------------------------*/
+yyreturnlab:
+  if (yychar != ZENDEMPTY)
     {
       /* Make sure we have latest lookahead translation.  See comments at
          user semantic actions for why this is necessary.  */
@@ -8091,17 +7250,15 @@
   while (yyssp != yyss)
     {
       yydestruct ("Cleanup: popping",
-                  yystos*yyssp, yyvsp);
+                  YY_ACCESSING_SYMBOL (+*yyssp), yyvsp);
       YYPOPSTACK (1);
     }
 #ifndef yyoverflow
   if (yyss != yyssa)
     YYSTACK_FREE (yyss);
 #endif
-#if YYERROR_VERBOSE
   if (yymsg != yymsgbuf)
     YYSTACK_FREE (yymsg);
-#endif
   return yyresult;
 }

php-8.3.7.tar.xz/Zend/zend_language_parser.h -> php-8.3.21.tar.xz/Zend/zend_language_parser.h Changed

@@ -1,8 +1,9 @@
-/* A Bison parser, made by GNU Bison 3.0.4.  */
+/* A Bison parser, made by GNU Bison 3.8.2.  */
 
 /* Bison interface for Yacc-like parsers in C
 
-   Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2021 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -15,7 +16,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* As a special exception, you may create a larger work that contains
    part or all of the Bison parser skeleton and distribute that work
@@ -30,6 +31,10 @@
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
+/* DO NOT RELY ON FEATURES THAT ARE NOT DOCUMENTED in the manual,
+   especially those whose name start with YY_ or yy_.  They are
+   private implementation details that can be changed or removed.  */
+
 #ifndef YY_ZEND_ZEND_ZEND_LANGUAGE_PARSER_H_INCLUDED
 # define YY_ZEND_ZEND_ZEND_LANGUAGE_PARSER_H_INCLUDED
 /* Debug traces.  */
@@ -49,167 +54,169 @@
 #endif
 /* "%code requires" blocks.  */
 
-
 #include "zend_compile.h"
 
 
-
-/* Token type.  */
+/* Token kinds.  */
 #ifndef ZENDTOKENTYPE
 # define ZENDTOKENTYPE
   enum zendtokentype
   {
-    END = 0,
-    T_THROW = 258,
-    PREC_ARROW_FUNCTION = 259,
-    T_INCLUDE = 260,
-    T_INCLUDE_ONCE = 261,
-    T_REQUIRE = 262,
-    T_REQUIRE_ONCE = 263,
-    T_LOGICAL_OR = 264,
-    T_LOGICAL_XOR = 265,
-    T_LOGICAL_AND = 266,
-    T_PRINT = 267,
-    T_YIELD = 268,
-    T_DOUBLE_ARROW = 269,
-    T_YIELD_FROM = 270,
-    T_PLUS_EQUAL = 271,
-    T_MINUS_EQUAL = 272,
-    T_MUL_EQUAL = 273,
-    T_DIV_EQUAL = 274,
-    T_CONCAT_EQUAL = 275,
-    T_MOD_EQUAL = 276,
-    T_AND_EQUAL = 277,
-    T_OR_EQUAL = 278,
-    T_XOR_EQUAL = 279,
-    T_SL_EQUAL = 280,
-    T_SR_EQUAL = 281,
-    T_POW_EQUAL = 282,
-    T_COALESCE_EQUAL = 283,
-    T_COALESCE = 284,
-    T_BOOLEAN_OR = 285,
-    T_BOOLEAN_AND = 286,
-    T_AMPERSAND_NOT_FOLLOWED_BY_VAR_OR_VARARG = 287,
-    T_AMPERSAND_FOLLOWED_BY_VAR_OR_VARARG = 288,
-    T_IS_EQUAL = 289,
-    T_IS_NOT_EQUAL = 290,
-    T_IS_IDENTICAL = 291,
-    T_IS_NOT_IDENTICAL = 292,
-    T_SPACESHIP = 293,
-    T_IS_SMALLER_OR_EQUAL = 294,
-    T_IS_GREATER_OR_EQUAL = 295,
-    T_SL = 296,
-    T_SR = 297,
-    T_INSTANCEOF = 298,
-    T_INT_CAST = 299,
-    T_DOUBLE_CAST = 300,
-    T_STRING_CAST = 301,
-    T_ARRAY_CAST = 302,
-    T_OBJECT_CAST = 303,
-    T_BOOL_CAST = 304,
-    T_UNSET_CAST = 305,
-    T_POW = 306,
-    T_CLONE = 307,
-    T_NOELSE = 308,
-    T_ELSEIF = 309,
-    T_ELSE = 310,
-    T_LNUMBER = 311,
-    T_DNUMBER = 312,
-    T_STRING = 313,
-    T_NAME_FULLY_QUALIFIED = 314,
-    T_NAME_RELATIVE = 315,
-    T_NAME_QUALIFIED = 316,
-    T_VARIABLE = 317,
-    T_INLINE_HTML = 318,
-    T_ENCAPSED_AND_WHITESPACE = 319,
-    T_CONSTANT_ENCAPSED_STRING = 320,
-    T_STRING_VARNAME = 321,
-    T_NUM_STRING = 322,
-    T_EVAL = 323,
-    T_NEW = 324,
-    T_EXIT = 325,
-    T_IF = 326,
-    T_ENDIF = 327,
-    T_ECHO = 328,
-    T_DO = 329,
-    T_WHILE = 330,
-    T_ENDWHILE = 331,
-    T_FOR = 332,
-    T_ENDFOR = 333,
-    T_FOREACH = 334,
-    T_ENDFOREACH = 335,
-    T_DECLARE = 336,
-    T_ENDDECLARE = 337,
-    T_AS = 338,
-    T_SWITCH = 339,
-    T_ENDSWITCH = 340,
-    T_CASE = 341,
-    T_DEFAULT = 342,
-    T_MATCH = 343,
-    T_BREAK = 344,
-    T_CONTINUE = 345,
-    T_GOTO = 346,
-    T_FUNCTION = 347,
-    T_FN = 348,
-    T_CONST = 349,
-    T_RETURN = 350,
-    T_TRY = 351,
-    T_CATCH = 352,
-    T_FINALLY = 353,
-    T_USE = 354,
-    T_INSTEADOF = 355,
-    T_GLOBAL = 356,
-    T_STATIC = 357,
-    T_ABSTRACT = 358,
-    T_FINAL = 359,
-    T_PRIVATE = 360,
-    T_PROTECTED = 361,
-    T_PUBLIC = 362,
-    T_READONLY = 363,
-    T_VAR = 364,
-    T_UNSET = 365,
-    T_ISSET = 366,
-    T_EMPTY = 367,
-    T_HALT_COMPILER = 368,
-    T_CLASS = 369,
-    T_TRAIT = 370,
-    T_INTERFACE = 371,
-    T_ENUM = 372,
-    T_EXTENDS = 373,
-    T_IMPLEMENTS = 374,
-    T_NAMESPACE = 375,
-    T_LIST = 376,
-    T_ARRAY = 377,
-    T_CALLABLE = 378,
-    T_LINE = 379,
-    T_FILE = 380,
-    T_DIR = 381,
-    T_CLASS_C = 382,
-    T_TRAIT_C = 383,
-    T_METHOD_C = 384,
-    T_FUNC_C = 385,
-    T_NS_C = 386,
-    T_ATTRIBUTE = 387,
-    T_INC = 388,
-    T_DEC = 389,
-    T_OBJECT_OPERATOR = 390,
-    T_NULLSAFE_OBJECT_OPERATOR = 391,
-    T_COMMENT = 392,
-    T_DOC_COMMENT = 393,
-    T_OPEN_TAG = 394,
-    T_OPEN_TAG_WITH_ECHO = 395,
-    T_CLOSE_TAG = 396,
-    T_WHITESPACE = 397,
-    T_START_HEREDOC = 398,
-    T_END_HEREDOC = 399,
-    T_DOLLAR_OPEN_CURLY_BRACES = 400,
-    T_CURLY_OPEN = 401,
-    T_PAAMAYIM_NEKUDOTAYIM = 402,
-    T_NS_SEPARATOR = 403,
-    T_ELLIPSIS = 404,
-    T_BAD_CHARACTER = 405,
-    T_ERROR = 406
+    ZENDEMPTY = -2,
+    END = 0,                       /* "end of file"  */
+    ZENDerror = 256,               /* error  */
+    ZENDUNDEF = 257,               /* "invalid token"  */
+    PREC_ARROW_FUNCTION = 258,     /* PREC_ARROW_FUNCTION  */
+    T_NOELSE = 259,                /* T_NOELSE  */
+    T_LNUMBER = 260,               /* "integer"  */
+    T_DNUMBER = 261,               /* "floating-point number"  */
+    T_STRING = 262,                /* "identifier"  */
+    T_NAME_FULLY_QUALIFIED = 263,  /* "fully qualified name"  */
+    T_NAME_RELATIVE = 264,         /* "namespace-relative name"  */
+    T_NAME_QUALIFIED = 265,        /* "namespaced name"  */
+    T_VARIABLE = 266,              /* "variable"  */
+    T_INLINE_HTML = 267,           /* T_INLINE_HTML  */
+    T_ENCAPSED_AND_WHITESPACE = 268, /* "string content"  */
+    T_CONSTANT_ENCAPSED_STRING = 269, /* "quoted string"  */
+    T_STRING_VARNAME = 270,        /* "variable name"  */
+    T_NUM_STRING = 271,            /* "number"  */
+    T_INCLUDE = 272,               /* "'include'"  */
+    T_INCLUDE_ONCE = 273,          /* "'include_once'"  */
+    T_EVAL = 274,                  /* "'eval'"  */
+    T_REQUIRE = 275,               /* "'require'"  */
+    T_REQUIRE_ONCE = 276,          /* "'require_once'"  */
+    T_LOGICAL_OR = 277,            /* "'or'"  */
+    T_LOGICAL_XOR = 278,           /* "'xor'"  */
+    T_LOGICAL_AND = 279,           /* "'and'"  */
+    T_PRINT = 280,                 /* "'print'"  */
+    T_YIELD = 281,                 /* "'yield'"  */
+    T_YIELD_FROM = 282,            /* "'yield from'"  */
+    T_INSTANCEOF = 283,            /* "'instanceof'"  */
+    T_NEW = 284,                   /* "'new'"  */
+    T_CLONE = 285,                 /* "'clone'"  */
+    T_EXIT = 286,                  /* "'exit'"  */
+    T_IF = 287,                    /* "'if'"  */
+    T_ELSEIF = 288,                /* "'elseif'"  */
+    T_ELSE = 289,                  /* "'else'"  */
+    T_ENDIF = 290,                 /* "'endif'"  */
+    T_ECHO = 291,                  /* "'echo'"  */
+    T_DO = 292,                    /* "'do'"  */
+    T_WHILE = 293,                 /* "'while'"  */
+    T_ENDWHILE = 294,              /* "'endwhile'"  */
+    T_FOR = 295,                   /* "'for'"  */
+    T_ENDFOR = 296,                /* "'endfor'"  */
+    T_FOREACH = 297,               /* "'foreach'"  */
+    T_ENDFOREACH = 298,            /* "'endforeach'"  */
+    T_DECLARE = 299,               /* "'declare'"  */
+    T_ENDDECLARE = 300,            /* "'enddeclare'"  */
+    T_AS = 301,                    /* "'as'"  */
+    T_SWITCH = 302,                /* "'switch'"  */
+    T_ENDSWITCH = 303,             /* "'endswitch'"  */
+    T_CASE = 304,                  /* "'case'"  */
+    T_DEFAULT = 305,               /* "'default'"  */
+    T_MATCH = 306,                 /* "'match'"  */
+    T_BREAK = 307,                 /* "'break'"  */
+    T_CONTINUE = 308,              /* "'continue'"  */
+    T_GOTO = 309,                  /* "'goto'"  */
+    T_FUNCTION = 310,              /* "'function'"  */
+    T_FN = 311,                    /* "'fn'"  */
+    T_CONST = 312,                 /* "'const'"  */
+    T_RETURN = 313,                /* "'return'"  */
+    T_TRY = 314,                   /* "'try'"  */
+    T_CATCH = 315,                 /* "'catch'"  */
+    T_FINALLY = 316,               /* "'finally'"  */
+    T_THROW = 317,                 /* "'throw'"  */
+    T_USE = 318,                   /* "'use'"  */
+    T_INSTEADOF = 319,             /* "'insteadof'"  */
+    T_GLOBAL = 320,                /* "'global'"  */
+    T_STATIC = 321,                /* "'static'"  */
+    T_ABSTRACT = 322,              /* "'abstract'"  */
+    T_FINAL = 323,                 /* "'final'"  */
+    T_PRIVATE = 324,               /* "'private'"  */
+    T_PROTECTED = 325,             /* "'protected'"  */
+    T_PUBLIC = 326,                /* "'public'"  */
+    T_READONLY = 327,              /* "'readonly'"  */
+    T_VAR = 328,                   /* "'var'"  */
+    T_UNSET = 329,                 /* "'unset'"  */
+    T_ISSET = 330,                 /* "'isset'"  */
+    T_EMPTY = 331,                 /* "'empty'"  */
+    T_HALT_COMPILER = 332,         /* "'__halt_compiler'"  */
+    T_CLASS = 333,                 /* "'class'"  */
+    T_TRAIT = 334,                 /* "'trait'"  */
+    T_INTERFACE = 335,             /* "'interface'"  */
+    T_ENUM = 336,                  /* "'enum'"  */
+    T_EXTENDS = 337,               /* "'extends'"  */
+    T_IMPLEMENTS = 338,            /* "'implements'"  */
+    T_NAMESPACE = 339,             /* "'namespace'"  */
+    T_LIST = 340,                  /* "'list'"  */
+    T_ARRAY = 341,                 /* "'array'"  */
+    T_CALLABLE = 342,              /* "'callable'"  */
+    T_LINE = 343,                  /* "'__LINE__'"  */
+    T_FILE = 344,                  /* "'__FILE__'"  */
+    T_DIR = 345,                   /* "'__DIR__'"  */
+    T_CLASS_C = 346,               /* "'__CLASS__'"  */
+    T_TRAIT_C = 347,               /* "'__TRAIT__'"  */
+    T_METHOD_C = 348,              /* "'__METHOD__'"  */
+    T_FUNC_C = 349,                /* "'__FUNCTION__'"  */
+    T_NS_C = 350,                  /* "'__NAMESPACE__'"  */
+    T_ATTRIBUTE = 351,             /* "'#'"  */
+    T_PLUS_EQUAL = 352,            /* "'+='"  */
+    T_MINUS_EQUAL = 353,           /* "'-='"  */
+    T_MUL_EQUAL = 354,             /* "'*='"  */
+    T_DIV_EQUAL = 355,             /* "'/='"  */
+    T_CONCAT_EQUAL = 356,          /* "'.='"  */
+    T_MOD_EQUAL = 357,             /* "'%='"  */
+    T_AND_EQUAL = 358,             /* "'&='"  */
+    T_OR_EQUAL = 359,              /* "'|='"  */
+    T_XOR_EQUAL = 360,             /* "'^='"  */
+    T_SL_EQUAL = 361,              /* "'<<='"  */
+    T_SR_EQUAL = 362,              /* "'>>='"  */
+    T_COALESCE_EQUAL = 363,        /* "'??='"  */
+    T_BOOLEAN_OR = 364,            /* "'||'"  */
+    T_BOOLEAN_AND = 365,           /* "'&&'"  */
+    T_IS_EQUAL = 366,              /* "'=='"  */
+    T_IS_NOT_EQUAL = 367,          /* "'!='"  */
+    T_IS_IDENTICAL = 368,          /* "'==='"  */
+    T_IS_NOT_IDENTICAL = 369,      /* "'!=='"  */
+    T_IS_SMALLER_OR_EQUAL = 370,   /* "'<='"  */
+    T_IS_GREATER_OR_EQUAL = 371,   /* "'>='"  */
+    T_SPACESHIP = 372,             /* "'<=>'"  */
+    T_SL = 373,                    /* "'<<'"  */
+    T_SR = 374,                    /* "'>>'"  */
+    T_INC = 375,                   /* "'++'"  */
+    T_DEC = 376,                   /* "'--'"  */
+    T_INT_CAST = 377,              /* "'(int)'"  */
+    T_DOUBLE_CAST = 378,           /* "'(double)'"  */
+    T_STRING_CAST = 379,           /* "'(string)'"  */
+    T_ARRAY_CAST = 380,            /* "'(array)'"  */
+    T_OBJECT_CAST = 381,           /* "'(object)'"  */
+    T_BOOL_CAST = 382,             /* "'(bool)'"  */
+    T_UNSET_CAST = 383,            /* "'(unset)'"  */
+    T_OBJECT_OPERATOR = 384,       /* "'->'"  */
+    T_NULLSAFE_OBJECT_OPERATOR = 385, /* "'?->'"  */
+    T_DOUBLE_ARROW = 386,          /* "'=>'"  */
+    T_COMMENT = 387,               /* "comment"  */
+    T_DOC_COMMENT = 388,           /* "doc comment"  */
+    T_OPEN_TAG = 389,              /* "open tag"  */
+    T_OPEN_TAG_WITH_ECHO = 390,    /* "'<?='"  */
+    T_CLOSE_TAG = 391,             /* "'?>'"  */
+    T_WHITESPACE = 392,            /* "whitespace"  */
+    T_START_HEREDOC = 393,         /* "heredoc start"  */
+    T_END_HEREDOC = 394,           /* "heredoc end"  */
+    T_DOLLAR_OPEN_CURLY_BRACES = 395, /* "'${'"  */
+    T_CURLY_OPEN = 396,            /* "'{$'"  */
+    T_PAAMAYIM_NEKUDOTAYIM = 397,  /* "'::'"  */
+    T_NS_SEPARATOR = 398,          /* "'\\'"  */
+    T_ELLIPSIS = 399,              /* "'...'"  */
+    T_COALESCE = 400,              /* "'??'"  */
+    T_POW = 401,                   /* "'**'"  */
+    T_POW_EQUAL = 402,             /* "'**='"  */
+    T_AMPERSAND_FOLLOWED_BY_VAR_OR_VARARG = 403, /* "'&'"  */
+    T_AMPERSAND_NOT_FOLLOWED_BY_VAR_OR_VARARG = 404, /* "amp"  */
+    T_BAD_CHARACTER = 405,         /* "invalid character"  */
+    T_ERROR = 406                  /* T_ERROR  */
   };
+  typedef enum zendtokentype zendtoken_kind_t;
 #endif
 
 /* Value type.  */
@@ -221,6 +228,8 @@
 
 
 
+
 ZEND_API int zendparse (void);
 
+
 #endif /* !YY_ZEND_ZEND_ZEND_LANGUAGE_PARSER_H_INCLUDED  */

php-8.3.7.tar.xz/Zend/zend_language_parser.output -> php-8.3.21.tar.xz/Zend/zend_language_parser.output Changed

@@ -1,13 +1,13 @@
 Terminals unused in grammar
 
-   "comment"
-   "doc comment"
-   "open tag"
-   "'<?='"
-   "'?>'"
-   "whitespace"
-   "invalid character"
-   T_ERROR
+    "comment"
+    "doc comment"
+    "open tag"
+    "'<?='"
+    "'?>'"
+    "whitespace"
+    "invalid character"
+    T_ERROR
 
 
 Grammar
@@ -103,7 +103,7 @@
    83           | semi_reserved
 
    84 top_statement_list: top_statement_list top_statement
-   85                   | %empty
+   85                   | ε
 
    86 namespace_declaration_name: identifier
    87                           | "namespaced name"
@@ -142,11 +142,11 @@
   111              | "'__halt_compiler'" '(' ')' ';'
   112              | "'namespace'" namespace_declaration_name ';'
 
-  113 $@1: %empty
+  113 $@1: ε
 
   114 top_statement: "'namespace'" namespace_declaration_name $@1 '{' top_statement_list '}'
 
-  115 $@2: %empty
+  115 $@2: ε
 
   116 top_statement: "'namespace'" $@2 '{' top_statement_list '}'
   117              | "'use'" mixed_group_use_declaration ';'
@@ -162,7 +162,7 @@
 
   125 mixed_group_use_declaration: legacy_namespace_name "'\\'" '{' inline_use_declarations possible_comma '}'
 
-  126 possible_comma: %empty
+  126 possible_comma: ε
   127               | ','
 
   128 inline_use_declarations: inline_use_declarations ',' inline_use_declaration
@@ -187,7 +187,7 @@
   141           | const_decl
 
   142 inner_statement_list: inner_statement_list inner_statement
-  143                     | %empty
+  143                     | ε
 
   144 inner_statement: statement
   145                | attributed_statement
@@ -213,7 +213,7 @@
   164          | "'foreach'" '(' expr "'as'" foreach_variable ')' foreach_statement
   165          | "'foreach'" '(' expr "'as'" foreach_variable "'=>'" foreach_variable ')' foreach_statement
 
-  166 $@3: %empty
+  166 $@3: ε
 
   167 statement: "'declare'" '(' const_list ')' $@3 declare_statement
   168          | ';'
@@ -221,16 +221,16 @@
   170          | "'goto'" "identifier" ';'
   171          | "identifier" ':'
 
-  172 catch_list: %empty
+  172 catch_list: ε
   173           | catch_list "'catch'" '(' catch_name_list optional_variable ')' '{' inner_statement_list '}'
 
   174 catch_name_list: class_name
   175                | catch_name_list '|' class_name
 
-  176 optional_variable: %empty
+  176 optional_variable: ε
   177                  | "variable"
 
-  178 finally_statement: %empty
+  178 finally_statement: ε
   179                  | "'finally'" '{' inner_statement_list '}'
 
   180 unset_variables: unset_variable
@@ -243,17 +243,17 @@
 
   185 function_declaration_statement: function returns_ref function_name backup_doc_comment '(' parameter_list ')' return_type backup_fn_flags '{' inner_statement_list '}' backup_fn_flags
 
-  186 is_reference: %empty
+  186 is_reference: ε
   187             | "'&'"
 
-  188 is_variadic: %empty
+  188 is_variadic: ε
   189            | "'...'"
 
-  190 @4: %empty
+  190 @4: ε
 
   191 class_declaration_statement: class_modifiers "'class'" @4 "identifier" extends_from implements_list backup_doc_comment '{' class_statement_list '}'
 
-  192 @5: %empty
+  192 @5: ε
 
   193 class_declaration_statement: "'class'" @5 "identifier" extends_from implements_list backup_doc_comment '{' class_statement_list '}'
 
@@ -263,40 +263,40 @@
   196 anonymous_class_modifiers: class_modifier
   197                          | anonymous_class_modifiers class_modifier
 
-  198 anonymous_class_modifiers_optional: %empty
+  198 anonymous_class_modifiers_optional: ε
   199                                   | anonymous_class_modifiers
 
   200 class_modifier: "'abstract'"
   201               | "'final'"
   202               | "'readonly'"
 
-  203 @6: %empty
+  203 @6: ε
 
   204 trait_declaration_statement: "'trait'" @6 "identifier" backup_doc_comment '{' class_statement_list '}'
 
-  205 @7: %empty
+  205 @7: ε
 
   206 interface_declaration_statement: "'interface'" @7 "identifier" interface_extends_list backup_doc_comment '{' class_statement_list '}'
 
-  207 @8: %empty
+  207 @8: ε
 
   208 enum_declaration_statement: "'enum'" @8 "identifier" enum_backing_type implements_list backup_doc_comment '{' class_statement_list '}'
 
-  209 enum_backing_type: %empty
+  209 enum_backing_type: ε
   210                  | ':' type_expr
 
   211 enum_case: "'case'" backup_doc_comment identifier enum_case_expr ';'
 
-  212 enum_case_expr: %empty
+  212 enum_case_expr: ε
   213               | '=' expr
 
-  214 extends_from: %empty
+  214 extends_from: ε
   215             | "'extends'" class_name
 
-  216 interface_extends_list: %empty
+  216 interface_extends_list: ε
   217                       | "'extends'" class_name_list
 
-  218 implements_list: %empty
+  218 implements_list: ε
   219                | "'implements'" class_name_list
 
   220 foreach_variable: variable
@@ -318,7 +318,7 @@
   232                 | ':' case_list "'endswitch'" ';'
   233                 | ':' ';' case_list "'endswitch'" ';'
 
-  234 case_list: %empty
+  234 case_list: ε
   235          | case_list "'case'" expr case_separator inner_statement_list
   236          | case_list "'default'" case_separator inner_statement_list
 
@@ -327,7 +327,7 @@
 
   239 match: "'match'" '(' expr ')' '{' match_arm_list '}'
 
-  240 match_arm_list: %empty
+  240 match_arm_list: ε
   241               | non_empty_match_arm_list possible_comma
 
   242 non_empty_match_arm_list: match_arm
@@ -355,7 +355,7 @@
   257            | alt_if_stmt_without_else "'else'" ':' inner_statement_list "'endif'" ';'
 
   258 parameter_list: non_empty_parameter_list possible_comma
-  259               | %empty
+  259               | ε
 
   260 non_empty_parameter_list: attributed_parameter
   261                         | non_empty_parameter_list ',' attributed_parameter
@@ -363,13 +363,13 @@
   262 attributed_parameter: attributes parameter
   263                     | parameter
 
-  264 optional_cpp_modifiers: %empty
+  264 optional_cpp_modifiers: ε
   265                       | non_empty_member_modifiers
 
   266 parameter: optional_cpp_modifiers optional_type_without_static is_reference is_variadic "variable" backup_doc_comment
   267          | optional_cpp_modifiers optional_type_without_static is_reference is_variadic "variable" backup_doc_comment '=' expr
 
-  268 optional_type_without_static: %empty
+  268 optional_type_without_static: ε
   269                             | type_expr_without_static
 
   270 type_expr: type
@@ -407,7 +407,7 @@
   293 intersection_type_without_static: type_without_static "amp" type_without_static
   294                                 | intersection_type_without_static "amp" type_without_static
 
-  295 return_type: %empty
+  295 return_type: ε
   296            | ':' type_expr
 
   297 argument_list: '(' ')'
@@ -433,7 +433,7 @@
   311           | "variable" '=' expr
 
   312 class_statement_list: class_statement_list class_statement
-  313                     | %empty
+  313                     | ε
 
   314 attributed_class_statement: property_modifiers optional_type_without_static property_list ';'
   315                           | class_const_modifiers "'const'" class_const_list ';'
@@ -476,10 +476,10 @@
   341 property_modifiers: non_empty_member_modifiers
   342                   | "'var'"
 
-  343 method_modifiers: %empty
+  343 method_modifiers: ε
   344                 | non_empty_member_modifiers
 
-  345 class_const_modifiers: %empty
+  345 class_const_modifiers: ε
   346                      | non_empty_member_modifiers
 
   347 non_empty_member_modifiers: member_modifier
@@ -512,13 +512,13 @@
 
   367 echo_expr: expr
 
-  368 for_exprs: %empty
+  368 for_exprs: ε
   369          | non_empty_for_exprs
 
   370 non_empty_for_exprs: non_empty_for_exprs ',' expr
   371                    | expr
 
-  372 @9: %empty
+  372 @9: ε
 
   373 anonymous_class: anonymous_class_modifiers_optional "'class'" @9 ctor_arguments extends_from implements_list backup_doc_comment '{' class_statement_list '}'
 
@@ -617,16 +617,16 @@
 
   463 function: "'function'"
 
-  464 backup_doc_comment: %empty
+  464 backup_doc_comment: ε
 
-  465 backup_fn_flags: %empty
+  465 backup_fn_flags: ε
 
-  466 backup_lex_pos: %empty
+  466 backup_lex_pos: ε
 
-  467 returns_ref: %empty
+  467 returns_ref: ε
   468            | ampersand
 
-  469 lexical_vars: %empty
+  469 lexical_vars: ε
   470             | "'use'" '(' lexical_var_list possible_comma ')'
 
   471 lexical_var_list: lexical_var_list ',' lexical_var
@@ -640,7 +640,7 @@
   477              | class_name "'::'" member_name argument_list
   478              | variable_class_name "'::'" member_name argument_list
 
-  479 @10: %empty
+  479 @10: ε
 
   480 function_call: callable_expr @10 argument_list
 
@@ -651,14 +651,14 @@
   484                     | new_variable
   485                     | '(' expr ')'
 
-  486 exit_expr: %empty
+  486 exit_expr: ε
   487          | '(' optional_expr ')'
 
-  488 backticks_expr: %empty
+  488 backticks_expr: ε
   489               | "string content"
   490               | encaps_list
 
-  491 ctor_arguments: %empty
+  491 ctor_arguments: ε
   492               | argument_list
 
   493 dereferenceable_scalar: "'array'" '(' array_pair_list ')'
@@ -690,7 +690,7 @@
   516               | class_name "'::'" '{' expr '}'
   517               | variable_class_name "'::'" '{' expr '}'
 
-  518 optional_expr: %empty
+  518 optional_expr: ε
   519              | expr
 
   520 variable_class_name: fully_dereferenceable
@@ -744,7 +744,7 @@
 
   558 array_pair_list: non_empty_array_pair_list
 
-  559 possible_array_pair: %empty
+  559 possible_array_pair: ε
   560                    | array_pair
 
   561 non_empty_array_pair_list: non_empty_array_pair_list ',' possible_array_pair
@@ -793,588 +793,723 @@
 
 Terminals, with rules where they appear
 
-"end of file" (0) 0
-'!' (33) 420
-'"' (34) 496
-'$' (36) 541 542
-'%' (37) 415
-'(' (40) 111 147 151 152 153 154 163 164 165 167 173 185 222 239 250
-    251 254 255 277 290 297 298 299 317 378 432 460 461 470 485 487
-    493 522 528 568 569 586 587 590
-')' (41) 111 147 151 152 153 154 163 164 165 167 173 185 222 239 250
-    251 254 255 277 290 297 298 299 317 378 432 460 461 470 485 487
-    493 522 528 568 569 586 587 590
-'*' (42) 412
-'+' (43) 410 418
-',' (44) 99 127 128 130 132 140 181 243 247 261 301 305 308 323 356
-    360 365 370 471 561 594
-'-' (45) 411 419 584
-'.' (46) 409
-'/' (47) 414
-':' (58) 171 210 225 227 229 232 233 237 249 254 255 257 296 303 434
-    435
-';' (59) 111 112 117 118 119 120 121 147 152 153 155 156 157 158 159
-    160 162 163 168 170 211 225 227 229 231 232 233 238 249 256 257
-    314 315 316 324 329 330 339
-'<' (60) 426
-'=' (61) 213 267 311 359 362 363 364 378 379 380 381
-'>' (62) 428
-'?' (63) 271 283 434 435
-'@' (64) 446
-'' (91) 223 379 494 531 546 575 580
-'' (93) 100 223 379 494 531 546 575 580
-'^' (94) 408
-'`' (96) 448
-'{' (123) 114 116 124 125 148 169 173 179 185 191 193 204 206 208 230
-    231 239 325 326 340 373 460 516 517 532 541 547 553 556
-'|' (124) 175 278 279 291 292 405
-'}' (125) 114 116 124 125 148 169 173 179 185 191 193 204 206 208 230
-    231 239 325 326 340 373 460 516 517 532 541 547 553 556 578 579
-    580 581
-'~' (126) 421
-error (256)
-"'throw'" (258) 32 454
-PREC_ARROW_FUNCTION (259)
-"'include'" (260) 2 588
-"'include_once'" (261) 3 589
-"'require'" (262) 5 591
-"'require_once'" (263) 6 592
-"'or'" (264) 7 402
-"'xor'" (265) 8 404
-"'and'" (266) 9 403
-"'print'" (267) 45 449
-"'yield'" (268) 46 450 451 452
-"'=>'" (269) 165 244 245 452 461 563 565 568
-"'yield from'" (270) 453
-"'+='" (271) 383
-"'-='" (272) 384
-"'*='" (273) 385
-"'/='" (274) 387
-"'.='" (275) 388
-"'%='" (276) 389
-"'&='" (277) 390
-"'|='" (278) 391
-"'^='" (279) 392
-"'<<='" (280) 393
-"'>>='" (281) 394
-"'**='" (282) 386
-"'??='" (283) 395
-"'??'" (284) 436
-"'||'" (285) 400
-"'&&'" (286) 401
-"amp" (287) 81 280 281 293 294 406
-"'&'" (288) 80 187 407
-"'=='" (289) 424
-"'!='" (290) 425
-"'==='" (291) 422
-"'!=='" (292) 423
-"'<=>'" (293) 430
-"'<='" (294) 427
-"'>='" (295) 429
-"'<<'" (296) 416
-"'>>'" (297) 417
-"'instanceof'" (298) 10 431
-"'(int)'" (299) 438
-"'(double)'" (300) 439
-"'(string)'" (301) 440
-"'(array)'" (302) 441
-"'(object)'" (303) 442
-"'(bool)'" (304) 443
-"'(unset)'" (305) 444
-"'**'" (306) 413
-"'clone'" (307) 12 382
-T_NOELSE (308)
-"'elseif'" (309) 15 251 255
-"'else'" (310) 16 253 257
-"integer" (311) 497
-"floating-point number" (312) 498
-"identifier" (313) 82 88 92 137 139 170 171 183 191 193 204 206 208
-    332 362 364 555 576 577 582
-"fully qualified name" (314) 91 94
-"namespace-relative name" (315) 95
-"namespaced name" (316) 87 89 93
-"variable" (317) 177 266 267 310 311 358 359 473 474 540 574 575 576
-    577 585
-T_INLINE_HTML (318) 161
-"string content" (319) 489 499 571 573
-"quoted string" (320) 495
-"variable name" (321) 579 580
-"number" (322) 583 584
-"'eval'" (323) 4 590
-"'new'" (324) 11 374 375 376
-"'exit'" (325) 13 445
-"'if'" (326) 14 250 254
-"'endif'" (327) 17 256 257
-"'echo'" (328) 18 160
-"'do'" (329) 19 152
-"'while'" (330) 20 151 152
-"'endwhile'" (331) 21 249
-"'for'" (332) 22 153
-"'endfor'" (333) 23 225
-"'foreach'" (334) 24 164 165
-"'endforeach'" (335) 25 227
-"'declare'" (336) 26 167
-"'enddeclare'" (337) 27 229
-"'as'" (338) 28 137 139 164 165 332 333 334 335
-"'switch'" (339) 48 154
-"'endswitch'" (340) 49 232 233
-"'case'" (341) 50 211 235
-"'default'" (342) 51 236 245
-"'match'" (343) 70 239
-"'break'" (344) 52 155
-"'continue'" (345) 40 156
-"'goto'" (346) 41 170
-"'function'" (347) 42 122 463
-"'fn'" (348) 69 462
-"'const'" (349) 43 121 123 315 316
-"'return'" (350) 44 157
-"'try'" (351) 29 169
-"'catch'" (352) 30 173
-"'finally'" (353) 31 179
-"'use'" (354) 33 117 118 119 120 321 470
-"'insteadof'" (355) 34 331
-"'global'" (356) 35 158
-"'static'" (357) 73 159 275 352 457 458 481
-"'abstract'" (358) 74 200 353
-"'final'" (359) 75 201 354
-"'private'" (360) 76 351
-"'protected'" (361) 77 350
-"'public'" (362) 78 349
-"'readonly'" (363) 79 184 202 355 476
-"'var'" (364) 36 342
-"'unset'" (365) 37 163
-"'isset'" (366) 38 586
-"'empty'" (367) 39 587
-"'__halt_compiler'" (368) 111 147
-"'class'" (369) 60 191 193 373
-"'trait'" (370) 58 204
-"'interface'" (371) 59 206
-"'enum'" (372) 71 208
-"'extends'" (373) 55 215 217
-"'implements'" (374) 56 219
-"'namespace'" (375) 57 112 114 116
-"'list'" (376) 47 222 378 568 569
-"'array'" (377) 53 286 493
-"'callable'" (378) 54 287
-"'__LINE__'" (379) 65 506
-"'__FILE__'" (380) 66 507
-"'__DIR__'" (381) 67 508
-"'__CLASS__'" (382) 61 513
-"'__TRAIT__'" (383) 62 509
-"'__METHOD__'" (384) 64 510
-"'__FUNCTION__'" (385) 63 511
-"'__NAMESPACE__'" (386) 68 512
-"'#'" (387) 100
-"'++'" (388) 396 397
-"'--'" (389) 398 399
-"'->'" (390) 533 538 548 576
-"'?->'" (391) 534 539 549 577
-"comment" (392)
-"doc comment" (393)
-"open tag" (394)
-"'<?='" (395)
-"'?>'" (396)
-"whitespace" (397)
-"heredoc start" (398) 499 500 501
-"heredoc end" (399) 499 500 501
-"'${'" (400) 578 579 580
-"'{$'" (401) 581
-"'::'" (402) 338 477 478 514 515 516 517 543 544 550 551
-"'\\'" (403) 124 125
-"'...'" (404) 189 299 304 567
-"invalid character" (405)
-T_ERROR (406)
+    "end of file" (0) 0
+    '!' (33) 420
+    '"' (34) 496
+    '$' (36) 541 542
+    '%' (37) 415
+    '(' (40) 111 147 151 152 153 154 163 164 165 167 173 185 222 239 250 251 254 255 277 290 297 298 299 317 378 432 460 461 470 485 487 493 522 528 568 569 586 587 590
+    ')' (41) 111 147 151 152 153 154 163 164 165 167 173 185 222 239 250 251 254 255 277 290 297 298 299 317 378 432 460 461 470 485 487 493 522 528 568 569 586 587 590
+    '*' (42) 412
+    '+' (43) 410 418
+    ',' (44) 99 127 128 130 132 140 181 243 247 261 301 305 308 323 356 360 365 370 471 561 594
+    '-' (45) 411 419 584
+    '.' (46) 409
+    '/' (47) 414
+    ':' (58) 171 210 225 227 229 232 233 237 249 254 255 257 296 303 434 435
+    ';' (59) 111 112 117 118 119 120 121 147 152 153 155 156 157 158 159 160 162 163 168 170 211 225 227 229 231 232 233 238 249 256 257 314 315 316 324 329 330 339
+    '<' (60) 426
+    '=' (61) 213 267 311 359 362 363 364 378 379 380 381
+    '>' (62) 428
+    '?' (63) 271 283 434 435
+    '@' (64) 446
+    '' (91) 223 379 494 531 546 575 580
+    '' (93) 100 223 379 494 531 546 575 580
+    '^' (94) 408
+    '`' (96) 448
+    '{' (123) 114 116 124 125 148 169 173 179 185 191 193 204 206 208 230 231 239 325 326 340 373 460 516 517 532 541 547 553 556
+    '|' (124) 175 278 279 291 292 405
+    '}' (125) 114 116 124 125 148 169 173 179 185 191 193 204 206 208 230 231 239 325 326 340 373 460 516 517 532 541 547 553 556 578 579 580 581
+    '~' (126) 421
+    error (256)
+    PREC_ARROW_FUNCTION (258)
+    T_NOELSE (259)
+    "integer" <ast> (260) 497
+    "floating-point number" <ast> (261) 498
+    "identifier" <ast> (262) 82 88 92 137 139 170 171 183 191 193 204 206 208 332 362 364 555 576 577 582
+    "fully qualified name" <ast> (263) 91 94
+    "namespace-relative name" <ast> (264) 95
+    "namespaced name" <ast> (265) 87 89 93
+    "variable" <ast> (266) 177 266 267 310 311 358 359 473 474 540 574 575 576 577 585
+    T_INLINE_HTML <ast> (267) 161
+    "string content" <ast> (268) 489 499 571 573
+    "quoted string" <ast> (269) 495
+    "variable name" <ast> (270) 579 580
+    "number" <ast> (271) 583 584
+    "'include'" <ident> (272) 2 588
+    "'include_once'" <ident> (273) 3 589
+    "'eval'" <ident> (274) 4 590
+    "'require'" <ident> (275) 5 591
+    "'require_once'" <ident> (276) 6 592
+    "'or'" <ident> (277) 7 402
+    "'xor'" <ident> (278) 8 404
+    "'and'" <ident> (279) 9 403
+    "'print'" <ident> (280) 45 449
+    "'yield'" <ident> (281) 46 450 451 452
+    "'yield from'" <ident> (282) 453
+    "'instanceof'" <ident> (283) 10 431
+    "'new'" <ident> (284) 11 374 375 376
+    "'clone'" <ident> (285) 12 382
+    "'exit'" <ident> (286) 13 445
+    "'if'" <ident> (287) 14 250 254
+    "'elseif'" <ident> (288) 15 251 255
+    "'else'" <ident> (289) 16 253 257
+    "'endif'" <ident> (290) 17 256 257
+    "'echo'" <ident> (291) 18 160
+    "'do'" <ident> (292) 19 152
+    "'while'" <ident> (293) 20 151 152
+    "'endwhile'" <ident> (294) 21 249
+    "'for'" <ident> (295) 22 153
+    "'endfor'" <ident> (296) 23 225
+    "'foreach'" <ident> (297) 24 164 165
+    "'endforeach'" <ident> (298) 25 227
+    "'declare'" <ident> (299) 26 167
+    "'enddeclare'" <ident> (300) 27 229
+    "'as'" <ident> (301) 28 137 139 164 165 332 333 334 335
+    "'switch'" <ident> (302) 48 154
+    "'endswitch'" <ident> (303) 49 232 233
+    "'case'" <ident> (304) 50 211 235
+    "'default'" <ident> (305) 51 236 245
+    "'match'" <ident> (306) 70 239
+    "'break'" <ident> (307) 52 155
+    "'continue'" <ident> (308) 40 156
+    "'goto'" <ident> (309) 41 170
+    "'function'" <ident> (310) 42 122 463
+    "'fn'" <ident> (311) 69 462
+    "'const'" <ident> (312) 43 121 123 315 316
+    "'return'" <ident> (313) 44 157
+    "'try'" <ident> (314) 29 169
+    "'catch'" <ident> (315) 30 173
+    "'finally'" <ident> (316) 31 179
+    "'throw'" <ident> (317) 32 454
+    "'use'" <ident> (318) 33 117 118 119 120 321 470
+    "'insteadof'" <ident> (319) 34 331
+    "'global'" <ident> (320) 35 158
+    "'static'" <ident> (321) 73 159 275 352 457 458 481
+    "'abstract'" <ident> (322) 74 200 353
+    "'final'" <ident> (323) 75 201 354
+    "'private'" <ident> (324) 76 351
+    "'protected'" <ident> (325) 77 350
+    "'public'" <ident> (326) 78 349
+    "'readonly'" <ident> (327) 79 184 202 355 476
+    "'var'" <ident> (328) 36 342
+    "'unset'" <ident> (329) 37 163
+    "'isset'" <ident> (330) 38 586
+    "'empty'" <ident> (331) 39 587
+    "'__halt_compiler'" <ident> (332) 111 147
+    "'class'" <ident> (333) 60 191 193 373
+    "'trait'" <ident> (334) 58 204
+    "'interface'" <ident> (335) 59 206
+    "'enum'" <ident> (336) 71 208
+    "'extends'" <ident> (337) 55 215 217
+    "'implements'" <ident> (338) 56 219
+    "'namespace'" <ident> (339) 57 112 114 116
+    "'list'" <ident> (340) 47 222 378 568 569
+    "'array'" <ident> (341) 53 286 493
+    "'callable'" <ident> (342) 54 287
+    "'__LINE__'" <ident> (343) 65 506
+    "'__FILE__'" <ident> (344) 66 507
+    "'__DIR__'" <ident> (345) 67 508
+    "'__CLASS__'" <ident> (346) 61 513
+    "'__TRAIT__'" <ident> (347) 62 509
+    "'__METHOD__'" <ident> (348) 64 510
+    "'__FUNCTION__'" <ident> (349) 63 511
+    "'__NAMESPACE__'" <ident> (350) 68 512
+    "'#'" (351) 100
+    "'+='" (352) 383
+    "'-='" (353) 384
+    "'*='" (354) 385
+    "'/='" (355) 387
+    "'.='" (356) 388
+    "'%='" (357) 389
+    "'&='" (358) 390
+    "'|='" (359) 391
+    "'^='" (360) 392
+    "'<<='" (361) 393
+    "'>>='" (362) 394
+    "'??='" (363) 395
+    "'||'" (364) 400
+    "'&&'" (365) 401
+    "'=='" (366) 424
+    "'!='" (367) 425
+    "'==='" (368) 422
+    "'!=='" (369) 423
+    "'<='" (370) 427
+    "'>='" (371) 429
+    "'<=>'" (372) 430
+    "'<<'" (373) 416
+    "'>>'" (374) 417
+    "'++'" (375) 396 397
+    "'--'" (376) 398 399
+    "'(int)'" (377) 438
+    "'(double)'" (378) 439
+    "'(string)'" (379) 440
+    "'(array)'" (380) 441
+    "'(object)'" (381) 442
+    "'(bool)'" (382) 443
+    "'(unset)'" (383) 444
+    "'->'" (384) 533 538 548 576
+    "'?->'" (385) 534 539 549 577
+    "'=>'" (386) 165 244 245 452 461 563 565 568
+    "comment" (387)
+    "doc comment" (388)
+    "open tag" (389)
+    "'<?='" (390)
+    "'?>'" (391)
+    "whitespace" (392)
+    "heredoc start" (393) 499 500 501
+    "heredoc end" (394) 499 500 501
+    "'${'" (395) 578 579 580
+    "'{$'" (396) 581
+    "'::'" (397) 338 477 478 514 515 516 517 543 544 550 551
+    "'\\'" (398) 124 125
+    "'...'" (399) 189 299 304 567
+    "'??'" (400) 436
+    "'**'" (401) 413
+    "'**='" (402) 386
+    "'&'" (403) 80 187 407
+    "amp" (404) 81 280 281 293 294 406
+    "invalid character" (405)
+    T_ERROR (406)
 
 
 Nonterminals, with rules where they appear
 
-$accept (179)
-    on left: 0
-start (180)
-    on left: 1, on right: 0
-reserved_non_modifiers (181)
-    on left: 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22
-    23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43
-    44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64
-    65 66 67 68 69 70 71, on right: 72 333
-semi_reserved (182)
-    on left: 72 73 74 75 76 77 78 79, on right: 83 363
-ampersand (183)
-    on left: 80 81, on right: 221 381 468 474 565 566
-identifier (184)
-    on left: 82 83, on right: 86 211 303 317 334 336 338 514 515 552
-top_statement_list (185)
-    on left: 84 85, on right: 1 84 114 116
-namespace_declaration_name (186)
-    on left: 86 87, on right: 112 114
-namespace_name (187)
-    on left: 88 89, on right: 90 136 137
-legacy_namespace_name (188)
-    on left: 90 91, on right: 124 125 138 139
-name (189)
-    on left: 92 93 94 95, on right: 288 475 482 505
-attribute_decl (190)
-    on left: 96 97, on right: 98 99
-attribute_group (191)
-    on left: 98 99, on right: 99 100
-attribute (192)
-    on left: 100, on right: 101 102
-attributes (193)
-    on left: 101 102, on right: 102 110 146 262 320 376 456 458
-attributed_statement (194)
-    on left: 103 104 105 106 107, on right: 109 110 145 146
-top_statement (195)
-    on left: 108 109 110 111 112 114 116 117 118 119 120 121, on right:
-    84
-$@1 (196)
-    on left: 113, on right: 114
-$@2 (197)
-    on left: 115, on right: 116
-use_type (198)
-    on left: 122 123, on right: 118 120 135
-group_use_declaration (199)
-    on left: 124, on right: 118
-mixed_group_use_declaration (200)
-    on left: 125, on right: 117
-possible_comma (201)
-    on left: 126 127, on right: 100 124 125 163 241 244 245 258 298
-    470 586
-inline_use_declarations (202)
-    on left: 128 129, on right: 125 128
-unprefixed_use_declarations (203)
-    on left: 130 131, on right: 124 130
-use_declarations (204)
-    on left: 132 133, on right: 119 120 132
-inline_use_declaration (205)
-    on left: 134 135, on right: 128 129
-unprefixed_use_declaration (206)
-    on left: 136 137, on right: 130 131 134 135
-use_declaration (207)
-    on left: 138 139, on right: 132 133
-const_list (208)
-    on left: 140 141, on right: 121 140 167
-inner_statement_list (209)
-    on left: 142 143, on right: 142 148 169 173 179 185 225 227 229
-    235 236 249 254 255 257 340 460
-inner_statement (210)
-    on left: 144 145 146 147, on right: 142
-statement (211)
-    on left: 148 149 150 151 152 153 154 155 156 157 158 159 160 161
-    162 163 164 165 167 168 169 170 171, on right: 108 144 152 224
-    226 228 248 250 251 253
-$@3 (212)
-    on left: 166, on right: 167
-catch_list (213)
-    on left: 172 173, on right: 169 173
-catch_name_list (214)
-    on left: 174 175, on right: 173 175
-optional_variable (215)
-    on left: 176 177, on right: 173
-finally_statement (216)
-    on left: 178 179, on right: 169
-unset_variables (217)
-    on left: 180 181, on right: 163 181
-unset_variable (218)
-    on left: 182, on right: 180 181
-function_name (219)
-    on left: 183 184, on right: 185
-function_declaration_statement (220)
-    on left: 185, on right: 103
-is_reference (221)
-    on left: 186 187, on right: 266 267
-is_variadic (222)
-    on left: 188 189, on right: 266 267
-class_declaration_statement (223)
-    on left: 191 193, on right: 104
-@4 (224)
-    on left: 190, on right: 191
-@5 (225)
-    on left: 192, on right: 193
-class_modifiers (226)
-    on left: 194 195, on right: 191 195
-anonymous_class_modifiers (227)
-    on left: 196 197, on right: 197 199
-anonymous_class_modifiers_optional (228)
-    on left: 198 199, on right: 373
-class_modifier (229)
-    on left: 200 201 202, on right: 194 195 196 197
-trait_declaration_statement (230)
-    on left: 204, on right: 105
-@6 (231)
-    on left: 203, on right: 204
-interface_declaration_statement (232)
-    on left: 206, on right: 106
-@7 (233)
-    on left: 205, on right: 206
-enum_declaration_statement (234)
-    on left: 208, on right: 107
-@8 (235)
-    on left: 207, on right: 208
-enum_backing_type (236)
-    on left: 209 210, on right: 208
-enum_case (237)
-    on left: 211, on right: 318
-enum_case_expr (238)
-    on left: 212 213, on right: 211
-extends_from (239)
-    on left: 214 215, on right: 191 193 373
-interface_extends_list (240)
-    on left: 216 217, on right: 206
-implements_list (241)
-    on left: 218 219, on right: 191 193 208 373
-foreach_variable (242)
-    on left: 220 221 222 223, on right: 164 165
-for_statement (243)
-    on left: 224 225, on right: 153
-foreach_statement (244)
-    on left: 226 227, on right: 164 165
-declare_statement (245)
-    on left: 228 229, on right: 167
-switch_case_list (246)
-    on left: 230 231 232 233, on right: 154
-case_list (247)
-    on left: 234 235 236, on right: 230 231 232 233 235 236
-case_separator (248)
-    on left: 237 238, on right: 235 236
-match (249)
-    on left: 239, on right: 459
-match_arm_list (250)
-    on left: 240 241, on right: 239
-non_empty_match_arm_list (251)
-    on left: 242 243, on right: 241 243
-match_arm (252)
-    on left: 244 245, on right: 242 243
-match_arm_cond_list (253)
-    on left: 246 247, on right: 244 247
-while_statement (254)
-    on left: 248 249, on right: 151
-if_stmt_without_else (255)
-    on left: 250 251, on right: 251 252 253
-if_stmt (256)
-    on left: 252 253, on right: 149
-alt_if_stmt_without_else (257)
-    on left: 254 255, on right: 255 256 257
-alt_if_stmt (258)
-    on left: 256 257, on right: 150
-parameter_list (259)
-    on left: 258 259, on right: 185 317 460 461
-non_empty_parameter_list (260)
-    on left: 260 261, on right: 258 261
-attributed_parameter (261)
-    on left: 262 263, on right: 260 261
-optional_cpp_modifiers (262)
-    on left: 264 265, on right: 266 267
-parameter (263)
-    on left: 266 267, on right: 262 263
-optional_type_without_static (264)
-    on left: 268 269, on right: 266 267 314
-type_expr (265)
-    on left: 270 271 272 273, on right: 210 296 316
-type (266)
-    on left: 274 275, on right: 270 271 276 280 281
-union_type_element (267)
-    on left: 276 277, on right: 278 279
-union_type (268)
-    on left: 278 279, on right: 272 279
-intersection_type (269)
-    on left: 280 281, on right: 273 277 281
-type_expr_without_static (270)
-    on left: 282 283 284 285, on right: 269
-type_without_static (271)
-    on left: 286 287 288, on right: 274 282 283 289 293 294
-union_type_without_static_element (272)
-    on left: 289 290, on right: 291 292
-union_type_without_static (273)
-    on left: 291 292, on right: 284 292
-intersection_type_without_static (274)
-    on left: 293 294, on right: 285 290 294
-return_type (275)
-    on left: 295 296, on right: 185 317 460 461
-argument_list (276)
-    on left: 297 298 299, on right: 97 475 476 477 478 480 492 533
-    534
-non_empty_argument_list (277)
-    on left: 300 301, on right: 298 301
-argument (278)
-    on left: 302 303 304, on right: 300 301
-global_var_list (279)
-    on left: 305 306, on right: 158 305
-global_var (280)
-    on left: 307, on right: 305 306
-static_var_list (281)
-    on left: 308 309, on right: 159 308
-static_var (282)
-    on left: 310 311, on right: 308 309
-class_statement_list (283)
-    on left: 312 313, on right: 191 193 204 206 208 312 373
-attributed_class_statement (284)
-    on left: 314 315 316 317 318, on right: 319 320
-class_statement (285)
-    on left: 319 320 321, on right: 312
-class_name_list (286)
-    on left: 322 323, on right: 217 219 321 323 331
-trait_adaptations (287)
-    on left: 324 325 326, on right: 321
-trait_adaptation_list (288)
-    on left: 327 328, on right: 326 328
-trait_adaptation (289)
-    on left: 329 330, on right: 327 328
-trait_precedence (290)
-    on left: 331, on right: 329
-trait_alias (291)
-    on left: 332 333 334 335, on right: 330
-trait_method_reference (292)
-    on left: 336 337, on right: 332 333 334 335
-absolute_trait_method_reference (293)
-    on left: 338, on right: 331 337
-method_body (294)
-    on left: 339 340, on right: 317
-property_modifiers (295)
-    on left: 341 342, on right: 314
-method_modifiers (296)
-    on left: 343 344, on right: 317
-class_const_modifiers (297)
-    on left: 345 346, on right: 315 316
-non_empty_member_modifiers (298)
-    on left: 347 348, on right: 265 341 344 346 348
-member_modifier (299)
-    on left: 349 350 351 352 353 354 355, on right: 334 335 347 348
-property_list (300)
-    on left: 356 357, on right: 314 356
-property (301)
-    on left: 358 359, on right: 356 357
-class_const_list (302)
-    on left: 360 361, on right: 315 316 360
-class_const_decl (303)
-    on left: 362 363, on right: 360 361
-const_decl (304)
-    on left: 364, on right: 140 141
-echo_expr_list (305)
-    on left: 365 366, on right: 160 365
-echo_expr (306)
-    on left: 367, on right: 365 366
-for_exprs (307)
-    on left: 368 369, on right: 153
-non_empty_for_exprs (308)
-    on left: 370 371, on right: 369 370
-anonymous_class (309)
-    on left: 373, on right: 375 376
-@9 (310)
-    on left: 372, on right: 373
-new_expr (311)
-    on left: 374 375 376, on right: 433
-expr (312)
-    on left: 377 378 379 380 381 382 383 384 385 386 387 388 389 390
-    391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406
-    407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422
-    423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438
-    439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454
-    455 456 457 458 459, on right: 151 152 154 162 164 165 213 235
-    239 244 245 246 247 250 251 254 255 267 302 303 304 311 359 362
-    363 364 367 370 371 378 379 380 382 383 384 385 386 387 388 389
-    390 391 392 393 394 395 400 401 402 403 404 405 406 407 408 409
-    410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425
-    426 427 428 429 430 431 432 434 435 436 438 439 440 441 442 443
-    444 446 449 451 452 453 454 461 485 516 517 519 522 528 532 541
-    547 553 556 563 564 565 567 568 578 580 587 588 589 590 591 592
-    595
-inline_function (313)
-    on left: 460 461, on right: 455 456 457 458
-fn (314)
-    on left: 462, on right: 461
-function (315)
-    on left: 463, on right: 185 317 460
-backup_doc_comment (316)
-    on left: 464, on right: 185 191 193 204 206 208 211 266 267 317
-    358 359 362 363 364 373 460 461
-backup_fn_flags (317)
-    on left: 465, on right: 185 317 460 461
-backup_lex_pos (318)
-    on left: 466, on right: 461
-returns_ref (319)
-    on left: 467 468, on right: 185 317 460 461
-lexical_vars (320)
-    on left: 469 470, on right: 460
-lexical_var_list (321)
-    on left: 471 472, on right: 470 471
-lexical_var (322)
-    on left: 473 474, on right: 471 472
-function_call (323)
-    on left: 475 476 477 478 480, on right: 535
-@10 (324)
-    on left: 479, on right: 480
-class_name (325)
-    on left: 481 482, on right: 96 97 174 175 215 322 323 338 477 483
-    514 516 543 550
-class_name_reference (326)
-    on left: 483 484 485, on right: 374 431
-exit_expr (327)
-    on left: 486 487, on right: 445
-backticks_expr (328)
-    on left: 488 489 490, on right: 448
-ctor_arguments (329)
-    on left: 491 492, on right: 373 374
-dereferenceable_scalar (330)
-    on left: 493 494 495 496, on right: 502 523 529
-scalar (331)
-    on left: 497 498 499 500 501 502 503 504, on right: 447
-constant (332)
-    on left: 505 506 507 508 509 510 511 512 513, on right: 503 526
-class_constant (333)
-    on left: 514 515 516 517, on right: 504 524
-optional_expr (334)
-    on left: 518 519, on right: 155 156 157 487 531 546
-variable_class_name (335)
-    on left: 520, on right: 478 515 517 544
-fully_dereferenceable (336)
-    on left: 521 522 523 524, on right: 520 525
-array_object_dereferenceable (337)
-    on left: 525 526, on right: 531 532 533 534 538 539
-callable_expr (338)
-    on left: 527 528 529, on right: 480
-callable_variable (339)
-    on left: 530 531 532 533 534 535, on right: 527 536
-variable (340)
-    on left: 536 537 538 539, on right: 182 220 221 377 380 381 383
-    384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399
-    521 565 566 581
-simple_variable (341)
-    on left: 540 541 542, on right: 307 530 542 543 544 545 550 551
-    554 557
-static_member (342)
-    on left: 543 544, on right: 537
-new_variable (343)
-    on left: 545 546 547 548 549 550 551, on right: 484 546 547 548
-    549 551
-member_name (344)
-    on left: 552 553 554, on right: 477 478
-property_name (345)
-    on left: 555 556 557, on right: 533 534 538 539 548 549
-array_pair_list (346)
-    on left: 558, on right: 222 223 378 379 493 494 568 569
-possible_array_pair (347)
-    on left: 559 560, on right: 561 562
-non_empty_array_pair_list (348)
-    on left: 561 562, on right: 558 561
-array_pair (349)
-    on left: 563 564 565 566 567 568 569, on right: 560
-encaps_list (350)
-    on left: 570 571 572 573, on right: 490 496 501 570 571
-encaps_var (351)
-    on left: 574 575 576 577 578 579 580 581, on right: 570 572 573
-encaps_var_offset (352)
-    on left: 582 583 584 585, on right: 575
-internal_functions_in_yacc (353)
-    on left: 586 587 588 589 590 591 592, on right: 437
-isset_variables (354)
-    on left: 593 594, on right: 586 594
-isset_variable (355)
-    on left: 595, on right: 593 594
+    $accept (179)
+        on left: 0
+    start (180)
+        on left: 1
+        on right: 0
+    reserved_non_modifiers <ident> (181)
+        on left: 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71
+        on right: 72 333
+    semi_reserved <ident> (182)
+        on left: 72 73 74 75 76 77 78 79
+        on right: 83 363
+    ampersand (183)
+        on left: 80 81
+        on right: 221 381 468 474 565 566
+    identifier <ast> (184)
+        on left: 82 83
+        on right: 86 211 303 317 334 336 338 514 515 552
+    top_statement_list <ast> (185)
+        on left: 84 85
+        on right: 1 84 114 116
+    namespace_declaration_name <ast> (186)
+        on left: 86 87
+        on right: 112 114
+    namespace_name <ast> (187)
+        on left: 88 89
+        on right: 90 136 137
+    legacy_namespace_name <ast> (188)
+        on left: 90 91
+        on right: 124 125 138 139
+    name <ast> (189)
+        on left: 92 93 94 95
+        on right: 288 475 482 505
+    attribute_decl <ast> (190)
+        on left: 96 97
+        on right: 98 99
+    attribute_group <ast> (191)
+        on left: 98 99
+        on right: 99 100
+    attribute <ast> (192)
+        on left: 100
+        on right: 101 102
+    attributes <ast> (193)
+        on left: 101 102
+        on right: 102 110 146 262 320 376 456 458
+    attributed_statement <ast> (194)
+        on left: 103 104 105 106 107
+        on right: 109 110 145 146
+    top_statement <ast> (195)
+        on left: 108 109 110 111 112 114 116 117 118 119 120 121
+        on right: 84
+    $@1 (196)
+        on left: 113
+        on right: 114
+    $@2 (197)
+        on left: 115
+        on right: 116
+    use_type <num> (198)
+        on left: 122 123
+        on right: 118 120 135
+    group_use_declaration <ast> (199)
+        on left: 124
+        on right: 118
+    mixed_group_use_declaration <ast> (200)
+        on left: 125
+        on right: 117
+    possible_comma (201)
+        on left: 126 127
+        on right: 100 124 125 163 241 244 245 258 298 470 586
+    inline_use_declarations <ast> (202)
+        on left: 128 129
+        on right: 125 128
+    unprefixed_use_declarations <ast> (203)
+        on left: 130 131
+        on right: 124 130
+    use_declarations <ast> (204)
+        on left: 132 133
+        on right: 119 120 132
+    inline_use_declaration <ast> (205)
+        on left: 134 135
+        on right: 128 129
+    unprefixed_use_declaration <ast> (206)
+        on left: 136 137
+        on right: 130 131 134 135
+    use_declaration <ast> (207)
+        on left: 138 139
+        on right: 132 133
+    const_list <ast> (208)
+        on left: 140 141
+        on right: 121 140 167
+    inner_statement_list <ast> (209)
+        on left: 142 143
+        on right: 142 148 169 173 179 185 225 227 229 235 236 249 254 255 257 340 460
+    inner_statement <ast> (210)
+        on left: 144 145 146 147
+        on right: 142
+    statement <ast> (211)
+        on left: 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 167 168 169 170 171
+        on right: 108 144 152 224 226 228 248 250 251 253
+    $@3 (212)
+        on left: 166
+        on right: 167
+    catch_list <ast> (213)
+        on left: 172 173
+        on right: 169 173
+    catch_name_list <ast> (214)
+        on left: 174 175
+        on right: 173 175
+    optional_variable <ast> (215)
+        on left: 176 177
+        on right: 173
+    finally_statement <ast> (216)
+        on left: 178 179
+        on right: 169
+    unset_variables <ast> (217)
+        on left: 180 181
+        on right: 163 181
+    unset_variable <ast> (218)
+        on left: 182
+        on right: 180 181
+    function_name <ast> (219)
+        on left: 183 184
+        on right: 185
+    function_declaration_statement <ast> (220)
+        on left: 185
+        on right: 103
+    is_reference <num> (221)
+        on left: 186 187
+        on right: 266 267
+    is_variadic <num> (222)
+        on left: 188 189
+        on right: 266 267
+    class_declaration_statement <ast> (223)
+        on left: 191 193
+        on right: 104
+    @4 (224)
+        on left: 190
+        on right: 191
+    @5 (225)
+        on left: 192
+        on right: 193
+    class_modifiers <num> (226)
+        on left: 194 195
+        on right: 191 195
+    anonymous_class_modifiers <num> (227)
+        on left: 196 197
+        on right: 197 199
+    anonymous_class_modifiers_optional <num> (228)
+        on left: 198 199
+        on right: 373
+    class_modifier <num> (229)
+        on left: 200 201 202
+        on right: 194 195 196 197
+    trait_declaration_statement <ast> (230)
+        on left: 204
+        on right: 105
+    @6 (231)
+        on left: 203
+        on right: 204
+    interface_declaration_statement <ast> (232)
+        on left: 206
+        on right: 106
+    @7 (233)
+        on left: 205
+        on right: 206
+    enum_declaration_statement <ast> (234)
+        on left: 208
+        on right: 107
+    @8 (235)
+        on left: 207
+        on right: 208
+    enum_backing_type <ast> (236)
+        on left: 209 210
+        on right: 208
+    enum_case <ast> (237)
+        on left: 211
+        on right: 318
+    enum_case_expr <ast> (238)
+        on left: 212 213
+        on right: 211
+    extends_from <ast> (239)
+        on left: 214 215
+        on right: 191 193 373
+    interface_extends_list <ast> (240)
+        on left: 216 217
+        on right: 206
+    implements_list <ast> (241)
+        on left: 218 219
+        on right: 191 193 208 373
+    foreach_variable <ast> (242)
+        on left: 220 221 222 223
+        on right: 164 165
+    for_statement <ast> (243)
+        on left: 224 225
+        on right: 153
+    foreach_statement <ast> (244)
+        on left: 226 227
+        on right: 164 165
+    declare_statement <ast> (245)
+        on left: 228 229
+        on right: 167
+    switch_case_list <ast> (246)
+        on left: 230 231 232 233
+        on right: 154
+    case_list <ast> (247)
+        on left: 234 235 236
+        on right: 230 231 232 233 235 236
+    case_separator (248)
+        on left: 237 238
+        on right: 235 236
+    match <ast> (249)
+        on left: 239
+        on right: 459
+    match_arm_list <ast> (250)
+        on left: 240 241
+        on right: 239
+    non_empty_match_arm_list <ast> (251)
+        on left: 242 243
+        on right: 241 243
+    match_arm <ast> (252)
+        on left: 244 245
+        on right: 242 243
+    match_arm_cond_list <ast> (253)
+        on left: 246 247
+        on right: 244 247
+    while_statement <ast> (254)
+        on left: 248 249
+        on right: 151
+    if_stmt_without_else <ast> (255)
+        on left: 250 251
+        on right: 251 252 253
+    if_stmt <ast> (256)
+        on left: 252 253
+        on right: 149
+    alt_if_stmt_without_else <ast> (257)
+        on left: 254 255
+        on right: 255 256 257
+    alt_if_stmt <ast> (258)
+        on left: 256 257
+        on right: 150
+    parameter_list <ast> (259)
+        on left: 258 259
+        on right: 185 317 460 461
+    non_empty_parameter_list <ast> (260)
+        on left: 260 261
+        on right: 258 261
+    attributed_parameter <ast> (261)
+        on left: 262 263
+        on right: 260 261
+    optional_cpp_modifiers <num> (262)
+        on left: 264 265
+        on right: 266 267
+    parameter <ast> (263)
+        on left: 266 267
+        on right: 262 263
+    optional_type_without_static <ast> (264)
+        on left: 268 269
+        on right: 266 267 314
+    type_expr <ast> (265)
+        on left: 270 271 272 273
+        on right: 210 296 316
+    type <ast> (266)
+        on left: 274 275
+        on right: 270 271 276 280 281
+    union_type_element <ast> (267)
+        on left: 276 277
+        on right: 278 279
+    union_type <ast> (268)
+        on left: 278 279
+        on right: 272 279
+    intersection_type <ast> (269)
+        on left: 280 281
+        on right: 273 277 281
+    type_expr_without_static <ast> (270)
+        on left: 282 283 284 285
+        on right: 269
+    type_without_static <ast> (271)
+        on left: 286 287 288
+        on right: 274 282 283 289 293 294
+    union_type_without_static_element <ast> (272)
+        on left: 289 290
+        on right: 291 292
+    union_type_without_static <ast> (273)
+        on left: 291 292
+        on right: 284 292
+    intersection_type_without_static <ast> (274)
+        on left: 293 294
+        on right: 285 290 294
+    return_type <ast> (275)
+        on left: 295 296
+        on right: 185 317 460 461
+    argument_list <ast> (276)
+        on left: 297 298 299
+        on right: 97 475 476 477 478 480 492 533 534
+    non_empty_argument_list <ast> (277)
+        on left: 300 301
+        on right: 298 301
+    argument <ast> (278)
+        on left: 302 303 304
+        on right: 300 301
+    global_var_list <ast> (279)
+        on left: 305 306
+        on right: 158 305
+    global_var <ast> (280)
+        on left: 307
+        on right: 305 306
+    static_var_list <ast> (281)
+        on left: 308 309
+        on right: 159 308
+    static_var <ast> (282)
+        on left: 310 311
+        on right: 308 309
+    class_statement_list <ast> (283)
+        on left: 312 313
+        on right: 191 193 204 206 208 312 373
+    attributed_class_statement <ast> (284)
+        on left: 314 315 316 317 318
+        on right: 319 320
+    class_statement <ast> (285)
+        on left: 319 320 321
+        on right: 312
+    class_name_list <ast> (286)
+        on left: 322 323
+        on right: 217 219 321 323 331
+    trait_adaptations <ast> (287)
+        on left: 324 325 326
+        on right: 321
+    trait_adaptation_list <ast> (288)
+        on left: 327 328
+        on right: 326 328
+    trait_adaptation <ast> (289)
+        on left: 329 330
+        on right: 327 328
+    trait_precedence <ast> (290)
+        on left: 331
+        on right: 329
+    trait_alias <ast> (291)
+        on left: 332 333 334 335
+        on right: 330
+    trait_method_reference <ast> (292)
+        on left: 336 337
+        on right: 332 333 334 335
+    absolute_trait_method_reference <ast> (293)
+        on left: 338
+        on right: 331 337
+    method_body <ast> (294)
+        on left: 339 340
+        on right: 317
+    property_modifiers <num> (295)
+        on left: 341 342
+        on right: 314
+    method_modifiers <num> (296)
+        on left: 343 344
+        on right: 317
+    class_const_modifiers <num> (297)
+        on left: 345 346
+        on right: 315 316
+    non_empty_member_modifiers <ast> (298)
+        on left: 347 348
+        on right: 265 341 344 346 348
+    member_modifier <num> (299)
+        on left: 349 350 351 352 353 354 355
+        on right: 334 335 347 348
+    property_list <ast> (300)
+        on left: 356 357
+        on right: 314 356
+    property <ast> (301)
+        on left: 358 359
+        on right: 356 357
+    class_const_list <ast> (302)
+        on left: 360 361
+        on right: 315 316 360
+    class_const_decl <ast> (303)
+        on left: 362 363
+        on right: 360 361
+    const_decl <ast> (304)
+        on left: 364
+        on right: 140 141
+    echo_expr_list <ast> (305)
+        on left: 365 366
+        on right: 160 365
+    echo_expr <ast> (306)
+        on left: 367
+        on right: 365 366
+    for_exprs <ast> (307)
+        on left: 368 369
+        on right: 153
+    non_empty_for_exprs <ast> (308)
+        on left: 370 371
+        on right: 369 370
+    anonymous_class <ast> (309)
+        on left: 373
+        on right: 375 376
+    @9 (310)
+        on left: 372
+        on right: 373
+    new_expr <ast> (311)
+        on left: 374 375 376
+        on right: 433
+    expr <ast> (312)
+        on left: 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459
+        on right: 151 152 154 162 164 165 213 235 239 244 245 246 247 250 251 254 255 267 302 303 304 311 359 362 363 364 367 370 371 378 379 380 382 383 384 385 386 387 388 389 390 391 392 393 394 395 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 434 435 436 438 439 440 441 442 443 444 446 449 451 452 453 454 461 485 516 517 519 522 528 532 541 547 553 556 563 564 565 567 568 578 580 587 588 589 590 591 592 595
+    inline_function <ast> (313)
+        on left: 460 461
+        on right: 455 456 457 458
+    fn <num> (314)
+        on left: 462
+        on right: 461
+    function <num> (315)
+        on left: 463
+        on right: 185 317 460
+    backup_doc_comment <str> (316)
+        on left: 464
+        on right: 185 191 193 204 206 208 211 266 267 317 358 359 362 363 364 373 460 461
+    backup_fn_flags <num> (317)
+        on left: 465
+        on right: 185 317 460 461
+    backup_lex_pos <ptr> (318)
+        on left: 466
+        on right: 461
+    returns_ref <num> (319)
+        on left: 467 468
+        on right: 185 317 460 461
+    lexical_vars <ast> (320)
+        on left: 469 470
+        on right: 460
+    lexical_var_list <ast> (321)
+        on left: 471 472
+        on right: 470 471
+    lexical_var <ast> (322)
+        on left: 473 474
+        on right: 471 472
+    function_call <ast> (323)
+        on left: 475 476 477 478 480
+        on right: 535
+    @10 (324)
+        on left: 479
+        on right: 480
+    class_name <ast> (325)
+        on left: 481 482
+        on right: 96 97 174 175 215 322 323 338 477 483 514 516 543 550
+    class_name_reference <ast> (326)
+        on left: 483 484 485
+        on right: 374 431
+    exit_expr <ast> (327)
+        on left: 486 487
+        on right: 445
+    backticks_expr <ast> (328)
+        on left: 488 489 490
+        on right: 448
+    ctor_arguments <ast> (329)
+        on left: 491 492
+        on right: 373 374
+    dereferenceable_scalar <ast> (330)
+        on left: 493 494 495 496
+        on right: 502 523 529
+    scalar <ast> (331)
+        on left: 497 498 499 500 501 502 503 504
+        on right: 447
+    constant <ast> (332)
+        on left: 505 506 507 508 509 510 511 512 513
+        on right: 503 526
+    class_constant <ast> (333)
+        on left: 514 515 516 517
+        on right: 504 524
+    optional_expr <ast> (334)
+        on left: 518 519
+        on right: 155 156 157 487 531 546
+    variable_class_name <ast> (335)
+        on left: 520
+        on right: 478 515 517 544
+    fully_dereferenceable <ast> (336)
+        on left: 521 522 523 524
+        on right: 520 525
+    array_object_dereferenceable <ast> (337)
+        on left: 525 526
+        on right: 531 532 533 534 538 539
+    callable_expr <ast> (338)
+        on left: 527 528 529
+        on right: 480
+    callable_variable <ast> (339)
+        on left: 530 531 532 533 534 535
+        on right: 527 536
+    variable <ast> (340)
+        on left: 536 537 538 539
+        on right: 182 220 221 377 380 381 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 521 565 566 581
+    simple_variable <ast> (341)
+        on left: 540 541 542
+        on right: 307 530 542 543 544 545 550 551 554 557
+    static_member <ast> (342)
+        on left: 543 544
+        on right: 537
+    new_variable <ast> (343)
+        on left: 545 546 547 548 549 550 551
+        on right: 484 546 547 548 549 551
+    member_name <ast> (344)
+        on left: 552 553 554
+        on right: 477 478
+    property_name <ast> (345)
+        on left: 555 556 557
+        on right: 533 534 538 539 548 549
+    array_pair_list <ast> (346)
+        on left: 558
+        on right: 222 223 378 379 493 494 568 569
+    possible_array_pair <ast> (347)
+        on left: 559 560
+        on right: 561 562
+    non_empty_array_pair_list <ast> (348)
+        on left: 561 562
+        on right: 558 561
+    array_pair <ast> (349)
+        on left: 563 564 565 566 567 568 569
+        on right: 560
+    encaps_list <ast> (350)
+        on left: 570 571 572 573
+        on right: 490 496 501 570 571
+    encaps_var <ast> (351)
+        on left: 574 575 576 577 578 579 580 581
+        on right: 570 572 573
+    encaps_var_offset <ast> (352)
+        on left: 582 583 584 585
+        on right: 575
+    internal_functions_in_yacc <ast> (353)
+        on left: 586 587 588 589 590 591 592
+        on right: 437
+    isset_variables <ast> (354)
+        on left: 593 594
+        on right: 586 594
+    isset_variable <ast> (355)
+        on left: 595
+        on right: 593 594
 
 
 State 0
 
-    0 $accept: . start "end of file"
+    0 $accept: • start "end of file"
 
     $default  reduce using rule 85 (top_statement_list)
 
@@ -1384,94 +1519,94 @@
 
 State 1
 
-    0 $accept: start . "end of file"
+    0 $accept: start • "end of file"
 
     "end of file"  shift, and go to state 3
 
 
 State 2
 
-    1 start: top_statement_list .
-   84 top_statement_list: top_statement_list . top_statement
+    1 start: top_statement_list •
+   84 top_statement_list: top_statement_list • top_statement
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 27
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    T_INLINE_HTML              shift, and go to state 32
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'if'"                     shift, and go to state 37
-    "'echo'"                   shift, and go to state 38
-    "'do'"                     shift, and go to state 39
-    "'while'"                  shift, and go to state 40
-    "'for'"                    shift, and go to state 41
-    "'foreach'"                shift, and go to state 42
-    "'declare'"                shift, and go to state 43
-    "'switch'"                 shift, and go to state 44
-    "'match'"                  shift, and go to state 45
-    "'break'"                  shift, and go to state 46
-    "'continue'"               shift, and go to state 47
-    "'goto'"                   shift, and go to state 48
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'const'"                  shift, and go to state 51
-    "'return'"                 shift, and go to state 52
-    "'try'"                    shift, and go to state 53
-    "'use'"                    shift, and go to state 54
-    "'global'"                 shift, and go to state 55
-    "'static'"                 shift, and go to state 56
-    "'abstract'"               shift, and go to state 57
-    "'final'"                  shift, and go to state 58
-    "'readonly'"               shift, and go to state 59
-    "'unset'"                  shift, and go to state 60
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'__halt_compiler'"        shift, and go to state 63
-    "'class'"                  shift, and go to state 64
-    "'trait'"                  shift, and go to state 65
-    "'interface'"              shift, and go to state 66
-    "'enum'"                   shift, and go to state 67
-    "'namespace'"              shift, and go to state 68
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 11
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    T_INLINE_HTML              shift, and go to state 16
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'if'"                     shift, and go to state 29
+    "'echo'"                   shift, and go to state 30
+    "'do'"                     shift, and go to state 31
+    "'while'"                  shift, and go to state 32
+    "'for'"                    shift, and go to state 33
+    "'foreach'"                shift, and go to state 34
+    "'declare'"                shift, and go to state 35
+    "'switch'"                 shift, and go to state 36
+    "'match'"                  shift, and go to state 37
+    "'break'"                  shift, and go to state 38
+    "'continue'"               shift, and go to state 39
+    "'goto'"                   shift, and go to state 40
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'const'"                  shift, and go to state 43
+    "'return'"                 shift, and go to state 44
+    "'try'"                    shift, and go to state 45
+    "'throw'"                  shift, and go to state 46
+    "'use'"                    shift, and go to state 47
+    "'global'"                 shift, and go to state 48
+    "'static'"                 shift, and go to state 49
+    "'abstract'"               shift, and go to state 50
+    "'final'"                  shift, and go to state 51
+    "'readonly'"               shift, and go to state 52
+    "'unset'"                  shift, and go to state 53
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'__halt_compiler'"        shift, and go to state 56
+    "'class'"                  shift, and go to state 57
+    "'trait'"                  shift, and go to state 58
+    "'interface'"              shift, and go to state 59
+    "'enum'"                   shift, and go to state 60
+    "'namespace'"              shift, and go to state 61
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ';'                        shift, and go to state 84
@@ -1525,67 +1660,67 @@
 
 State 3
 
-    0 $accept: start "end of file" .
+    0 $accept: start "end of file" •
 
     $default  accept
 
 
 State 4
 
-  454 expr: "'throw'" . expr
+  418 expr: '+' • expr
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -1621,60 +1756,60 @@
 
 State 5
 
-  588 internal_functions_in_yacc: "'include'" . expr
+  419 expr: '-' • expr
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -1710,60 +1845,60 @@
 
 State 6
 
-  589 internal_functions_in_yacc: "'include_once'" . expr
+  420 expr: '!' • expr
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -1799,60 +1934,60 @@
 
 State 7
 
-  591 internal_functions_in_yacc: "'require'" . expr
+  421 expr: '~' • expr
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -1888,60 +2023,60 @@
 
 State 8
 
-  592 internal_functions_in_yacc: "'require_once'" . expr
+  446 expr: '@' • expr
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -1977,509 +2112,126 @@
 
 State 9
 
-  449 expr: "'print'" . expr
+  497 scalar: "integer" •
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
-    "heredoc start"            shift, and go to state 82
-    '('                        shift, and go to state 83
-    ''                        shift, and go to state 86
-    '`'                        shift, and go to state 87
-    '"'                        shift, and go to state 88
-    '$'                        shift, and go to state 89
-
-    name                          go to state 90
-    attribute                     go to state 91
-    attributes                    go to state 131
-    match                         go to state 103
-    new_expr                      go to state 108
-    expr                          go to state 138
-    inline_function               go to state 110
-    fn                            go to state 111
-    function                      go to state 133
-    function_call                 go to state 113
-    class_name                    go to state 114
-    dereferenceable_scalar        go to state 115
-    scalar                        go to state 116
-    constant                      go to state 117
-    class_constant                go to state 118
-    variable_class_name           go to state 119
-    fully_dereferenceable         go to state 120
-    array_object_dereferenceable  go to state 121
-    callable_expr                 go to state 122
-    callable_variable             go to state 123
-    variable                      go to state 124
-    simple_variable               go to state 125
-    static_member                 go to state 126
-    internal_functions_in_yacc    go to state 127
+    $default  reduce using rule 497 (scalar)
 
 
 State 10
 
-  450 expr: "'yield'" .
-  451     | "'yield'" . expr
-  452     | "'yield'" . expr "'=>'" expr
-
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
-    "heredoc start"            shift, and go to state 82
-    '('                        shift, and go to state 83
-    ''                        shift, and go to state 86
-    '`'                        shift, and go to state 87
-    '"'                        shift, and go to state 88
-    '$'                        shift, and go to state 89
-
-    $default  reduce using rule 450 (expr)
+  498 scalar: "floating-point number" •
 
-    name                          go to state 90
-    attribute                     go to state 91
-    attributes                    go to state 131
-    match                         go to state 103
-    new_expr                      go to state 108
-    expr                          go to state 139
-    inline_function               go to state 110
-    fn                            go to state 111
-    function                      go to state 133
-    function_call                 go to state 113
-    class_name                    go to state 114
-    dereferenceable_scalar        go to state 115
-    scalar                        go to state 116
-    constant                      go to state 117
-    class_constant                go to state 118
-    variable_class_name           go to state 119
-    fully_dereferenceable         go to state 120
-    array_object_dereferenceable  go to state 121
-    callable_expr                 go to state 122
-    callable_variable             go to state 123
-    variable                      go to state 124
-    simple_variable               go to state 125
-    static_member                 go to state 126
-    internal_functions_in_yacc    go to state 127
+    $default  reduce using rule 498 (scalar)
 
 
 State 11
 
-  453 expr: "'yield from'" . expr
+   92 name: "identifier" •
+  171 statement: "identifier" • ':'
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
-    "heredoc start"            shift, and go to state 82
-    '('                        shift, and go to state 83
-    ''                        shift, and go to state 86
-    '`'                        shift, and go to state 87
-    '"'                        shift, and go to state 88
-    '$'                        shift, and go to state 89
+    ':'  shift, and go to state 138
 
-    name                          go to state 90
-    attribute                     go to state 91
-    attributes                    go to state 131
-    match                         go to state 103
-    new_expr                      go to state 108
-    expr                          go to state 140
-    inline_function               go to state 110
-    fn                            go to state 111
-    function                      go to state 133
-    function_call                 go to state 113
-    class_name                    go to state 114
-    dereferenceable_scalar        go to state 115
-    scalar                        go to state 116
-    constant                      go to state 117
-    class_constant                go to state 118
-    variable_class_name           go to state 119
-    fully_dereferenceable         go to state 120
-    array_object_dereferenceable  go to state 121
-    callable_expr                 go to state 122
-    callable_variable             go to state 123
-    variable                      go to state 124
-    simple_variable               go to state 125
-    static_member                 go to state 126
-    internal_functions_in_yacc    go to state 127
+    $default  reduce using rule 92 (name)
 
 
 State 12
 
-  418 expr: '+' . expr
+   94 name: "fully qualified name" •
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
-    "heredoc start"            shift, and go to state 82
-    '('                        shift, and go to state 83
-    ''                        shift, and go to state 86
-    '`'                        shift, and go to state 87
-    '"'                        shift, and go to state 88
-    '$'                        shift, and go to state 89
-
-    name                          go to state 90
-    attribute                     go to state 91
-    attributes                    go to state 131
-    match                         go to state 103
-    new_expr                      go to state 108
-    expr                          go to state 141
-    inline_function               go to state 110
-    fn                            go to state 111
-    function                      go to state 133
-    function_call                 go to state 113
-    class_name                    go to state 114
-    dereferenceable_scalar        go to state 115
-    scalar                        go to state 116
-    constant                      go to state 117
-    class_constant                go to state 118
-    variable_class_name           go to state 119
-    fully_dereferenceable         go to state 120
-    array_object_dereferenceable  go to state 121
-    callable_expr                 go to state 122
-    callable_variable             go to state 123
-    variable                      go to state 124
-    simple_variable               go to state 125
-    static_member                 go to state 126
-    internal_functions_in_yacc    go to state 127
+    $default  reduce using rule 94 (name)
 
 
 State 13
 
-  419 expr: '-' . expr
+   95 name: "namespace-relative name" •
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
-    "heredoc start"            shift, and go to state 82
-    '('                        shift, and go to state 83
-    ''                        shift, and go to state 86
-    '`'                        shift, and go to state 87
-    '"'                        shift, and go to state 88
-    '$'                        shift, and go to state 89
-
-    name                          go to state 90
-    attribute                     go to state 91
-    attributes                    go to state 131
-    match                         go to state 103
-    new_expr                      go to state 108
-    expr                          go to state 142
-    inline_function               go to state 110
-    fn                            go to state 111
-    function                      go to state 133
-    function_call                 go to state 113
-    class_name                    go to state 114
-    dereferenceable_scalar        go to state 115
-    scalar                        go to state 116
-    constant                      go to state 117
-    class_constant                go to state 118
-    variable_class_name           go to state 119
-    fully_dereferenceable         go to state 120
-    array_object_dereferenceable  go to state 121
-    callable_expr                 go to state 122
-    callable_variable             go to state 123
-    variable                      go to state 124
-    simple_variable               go to state 125
-    static_member                 go to state 126
-    internal_functions_in_yacc    go to state 127
+    $default  reduce using rule 95 (name)
 
 
 State 14
 
-  420 expr: '!' . expr
+   93 name: "namespaced name" •
+
+    $default  reduce using rule 93 (name)
+
+
+State 15
+
+  540 simple_variable: "variable" •
+
+    $default  reduce using rule 540 (simple_variable)
+
+
+State 16
+
+  161 statement: T_INLINE_HTML •
+
+    $default  reduce using rule 161 (statement)
+
+
+State 17
+
+  495 dereferenceable_scalar: "quoted string" •
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    $default  reduce using rule 495 (dereferenceable_scalar)
+
+
+State 18
+
+  588 internal_functions_in_yacc: "'include'" • expr
+
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -2492,7 +2244,7 @@
     attributes                    go to state 131
     match                         go to state 103
     new_expr                      go to state 108
-    expr                          go to state 143
+    expr                          go to state 139
     inline_function               go to state 110
     fn                            go to state 111
     function                      go to state 133
@@ -2513,62 +2265,62 @@
     internal_functions_in_yacc    go to state 127
 
 
-State 15
+State 19
 
-  421 expr: '~' . expr
+  589 internal_functions_in_yacc: "'include_once'" • expr
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -2581,7 +2333,7 @@
     attributes                    go to state 131
     match                         go to state 103
     new_expr                      go to state 108
-    expr                          go to state 144
+    expr                          go to state 140
     inline_function               go to state 110
     fn                            go to state 111
     function                      go to state 133
@@ -2602,62 +2354,69 @@
     internal_functions_in_yacc    go to state 127
 
 
-State 16
+State 20
+
+  590 internal_functions_in_yacc: "'eval'" • '(' expr ')'
 
-  438 expr: "'(int)'" . expr
+    '('  shift, and go to state 141
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+
+State 21
+
+  591 internal_functions_in_yacc: "'require'" • expr
+
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -2670,7 +2429,7 @@
     attributes                    go to state 131
     match                         go to state 103
     new_expr                      go to state 108
-    expr                          go to state 145
+    expr                          go to state 142
     inline_function               go to state 110
     fn                            go to state 111
     function                      go to state 133
@@ -2691,62 +2450,62 @@
     internal_functions_in_yacc    go to state 127
 
 
-State 17
+State 22
 
-  439 expr: "'(double)'" . expr
+  592 internal_functions_in_yacc: "'require_once'" • expr
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -2759,7 +2518,7 @@
     attributes                    go to state 131
     match                         go to state 103
     new_expr                      go to state 108
-    expr                          go to state 146
+    expr                          go to state 143
     inline_function               go to state 110
     fn                            go to state 111
     function                      go to state 133
@@ -2780,62 +2539,62 @@
     internal_functions_in_yacc    go to state 127
 
 
-State 18
+State 23
 
-  440 expr: "'(string)'" . expr
+  449 expr: "'print'" • expr
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -2848,7 +2607,7 @@
     attributes                    go to state 131
     match                         go to state 103
     new_expr                      go to state 108
-    expr                          go to state 147
+    expr                          go to state 144
     inline_function               go to state 110
     fn                            go to state 111
     function                      go to state 133
@@ -2869,62 +2628,64 @@
     internal_functions_in_yacc    go to state 127
 
 
-State 19
-
-  441 expr: "'(array)'" . expr
+State 24
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+  450 expr: "'yield'" •
+  451     | "'yield'" • expr
+  452     | "'yield'" • expr "'=>'" expr
+
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -2932,12 +2693,14 @@
     '"'                        shift, and go to state 88
     '$'                        shift, and go to state 89
 
+    $default  reduce using rule 450 (expr)
+
     name                          go to state 90
     attribute                     go to state 91
     attributes                    go to state 131
     match                         go to state 103
     new_expr                      go to state 108
-    expr                          go to state 148
+    expr                          go to state 145
     inline_function               go to state 110
     fn                            go to state 111
     function                      go to state 133
@@ -2958,62 +2721,62 @@
     internal_functions_in_yacc    go to state 127
 
 
-State 20
+State 25
 
-  442 expr: "'(object)'" . expr
+  453 expr: "'yield from'" • expr
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -3026,7 +2789,7 @@
     attributes                    go to state 131
     match                         go to state 103
     new_expr                      go to state 108
-    expr                          go to state 149
+    expr                          go to state 146
     inline_function               go to state 110
     fn                            go to state 111
     function                      go to state 133
@@ -3047,151 +2810,96 @@
     internal_functions_in_yacc    go to state 127
 
 
-State 21
+State 26
 
-  443 expr: "'(bool)'" . expr
+  374 new_expr: "'new'" • class_name_reference ctor_arguments
+  375         | "'new'" • anonymous_class
+  376         | "'new'" • attributes anonymous_class
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
-    "heredoc start"            shift, and go to state 82
-    '('                        shift, and go to state 83
-    ''                        shift, and go to state 86
-    '`'                        shift, and go to state 87
-    '"'                        shift, and go to state 88
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "'static'"                 shift, and go to state 147
+    "'abstract'"               shift, and go to state 50
+    "'final'"                  shift, and go to state 51
+    "'readonly'"               shift, and go to state 148
+    "'#'"                     shift, and go to state 72
+    '('                        shift, and go to state 149
     '$'                        shift, and go to state 89
 
-    name                          go to state 90
-    attribute                     go to state 91
-    attributes                    go to state 131
-    match                         go to state 103
-    new_expr                      go to state 108
-    expr                          go to state 150
-    inline_function               go to state 110
-    fn                            go to state 111
-    function                      go to state 133
-    function_call                 go to state 113
-    class_name                    go to state 114
-    dereferenceable_scalar        go to state 115
-    scalar                        go to state 116
-    constant                      go to state 117
-    class_constant                go to state 118
-    variable_class_name           go to state 119
-    fully_dereferenceable         go to state 120
-    array_object_dereferenceable  go to state 121
-    callable_expr                 go to state 122
-    callable_variable             go to state 123
-    variable                      go to state 124
-    simple_variable               go to state 125
-    static_member                 go to state 126
-    internal_functions_in_yacc    go to state 127
+    $default  reduce using rule 198 (anonymous_class_modifiers_optional)
 
+    name                                go to state 150
+    attribute                           go to state 91
+    attributes                          go to state 151
+    anonymous_class_modifiers           go to state 152
+    anonymous_class_modifiers_optional  go to state 153
+    class_modifier                      go to state 154
+    anonymous_class                     go to state 155
+    class_name                          go to state 156
+    class_name_reference                go to state 157
+    simple_variable                     go to state 158
+    new_variable                        go to state 159
 
-State 22
 
-  444 expr: "'(unset)'" . expr
+State 27
+
+  382 expr: "'clone'" • expr
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -3204,7 +2912,7 @@
     attributes                    go to state 131
     match                         go to state 103
     new_expr                      go to state 108
-    expr                          go to state 151
+    expr                          go to state 160
     inline_function               go to state 110
     fn                            go to state 111
     function                      go to state 133
@@ -3225,62 +2933,81 @@
     internal_functions_in_yacc    go to state 127
 
 
-State 23
+State 28
+
+  445 expr: "'exit'" • exit_expr
 
-  446 expr: '@' . expr
+    '('  shift, and go to state 161
+
+    $default  reduce using rule 486 (exit_expr)
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    exit_expr  go to state 162
+
+
+State 29
+
+  250 if_stmt_without_else: "'if'" • '(' expr ')' statement
+  254 alt_if_stmt_without_else: "'if'" • '(' expr ')' ':' inner_statement_list
+
+    '('  shift, and go to state 163
+
+
+State 30
+
+  160 statement: "'echo'" • echo_expr_list ';'
+
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -3292,8 +3019,10 @@
     attribute                     go to state 91
     attributes                    go to state 131
     match                         go to state 103
+    echo_expr_list                go to state 164
+    echo_expr                     go to state 165
     new_expr                      go to state 108
-    expr                          go to state 152
+    expr                          go to state 166
     inline_function               go to state 110
     fn                            go to state 111
     function                      go to state 133
@@ -3314,64 +3043,82 @@
     internal_functions_in_yacc    go to state 127
 
 
-State 24
+State 31
 
-  382 expr: "'clone'" . expr
+  152 statement: "'do'" • statement "'while'" '(' expr ')' ';'
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 11
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    T_INLINE_HTML              shift, and go to state 16
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'if'"                     shift, and go to state 29
+    "'echo'"                   shift, and go to state 30
+    "'do'"                     shift, and go to state 31
+    "'while'"                  shift, and go to state 32
+    "'for'"                    shift, and go to state 33
+    "'foreach'"                shift, and go to state 34
+    "'declare'"                shift, and go to state 35
+    "'switch'"                 shift, and go to state 36
+    "'match'"                  shift, and go to state 37
+    "'break'"                  shift, and go to state 38
+    "'continue'"               shift, and go to state 39
+    "'goto'"                   shift, and go to state 40
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'return'"                 shift, and go to state 44
+    "'try'"                    shift, and go to state 45
+    "'throw'"                  shift, and go to state 46
+    "'global'"                 shift, and go to state 48
+    "'static'"                 shift, and go to state 49
+    "'readonly'"               shift, and go to state 130
+    "'unset'"                  shift, and go to state 53
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
+    ';'                        shift, and go to state 84
+    '{'                        shift, and go to state 85
     ''                        shift, and go to state 86
     '`'                        shift, and go to state 87
     '"'                        shift, and go to state 88
@@ -3380,9 +3127,14 @@
     name                          go to state 90
     attribute                     go to state 91
     attributes                    go to state 131
+    statement                     go to state 167
     match                         go to state 103
+    if_stmt_without_else          go to state 104
+    if_stmt                       go to state 105
+    alt_if_stmt_without_else      go to state 106
+    alt_if_stmt                   go to state 107
     new_expr                      go to state 108
-    expr                          go to state 153
+    expr                          go to state 109
     inline_function               go to state 110
     fn                            go to state 111
     function                      go to state 133
@@ -3403,188 +3155,105 @@
     internal_functions_in_yacc    go to state 127
 
 
-State 25
-
-  497 scalar: "integer" .
-
-    $default  reduce using rule 497 (scalar)
-
-
-State 26
-
-  498 scalar: "floating-point number" .
-
-    $default  reduce using rule 498 (scalar)
-
-
-State 27
-
-   92 name: "identifier" .
-  171 statement: "identifier" . ':'
-
-    ':'  shift, and go to state 154
-
-    $default  reduce using rule 92 (name)
-
-
-State 28
-
-   94 name: "fully qualified name" .
-
-    $default  reduce using rule 94 (name)
-
-
-State 29
-
-   95 name: "namespace-relative name" .
-
-    $default  reduce using rule 95 (name)
-
-
-State 30
-
-   93 name: "namespaced name" .
-
-    $default  reduce using rule 93 (name)
-
-
-State 31
-
-  540 simple_variable: "variable" .
-
-    $default  reduce using rule 540 (simple_variable)
-
-
 State 32
 
-  161 statement: T_INLINE_HTML .
+  151 statement: "'while'" • '(' expr ')' while_statement
 
-    $default  reduce using rule 161 (statement)
+    '('  shift, and go to state 168
 
 
 State 33
 
-  495 dereferenceable_scalar: "quoted string" .
+  153 statement: "'for'" • '(' for_exprs ';' for_exprs ';' for_exprs ')' for_statement
 
-    $default  reduce using rule 495 (dereferenceable_scalar)
+    '('  shift, and go to state 169
 
 
 State 34
 
-  590 internal_functions_in_yacc: "'eval'" . '(' expr ')'
+  164 statement: "'foreach'" • '(' expr "'as'" foreach_variable ')' foreach_statement
+  165          | "'foreach'" • '(' expr "'as'" foreach_variable "'=>'" foreach_variable ')' foreach_statement
 
-    '('  shift, and go to state 155
+    '('  shift, and go to state 170
 
 
 State 35
 
-  374 new_expr: "'new'" . class_name_reference ctor_arguments
-  375         | "'new'" . anonymous_class
-  376         | "'new'" . attributes anonymous_class
-
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "'static'"                 shift, and go to state 156
-    "'abstract'"               shift, and go to state 57
-    "'final'"                  shift, and go to state 58
-    "'readonly'"               shift, and go to state 157
-    "'#'"                     shift, and go to state 79
-    '('                        shift, and go to state 158
-    '$'                        shift, and go to state 89
-
-    $default  reduce using rule 198 (anonymous_class_modifiers_optional)
+  167 statement: "'declare'" • '(' const_list ')' $@3 declare_statement
 
-    name                                go to state 159
-    attribute                           go to state 91
-    attributes                          go to state 160
-    anonymous_class_modifiers           go to state 161
-    anonymous_class_modifiers_optional  go to state 162
-    class_modifier                      go to state 163
-    anonymous_class                     go to state 164
-    class_name                          go to state 165
-    class_name_reference                go to state 166
-    simple_variable                     go to state 167
-    new_variable                        go to state 168
+    '('  shift, and go to state 171
 
 
 State 36
 
-  445 expr: "'exit'" . exit_expr
+  154 statement: "'switch'" • '(' expr ')' switch_case_list
 
-    '('  shift, and go to state 169
-
-    $default  reduce using rule 486 (exit_expr)
-
-    exit_expr  go to state 170
+    '('  shift, and go to state 172
 
 
 State 37
 
-  250 if_stmt_without_else: "'if'" . '(' expr ')' statement
-  254 alt_if_stmt_without_else: "'if'" . '(' expr ')' ':' inner_statement_list
+  239 match: "'match'" • '(' expr ')' '{' match_arm_list '}'
 
-    '('  shift, and go to state 171
+    '('  shift, and go to state 173
 
 
 State 38
 
-  160 statement: "'echo'" . echo_expr_list ';'
+  155 statement: "'break'" • optional_expr ';'
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -3592,12 +3261,12 @@
     '"'                        shift, and go to state 88
     '$'                        shift, and go to state 89
 
+    $default  reduce using rule 518 (optional_expr)
+
     name                          go to state 90
     attribute                     go to state 91
     attributes                    go to state 131
     match                         go to state 103
-    echo_expr_list                go to state 172
-    echo_expr                     go to state 173
     new_expr                      go to state 108
     expr                          go to state 174
     inline_function               go to state 110
@@ -3609,6 +3278,7 @@
     scalar                        go to state 116
     constant                      go to state 117
     class_constant                go to state 118
+    optional_expr                 go to state 175
     variable_class_name           go to state 119
     fully_dereferenceable         go to state 120
     array_object_dereferenceable  go to state 121
@@ -3622,96 +3292,75 @@
 
 State 39
 
-  152 statement: "'do'" . statement "'while'" '(' expr ')' ';'
+  156 statement: "'continue'" • optional_expr ';'
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 27
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    T_INLINE_HTML              shift, and go to state 32
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'if'"                     shift, and go to state 37
-    "'echo'"                   shift, and go to state 38
-    "'do'"                     shift, and go to state 39
-    "'while'"                  shift, and go to state 40
-    "'for'"                    shift, and go to state 41
-    "'foreach'"                shift, and go to state 42
-    "'declare'"                shift, and go to state 43
-    "'switch'"                 shift, and go to state 44
-    "'match'"                  shift, and go to state 45
-    "'break'"                  shift, and go to state 46
-    "'continue'"               shift, and go to state 47
-    "'goto'"                   shift, and go to state 48
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'return'"                 shift, and go to state 52
-    "'try'"                    shift, and go to state 53
-    "'global'"                 shift, and go to state 55
-    "'static'"                 shift, and go to state 56
-    "'readonly'"               shift, and go to state 130
-    "'unset'"                  shift, and go to state 60
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
-    ';'                        shift, and go to state 84
-    '{'                        shift, and go to state 85
     ''                        shift, and go to state 86
     '`'                        shift, and go to state 87
     '"'                        shift, and go to state 88
     '$'                        shift, and go to state 89
 
+    $default  reduce using rule 518 (optional_expr)
+
     name                          go to state 90
     attribute                     go to state 91
     attributes                    go to state 131
-    statement                     go to state 175
     match                         go to state 103
-    if_stmt_without_else          go to state 104
-    if_stmt                       go to state 105
-    alt_if_stmt_without_else      go to state 106
-    alt_if_stmt                   go to state 107
     new_expr                      go to state 108
-    expr                          go to state 109
+    expr                          go to state 174
     inline_function               go to state 110
     fn                            go to state 111
     function                      go to state 133
@@ -3721,6 +3370,7 @@
     scalar                        go to state 116
     constant                      go to state 117
     class_constant                go to state 118
+    optional_expr                 go to state 176
     variable_class_name           go to state 119
     fully_dereferenceable         go to state 120
     array_object_dereferenceable  go to state 121
@@ -3734,103 +3384,91 @@
 
 State 40
 
-  151 statement: "'while'" . '(' expr ')' while_statement
+  170 statement: "'goto'" • "identifier" ';'
 
-    '('  shift, and go to state 176
+    "identifier"  shift, and go to state 177
 
 
 State 41
 
-  153 statement: "'for'" . '(' for_exprs ';' for_exprs ';' for_exprs ')' for_statement
+  463 function: "'function'" •
 
-    '('  shift, and go to state 177
+    $default  reduce using rule 463 (function)
 
 
 State 42
 
-  164 statement: "'foreach'" . '(' expr "'as'" foreach_variable ')' foreach_statement
-  165          | "'foreach'" . '(' expr "'as'" foreach_variable "'=>'" foreach_variable ')' foreach_statement
+  462 fn: "'fn'" •
 
-    '('  shift, and go to state 178
+    $default  reduce using rule 462 (fn)
 
 
 State 43
 
-  167 statement: "'declare'" . '(' const_list ')' $@3 declare_statement
-
-    '('  shift, and go to state 179
-
-
-State 44
-
-  154 statement: "'switch'" . '(' expr ')' switch_case_list
-
-    '('  shift, and go to state 180
+  121 top_statement: "'const'" • const_list ';'
 
+    "identifier"  shift, and go to state 178
 
-State 45
-
-  239 match: "'match'" . '(' expr ')' '{' match_arm_list '}'
+    const_list  go to state 179
+    const_decl  go to state 180
 
-    '('  shift, and go to state 181
 
+State 44
 
-State 46
-
-  155 statement: "'break'" . optional_expr ';'
+  157 statement: "'return'" • optional_expr ';'
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -3845,7 +3483,7 @@
     attributes                    go to state 131
     match                         go to state 103
     new_expr                      go to state 108
-    expr                          go to state 182
+    expr                          go to state 174
     inline_function               go to state 110
     fn                            go to state 111
     function                      go to state 133
@@ -3855,7 +3493,7 @@
     scalar                        go to state 116
     constant                      go to state 117
     class_constant                go to state 118
-    optional_expr                 go to state 183
+    optional_expr                 go to state 181
     variable_class_name           go to state 119
     fully_dereferenceable         go to state 120
     array_object_dereferenceable  go to state 121
@@ -3867,62 +3505,69 @@
     internal_functions_in_yacc    go to state 127
 
 
-State 47
+State 45
+
+  169 statement: "'try'" • '{' inner_statement_list '}' catch_list finally_statement
 
-  156 statement: "'continue'" . optional_expr ';'
+    '{'  shift, and go to state 182
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+
+State 46
+
+  454 expr: "'throw'" • expr
+
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -3930,14 +3575,12 @@
     '"'                        shift, and go to state 88
     '$'                        shift, and go to state 89
 
-    $default  reduce using rule 518 (optional_expr)
-
     name                          go to state 90
     attribute                     go to state 91
     attributes                    go to state 131
     match                         go to state 103
     new_expr                      go to state 108
-    expr                          go to state 182
+    expr                          go to state 183
     inline_function               go to state 110
     fn                            go to state 111
     function                      go to state 133
@@ -3947,7 +3590,6 @@
     scalar                        go to state 116
     constant                      go to state 117
     class_constant                go to state 118
-    optional_expr                 go to state 184
     variable_class_name           go to state 119
     fully_dereferenceable         go to state 120
     array_object_dereferenceable  go to state 121
@@ -3959,548 +3601,1041 @@
     internal_functions_in_yacc    go to state 127
 
 
+State 47
+
+  117 top_statement: "'use'" • mixed_group_use_declaration ';'
+  118              | "'use'" • use_type group_use_declaration ';'
+  119              | "'use'" • use_declarations ';'
+  120              | "'use'" • use_type use_declarations ';'
+
+    "identifier"            shift, and go to state 184
+    "fully qualified name"  shift, and go to state 185
+    "namespaced name"       shift, and go to state 186
+    "'function'"            shift, and go to state 187
+    "'const'"               shift, and go to state 188
+
+    namespace_name               go to state 189
+    legacy_namespace_name        go to state 190
+    use_type                     go to state 191
+    mixed_group_use_declaration  go to state 192
+    use_declarations             go to state 193
+    use_declaration              go to state 194
+
+
 State 48
 
-  170 statement: "'goto'" . "identifier" ';'
+  158 statement: "'global'" • global_var_list ';'
+
+    "variable"  shift, and go to state 15
+    '$'         shift, and go to state 89
 
-    "identifier"  shift, and go to state 185
+    global_var_list  go to state 195
+    global_var       go to state 196
+    simple_variable  go to state 197
 
 
 State 49
 
-  463 function: "'function'" .
+  159 statement: "'static'" • static_var_list ';'
+  457 expr: "'static'" • inline_function
+  481 class_name: "'static'" •
+
+    "variable"    shift, and go to state 198
+    "'function'"  shift, and go to state 41
+    "'fn'"        shift, and go to state 42
 
-    $default  reduce using rule 463 (function)
+    $default  reduce using rule 481 (class_name)
+
+    static_var_list  go to state 199
+    static_var       go to state 200
+    inline_function  go to state 201
+    fn               go to state 111
+    function         go to state 133
 
 
 State 50
 
-  462 fn: "'fn'" .
+  200 class_modifier: "'abstract'" •
 
-    $default  reduce using rule 462 (fn)
+    $default  reduce using rule 200 (class_modifier)
 
 
 State 51
 
-  121 top_statement: "'const'" . const_list ';'
-
-    "identifier"  shift, and go to state 186
+  201 class_modifier: "'final'" •
 
-    const_list  go to state 187
-    const_decl  go to state 188
+    $default  reduce using rule 201 (class_modifier)
 
 
 State 52
 
-  157 statement: "'return'" . optional_expr ';'
+  202 class_modifier: "'readonly'" •
+  476 function_call: "'readonly'" • argument_list
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
-    "heredoc start"            shift, and go to state 82
-    '('                        shift, and go to state 83
-    ''                        shift, and go to state 86
-    '`'                        shift, and go to state 87
-    '"'                        shift, and go to state 88
-    '$'                        shift, and go to state 89
+    '('  shift, and go to state 202
 
-    $default  reduce using rule 518 (optional_expr)
+    $default  reduce using rule 202 (class_modifier)
 
-    name                          go to state 90
-    attribute                     go to state 91
-    attributes                    go to state 131
-    match                         go to state 103
-    new_expr                      go to state 108
-    expr                          go to state 182
-    inline_function               go to state 110
-    fn                            go to state 111
-    function                      go to state 133
-    function_call                 go to state 113
-    class_name                    go to state 114
-    dereferenceable_scalar        go to state 115
-    scalar                        go to state 116
-    constant                      go to state 117
-    class_constant                go to state 118
-    optional_expr                 go to state 189
-    variable_class_name           go to state 119
-    fully_dereferenceable         go to state 120
-    array_object_dereferenceable  go to state 121
-    callable_expr                 go to state 122
-    callable_variable             go to state 123
-    variable                      go to state 124
-    simple_variable               go to state 125
-    static_member                 go to state 126
-    internal_functions_in_yacc    go to state 127
+    argument_list  go to state 203
 
 
 State 53
 
-  169 statement: "'try'" . '{' inner_statement_list '}' catch_list finally_statement
+  163 statement: "'unset'" • '(' unset_variables possible_comma ')' ';'
 
-    '{'  shift, and go to state 190
+    '('  shift, and go to state 204
 
 
 State 54
 
-  117 top_statement: "'use'" . mixed_group_use_declaration ';'
-  118              | "'use'" . use_type group_use_declaration ';'
-  119              | "'use'" . use_declarations ';'
-  120              | "'use'" . use_type use_declarations ';'
-
-    "identifier"            shift, and go to state 191
-    "fully qualified name"  shift, and go to state 192
-    "namespaced name"       shift, and go to state 193
-    "'function'"            shift, and go to state 194
-    "'const'"               shift, and go to state 195
-
-    namespace_name               go to state 196
-    legacy_namespace_name        go to state 197
-    use_type                     go to state 198
-    mixed_group_use_declaration  go to state 199
-    use_declarations             go to state 200
-    use_declaration              go to state 201
+  586 internal_functions_in_yacc: "'isset'" • '(' isset_variables possible_comma ')'
 
+    '('  shift, and go to state 205
 
-State 55
 
-  158 statement: "'global'" . global_var_list ';'
+State 55
 
-    "variable"  shift, and go to state 31
-    '$'         shift, and go to state 89
+  587 internal_functions_in_yacc: "'empty'" • '(' expr ')'
 
-    global_var_list  go to state 202
-    global_var       go to state 203
-    simple_variable  go to state 204
+    '('  shift, and go to state 206
 
 
 State 56
 
-  159 statement: "'static'" . static_var_list ';'
-  457 expr: "'static'" . inline_function
-  481 class_name: "'static'" .
-
-    "variable"    shift, and go to state 205
-    "'function'"  shift, and go to state 49
-    "'fn'"        shift, and go to state 50
+  111 top_statement: "'__halt_compiler'" • '(' ')' ';'
 
-    $default  reduce using rule 481 (class_name)
-
-    static_var_list  go to state 206
-    static_var       go to state 207
-    inline_function  go to state 208
-    fn               go to state 111
-    function         go to state 133
+    '('  shift, and go to state 207
 
 
 State 57
 
-  200 class_modifier: "'abstract'" .
+  193 class_declaration_statement: "'class'" • @5 "identifier" extends_from implements_list backup_doc_comment '{' class_statement_list '}'
 
-    $default  reduce using rule 200 (class_modifier)
+    $default  reduce using rule 192 (@5)
+
+    @5  go to state 208
 
 
 State 58
 
-  201 class_modifier: "'final'" .
+  204 trait_declaration_statement: "'trait'" • @6 "identifier" backup_doc_comment '{' class_statement_list '}'
 
-    $default  reduce using rule 201 (class_modifier)
+    $default  reduce using rule 203 (@6)
 
+    @6  go to state 209
 
-State 59
 
-  202 class_modifier: "'readonly'" .
-  476 function_call: "'readonly'" . argument_list
+State 59
 
-    '('  shift, and go to state 209
+  206 interface_declaration_statement: "'interface'" • @7 "identifier" interface_extends_list backup_doc_comment '{' class_statement_list '}'
 
-    $default  reduce using rule 202 (class_modifier)
+    $default  reduce using rule 205 (@7)
 
-    argument_list  go to state 210
+    @7  go to state 210
 
 
 State 60
 
-  163 statement: "'unset'" . '(' unset_variables possible_comma ')' ';'
+  208 enum_declaration_statement: "'enum'" • @8 "identifier" enum_backing_type implements_list backup_doc_comment '{' class_statement_list '}'
 
-    '('  shift, and go to state 211
+    $default  reduce using rule 207 (@8)
+
+    @8  go to state 211
 
 
 State 61
 
-  586 internal_functions_in_yacc: "'isset'" . '(' isset_variables possible_comma ')'
+  112 top_statement: "'namespace'" • namespace_declaration_name ';'
+  114              | "'namespace'" • namespace_declaration_name $@1 '{' top_statement_list '}'
+  116              | "'namespace'" • $@2 '{' top_statement_list '}'
+
+    "identifier"       shift, and go to state 212
+    "namespaced name"  shift, and go to state 213
+    "'include'"        shift, and go to state 214
+    "'include_once'"   shift, and go to state 215
+    "'eval'"           shift, and go to state 216
+    "'require'"        shift, and go to state 217
+    "'require_once'"   shift, and go to state 218
+    "'or'"             shift, and go to state 219
+    "'xor'"            shift, and go to state 220
+    "'and'"            shift, and go to state 221
+    "'print'"          shift, and go to state 222
+    "'yield'"          shift, and go to state 223
+    "'instanceof'"     shift, and go to state 224
+    "'new'"            shift, and go to state 225
+    "'clone'"          shift, and go to state 226
+    "'exit'"           shift, and go to state 227
+    "'if'"             shift, and go to state 228
+    "'elseif'"         shift, and go to state 229
+    "'else'"           shift, and go to state 230
+    "'endif'"          shift, and go to state 231
+    "'echo'"           shift, and go to state 232
+    "'do'"             shift, and go to state 233
+    "'while'"          shift, and go to state 234
+    "'endwhile'"       shift, and go to state 235
+    "'for'"            shift, and go to state 236
+    "'endfor'"         shift, and go to state 237
+    "'foreach'"        shift, and go to state 238
+    "'endforeach'"     shift, and go to state 239
+    "'declare'"        shift, and go to state 240
+    "'enddeclare'"     shift, and go to state 241
+    "'as'"             shift, and go to state 242
+    "'switch'"         shift, and go to state 243
+    "'endswitch'"      shift, and go to state 244
+    "'case'"           shift, and go to state 245
+    "'default'"        shift, and go to state 246
+    "'match'"          shift, and go to state 247
+    "'break'"          shift, and go to state 248
+    "'continue'"       shift, and go to state 249
+    "'goto'"           shift, and go to state 250
+    "'function'"       shift, and go to state 251
+    "'fn'"             shift, and go to state 252
+    "'const'"          shift, and go to state 253
+    "'return'"         shift, and go to state 254
+    "'try'"            shift, and go to state 255
+    "'catch'"          shift, and go to state 256
+    "'finally'"        shift, and go to state 257
+    "'throw'"          shift, and go to state 258
+    "'use'"            shift, and go to state 259
+    "'insteadof'"      shift, and go to state 260
+    "'global'"         shift, and go to state 261
+    "'static'"         shift, and go to state 262
+    "'abstract'"       shift, and go to state 263
+    "'final'"          shift, and go to state 264
+    "'private'"        shift, and go to state 265
+    "'protected'"      shift, and go to state 266
+    "'public'"         shift, and go to state 267
+    "'readonly'"       shift, and go to state 268
+    "'var'"            shift, and go to state 269
+    "'unset'"          shift, and go to state 270
+    "'isset'"          shift, and go to state 271
+    "'empty'"          shift, and go to state 272
+    "'class'"          shift, and go to state 273
+    "'trait'"          shift, and go to state 274
+    "'interface'"      shift, and go to state 275
+    "'enum'"           shift, and go to state 276
+    "'extends'"        shift, and go to state 277
+    "'implements'"     shift, and go to state 278
+    "'namespace'"      shift, and go to state 279
+    "'list'"           shift, and go to state 280
+    "'array'"          shift, and go to state 281
+    "'callable'"       shift, and go to state 282
+    "'__LINE__'"       shift, and go to state 283
+    "'__FILE__'"       shift, and go to state 284
+    "'__DIR__'"        shift, and go to state 285
+    "'__CLASS__'"      shift, and go to state 286
+    "'__TRAIT__'"      shift, and go to state 287
+    "'__METHOD__'"     shift, and go to state 288
+    "'__FUNCTION__'"   shift, and go to state 289
+    "'__NAMESPACE__'"  shift, and go to state 290
 
-    '('  shift, and go to state 212
+    $default  reduce using rule 115 ($@2)
+
+    reserved_non_modifiers      go to state 291
+    semi_reserved               go to state 292
+    identifier                  go to state 293
+    namespace_declaration_name  go to state 294
+    $@2                         go to state 295
 
 
 State 62
 
-  587 internal_functions_in_yacc: "'empty'" . '(' expr ')'
+  378 expr: "'list'" • '(' array_pair_list ')' '=' expr
 
-    '('  shift, and go to state 213
+    '('  shift, and go to state 296
 
 
 State 63
 
-  111 top_statement: "'__halt_compiler'" . '(' ')' ';'
+  493 dereferenceable_scalar: "'array'" • '(' array_pair_list ')'
 
-    '('  shift, and go to state 214
+    '('  shift, and go to state 297
 
 
 State 64
 
-  193 class_declaration_statement: "'class'" . @5 "identifier" extends_from implements_list backup_doc_comment '{' class_statement_list '}'
-
-    $default  reduce using rule 192 (@5)
+  506 constant: "'__LINE__'" •
 
-    @5  go to state 215
+    $default  reduce using rule 506 (constant)
 
 
 State 65
 
-  204 trait_declaration_statement: "'trait'" . @6 "identifier" backup_doc_comment '{' class_statement_list '}'
+  507 constant: "'__FILE__'" •
 
-    $default  reduce using rule 203 (@6)
-
-    @6  go to state 216
+    $default  reduce using rule 507 (constant)
 
 
 State 66
 
-  206 interface_declaration_statement: "'interface'" . @7 "identifier" interface_extends_list backup_doc_comment '{' class_statement_list '}'
+  508 constant: "'__DIR__'" •
 
-    $default  reduce using rule 205 (@7)
-
-    @7  go to state 217
+    $default  reduce using rule 508 (constant)
 
 
 State 67
 
-  208 enum_declaration_statement: "'enum'" . @8 "identifier" enum_backing_type implements_list backup_doc_comment '{' class_statement_list '}'
+  513 constant: "'__CLASS__'" •
 
-    $default  reduce using rule 207 (@8)
-
-    @8  go to state 218
+    $default  reduce using rule 513 (constant)
 
 
 State 68
 
-  112 top_statement: "'namespace'" . namespace_declaration_name ';'
-  114              | "'namespace'" . namespace_declaration_name $@1 '{' top_statement_list '}'
-  116              | "'namespace'" . $@2 '{' top_statement_list '}'
-
-    "'throw'"          shift, and go to state 219
-    "'include'"        shift, and go to state 220
-    "'include_once'"   shift, and go to state 221
-    "'require'"        shift, and go to state 222
-    "'require_once'"   shift, and go to state 223
-    "'or'"             shift, and go to state 224
-    "'xor'"            shift, and go to state 225
-    "'and'"            shift, and go to state 226
-    "'print'"          shift, and go to state 227
-    "'yield'"          shift, and go to state 228
-    "'instanceof'"     shift, and go to state 229
-    "'clone'"          shift, and go to state 230
-    "'elseif'"         shift, and go to state 231
-    "'else'"           shift, and go to state 232
-    "identifier"       shift, and go to state 233
-    "namespaced name"  shift, and go to state 234
-    "'eval'"           shift, and go to state 235
-    "'new'"            shift, and go to state 236
-    "'exit'"           shift, and go to state 237
-    "'if'"             shift, and go to state 238
-    "'endif'"          shift, and go to state 239
-    "'echo'"           shift, and go to state 240
-    "'do'"             shift, and go to state 241
-    "'while'"          shift, and go to state 242
-    "'endwhile'"       shift, and go to state 243
-    "'for'"            shift, and go to state 244
-    "'endfor'"         shift, and go to state 245
-    "'foreach'"        shift, and go to state 246
-    "'endforeach'"     shift, and go to state 247
-    "'declare'"        shift, and go to state 248
-    "'enddeclare'"     shift, and go to state 249
-    "'as'"             shift, and go to state 250
-    "'switch'"         shift, and go to state 251
-    "'endswitch'"      shift, and go to state 252
-    "'case'"           shift, and go to state 253
-    "'default'"        shift, and go to state 254
-    "'match'"          shift, and go to state 255
-    "'break'"          shift, and go to state 256
-    "'continue'"       shift, and go to state 257
-    "'goto'"           shift, and go to state 258
-    "'function'"       shift, and go to state 259
-    "'fn'"             shift, and go to state 260
-    "'const'"          shift, and go to state 261
-    "'return'"         shift, and go to state 262
-    "'try'"            shift, and go to state 263
-    "'catch'"          shift, and go to state 264
-    "'finally'"        shift, and go to state 265
-    "'use'"            shift, and go to state 266
-    "'insteadof'"      shift, and go to state 267
-    "'global'"         shift, and go to state 268
-    "'static'"         shift, and go to state 269
-    "'abstract'"       shift, and go to state 270
-    "'final'"          shift, and go to state 271
-    "'private'"        shift, and go to state 272
-    "'protected'"      shift, and go to state 273
-    "'public'"         shift, and go to state 274
-    "'readonly'"       shift, and go to state 275
-    "'var'"            shift, and go to state 276
-    "'unset'"          shift, and go to state 277
-    "'isset'"          shift, and go to state 278
-    "'empty'"          shift, and go to state 279
-    "'class'"          shift, and go to state 280
-    "'trait'"          shift, and go to state 281
-    "'interface'"      shift, and go to state 282
-    "'enum'"           shift, and go to state 283
-    "'extends'"        shift, and go to state 284
-    "'implements'"     shift, and go to state 285
-    "'namespace'"      shift, and go to state 286
-    "'list'"           shift, and go to state 287
-    "'array'"          shift, and go to state 288
-    "'callable'"       shift, and go to state 289
-    "'__LINE__'"       shift, and go to state 290
-    "'__FILE__'"       shift, and go to state 291
-    "'__DIR__'"        shift, and go to state 292
-    "'__CLASS__'"      shift, and go to state 293
-    "'__TRAIT__'"      shift, and go to state 294
-    "'__METHOD__'"     shift, and go to state 295
-    "'__FUNCTION__'"   shift, and go to state 296
-    "'__NAMESPACE__'"  shift, and go to state 297
+  509 constant: "'__TRAIT__'" •
 
-    $default  reduce using rule 115 ($@2)
-
-    reserved_non_modifiers      go to state 298
-    semi_reserved               go to state 299
-    identifier                  go to state 300
-    namespace_declaration_name  go to state 301
-    $@2                         go to state 302
+    $default  reduce using rule 509 (constant)
 
 
 State 69
 
-  378 expr: "'list'" . '(' array_pair_list ')' '=' expr
+  510 constant: "'__METHOD__'" •
 
-    '('  shift, and go to state 303
+    $default  reduce using rule 510 (constant)
 
 
 State 70
 
-  493 dereferenceable_scalar: "'array'" . '(' array_pair_list ')'
+  511 constant: "'__FUNCTION__'" •
 
-    '('  shift, and go to state 304
+    $default  reduce using rule 511 (constant)
 
 
 State 71
 
-  506 constant: "'__LINE__'" .
+  512 constant: "'__NAMESPACE__'" •
 
-    $default  reduce using rule 506 (constant)
+    $default  reduce using rule 512 (constant)
 
 
 State 72
 
-  507 constant: "'__FILE__'" .
+  100 attribute: "'#'" • attribute_group possible_comma ''
 
-    $default  reduce using rule 507 (constant)
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "'static'"                 shift, and go to state 147
+
+    name             go to state 150
+    attribute_decl   go to state 298
+    attribute_group  go to state 299
+    class_name       go to state 300
 
 
 State 73
 
-  508 constant: "'__DIR__'" .
+  397 expr: "'++'" • variable
 
-    $default  reduce using rule 508 (constant)
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'static'"                 shift, and go to state 147
+    "'readonly'"               shift, and go to state 130
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    '('                        shift, and go to state 301
+    ''                        shift, and go to state 302
+    '"'                        shift, and go to state 88
+    '$'                        shift, and go to state 89
+
+    name                          go to state 90
+    function_call                 go to state 113
+    class_name                    go to state 114
+    dereferenceable_scalar        go to state 303
+    constant                      go to state 304
+    class_constant                go to state 305
+    variable_class_name           go to state 119
+    fully_dereferenceable         go to state 120
+    array_object_dereferenceable  go to state 121
+    callable_expr                 go to state 122
+    callable_variable             go to state 123
+    variable                      go to state 306
+    simple_variable               go to state 125
+    static_member                 go to state 126
 
 
 State 74
 
-  513 constant: "'__CLASS__'" .
+  399 expr: "'--'" • variable
 
-    $default  reduce using rule 513 (constant)
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'static'"                 shift, and go to state 147
+    "'readonly'"               shift, and go to state 130
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    '('                        shift, and go to state 301
+    ''                        shift, and go to state 302
+    '"'                        shift, and go to state 88
+    '$'                        shift, and go to state 89
+
+    name                          go to state 90
+    function_call                 go to state 113
+    class_name                    go to state 114
+    dereferenceable_scalar        go to state 303
+    constant                      go to state 304
+    class_constant                go to state 305
+    variable_class_name           go to state 119
+    fully_dereferenceable         go to state 120
+    array_object_dereferenceable  go to state 121
+    callable_expr                 go to state 122
+    callable_variable             go to state 123
+    variable                      go to state 307
+    simple_variable               go to state 125
+    static_member                 go to state 126
 
 
 State 75
 
-  509 constant: "'__TRAIT__'" .
+  438 expr: "'(int)'" • expr
 
-    $default  reduce using rule 509 (constant)
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
+    "heredoc start"            shift, and go to state 82
+    '('                        shift, and go to state 83
+    ''                        shift, and go to state 86
+    '`'                        shift, and go to state 87
+    '"'                        shift, and go to state 88
+    '$'                        shift, and go to state 89
+
+    name                          go to state 90
+    attribute                     go to state 91
+    attributes                    go to state 131
+    match                         go to state 103
+    new_expr                      go to state 108
+    expr                          go to state 308
+    inline_function               go to state 110
+    fn                            go to state 111
+    function                      go to state 133
+    function_call                 go to state 113
+    class_name                    go to state 114
+    dereferenceable_scalar        go to state 115
+    scalar                        go to state 116
+    constant                      go to state 117
+    class_constant                go to state 118
+    variable_class_name           go to state 119
+    fully_dereferenceable         go to state 120
+    array_object_dereferenceable  go to state 121
+    callable_expr                 go to state 122
+    callable_variable             go to state 123
+    variable                      go to state 124
+    simple_variable               go to state 125
+    static_member                 go to state 126
+    internal_functions_in_yacc    go to state 127
 
 
 State 76
 
-  510 constant: "'__METHOD__'" .
+  439 expr: "'(double)'" • expr
 
-    $default  reduce using rule 510 (constant)
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
+    "heredoc start"            shift, and go to state 82
+    '('                        shift, and go to state 83
+    ''                        shift, and go to state 86
+    '`'                        shift, and go to state 87
+    '"'                        shift, and go to state 88
+    '$'                        shift, and go to state 89
+
+    name                          go to state 90
+    attribute                     go to state 91
+    attributes                    go to state 131
+    match                         go to state 103
+    new_expr                      go to state 108
+    expr                          go to state 309
+    inline_function               go to state 110
+    fn                            go to state 111
+    function                      go to state 133
+    function_call                 go to state 113
+    class_name                    go to state 114
+    dereferenceable_scalar        go to state 115
+    scalar                        go to state 116
+    constant                      go to state 117
+    class_constant                go to state 118
+    variable_class_name           go to state 119
+    fully_dereferenceable         go to state 120
+    array_object_dereferenceable  go to state 121
+    callable_expr                 go to state 122
+    callable_variable             go to state 123
+    variable                      go to state 124
+    simple_variable               go to state 125
+    static_member                 go to state 126
+    internal_functions_in_yacc    go to state 127
 
 
 State 77
 
-  511 constant: "'__FUNCTION__'" .
+  440 expr: "'(string)'" • expr
 
-    $default  reduce using rule 511 (constant)
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
+    "heredoc start"            shift, and go to state 82
+    '('                        shift, and go to state 83
+    ''                        shift, and go to state 86
+    '`'                        shift, and go to state 87
+    '"'                        shift, and go to state 88
+    '$'                        shift, and go to state 89
+
+    name                          go to state 90
+    attribute                     go to state 91
+    attributes                    go to state 131
+    match                         go to state 103
+    new_expr                      go to state 108
+    expr                          go to state 310
+    inline_function               go to state 110
+    fn                            go to state 111
+    function                      go to state 133
+    function_call                 go to state 113
+    class_name                    go to state 114
+    dereferenceable_scalar        go to state 115
+    scalar                        go to state 116
+    constant                      go to state 117
+    class_constant                go to state 118
+    variable_class_name           go to state 119
+    fully_dereferenceable         go to state 120
+    array_object_dereferenceable  go to state 121
+    callable_expr                 go to state 122
+    callable_variable             go to state 123
+    variable                      go to state 124
+    simple_variable               go to state 125
+    static_member                 go to state 126
+    internal_functions_in_yacc    go to state 127
 
 
 State 78
 
-  512 constant: "'__NAMESPACE__'" .
+  441 expr: "'(array)'" • expr
 
-    $default  reduce using rule 512 (constant)
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
+    "heredoc start"            shift, and go to state 82
+    '('                        shift, and go to state 83
+    ''                        shift, and go to state 86
+    '`'                        shift, and go to state 87
+    '"'                        shift, and go to state 88
+    '$'                        shift, and go to state 89
+
+    name                          go to state 90
+    attribute                     go to state 91
+    attributes                    go to state 131
+    match                         go to state 103
+    new_expr                      go to state 108
+    expr                          go to state 311
+    inline_function               go to state 110
+    fn                            go to state 111
+    function                      go to state 133
+    function_call                 go to state 113
+    class_name                    go to state 114
+    dereferenceable_scalar        go to state 115
+    scalar                        go to state 116
+    constant                      go to state 117
+    class_constant                go to state 118
+    variable_class_name           go to state 119
+    fully_dereferenceable         go to state 120
+    array_object_dereferenceable  go to state 121
+    callable_expr                 go to state 122
+    callable_variable             go to state 123
+    variable                      go to state 124
+    simple_variable               go to state 125
+    static_member                 go to state 126
+    internal_functions_in_yacc    go to state 127
 
 
 State 79
 
-  100 attribute: "'#'" . attribute_group possible_comma ''
+  442 expr: "'(object)'" • expr
 
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "'static'"                 shift, and go to state 156
-
-    name             go to state 159
-    attribute_decl   go to state 305
-    attribute_group  go to state 306
-    class_name       go to state 307
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
+    "heredoc start"            shift, and go to state 82
+    '('                        shift, and go to state 83
+    ''                        shift, and go to state 86
+    '`'                        shift, and go to state 87
+    '"'                        shift, and go to state 88
+    '$'                        shift, and go to state 89
+
+    name                          go to state 90
+    attribute                     go to state 91
+    attributes                    go to state 131
+    match                         go to state 103
+    new_expr                      go to state 108
+    expr                          go to state 312
+    inline_function               go to state 110
+    fn                            go to state 111
+    function                      go to state 133
+    function_call                 go to state 113
+    class_name                    go to state 114
+    dereferenceable_scalar        go to state 115
+    scalar                        go to state 116
+    constant                      go to state 117
+    class_constant                go to state 118
+    variable_class_name           go to state 119
+    fully_dereferenceable         go to state 120
+    array_object_dereferenceable  go to state 121
+    callable_expr                 go to state 122
+    callable_variable             go to state 123
+    variable                      go to state 124
+    simple_variable               go to state 125
+    static_member                 go to state 126
+    internal_functions_in_yacc    go to state 127
 
 
 State 80
 
-  397 expr: "'++'" . variable
+  443 expr: "'(bool)'" • expr
 
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'static'"                 shift, and go to state 156
-    "'readonly'"               shift, and go to state 130
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    '('                        shift, and go to state 308
-    ''                        shift, and go to state 309
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
+    "heredoc start"            shift, and go to state 82
+    '('                        shift, and go to state 83
+    ''                        shift, and go to state 86
+    '`'                        shift, and go to state 87
     '"'                        shift, and go to state 88
     '$'                        shift, and go to state 89
 
     name                          go to state 90
+    attribute                     go to state 91
+    attributes                    go to state 131
+    match                         go to state 103
+    new_expr                      go to state 108
+    expr                          go to state 313
+    inline_function               go to state 110
+    fn                            go to state 111
+    function                      go to state 133
     function_call                 go to state 113
     class_name                    go to state 114
-    dereferenceable_scalar        go to state 310
-    constant                      go to state 311
-    class_constant                go to state 312
+    dereferenceable_scalar        go to state 115
+    scalar                        go to state 116
+    constant                      go to state 117
+    class_constant                go to state 118
     variable_class_name           go to state 119
     fully_dereferenceable         go to state 120
     array_object_dereferenceable  go to state 121
     callable_expr                 go to state 122
     callable_variable             go to state 123
-    variable                      go to state 313
+    variable                      go to state 124
     simple_variable               go to state 125
     static_member                 go to state 126
+    internal_functions_in_yacc    go to state 127
 
 
 State 81
 
-  399 expr: "'--'" . variable
+  444 expr: "'(unset)'" • expr
 
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'static'"                 shift, and go to state 156
-    "'readonly'"               shift, and go to state 130
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    '('                        shift, and go to state 308
-    ''                        shift, and go to state 309
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
+    "heredoc start"            shift, and go to state 82
+    '('                        shift, and go to state 83
+    ''                        shift, and go to state 86
+    '`'                        shift, and go to state 87
     '"'                        shift, and go to state 88
     '$'                        shift, and go to state 89
 
     name                          go to state 90
+    attribute                     go to state 91
+    attributes                    go to state 131
+    match                         go to state 103
+    new_expr                      go to state 108
+    expr                          go to state 314
+    inline_function               go to state 110
+    fn                            go to state 111
+    function                      go to state 133
     function_call                 go to state 113
     class_name                    go to state 114
-    dereferenceable_scalar        go to state 310
-    constant                      go to state 311
-    class_constant                go to state 312
+    dereferenceable_scalar        go to state 115
+    scalar                        go to state 116
+    constant                      go to state 117
+    class_constant                go to state 118
     variable_class_name           go to state 119
     fully_dereferenceable         go to state 120
     array_object_dereferenceable  go to state 121
     callable_expr                 go to state 122
     callable_variable             go to state 123
-    variable                      go to state 314
+    variable                      go to state 124
     simple_variable               go to state 125
     static_member                 go to state 126
+    internal_functions_in_yacc    go to state 127
 
 
 State 82
 
-  499 scalar: "heredoc start" . "string content" "heredoc end"
-  500       | "heredoc start" . "heredoc end"
-  501       | "heredoc start" . encaps_list "heredoc end"
+  499 scalar: "heredoc start" • "string content" "heredoc end"
+  500       | "heredoc start" • "heredoc end"
+  501       | "heredoc start" • encaps_list "heredoc end"
 
     "variable"        shift, and go to state 315
     "string content"  shift, and go to state 316
@@ -4514,62 +4649,62 @@
 
 State 83
 
-  432 expr: '(' . expr ')'
-  522 fully_dereferenceable: '(' . expr ')'
-  528 callable_expr: '(' . expr ')'
-
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+  432 expr: '(' • expr ')'
+  522 fully_dereferenceable: '(' • expr ')'
+  528 callable_expr: '(' • expr ')'
+
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -4605,14 +4740,14 @@
 
 State 84
 
-  168 statement: ';' .
+  168 statement: ';' •
 
     $default  reduce using rule 168 (statement)
 
 
 State 85
 
-  148 statement: '{' . inner_statement_list '}'
+  148 statement: '{' • inner_statement_list '}'
 
     $default  reduce using rule 143 (inner_statement_list)
 
@@ -4621,65 +4756,65 @@
 
 State 86
 
-  379 expr: '' . array_pair_list '' '=' expr
-  494 dereferenceable_scalar: '' . array_pair_list ''
+  379 expr: '' • array_pair_list '' '=' expr
+  494 dereferenceable_scalar: '' • array_pair_list ''
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    "amp"                      shift, and go to state 324
-    "'&'"                      shift, and go to state 325
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 326
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
-    "heredoc start"            shift, and go to state 82
-    "'...'"                    shift, and go to state 327
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 324
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
+    "heredoc start"            shift, and go to state 82
+    "'...'"                    shift, and go to state 325
+    "'&'"                      shift, and go to state 326
+    "amp"                      shift, and go to state 327
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
     '`'                        shift, and go to state 87
@@ -4721,7 +4856,7 @@
 
 State 87
 
-  448 expr: '`' . backticks_expr '`'
+  448 expr: '`' • backticks_expr '`'
 
     "variable"        shift, and go to state 315
     "string content"  shift, and go to state 334
@@ -4737,7 +4872,7 @@
 
 State 88
 
-  496 dereferenceable_scalar: '"' . encaps_list '"'
+  496 dereferenceable_scalar: '"' • encaps_list '"'
 
     "variable"        shift, and go to state 315
     "string content"  shift, and go to state 337
@@ -4750,10 +4885,10 @@
 
 State 89
 
-  541 simple_variable: '$' . '{' expr '}'
-  542                | '$' . simple_variable
+  541 simple_variable: '$' • '{' expr '}'
+  542                | '$' • simple_variable
 
-    "variable"  shift, and go to state 31
+    "variable"  shift, and go to state 15
     '{'         shift, and go to state 339
     '$'         shift, and go to state 89
 
@@ -4762,11 +4897,11 @@
 
 State 90
 
-  475 function_call: name . argument_list
-  482 class_name: name .
-  505 constant: name .
+  475 function_call: name • argument_list
+  482 class_name: name •
+  505 constant: name •
 
-    '('  shift, and go to state 209
+    '('  shift, and go to state 202
 
     "'::'"    reduce using rule 482 (class_name)
     $default  reduce using rule 505 (constant)
@@ -4776,29 +4911,29 @@
 
 State 91
 
-  101 attributes: attribute .
+  101 attributes: attribute •
 
     $default  reduce using rule 101 (attributes)
 
 
 State 92
 
-  102 attributes: attributes . attribute
-  110 top_statement: attributes . attributed_statement
-  456 expr: attributes . inline_function
-  458     | attributes . "'static'" inline_function
+  102 attributes: attributes • attribute
+  110 top_statement: attributes • attributed_statement
+  456 expr: attributes • inline_function
+  458     | attributes • "'static'" inline_function
 
-    "'function'"   shift, and go to state 49
-    "'fn'"         shift, and go to state 50
+    "'function'"   shift, and go to state 41
+    "'fn'"         shift, and go to state 42
     "'static'"     shift, and go to state 342
-    "'abstract'"   shift, and go to state 57
-    "'final'"      shift, and go to state 58
-    "'readonly'"   shift, and go to state 157
-    "'class'"      shift, and go to state 64
-    "'trait'"      shift, and go to state 65
-    "'interface'"  shift, and go to state 66
-    "'enum'"       shift, and go to state 67
-    "'#'"         shift, and go to state 79
+    "'abstract'"   shift, and go to state 50
+    "'final'"      shift, and go to state 51
+    "'readonly'"   shift, and go to state 148
+    "'class'"      shift, and go to state 57
+    "'trait'"      shift, and go to state 58
+    "'interface'"  shift, and go to state 59
+    "'enum'"       shift, and go to state 60
+    "'#'"         shift, and go to state 72
 
     attribute                        go to state 343
     attributed_statement             go to state 344
@@ -4816,47 +4951,47 @@
 
 State 93
 
-  109 top_statement: attributed_statement .
+  109 top_statement: attributed_statement •
 
     $default  reduce using rule 109 (top_statement)
 
 
 State 94
 
-   84 top_statement_list: top_statement_list top_statement .
+   84 top_statement_list: top_statement_list top_statement •
 
     $default  reduce using rule 84 (top_statement_list)
 
 
 State 95
 
-  108 top_statement: statement .
+  108 top_statement: statement •
 
     $default  reduce using rule 108 (top_statement)
 
 
 State 96
 
-  103 attributed_statement: function_declaration_statement .
+  103 attributed_statement: function_declaration_statement •
 
     $default  reduce using rule 103 (attributed_statement)
 
 
 State 97
 
-  104 attributed_statement: class_declaration_statement .
+  104 attributed_statement: class_declaration_statement •
 
     $default  reduce using rule 104 (attributed_statement)
 
 
 State 98
 
-  191 class_declaration_statement: class_modifiers . "'class'" @4 "identifier" extends_from implements_list backup_doc_comment '{' class_statement_list '}'
-  195 class_modifiers: class_modifiers . class_modifier
+  191 class_declaration_statement: class_modifiers • "'class'" @4 "identifier" extends_from implements_list backup_doc_comment '{' class_statement_list '}'
+  195 class_modifiers: class_modifiers • class_modifier
 
-    "'abstract'"  shift, and go to state 57
-    "'final'"     shift, and go to state 58
-    "'readonly'"  shift, and go to state 157
+    "'abstract'"  shift, and go to state 50
+    "'final'"     shift, and go to state 51
+    "'readonly'"  shift, and go to state 148
     "'class'"     shift, and go to state 346
 
     class_modifier  go to state 347
@@ -4864,44 +4999,44 @@
 
 State 99
 
-  194 class_modifiers: class_modifier .
+  194 class_modifiers: class_modifier •
 
     $default  reduce using rule 194 (class_modifiers)
 
 
 State 100
 
-  105 attributed_statement: trait_declaration_statement .
+  105 attributed_statement: trait_declaration_statement •
 
     $default  reduce using rule 105 (attributed_statement)
 
 
 State 101
 
-  106 attributed_statement: interface_declaration_statement .
+  106 attributed_statement: interface_declaration_statement •
 
     $default  reduce using rule 106 (attributed_statement)
 
 
 State 102
 
-  107 attributed_statement: enum_declaration_statement .
+  107 attributed_statement: enum_declaration_statement •
 
     $default  reduce using rule 107 (attributed_statement)
 
 
 State 103
 
-  459 expr: match .
+  459 expr: match •
 
     $default  reduce using rule 459 (expr)
 
 
 State 104
 
-  251 if_stmt_without_else: if_stmt_without_else . "'elseif'" '(' expr ')' statement
-  252 if_stmt: if_stmt_without_else .
-  253        | if_stmt_without_else . "'else'" statement
+  251 if_stmt_without_else: if_stmt_without_else • "'elseif'" '(' expr ')' statement
+  252 if_stmt: if_stmt_without_else •
+  253        | if_stmt_without_else • "'else'" statement
 
     "'elseif'"  shift, and go to state 348
     "'else'"    shift, and go to state 349
@@ -4911,16 +5046,16 @@
 
 State 105
 
-  149 statement: if_stmt .
+  149 statement: if_stmt •
 
     $default  reduce using rule 149 (statement)
 
 
 State 106
 
-  255 alt_if_stmt_without_else: alt_if_stmt_without_else . "'elseif'" '(' expr ')' ':' inner_statement_list
-  256 alt_if_stmt: alt_if_stmt_without_else . "'endif'" ';'
-  257            | alt_if_stmt_without_else . "'else'" ':' inner_statement_list "'endif'" ';'
+  255 alt_if_stmt_without_else: alt_if_stmt_without_else • "'elseif'" '(' expr ')' ':' inner_statement_list
+  256 alt_if_stmt: alt_if_stmt_without_else • "'endif'" ';'
+  257            | alt_if_stmt_without_else • "'else'" ':' inner_statement_list "'endif'" ';'
 
     "'elseif'"  shift, and go to state 350
     "'else'"    shift, and go to state 351
@@ -4929,99 +5064,99 @@
 
 State 107
 
-  150 statement: alt_if_stmt .
+  150 statement: alt_if_stmt •
 
     $default  reduce using rule 150 (statement)
 
 
 State 108
 
-  433 expr: new_expr .
+  433 expr: new_expr •
 
     $default  reduce using rule 433 (expr)
 
 
 State 109
 
-  162 statement: expr . ';'
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-
-    "'or'"          shift, and go to state 353
-    "'xor'"         shift, and go to state 354
-    "'and'"         shift, and go to state 355
-    '?'             shift, and go to state 356
-    "'??'"          shift, and go to state 357
-    "'||'"          shift, and go to state 358
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  162 statement: expr • ';'
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+
+    '?'             shift, and go to state 353
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'or'"          shift, and go to state 364
+    "'xor'"         shift, and go to state 365
+    "'and'"         shift, and go to state 366
+    "'instanceof'"  shift, and go to state 367
+    "'||'"          shift, and go to state 368
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'??'"          shift, and go to state 379
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
     ';'             shift, and go to state 383
 
 
 State 110
 
-  455 expr: inline_function .
+  455 expr: inline_function •
 
     $default  reduce using rule 455 (expr)
 
 
 State 111
 
-  461 inline_function: fn . returns_ref backup_doc_comment '(' parameter_list ')' return_type "'=>'" backup_fn_flags backup_lex_pos expr backup_fn_flags
+  461 inline_function: fn • returns_ref backup_doc_comment '(' parameter_list ')' return_type "'=>'" backup_fn_flags backup_lex_pos expr backup_fn_flags
 
-    "amp"  shift, and go to state 324
-    "'&'"  shift, and go to state 325
+    "'&'"  shift, and go to state 326
+    "amp"  shift, and go to state 327
 
     $default  reduce using rule 467 (returns_ref)
 
@@ -5031,11 +5166,11 @@
 
 State 112
 
-  185 function_declaration_statement: function . returns_ref function_name backup_doc_comment '(' parameter_list ')' return_type backup_fn_flags '{' inner_statement_list '}' backup_fn_flags
-  460 inline_function: function . returns_ref backup_doc_comment '(' parameter_list ')' lexical_vars return_type backup_fn_flags '{' inner_statement_list '}' backup_fn_flags
+  185 function_declaration_statement: function • returns_ref function_name backup_doc_comment '(' parameter_list ')' return_type backup_fn_flags '{' inner_statement_list '}' backup_fn_flags
+  460 inline_function: function • returns_ref backup_doc_comment '(' parameter_list ')' lexical_vars return_type backup_fn_flags '{' inner_statement_list '}' backup_fn_flags
 
-    "amp"  shift, and go to state 324
-    "'&'"  shift, and go to state 325
+    "'&'"  shift, and go to state 326
+    "amp"  shift, and go to state 327
 
     $default  reduce using rule 467 (returns_ref)
 
@@ -5045,26 +5180,26 @@
 
 State 113
 
-  535 callable_variable: function_call .
+  535 callable_variable: function_call •
 
     $default  reduce using rule 535 (callable_variable)
 
 
 State 114
 
-  477 function_call: class_name . "'::'" member_name argument_list
-  514 class_constant: class_name . "'::'" identifier
-  516               | class_name . "'::'" '{' expr '}'
-  543 static_member: class_name . "'::'" simple_variable
+  477 function_call: class_name • "'::'" member_name argument_list
+  514 class_constant: class_name • "'::'" identifier
+  516               | class_name • "'::'" '{' expr '}'
+  543 static_member: class_name • "'::'" simple_variable
 
     "'::'"  shift, and go to state 387
 
 
 State 115
 
-  502 scalar: dereferenceable_scalar .
-  523 fully_dereferenceable: dereferenceable_scalar .
-  529 callable_expr: dereferenceable_scalar .
+  502 scalar: dereferenceable_scalar •
+  523 fully_dereferenceable: dereferenceable_scalar •
+  529 callable_expr: dereferenceable_scalar •
 
     "'->'"    reduce using rule 523 (fully_dereferenceable)
     "'?->'"   reduce using rule 523 (fully_dereferenceable)
@@ -5077,15 +5212,15 @@
 
 State 116
 
-  447 expr: scalar .
+  447 expr: scalar •
 
     $default  reduce using rule 447 (expr)
 
 
 State 117
 
-  503 scalar: constant .
-  526 array_object_dereferenceable: constant .
+  503 scalar: constant •
+  526 array_object_dereferenceable: constant •
 
     "'->'"    reduce using rule 526 (array_object_dereferenceable)
     "'?->'"   reduce using rule 526 (array_object_dereferenceable)
@@ -5096,8 +5231,8 @@
 
 State 118
 
-  504 scalar: class_constant .
-  524 fully_dereferenceable: class_constant .
+  504 scalar: class_constant •
+  524 fully_dereferenceable: class_constant •
 
     "'->'"    reduce using rule 524 (fully_dereferenceable)
     "'?->'"   reduce using rule 524 (fully_dereferenceable)
@@ -5109,18 +5244,18 @@
 
 State 119
 
-  478 function_call: variable_class_name . "'::'" member_name argument_list
-  515 class_constant: variable_class_name . "'::'" identifier
-  517               | variable_class_name . "'::'" '{' expr '}'
-  544 static_member: variable_class_name . "'::'" simple_variable
+  478 function_call: variable_class_name • "'::'" member_name argument_list
+  515 class_constant: variable_class_name • "'::'" identifier
+  517               | variable_class_name • "'::'" '{' expr '}'
+  544 static_member: variable_class_name • "'::'" simple_variable
 
     "'::'"  shift, and go to state 388
 
 
 State 120
 
-  520 variable_class_name: fully_dereferenceable .
-  525 array_object_dereferenceable: fully_dereferenceable .
+  520 variable_class_name: fully_dereferenceable •
+  525 array_object_dereferenceable: fully_dereferenceable •
 
     "'::'"    reduce using rule 520 (variable_class_name)
     $default  reduce using rule 525 (array_object_dereferenceable)
@@ -5128,12 +5263,12 @@
 
 State 121
 
-  531 callable_variable: array_object_dereferenceable . '' optional_expr ''
-  532                  | array_object_dereferenceable . '{' expr '}'
-  533                  | array_object_dereferenceable . "'->'" property_name argument_list
-  534                  | array_object_dereferenceable . "'?->'" property_name argument_list
-  538 variable: array_object_dereferenceable . "'->'" property_name
-  539         | array_object_dereferenceable . "'?->'" property_name
+  531 callable_variable: array_object_dereferenceable • '' optional_expr ''
+  532                  | array_object_dereferenceable • '{' expr '}'
+  533                  | array_object_dereferenceable • "'->'" property_name argument_list
+  534                  | array_object_dereferenceable • "'?->'" property_name argument_list
+  538 variable: array_object_dereferenceable • "'->'" property_name
+  539         | array_object_dereferenceable • "'?->'" property_name
 
     "'->'"   shift, and go to state 389
     "'?->'"  shift, and go to state 390
@@ -5143,7 +5278,7 @@
 
 State 122
 
-  480 function_call: callable_expr . @10 argument_list
+  480 function_call: callable_expr • @10 argument_list
 
     $default  reduce using rule 479 (@10)
 
@@ -5152,8 +5287,8 @@
 
 State 123
 
-  527 callable_expr: callable_variable .
-  536 variable: callable_variable .
+  527 callable_expr: callable_variable •
+  536 variable: callable_variable •
 
     '('       reduce using rule 527 (callable_expr)
     $default  reduce using rule 536 (variable)
@@ -5161,25 +5296,25 @@
 
 State 124
 
-  377 expr: variable .
-  380     | variable . '=' expr
-  381     | variable . '=' ampersand variable
-  383     | variable . "'+='" expr
-  384     | variable . "'-='" expr
-  385     | variable . "'*='" expr
-  386     | variable . "'**='" expr
-  387     | variable . "'/='" expr
-  388     | variable . "'.='" expr
-  389     | variable . "'%='" expr
-  390     | variable . "'&='" expr
-  391     | variable . "'|='" expr
-  392     | variable . "'^='" expr
-  393     | variable . "'<<='" expr
-  394     | variable . "'>>='" expr
-  395     | variable . "'??='" expr
-  396     | variable . "'++'"
-  398     | variable . "'--'"
-  521 fully_dereferenceable: variable .
+  377 expr: variable •
+  380     | variable • '=' expr
+  381     | variable • '=' ampersand variable
+  383     | variable • "'+='" expr
+  384     | variable • "'-='" expr
+  385     | variable • "'*='" expr
+  386     | variable • "'**='" expr
+  387     | variable • "'/='" expr
+  388     | variable • "'.='" expr
+  389     | variable • "'%='" expr
+  390     | variable • "'&='" expr
+  391     | variable • "'|='" expr
+  392     | variable • "'^='" expr
+  393     | variable • "'<<='" expr
+  394     | variable • "'>>='" expr
+  395     | variable • "'??='" expr
+  396     | variable • "'++'"
+  398     | variable • "'--'"
+  521 fully_dereferenceable: variable •
 
     '='      shift, and go to state 394
     "'+='"   shift, and go to state 395
@@ -5193,10 +5328,10 @@
     "'^='"   shift, and go to state 403
     "'<<='"  shift, and go to state 404
     "'>>='"  shift, and go to state 405
-    "'**='"  shift, and go to state 406
-    "'??='"  shift, and go to state 407
-    "'++'"   shift, and go to state 408
-    "'--'"   shift, and go to state 409
+    "'??='"  shift, and go to state 406
+    "'++'"   shift, and go to state 407
+    "'--'"   shift, and go to state 408
+    "'**='"  shift, and go to state 409
 
     "'->'"    reduce using rule 521 (fully_dereferenceable)
     "'?->'"   reduce using rule 521 (fully_dereferenceable)
@@ -5208,66 +5343,66 @@
 
 State 125
 
-  530 callable_variable: simple_variable .
+  530 callable_variable: simple_variable •
 
     $default  reduce using rule 530 (callable_variable)
 
 
 State 126
 
-  537 variable: static_member .
+  537 variable: static_member •
 
     $default  reduce using rule 537 (variable)
 
 
 State 127
 
-  437 expr: internal_functions_in_yacc .
+  437 expr: internal_functions_in_yacc •
 
     $default  reduce using rule 437 (expr)
 
 
 State 128
 
-   92 name: "identifier" .
+   92 name: "identifier" •
 
     $default  reduce using rule 92 (name)
 
 
 State 129
 
-  457 expr: "'static'" . inline_function
-  481 class_name: "'static'" .
+  457 expr: "'static'" • inline_function
+  481 class_name: "'static'" •
 
-    "'function'"  shift, and go to state 49
-    "'fn'"        shift, and go to state 50
+    "'function'"  shift, and go to state 41
+    "'fn'"        shift, and go to state 42
 
     $default  reduce using rule 481 (class_name)
 
-    inline_function  go to state 208
+    inline_function  go to state 201
     fn               go to state 111
     function         go to state 133
 
 
 State 130
 
-  476 function_call: "'readonly'" . argument_list
+  476 function_call: "'readonly'" • argument_list
 
-    '('  shift, and go to state 209
+    '('  shift, and go to state 202
 
-    argument_list  go to state 210
+    argument_list  go to state 203
 
 
 State 131
 
-  102 attributes: attributes . attribute
-  456 expr: attributes . inline_function
-  458     | attributes . "'static'" inline_function
+  102 attributes: attributes • attribute
+  456 expr: attributes • inline_function
+  458     | attributes • "'static'" inline_function
 
-    "'function'"  shift, and go to state 49
-    "'fn'"        shift, and go to state 50
+    "'function'"  shift, and go to state 41
+    "'fn'"        shift, and go to state 42
     "'static'"    shift, and go to state 342
-    "'#'"        shift, and go to state 79
+    "'#'"        shift, and go to state 72
 
     attribute        go to state 343
     inline_function  go to state 345
@@ -5277,79 +5412,50 @@
 
 State 132
 
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-  454     | "'throw'" expr .
-
-    "'or'"          shift, and go to state 353
-    "'xor'"         shift, and go to state 354
-    "'and'"         shift, and go to state 355
-    '?'             shift, and go to state 356
-    "'??'"          shift, and go to state 357
-    "'||'"          shift, and go to state 358
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  418     | '+' expr •
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
 
-    $default  reduce using rule 454 (expr)
+    "'**'"  shift, and go to state 380
+
+    $default  reduce using rule 418 (expr)
 
 
 State 133
 
-  460 inline_function: function . returns_ref backup_doc_comment '(' parameter_list ')' lexical_vars return_type backup_fn_flags '{' inner_statement_list '}' backup_fn_flags
+  460 inline_function: function • returns_ref backup_doc_comment '(' parameter_list ')' lexical_vars return_type backup_fn_flags '{' inner_statement_list '}' backup_fn_flags
 
-    "amp"  shift, and go to state 324
-    "'&'"  shift, and go to state 325
+    "'&'"  shift, and go to state 326
+    "amp"  shift, and go to state 327
 
     $default  reduce using rule 467 (returns_ref)
 
@@ -5359,1062 +5465,366 @@
 
 State 134
 
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-  588 internal_functions_in_yacc: "'include'" expr .
-
-    "'or'"          shift, and go to state 353
-    "'xor'"         shift, and go to state 354
-    "'and'"         shift, and go to state 355
-    '?'             shift, and go to state 356
-    "'??'"          shift, and go to state 357
-    "'||'"          shift, and go to state 358
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
-
-    $default  reduce using rule 588 (internal_functions_in_yacc)
-
-
-State 135
-
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-  589 internal_functions_in_yacc: "'include_once'" expr .
-
-    "'or'"          shift, and go to state 353
-    "'xor'"         shift, and go to state 354
-    "'and'"         shift, and go to state 355
-    '?'             shift, and go to state 356
-    "'??'"          shift, and go to state 357
-    "'||'"          shift, and go to state 358
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
-
-    $default  reduce using rule 589 (internal_functions_in_yacc)
-
-
-State 136
-
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-  591 internal_functions_in_yacc: "'require'" expr .
-
-    "'or'"          shift, and go to state 353
-    "'xor'"         shift, and go to state 354
-    "'and'"         shift, and go to state 355
-    '?'             shift, and go to state 356
-    "'??'"          shift, and go to state 357
-    "'||'"          shift, and go to state 358
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
-
-    $default  reduce using rule 591 (internal_functions_in_yacc)
-
-
-State 137
-
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-  592 internal_functions_in_yacc: "'require_once'" expr .
-
-    "'or'"          shift, and go to state 353
-    "'xor'"         shift, and go to state 354
-    "'and'"         shift, and go to state 355
-    '?'             shift, and go to state 356
-    "'??'"          shift, and go to state 357
-    "'||'"          shift, and go to state 358
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
-
-    $default  reduce using rule 592 (internal_functions_in_yacc)
-
-
-State 138
-
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-  449     | "'print'" expr .
-
-    '?'             shift, and go to state 356
-    "'??'"          shift, and go to state 357
-    "'||'"          shift, and go to state 358
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
-
-    $default  reduce using rule 449 (expr)
-
-
-State 139
-
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-  451     | "'yield'" expr .
-  452     | "'yield'" expr . "'=>'" expr
-
-    "'=>'"          shift, and go to state 411
-    '?'             shift, and go to state 356
-    "'??'"          shift, and go to state 357
-    "'||'"          shift, and go to state 358
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
-
-    $default  reduce using rule 451 (expr)
-
-
-State 140
-
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-  453     | "'yield from'" expr .
-
-    '?'             shift, and go to state 356
-    "'??'"          shift, and go to state 357
-    "'||'"          shift, and go to state 358
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
-
-    $default  reduce using rule 453 (expr)
-
-
-State 141
-
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  418     | '+' expr .
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-
-    "'**'"  shift, and go to state 382
-
-    $default  reduce using rule 418 (expr)
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  419     | '-' expr •
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
 
-
-State 142
-
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  419     | '-' expr .
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-
-    "'**'"  shift, and go to state 382
+    "'**'"  shift, and go to state 380
 
     $default  reduce using rule 419 (expr)
 
 
-State 143
+State 135
 
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  420     | '!' expr .
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  420     | '!' expr •
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
 
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+    "'instanceof'"  shift, and go to state 367
+    "'**'"          shift, and go to state 380
 
     $default  reduce using rule 420 (expr)
 
 
-State 144
+State 136
 
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  421     | '~' expr .
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  421     | '~' expr •
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
 
-    "'**'"  shift, and go to state 382
+    "'**'"  shift, and go to state 380
 
     $default  reduce using rule 421 (expr)
 
 
-State 145
-
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-  438     | "'(int)'" expr .
-
-    "'**'"  shift, and go to state 382
-
-    $default  reduce using rule 438 (expr)
-
-
-State 146
-
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-  439     | "'(double)'" expr .
-
-    "'**'"  shift, and go to state 382
-
-    $default  reduce using rule 439 (expr)
-
-
-State 147
-
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-  440     | "'(string)'" expr .
-
-    "'**'"  shift, and go to state 382
-
-    $default  reduce using rule 440 (expr)
-
-
-State 148
-
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-  441     | "'(array)'" expr .
-
-    "'**'"  shift, and go to state 382
-
-    $default  reduce using rule 441 (expr)
-
-
-State 149
-
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-  442     | "'(object)'" expr .
-
-    "'**'"  shift, and go to state 382
-
-    $default  reduce using rule 442 (expr)
-
-
-State 150
-
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-  443     | "'(bool)'" expr .
-
-    "'**'"  shift, and go to state 382
-
-    $default  reduce using rule 443 (expr)
-
-
-State 151
-
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-  444     | "'(unset)'" expr .
+State 137
 
-    "'**'"  shift, and go to state 382
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+  446     | '@' expr •
 
-    $default  reduce using rule 444 (expr)
+    "'**'"  shift, and go to state 380
 
+    $default  reduce using rule 446 (expr)
 
-State 152
 
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-  446     | '@' expr .
+State 138
 
-    "'**'"  shift, and go to state 382
+  171 statement: "identifier" ':' •
 
-    $default  reduce using rule 446 (expr)
+    $default  reduce using rule 171 (statement)
 
 
-State 153
+State 139
 
-  382 expr: "'clone'" expr .
-  400     | expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+  588 internal_functions_in_yacc: "'include'" expr •
+
+    '?'             shift, and go to state 353
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'or'"          shift, and go to state 364
+    "'xor'"         shift, and go to state 365
+    "'and'"         shift, and go to state 366
+    "'instanceof'"  shift, and go to state 367
+    "'||'"          shift, and go to state 368
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'??'"          shift, and go to state 379
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
 
-    $default  reduce using rule 382 (expr)
+    $default  reduce using rule 588 (internal_functions_in_yacc)
 
 
-State 154
+State 140
 
-  171 statement: "identifier" ':' .
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+  589 internal_functions_in_yacc: "'include_once'" expr •
+
+    '?'             shift, and go to state 353
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'or'"          shift, and go to state 364
+    "'xor'"         shift, and go to state 365
+    "'and'"         shift, and go to state 366
+    "'instanceof'"  shift, and go to state 367
+    "'||'"          shift, and go to state 368
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'??'"          shift, and go to state 379
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
 
-    $default  reduce using rule 171 (statement)
+    $default  reduce using rule 589 (internal_functions_in_yacc)
 
 
-State 155
+State 141
 
-  590 internal_functions_in_yacc: "'eval'" '(' . expr ')'
+  590 internal_functions_in_yacc: "'eval'" '(' • expr ')'
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -6427,7 +5837,7 @@
     attributes                    go to state 131
     match                         go to state 103
     new_expr                      go to state 108
-    expr                          go to state 412
+    expr                          go to state 411
     inline_function               go to state 110
     fn                            go to state 111
     function                      go to state 133
@@ -6448,76 +5858,414 @@
     internal_functions_in_yacc    go to state 127
 
 
-State 156
+State 142
 
-  481 class_name: "'static'" .
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+  591 internal_functions_in_yacc: "'require'" expr •
+
+    '?'             shift, and go to state 353
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'or'"          shift, and go to state 364
+    "'xor'"         shift, and go to state 365
+    "'and'"         shift, and go to state 366
+    "'instanceof'"  shift, and go to state 367
+    "'||'"          shift, and go to state 368
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'??'"          shift, and go to state 379
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
+
+    $default  reduce using rule 591 (internal_functions_in_yacc)
+
+
+State 143
+
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+  592 internal_functions_in_yacc: "'require_once'" expr •
+
+    '?'             shift, and go to state 353
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'or'"          shift, and go to state 364
+    "'xor'"         shift, and go to state 365
+    "'and'"         shift, and go to state 366
+    "'instanceof'"  shift, and go to state 367
+    "'||'"          shift, and go to state 368
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'??'"          shift, and go to state 379
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
+
+    $default  reduce using rule 592 (internal_functions_in_yacc)
+
+
+State 144
+
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+  449     | "'print'" expr •
+
+    '?'             shift, and go to state 353
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'instanceof'"  shift, and go to state 367
+    "'||'"          shift, and go to state 368
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'??'"          shift, and go to state 379
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
+
+    $default  reduce using rule 449 (expr)
+
+
+State 145
+
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+  451     | "'yield'" expr •
+  452     | "'yield'" expr • "'=>'" expr
+
+    '?'             shift, and go to state 353
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'instanceof'"  shift, and go to state 367
+    "'||'"          shift, and go to state 368
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'=>'"          shift, and go to state 412
+    "'??'"          shift, and go to state 379
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
+
+    $default  reduce using rule 451 (expr)
+
+
+State 146
+
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+  453     | "'yield from'" expr •
+
+    '?'             shift, and go to state 353
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'instanceof'"  shift, and go to state 367
+    "'||'"          shift, and go to state 368
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'??'"          shift, and go to state 379
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
+
+    $default  reduce using rule 453 (expr)
+
+
+State 147
+
+  481 class_name: "'static'" •
 
     $default  reduce using rule 481 (class_name)
 
 
-State 157
+State 148
 
-  202 class_modifier: "'readonly'" .
+  202 class_modifier: "'readonly'" •
 
     $default  reduce using rule 202 (class_modifier)
 
 
-State 158
+State 149
 
-  485 class_name_reference: '(' . expr ')'
+  485 class_name_reference: '(' • expr ')'
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -6551,82 +6299,82 @@
     internal_functions_in_yacc    go to state 127
 
 
-State 159
+State 150
 
-  482 class_name: name .
+  482 class_name: name •
 
     $default  reduce using rule 482 (class_name)
 
 
-State 160
+State 151
 
-  102 attributes: attributes . attribute
-  376 new_expr: "'new'" attributes . anonymous_class
+  102 attributes: attributes • attribute
+  376 new_expr: "'new'" attributes • anonymous_class
 
-    "'abstract'"  shift, and go to state 57
-    "'final'"     shift, and go to state 58
-    "'readonly'"  shift, and go to state 157
-    "'#'"        shift, and go to state 79
+    "'abstract'"  shift, and go to state 50
+    "'final'"     shift, and go to state 51
+    "'readonly'"  shift, and go to state 148
+    "'#'"        shift, and go to state 72
 
     $default  reduce using rule 198 (anonymous_class_modifiers_optional)
 
     attribute                           go to state 343
-    anonymous_class_modifiers           go to state 161
-    anonymous_class_modifiers_optional  go to state 162
-    class_modifier                      go to state 163
+    anonymous_class_modifiers           go to state 152
+    anonymous_class_modifiers_optional  go to state 153
+    class_modifier                      go to state 154
     anonymous_class                     go to state 414
 
 
-State 161
+State 152
 
-  197 anonymous_class_modifiers: anonymous_class_modifiers . class_modifier
-  199 anonymous_class_modifiers_optional: anonymous_class_modifiers .
+  197 anonymous_class_modifiers: anonymous_class_modifiers • class_modifier
+  199 anonymous_class_modifiers_optional: anonymous_class_modifiers •
 
-    "'abstract'"  shift, and go to state 57
-    "'final'"     shift, and go to state 58
-    "'readonly'"  shift, and go to state 157
+    "'abstract'"  shift, and go to state 50
+    "'final'"     shift, and go to state 51
+    "'readonly'"  shift, and go to state 148
 
     $default  reduce using rule 199 (anonymous_class_modifiers_optional)
 
     class_modifier  go to state 415
 
 
-State 162
+State 153
 
-  373 anonymous_class: anonymous_class_modifiers_optional . "'class'" @9 ctor_arguments extends_from implements_list backup_doc_comment '{' class_statement_list '}'
+  373 anonymous_class: anonymous_class_modifiers_optional • "'class'" @9 ctor_arguments extends_from implements_list backup_doc_comment '{' class_statement_list '}'
 
     "'class'"  shift, and go to state 416
 
 
-State 163
+State 154
 
-  196 anonymous_class_modifiers: class_modifier .
+  196 anonymous_class_modifiers: class_modifier •
 
     $default  reduce using rule 196 (anonymous_class_modifiers)
 
 
-State 164
+State 155
 
-  375 new_expr: "'new'" anonymous_class .
+  375 new_expr: "'new'" anonymous_class •
 
     $default  reduce using rule 375 (new_expr)
 
 
-State 165
+State 156
 
-  483 class_name_reference: class_name .
-  550 new_variable: class_name . "'::'" simple_variable
+  483 class_name_reference: class_name •
+  550 new_variable: class_name • "'::'" simple_variable
 
     "'::'"  shift, and go to state 417
 
     $default  reduce using rule 483 (class_name_reference)
 
 
-State 166
+State 157
 
-  374 new_expr: "'new'" class_name_reference . ctor_arguments
+  374 new_expr: "'new'" class_name_reference • ctor_arguments
 
-    '('  shift, and go to state 209
+    '('  shift, and go to state 202
 
     $default  reduce using rule 491 (ctor_arguments)
 
@@ -6634,21 +6382,21 @@
     ctor_arguments  go to state 419
 
 
-State 167
+State 158
 
-  545 new_variable: simple_variable .
+  545 new_variable: simple_variable •
 
     $default  reduce using rule 545 (new_variable)
 
 
-State 168
+State 159
 
-  484 class_name_reference: new_variable .
-  546 new_variable: new_variable . '' optional_expr ''
-  547             | new_variable . '{' expr '}'
-  548             | new_variable . "'->'" property_name
-  549             | new_variable . "'?->'" property_name
-  551             | new_variable . "'::'" simple_variable
+  484 class_name_reference: new_variable •
+  546 new_variable: new_variable • '' optional_expr ''
+  547             | new_variable • '{' expr '}'
+  548             | new_variable • "'->'" property_name
+  549             | new_variable • "'?->'" property_name
+  551             | new_variable • "'::'" simple_variable
 
     "'->'"   shift, and go to state 420
     "'?->'"  shift, and go to state 421
@@ -6659,62 +6407,100 @@
     $default  reduce using rule 484 (class_name_reference)
 
 
-State 169
+State 160
 
-  487 exit_expr: '(' . optional_expr ')'
+  382 expr: "'clone'" expr •
+  400     | expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    $default  reduce using rule 382 (expr)
+
+
+State 161
+
+  487 exit_expr: '(' • optional_expr ')'
+
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -6729,7 +6515,7 @@
     attributes                    go to state 131
     match                         go to state 103
     new_expr                      go to state 108
-    expr                          go to state 182
+    expr                          go to state 174
     inline_function               go to state 110
     fn                            go to state 111
     function                      go to state 133
@@ -6751,70 +6537,70 @@
     internal_functions_in_yacc    go to state 127
 
 
-State 170
+State 162
 
-  445 expr: "'exit'" exit_expr .
+  445 expr: "'exit'" exit_expr •
 
     $default  reduce using rule 445 (expr)
 
 
-State 171
+State 163
 
-  250 if_stmt_without_else: "'if'" '(' . expr ')' statement
-  254 alt_if_stmt_without_else: "'if'" '(' . expr ')' ':' inner_statement_list
+  250 if_stmt_without_else: "'if'" '(' • expr ')' statement
+  254 alt_if_stmt_without_else: "'if'" '(' • expr ')' ':' inner_statement_list
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -6848,154 +6634,154 @@
     internal_functions_in_yacc    go to state 127
 
 
-State 172
+State 164
 
-  160 statement: "'echo'" echo_expr_list . ';'
-  365 echo_expr_list: echo_expr_list . ',' echo_expr
+  160 statement: "'echo'" echo_expr_list • ';'
+  365 echo_expr_list: echo_expr_list • ',' echo_expr
 
     ','  shift, and go to state 427
     ';'  shift, and go to state 428
 
 
-State 173
+State 165
 
-  366 echo_expr_list: echo_expr .
+  366 echo_expr_list: echo_expr •
 
     $default  reduce using rule 366 (echo_expr_list)
 
 
-State 174
+State 166
 
-  367 echo_expr: expr .
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-
-    "'or'"          shift, and go to state 353
-    "'xor'"         shift, and go to state 354
-    "'and'"         shift, and go to state 355
-    '?'             shift, and go to state 356
-    "'??'"          shift, and go to state 357
-    "'||'"          shift, and go to state 358
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  367 echo_expr: expr •
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+
+    '?'             shift, and go to state 353
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'or'"          shift, and go to state 364
+    "'xor'"         shift, and go to state 365
+    "'and'"         shift, and go to state 366
+    "'instanceof'"  shift, and go to state 367
+    "'||'"          shift, and go to state 368
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'??'"          shift, and go to state 379
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
 
     $default  reduce using rule 367 (echo_expr)
 
 
-State 175
+State 167
 
-  152 statement: "'do'" statement . "'while'" '(' expr ')' ';'
+  152 statement: "'do'" statement • "'while'" '(' expr ')' ';'
 
     "'while'"  shift, and go to state 429
 
 
-State 176
+State 168
 
-  151 statement: "'while'" '(' . expr ')' while_statement
+  151 statement: "'while'" '(' • expr ')' while_statement
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -7029,62 +6815,62 @@
     internal_functions_in_yacc    go to state 127
 
 
-State 177
+State 169
 
-  153 statement: "'for'" '(' . for_exprs ';' for_exprs ';' for_exprs ')' for_statement
+  153 statement: "'for'" '(' • for_exprs ';' for_exprs ';' for_exprs ')' for_statement
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -7122,63 +6908,63 @@
     internal_functions_in_yacc    go to state 127
 
 
-State 178
+State 170
 
-  164 statement: "'foreach'" '(' . expr "'as'" foreach_variable ')' foreach_statement
-  165          | "'foreach'" '(' . expr "'as'" foreach_variable "'=>'" foreach_variable ')' foreach_statement
+  164 statement: "'foreach'" '(' • expr "'as'" foreach_variable ')' foreach_statement
+  165          | "'foreach'" '(' • expr "'as'" foreach_variable "'=>'" foreach_variable ')' foreach_statement
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -7212,72 +6998,72 @@
     internal_functions_in_yacc    go to state 127
 
 
-State 179
+State 171
 
-  167 statement: "'declare'" '(' . const_list ')' $@3 declare_statement
+  167 statement: "'declare'" '(' • const_list ')' $@3 declare_statement
 
-    "identifier"  shift, and go to state 186
+    "identifier"  shift, and go to state 178
 
     const_list  go to state 435
-    const_decl  go to state 188
+    const_decl  go to state 180
 
 
-State 180
+State 172
 
-  154 statement: "'switch'" '(' . expr ')' switch_case_list
+  154 statement: "'switch'" '(' • expr ')' switch_case_list
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -7311,62 +7097,62 @@
     internal_functions_in_yacc    go to state 127
 
 
-State 181
+State 173
 
-  239 match: "'match'" '(' . expr ')' '{' match_arm_list '}'
+  239 match: "'match'" '(' • expr ')' '{' match_arm_list '}'
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -7400,182 +7186,251 @@
     internal_functions_in_yacc    go to state 127
 
 
-State 182
+State 174
 
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-  519 optional_expr: expr .
-
-    "'or'"          shift, and go to state 353
-    "'xor'"         shift, and go to state 354
-    "'and'"         shift, and go to state 355
-    '?'             shift, and go to state 356
-    "'??'"          shift, and go to state 357
-    "'||'"          shift, and go to state 358
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+  519 optional_expr: expr •
+
+    '?'             shift, and go to state 353
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'or'"          shift, and go to state 364
+    "'xor'"         shift, and go to state 365
+    "'and'"         shift, and go to state 366
+    "'instanceof'"  shift, and go to state 367
+    "'||'"          shift, and go to state 368
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'??'"          shift, and go to state 379
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
 
     $default  reduce using rule 519 (optional_expr)
 
 
-State 183
+State 175
 
-  155 statement: "'break'" optional_expr . ';'
+  155 statement: "'break'" optional_expr • ';'
 
     ';'  shift, and go to state 438
 
 
-State 184
+State 176
 
-  156 statement: "'continue'" optional_expr . ';'
+  156 statement: "'continue'" optional_expr • ';'
 
     ';'  shift, and go to state 439
 
 
-State 185
+State 177
 
-  170 statement: "'goto'" "identifier" . ';'
+  170 statement: "'goto'" "identifier" • ';'
 
     ';'  shift, and go to state 440
 
 
-State 186
+State 178
 
-  364 const_decl: "identifier" . '=' expr backup_doc_comment
+  364 const_decl: "identifier" • '=' expr backup_doc_comment
 
     '='  shift, and go to state 441
 
 
-State 187
+State 179
 
-  121 top_statement: "'const'" const_list . ';'
-  140 const_list: const_list . ',' const_decl
+  121 top_statement: "'const'" const_list • ';'
+  140 const_list: const_list • ',' const_decl
 
     ','  shift, and go to state 442
     ';'  shift, and go to state 443
 
 
-State 188
+State 180
 
-  141 const_list: const_decl .
+  141 const_list: const_decl •
 
     $default  reduce using rule 141 (const_list)
 
 
-State 189
+State 181
 
-  157 statement: "'return'" optional_expr . ';'
+  157 statement: "'return'" optional_expr • ';'
 
     ';'  shift, and go to state 444
 
 
-State 190
+State 182
 
-  169 statement: "'try'" '{' . inner_statement_list '}' catch_list finally_statement
+  169 statement: "'try'" '{' • inner_statement_list '}' catch_list finally_statement
 
     $default  reduce using rule 143 (inner_statement_list)
 
     inner_statement_list  go to state 445
 
 
-State 191
+State 183
 
-   88 namespace_name: "identifier" .
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+  454     | "'throw'" expr •
+
+    '?'             shift, and go to state 353
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'or'"          shift, and go to state 364
+    "'xor'"         shift, and go to state 365
+    "'and'"         shift, and go to state 366
+    "'instanceof'"  shift, and go to state 367
+    "'||'"          shift, and go to state 368
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'??'"          shift, and go to state 379
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
+
+    $default  reduce using rule 454 (expr)
+
+
+State 184
+
+   88 namespace_name: "identifier" •
 
     $default  reduce using rule 88 (namespace_name)
 
 
-State 192
+State 185
 
-   91 legacy_namespace_name: "fully qualified name" .
+   91 legacy_namespace_name: "fully qualified name" •
 
     $default  reduce using rule 91 (legacy_namespace_name)
 
 
-State 193
+State 186
 
-   89 namespace_name: "namespaced name" .
+   89 namespace_name: "namespaced name" •
 
     $default  reduce using rule 89 (namespace_name)
 
 
-State 194
+State 187
 
-  122 use_type: "'function'" .
+  122 use_type: "'function'" •
 
     $default  reduce using rule 122 (use_type)
 
 
-State 195
+State 188
 
-  123 use_type: "'const'" .
+  123 use_type: "'const'" •
 
     $default  reduce using rule 123 (use_type)
 
 
-State 196
+State 189
 
-   90 legacy_namespace_name: namespace_name .
+   90 legacy_namespace_name: namespace_name •
 
     $default  reduce using rule 90 (legacy_namespace_name)
 
 
-State 197
+State 190
 
-  125 mixed_group_use_declaration: legacy_namespace_name . "'\\'" '{' inline_use_declarations possible_comma '}'
-  138 use_declaration: legacy_namespace_name .
-  139                | legacy_namespace_name . "'as'" "identifier"
+  125 mixed_group_use_declaration: legacy_namespace_name • "'\\'" '{' inline_use_declarations possible_comma '}'
+  138 use_declaration: legacy_namespace_name •
+  139                | legacy_namespace_name • "'as'" "identifier"
 
     "'as'"  shift, and go to state 446
     "'\\'"  shift, and go to state 447
@@ -7583,197 +7438,190 @@
     $default  reduce using rule 138 (use_declaration)
 
 
-State 198
+State 191
 
-  118 top_statement: "'use'" use_type . group_use_declaration ';'
-  120              | "'use'" use_type . use_declarations ';'
+  118 top_statement: "'use'" use_type • group_use_declaration ';'
+  120              | "'use'" use_type • use_declarations ';'
 
-    "identifier"            shift, and go to state 191
-    "fully qualified name"  shift, and go to state 192
-    "namespaced name"       shift, and go to state 193
+    "identifier"            shift, and go to state 184
+    "fully qualified name"  shift, and go to state 185
+    "namespaced name"       shift, and go to state 186
 
-    namespace_name         go to state 196
+    namespace_name         go to state 189
     legacy_namespace_name  go to state 448
     group_use_declaration  go to state 449
     use_declarations       go to state 450
-    use_declaration        go to state 201
+    use_declaration        go to state 194
 
 
-State 199
+State 192
 
-  117 top_statement: "'use'" mixed_group_use_declaration . ';'
+  117 top_statement: "'use'" mixed_group_use_declaration • ';'
 
     ';'  shift, and go to state 451
 
 
-State 200
+State 193
 
-  119 top_statement: "'use'" use_declarations . ';'
-  132 use_declarations: use_declarations . ',' use_declaration
+  119 top_statement: "'use'" use_declarations • ';'
+  132 use_declarations: use_declarations • ',' use_declaration
 
     ','  shift, and go to state 452
     ';'  shift, and go to state 453
 
 
-State 201
+State 194
 
-  133 use_declarations: use_declaration .
+  133 use_declarations: use_declaration •
 
     $default  reduce using rule 133 (use_declarations)
 
 
-State 202
+State 195
 
-  158 statement: "'global'" global_var_list . ';'
-  305 global_var_list: global_var_list . ',' global_var
+  158 statement: "'global'" global_var_list • ';'
+  305 global_var_list: global_var_list • ',' global_var
 
     ','  shift, and go to state 454
     ';'  shift, and go to state 455
 
 
-State 203
+State 196
 
-  306 global_var_list: global_var .
+  306 global_var_list: global_var •
 
     $default  reduce using rule 306 (global_var_list)
 
 
-State 204
+State 197
 
-  307 global_var: simple_variable .
+  307 global_var: simple_variable •
 
     $default  reduce using rule 307 (global_var)
 
 
-State 205
+State 198
 
-  310 static_var: "variable" .
-  311           | "variable" . '=' expr
+  310 static_var: "variable" •
+  311           | "variable" • '=' expr
 
     '='  shift, and go to state 456
 
     $default  reduce using rule 310 (static_var)
 
 
-State 206
+State 199
 
-  159 statement: "'static'" static_var_list . ';'
-  308 static_var_list: static_var_list . ',' static_var
+  159 statement: "'static'" static_var_list • ';'
+  308 static_var_list: static_var_list • ',' static_var
 
     ','  shift, and go to state 457
     ';'  shift, and go to state 458
 
 
-State 207
+State 200
 
-  309 static_var_list: static_var .
+  309 static_var_list: static_var •
 
     $default  reduce using rule 309 (static_var_list)
 
 
-State 208
+State 201
 
-  457 expr: "'static'" inline_function .
+  457 expr: "'static'" inline_function •
 
     $default  reduce using rule 457 (expr)
 
 
-State 209
-
-  297 argument_list: '(' . ')'
-  298              | '(' . non_empty_argument_list possible_comma ')'
-  299              | '(' . "'...'" ')'
+State 202
 
-    "'throw'"                  shift, and go to state 459
+  297 argument_list: '(' • ')'
+  298              | '(' • non_empty_argument_list possible_comma ')'
+  299              | '(' • "'...'" ')'
+
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 459
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
     "'include'"                shift, and go to state 460
     "'include_once'"           shift, and go to state 461
-    "'require'"                shift, and go to state 462
-    "'require_once'"           shift, and go to state 463
-    "'or'"                     shift, and go to state 224
-    "'xor'"                    shift, and go to state 225
-    "'and'"                    shift, and go to state 226
-    "'print'"                  shift, and go to state 464
-    "'yield'"                  shift, and go to state 465
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    "'instanceof'"             shift, and go to state 229
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 466
-    "'elseif'"                 shift, and go to state 231
-    "'else'"                   shift, and go to state 232
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 467
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 468
-    "'new'"                    shift, and go to state 469
-    "'exit'"                   shift, and go to state 470
-    "'if'"                     shift, and go to state 238
-    "'endif'"                  shift, and go to state 239
-    "'echo'"                   shift, and go to state 240
-    "'do'"                     shift, and go to state 241
-    "'while'"                  shift, and go to state 242
-    "'endwhile'"               shift, and go to state 243
-    "'for'"                    shift, and go to state 244
-    "'endfor'"                 shift, and go to state 245
-    "'foreach'"                shift, and go to state 246
-    "'endforeach'"             shift, and go to state 247
-    "'declare'"                shift, and go to state 248
-    "'enddeclare'"             shift, and go to state 249
-    "'as'"                     shift, and go to state 250
-    "'switch'"                 shift, and go to state 251
-    "'endswitch'"              shift, and go to state 252
-    "'case'"                   shift, and go to state 253
-    "'default'"                shift, and go to state 254
-    "'match'"                  shift, and go to state 471
-    "'break'"                  shift, and go to state 256
-    "'continue'"               shift, and go to state 257
-    "'goto'"                   shift, and go to state 258
-    "'function'"               shift, and go to state 472
-    "'fn'"                     shift, and go to state 473
-    "'const'"                  shift, and go to state 261
-    "'return'"                 shift, and go to state 262
-    "'try'"                    shift, and go to state 263
-    "'catch'"                  shift, and go to state 264
-    "'finally'"                shift, and go to state 265
-    "'use'"                    shift, and go to state 266
-    "'insteadof'"              shift, and go to state 267
-    "'global'"                 shift, and go to state 268
+    "'eval'"                   shift, and go to state 462
+    "'require'"                shift, and go to state 463
+    "'require_once'"           shift, and go to state 464
+    "'or'"                     shift, and go to state 219
+    "'xor'"                    shift, and go to state 220
+    "'and'"                    shift, and go to state 221
+    "'print'"                  shift, and go to state 465
+    "'yield'"                  shift, and go to state 466
+    "'yield from'"             shift, and go to state 25
+    "'instanceof'"             shift, and go to state 224
+    "'new'"                    shift, and go to state 467
+    "'clone'"                  shift, and go to state 468
+    "'exit'"                   shift, and go to state 469
+    "'if'"                     shift, and go to state 228
+    "'elseif'"                 shift, and go to state 229
+    "'else'"                   shift, and go to state 230
+    "'endif'"                  shift, and go to state 231
+    "'echo'"                   shift, and go to state 232
+    "'do'"                     shift, and go to state 233
+    "'while'"                  shift, and go to state 234
+    "'endwhile'"               shift, and go to state 235
+    "'for'"                    shift, and go to state 236
+    "'endfor'"                 shift, and go to state 237
+    "'foreach'"                shift, and go to state 238
+    "'endforeach'"             shift, and go to state 239
+    "'declare'"                shift, and go to state 240
+    "'enddeclare'"             shift, and go to state 241
+    "'as'"                     shift, and go to state 242
+    "'switch'"                 shift, and go to state 243
+    "'endswitch'"              shift, and go to state 244
+    "'case'"                   shift, and go to state 245
+    "'default'"                shift, and go to state 246
+    "'match'"                  shift, and go to state 470
+    "'break'"                  shift, and go to state 248
+    "'continue'"               shift, and go to state 249
+    "'goto'"                   shift, and go to state 250
+    "'function'"               shift, and go to state 471
+    "'fn'"                     shift, and go to state 472
+    "'const'"                  shift, and go to state 253
+    "'return'"                 shift, and go to state 254
+    "'try'"                    shift, and go to state 255
+    "'catch'"                  shift, and go to state 256
+    "'finally'"                shift, and go to state 257
+    "'throw'"                  shift, and go to state 473
+    "'use'"                    shift, and go to state 259
+    "'insteadof'"              shift, and go to state 260
+    "'global'"                 shift, and go to state 261
     "'static'"                 shift, and go to state 474
-    "'abstract'"               shift, and go to state 270
-    "'final'"                  shift, and go to state 271
-    "'private'"                shift, and go to state 272
-    "'protected'"              shift, and go to state 273
-    "'public'"                 shift, and go to state 274
+    "'abstract'"               shift, and go to state 263
+    "'final'"                  shift, and go to state 264
+    "'private'"                shift, and go to state 265
+    "'protected'"              shift, and go to state 266
+    "'public'"                 shift, and go to state 267
     "'readonly'"               shift, and go to state 475
-    "'var'"                    shift, and go to state 276
-    "'unset'"                  shift, and go to state 277
+    "'var'"                    shift, and go to state 269
+    "'unset'"                  shift, and go to state 270
     "'isset'"                  shift, and go to state 476
     "'empty'"                  shift, and go to state 477
-    "'class'"                  shift, and go to state 280
-    "'trait'"                  shift, and go to state 281
-    "'interface'"              shift, and go to state 282
-    "'enum'"                   shift, and go to state 283
-    "'extends'"                shift, and go to state 284
-    "'implements'"             shift, and go to state 285
-    "'namespace'"              shift, and go to state 286
+    "'class'"                  shift, and go to state 273
+    "'trait'"                  shift, and go to state 274
+    "'interface'"              shift, and go to state 275
+    "'enum'"                   shift, and go to state 276
+    "'extends'"                shift, and go to state 277
+    "'implements'"             shift, and go to state 278
+    "'namespace'"              shift, and go to state 279
     "'list'"                   shift, and go to state 478
     "'array'"                  shift, and go to state 479
-    "'callable'"               shift, and go to state 289
+    "'callable'"               shift, and go to state 282
     "'__LINE__'"               shift, and go to state 480
     "'__FILE__'"               shift, and go to state 481
     "'__DIR__'"                shift, and go to state 482
@@ -7782,9 +7630,16 @@
     "'__METHOD__'"             shift, and go to state 485
     "'__FUNCTION__'"           shift, and go to state 486
     "'__NAMESPACE__'"          shift, and go to state 487
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     "'...'"                    shift, and go to state 488
     '('                        shift, and go to state 83
@@ -7794,8 +7649,8 @@
     '"'                        shift, and go to state 88
     '$'                        shift, and go to state 89
 
-    reserved_non_modifiers        go to state 298
-    semi_reserved                 go to state 299
+    reserved_non_modifiers        go to state 291
+    semi_reserved                 go to state 292
     identifier                    go to state 490
     name                          go to state 90
     attribute                     go to state 91
@@ -7825,36 +7680,36 @@
     internal_functions_in_yacc    go to state 127
 
 
-State 210
+State 203
 
-  476 function_call: "'readonly'" argument_list .
+  476 function_call: "'readonly'" argument_list •
 
     $default  reduce using rule 476 (function_call)
 
 
-State 211
+State 204
 
-  163 statement: "'unset'" '(' . unset_variables possible_comma ')' ';'
+  163 statement: "'unset'" '(' • unset_variables possible_comma ')' ';'
 
     "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'static'"                 shift, and go to state 156
-    "'readonly'"               shift, and go to state 130
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    '('                        shift, and go to state 308
-    ''                        shift, and go to state 309
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'static'"                 shift, and go to state 147
+    "'readonly'"               shift, and go to state 130
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    '('                        shift, and go to state 301
+    ''                        shift, and go to state 302
     '"'                        shift, and go to state 88
     '$'                        shift, and go to state 89
 
@@ -7863,9 +7718,9 @@
     unset_variable                go to state 495
     function_call                 go to state 113
     class_name                    go to state 114
-    dereferenceable_scalar        go to state 310
-    constant                      go to state 311
-    class_constant                go to state 312
+    dereferenceable_scalar        go to state 303
+    constant                      go to state 304
+    class_constant                go to state 305
     variable_class_name           go to state 119
     fully_dereferenceable         go to state 120
     array_object_dereferenceable  go to state 121
@@ -7876,62 +7731,62 @@
     static_member                 go to state 126
 
 
-State 212
+State 205
 
-  586 internal_functions_in_yacc: "'isset'" '(' . isset_variables possible_comma ')'
+  586 internal_functions_in_yacc: "'isset'" '(' • isset_variables possible_comma ')'
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -7967,62 +7822,62 @@
     isset_variable                go to state 499
 
 
-State 213
+State 206
 
-  587 internal_functions_in_yacc: "'empty'" '(' . expr ')'
+  587 internal_functions_in_yacc: "'empty'" '(' • expr ')'
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -8056,619 +7911,619 @@
     internal_functions_in_yacc    go to state 127
 
 
-State 214
+State 207
 
-  111 top_statement: "'__halt_compiler'" '(' . ')' ';'
+  111 top_statement: "'__halt_compiler'" '(' • ')' ';'
 
     ')'  shift, and go to state 501
 
 
-State 215
+State 208
 
-  193 class_declaration_statement: "'class'" @5 . "identifier" extends_from implements_list backup_doc_comment '{' class_statement_list '}'
+  193 class_declaration_statement: "'class'" @5 • "identifier" extends_from implements_list backup_doc_comment '{' class_statement_list '}'
 
     "identifier"  shift, and go to state 502
 
 
-State 216
+State 209
 
-  204 trait_declaration_statement: "'trait'" @6 . "identifier" backup_doc_comment '{' class_statement_list '}'
+  204 trait_declaration_statement: "'trait'" @6 • "identifier" backup_doc_comment '{' class_statement_list '}'
 
     "identifier"  shift, and go to state 503
 
 
-State 217
+State 210
 
-  206 interface_declaration_statement: "'interface'" @7 . "identifier" interface_extends_list backup_doc_comment '{' class_statement_list '}'
+  206 interface_declaration_statement: "'interface'" @7 • "identifier" interface_extends_list backup_doc_comment '{' class_statement_list '}'
 
     "identifier"  shift, and go to state 504
 
 
-State 218
+State 211
 
-  208 enum_declaration_statement: "'enum'" @8 . "identifier" enum_backing_type implements_list backup_doc_comment '{' class_statement_list '}'
+  208 enum_declaration_statement: "'enum'" @8 • "identifier" enum_backing_type implements_list backup_doc_comment '{' class_statement_list '}'
 
     "identifier"  shift, and go to state 505
 
 
-State 219
+State 212
 
-   32 reserved_non_modifiers: "'throw'" .
+   82 identifier: "identifier" •
 
-    $default  reduce using rule 32 (reserved_non_modifiers)
+    $default  reduce using rule 82 (identifier)
 
 
-State 220
+State 213
+
+   87 namespace_declaration_name: "namespaced name" •
+
+    $default  reduce using rule 87 (namespace_declaration_name)
+
 
-    2 reserved_non_modifiers: "'include'" .
+State 214
+
+    2 reserved_non_modifiers: "'include'" •
 
     $default  reduce using rule 2 (reserved_non_modifiers)
 
 
-State 221
+State 215
 
-    3 reserved_non_modifiers: "'include_once'" .
+    3 reserved_non_modifiers: "'include_once'" •
 
     $default  reduce using rule 3 (reserved_non_modifiers)
 
 
-State 222
+State 216
 
-    5 reserved_non_modifiers: "'require'" .
+    4 reserved_non_modifiers: "'eval'" •
+
+    $default  reduce using rule 4 (reserved_non_modifiers)
+
+
+State 217
+
+    5 reserved_non_modifiers: "'require'" •
 
     $default  reduce using rule 5 (reserved_non_modifiers)
 
 
-State 223
+State 218
 
-    6 reserved_non_modifiers: "'require_once'" .
+    6 reserved_non_modifiers: "'require_once'" •
 
     $default  reduce using rule 6 (reserved_non_modifiers)
 
 
-State 224
+State 219
 
-    7 reserved_non_modifiers: "'or'" .
+    7 reserved_non_modifiers: "'or'" •
 
     $default  reduce using rule 7 (reserved_non_modifiers)
 
 
-State 225
+State 220
 
-    8 reserved_non_modifiers: "'xor'" .
+    8 reserved_non_modifiers: "'xor'" •
 
     $default  reduce using rule 8 (reserved_non_modifiers)
 
 
-State 226
+State 221
 
-    9 reserved_non_modifiers: "'and'" .
+    9 reserved_non_modifiers: "'and'" •
 
     $default  reduce using rule 9 (reserved_non_modifiers)
 
 
-State 227
+State 222
 
-   45 reserved_non_modifiers: "'print'" .
+   45 reserved_non_modifiers: "'print'" •
 
     $default  reduce using rule 45 (reserved_non_modifiers)
 
 
-State 228
+State 223
 
-   46 reserved_non_modifiers: "'yield'" .
+   46 reserved_non_modifiers: "'yield'" •
 
     $default  reduce using rule 46 (reserved_non_modifiers)
 
 
-State 229
+State 224
 
-   10 reserved_non_modifiers: "'instanceof'" .
+   10 reserved_non_modifiers: "'instanceof'" •
 
     $default  reduce using rule 10 (reserved_non_modifiers)
 
 
-State 230
-
-   12 reserved_non_modifiers: "'clone'" .
-
-    $default  reduce using rule 12 (reserved_non_modifiers)
-
-
-State 231
-
-   15 reserved_non_modifiers: "'elseif'" .
-
-    $default  reduce using rule 15 (reserved_non_modifiers)
-
-
-State 232
-
-   16 reserved_non_modifiers: "'else'" .
-
-    $default  reduce using rule 16 (reserved_non_modifiers)
-
-
-State 233
+State 225
 
-   82 identifier: "identifier" .
+   11 reserved_non_modifiers: "'new'" •
 
-    $default  reduce using rule 82 (identifier)
+    $default  reduce using rule 11 (reserved_non_modifiers)
 
 
-State 234
+State 226
 
-   87 namespace_declaration_name: "namespaced name" .
+   12 reserved_non_modifiers: "'clone'" •
 
-    $default  reduce using rule 87 (namespace_declaration_name)
+    $default  reduce using rule 12 (reserved_non_modifiers)
 
 
-State 235
+State 227
 
-    4 reserved_non_modifiers: "'eval'" .
+   13 reserved_non_modifiers: "'exit'" •
 
-    $default  reduce using rule 4 (reserved_non_modifiers)
+    $default  reduce using rule 13 (reserved_non_modifiers)
 
 
-State 236
+State 228
 
-   11 reserved_non_modifiers: "'new'" .
+   14 reserved_non_modifiers: "'if'" •
 
-    $default  reduce using rule 11 (reserved_non_modifiers)
+    $default  reduce using rule 14 (reserved_non_modifiers)
 
 
-State 237
+State 229
 
-   13 reserved_non_modifiers: "'exit'" .
+   15 reserved_non_modifiers: "'elseif'" •
 
-    $default  reduce using rule 13 (reserved_non_modifiers)
+    $default  reduce using rule 15 (reserved_non_modifiers)
 
 
-State 238
+State 230
 
-   14 reserved_non_modifiers: "'if'" .
+   16 reserved_non_modifiers: "'else'" •
 
-    $default  reduce using rule 14 (reserved_non_modifiers)
+    $default  reduce using rule 16 (reserved_non_modifiers)
 
 
-State 239
+State 231
 
-   17 reserved_non_modifiers: "'endif'" .
+   17 reserved_non_modifiers: "'endif'" •
 
     $default  reduce using rule 17 (reserved_non_modifiers)
 
 
-State 240
+State 232
 
-   18 reserved_non_modifiers: "'echo'" .
+   18 reserved_non_modifiers: "'echo'" •
 
     $default  reduce using rule 18 (reserved_non_modifiers)
 
 
-State 241
+State 233
 
-   19 reserved_non_modifiers: "'do'" .
+   19 reserved_non_modifiers: "'do'" •
 
     $default  reduce using rule 19 (reserved_non_modifiers)
 
 
-State 242
+State 234
 
-   20 reserved_non_modifiers: "'while'" .
+   20 reserved_non_modifiers: "'while'" •
 
     $default  reduce using rule 20 (reserved_non_modifiers)
 
 
-State 243
+State 235
 
-   21 reserved_non_modifiers: "'endwhile'" .
+   21 reserved_non_modifiers: "'endwhile'" •
 
     $default  reduce using rule 21 (reserved_non_modifiers)
 
 
-State 244
+State 236
 
-   22 reserved_non_modifiers: "'for'" .
+   22 reserved_non_modifiers: "'for'" •
 
     $default  reduce using rule 22 (reserved_non_modifiers)
 
 
-State 245
+State 237
 
-   23 reserved_non_modifiers: "'endfor'" .
+   23 reserved_non_modifiers: "'endfor'" •
 
     $default  reduce using rule 23 (reserved_non_modifiers)
 
 
-State 246
+State 238
 
-   24 reserved_non_modifiers: "'foreach'" .
+   24 reserved_non_modifiers: "'foreach'" •
 
     $default  reduce using rule 24 (reserved_non_modifiers)
 
 
-State 247
+State 239
 
-   25 reserved_non_modifiers: "'endforeach'" .
+   25 reserved_non_modifiers: "'endforeach'" •
 
     $default  reduce using rule 25 (reserved_non_modifiers)
 
 
-State 248
+State 240
 
-   26 reserved_non_modifiers: "'declare'" .
+   26 reserved_non_modifiers: "'declare'" •
 
     $default  reduce using rule 26 (reserved_non_modifiers)
 
 
-State 249
+State 241
 
-   27 reserved_non_modifiers: "'enddeclare'" .
+   27 reserved_non_modifiers: "'enddeclare'" •
 
     $default  reduce using rule 27 (reserved_non_modifiers)
 
 
-State 250
+State 242
 
-   28 reserved_non_modifiers: "'as'" .
+   28 reserved_non_modifiers: "'as'" •
 
     $default  reduce using rule 28 (reserved_non_modifiers)
 
 
-State 251
+State 243
 
-   48 reserved_non_modifiers: "'switch'" .
+   48 reserved_non_modifiers: "'switch'" •
 
     $default  reduce using rule 48 (reserved_non_modifiers)
 
 
-State 252
+State 244
 
-   49 reserved_non_modifiers: "'endswitch'" .
+   49 reserved_non_modifiers: "'endswitch'" •
 
     $default  reduce using rule 49 (reserved_non_modifiers)
 
 
-State 253
+State 245
 
-   50 reserved_non_modifiers: "'case'" .
+   50 reserved_non_modifiers: "'case'" •
 
     $default  reduce using rule 50 (reserved_non_modifiers)
 
 
-State 254
+State 246
 
-   51 reserved_non_modifiers: "'default'" .
+   51 reserved_non_modifiers: "'default'" •
 
     $default  reduce using rule 51 (reserved_non_modifiers)
 
 
-State 255
+State 247
 
-   70 reserved_non_modifiers: "'match'" .
+   70 reserved_non_modifiers: "'match'" •
 
     $default  reduce using rule 70 (reserved_non_modifiers)
 
 
-State 256
+State 248
 
-   52 reserved_non_modifiers: "'break'" .
+   52 reserved_non_modifiers: "'break'" •
 
     $default  reduce using rule 52 (reserved_non_modifiers)
 
 
-State 257
+State 249
 
-   40 reserved_non_modifiers: "'continue'" .
+   40 reserved_non_modifiers: "'continue'" •
 
     $default  reduce using rule 40 (reserved_non_modifiers)
 
 
-State 258
+State 250
 
-   41 reserved_non_modifiers: "'goto'" .
+   41 reserved_non_modifiers: "'goto'" •
 
     $default  reduce using rule 41 (reserved_non_modifiers)
 
 
-State 259
+State 251
 
-   42 reserved_non_modifiers: "'function'" .
+   42 reserved_non_modifiers: "'function'" •
 
     $default  reduce using rule 42 (reserved_non_modifiers)
 
 
-State 260
+State 252
 
-   69 reserved_non_modifiers: "'fn'" .
+   69 reserved_non_modifiers: "'fn'" •
 
     $default  reduce using rule 69 (reserved_non_modifiers)
 
 
-State 261
+State 253
 
-   43 reserved_non_modifiers: "'const'" .
+   43 reserved_non_modifiers: "'const'" •
 
     $default  reduce using rule 43 (reserved_non_modifiers)
 
 
-State 262
+State 254
 
-   44 reserved_non_modifiers: "'return'" .
+   44 reserved_non_modifiers: "'return'" •
 
     $default  reduce using rule 44 (reserved_non_modifiers)
 
 
-State 263
+State 255
 
-   29 reserved_non_modifiers: "'try'" .
+   29 reserved_non_modifiers: "'try'" •
 
     $default  reduce using rule 29 (reserved_non_modifiers)
 
 
-State 264
+State 256
 
-   30 reserved_non_modifiers: "'catch'" .
+   30 reserved_non_modifiers: "'catch'" •
 
     $default  reduce using rule 30 (reserved_non_modifiers)
 
 
-State 265
+State 257
 
-   31 reserved_non_modifiers: "'finally'" .
+   31 reserved_non_modifiers: "'finally'" •
 
     $default  reduce using rule 31 (reserved_non_modifiers)
 
 
-State 266
+State 258
+
+   32 reserved_non_modifiers: "'throw'" •
+
+    $default  reduce using rule 32 (reserved_non_modifiers)
+
 
-   33 reserved_non_modifiers: "'use'" .
+State 259
+
+   33 reserved_non_modifiers: "'use'" •
 
     $default  reduce using rule 33 (reserved_non_modifiers)
 
 
-State 267
+State 260
 
-   34 reserved_non_modifiers: "'insteadof'" .
+   34 reserved_non_modifiers: "'insteadof'" •
 
     $default  reduce using rule 34 (reserved_non_modifiers)
 
 
-State 268
+State 261
 
-   35 reserved_non_modifiers: "'global'" .
+   35 reserved_non_modifiers: "'global'" •
 
     $default  reduce using rule 35 (reserved_non_modifiers)
 
 
-State 269
+State 262
 
-   73 semi_reserved: "'static'" .
+   73 semi_reserved: "'static'" •
 
     $default  reduce using rule 73 (semi_reserved)
 
 
-State 270
+State 263
 
-   74 semi_reserved: "'abstract'" .
+   74 semi_reserved: "'abstract'" •
 
     $default  reduce using rule 74 (semi_reserved)
 
 
-State 271
+State 264
 
-   75 semi_reserved: "'final'" .
+   75 semi_reserved: "'final'" •
 
     $default  reduce using rule 75 (semi_reserved)
 
 
-State 272
+State 265
 
-   76 semi_reserved: "'private'" .
+   76 semi_reserved: "'private'" •
 
     $default  reduce using rule 76 (semi_reserved)
 
 
-State 273
+State 266
 
-   77 semi_reserved: "'protected'" .
+   77 semi_reserved: "'protected'" •
 
     $default  reduce using rule 77 (semi_reserved)
 
 
-State 274
+State 267
 
-   78 semi_reserved: "'public'" .
+   78 semi_reserved: "'public'" •
 
     $default  reduce using rule 78 (semi_reserved)
 
 
-State 275
+State 268
 
-   79 semi_reserved: "'readonly'" .
+   79 semi_reserved: "'readonly'" •
 
     $default  reduce using rule 79 (semi_reserved)
 
 
-State 276
+State 269
 
-   36 reserved_non_modifiers: "'var'" .
+   36 reserved_non_modifiers: "'var'" •
 
     $default  reduce using rule 36 (reserved_non_modifiers)
 
 
-State 277
+State 270
 
-   37 reserved_non_modifiers: "'unset'" .
+   37 reserved_non_modifiers: "'unset'" •
 
     $default  reduce using rule 37 (reserved_non_modifiers)
 
 
-State 278
+State 271
 
-   38 reserved_non_modifiers: "'isset'" .
+   38 reserved_non_modifiers: "'isset'" •
 
     $default  reduce using rule 38 (reserved_non_modifiers)
 
 
-State 279
+State 272
 
-   39 reserved_non_modifiers: "'empty'" .
+   39 reserved_non_modifiers: "'empty'" •
 
     $default  reduce using rule 39 (reserved_non_modifiers)
 
 
-State 280
+State 273
 
-   60 reserved_non_modifiers: "'class'" .
+   60 reserved_non_modifiers: "'class'" •
 
     $default  reduce using rule 60 (reserved_non_modifiers)
 
 
-State 281
+State 274
 
-   58 reserved_non_modifiers: "'trait'" .
+   58 reserved_non_modifiers: "'trait'" •
 
     $default  reduce using rule 58 (reserved_non_modifiers)
 
 
-State 282
+State 275
 
-   59 reserved_non_modifiers: "'interface'" .
+   59 reserved_non_modifiers: "'interface'" •
 
     $default  reduce using rule 59 (reserved_non_modifiers)
 
 
-State 283
+State 276
 
-   71 reserved_non_modifiers: "'enum'" .
+   71 reserved_non_modifiers: "'enum'" •
 
     $default  reduce using rule 71 (reserved_non_modifiers)
 
 
-State 284
+State 277
 
-   55 reserved_non_modifiers: "'extends'" .
+   55 reserved_non_modifiers: "'extends'" •
 
     $default  reduce using rule 55 (reserved_non_modifiers)
 
 
-State 285
+State 278
 
-   56 reserved_non_modifiers: "'implements'" .
+   56 reserved_non_modifiers: "'implements'" •
 
     $default  reduce using rule 56 (reserved_non_modifiers)
 
 
-State 286
+State 279
 
-   57 reserved_non_modifiers: "'namespace'" .
+   57 reserved_non_modifiers: "'namespace'" •
 
     $default  reduce using rule 57 (reserved_non_modifiers)
 
 
-State 287
+State 280
 
-   47 reserved_non_modifiers: "'list'" .
+   47 reserved_non_modifiers: "'list'" •
 
     $default  reduce using rule 47 (reserved_non_modifiers)
 
 
-State 288
+State 281
 
-   53 reserved_non_modifiers: "'array'" .
+   53 reserved_non_modifiers: "'array'" •
 
     $default  reduce using rule 53 (reserved_non_modifiers)
 
 
-State 289
+State 282
 
-   54 reserved_non_modifiers: "'callable'" .
+   54 reserved_non_modifiers: "'callable'" •
 
     $default  reduce using rule 54 (reserved_non_modifiers)
 
 
-State 290
+State 283
 
-   65 reserved_non_modifiers: "'__LINE__'" .
+   65 reserved_non_modifiers: "'__LINE__'" •
 
     $default  reduce using rule 65 (reserved_non_modifiers)
 
 
-State 291
+State 284
 
-   66 reserved_non_modifiers: "'__FILE__'" .
+   66 reserved_non_modifiers: "'__FILE__'" •
 
     $default  reduce using rule 66 (reserved_non_modifiers)
 
 
-State 292
+State 285
 
-   67 reserved_non_modifiers: "'__DIR__'" .
+   67 reserved_non_modifiers: "'__DIR__'" •
 
     $default  reduce using rule 67 (reserved_non_modifiers)
 
 
-State 293
+State 286
 
-   61 reserved_non_modifiers: "'__CLASS__'" .
+   61 reserved_non_modifiers: "'__CLASS__'" •
 
     $default  reduce using rule 61 (reserved_non_modifiers)
 
 
-State 294
+State 287
 
-   62 reserved_non_modifiers: "'__TRAIT__'" .
+   62 reserved_non_modifiers: "'__TRAIT__'" •
 
     $default  reduce using rule 62 (reserved_non_modifiers)
 
 
-State 295
+State 288
 
-   64 reserved_non_modifiers: "'__METHOD__'" .
+   64 reserved_non_modifiers: "'__METHOD__'" •
 
     $default  reduce using rule 64 (reserved_non_modifiers)
 
 
-State 296
+State 289
 
-   63 reserved_non_modifiers: "'__FUNCTION__'" .
+   63 reserved_non_modifiers: "'__FUNCTION__'" •
 
     $default  reduce using rule 63 (reserved_non_modifiers)
 
 
-State 297
+State 290
 
-   68 reserved_non_modifiers: "'__NAMESPACE__'" .
+   68 reserved_non_modifiers: "'__NAMESPACE__'" •
 
     $default  reduce using rule 68 (reserved_non_modifiers)
 
 
-State 298
+State 291
 
-   72 semi_reserved: reserved_non_modifiers .
+   72 semi_reserved: reserved_non_modifiers •
 
     $default  reduce using rule 72 (semi_reserved)
 
 
-State 299
+State 292
 
-   83 identifier: semi_reserved .
+   83 identifier: semi_reserved •
 
     $default  reduce using rule 83 (identifier)
 
 
-State 300
+State 293
 
-   86 namespace_declaration_name: identifier .
+   86 namespace_declaration_name: identifier •
 
     $default  reduce using rule 86 (namespace_declaration_name)
 
 
-State 301
+State 294
 
-  112 top_statement: "'namespace'" namespace_declaration_name . ';'
-  114              | "'namespace'" namespace_declaration_name . $@1 '{' top_statement_list '}'
+  112 top_statement: "'namespace'" namespace_declaration_name • ';'
+  114              | "'namespace'" namespace_declaration_name • $@1 '{' top_statement_list '}'
 
     ';'  shift, and go to state 506
 
@@ -8677,73 +8532,73 @@
     $@1  go to state 507
 
 
-State 302
+State 295
 
-  116 top_statement: "'namespace'" $@2 . '{' top_statement_list '}'
+  116 top_statement: "'namespace'" $@2 • '{' top_statement_list '}'
 
     '{'  shift, and go to state 508
 
 
-State 303
+State 296
 
-  378 expr: "'list'" '(' . array_pair_list ')' '=' expr
+  378 expr: "'list'" '(' • array_pair_list ')' '=' expr
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    "amp"                      shift, and go to state 324
-    "'&'"                      shift, and go to state 325
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 326
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
-    "heredoc start"            shift, and go to state 82
-    "'...'"                    shift, and go to state 327
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 324
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
+    "heredoc start"            shift, and go to state 82
+    "'...'"                    shift, and go to state 325
+    "'&'"                      shift, and go to state 326
+    "amp"                      shift, and go to state 327
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
     '`'                        shift, and go to state 87
@@ -8783,66 +8638,66 @@
     internal_functions_in_yacc    go to state 127
 
 
-State 304
+State 297
 
-  493 dereferenceable_scalar: "'array'" '(' . array_pair_list ')'
+  493 dereferenceable_scalar: "'array'" '(' • array_pair_list ')'
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    "amp"                      shift, and go to state 324
-    "'&'"                      shift, and go to state 325
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 326
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
-    "heredoc start"            shift, and go to state 82
-    "'...'"                    shift, and go to state 327
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 324
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
+    "heredoc start"            shift, and go to state 82
+    "'...'"                    shift, and go to state 325
+    "'&'"                      shift, and go to state 326
+    "amp"                      shift, and go to state 327
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
     '`'                        shift, and go to state 87
@@ -8882,17 +8737,17 @@
     internal_functions_in_yacc    go to state 127
 
 
-State 305
+State 298
 
-   98 attribute_group: attribute_decl .
+   98 attribute_group: attribute_decl •
 
     $default  reduce using rule 98 (attribute_group)
 
 
-State 306
+State 299
 
-   99 attribute_group: attribute_group . ',' attribute_decl
-  100 attribute: "'#'" attribute_group . possible_comma ''
+   99 attribute_group: attribute_group • ',' attribute_decl
+  100 attribute: "'#'" attribute_group • possible_comma ''
 
     ','  shift, and go to state 511
 
@@ -8901,75 +8756,75 @@
     possible_comma  go to state 512
 
 
-State 307
+State 300
 
-   96 attribute_decl: class_name .
-   97               | class_name . argument_list
+   96 attribute_decl: class_name •
+   97               | class_name • argument_list
 
-    '('  shift, and go to state 209
+    '('  shift, and go to state 202
 
     $default  reduce using rule 96 (attribute_decl)
 
     argument_list  go to state 513
 
 
-State 308
+State 301
 
-  522 fully_dereferenceable: '(' . expr ')'
-  528 callable_expr: '(' . expr ')'
+  522 fully_dereferenceable: '(' • expr ')'
+  528 callable_expr: '(' • expr ')'
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -9003,66 +8858,66 @@
     internal_functions_in_yacc    go to state 127
 
 
-State 309
+State 302
 
-  494 dereferenceable_scalar: '' . array_pair_list ''
+  494 dereferenceable_scalar: '' • array_pair_list ''
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    "amp"                      shift, and go to state 324
-    "'&'"                      shift, and go to state 325
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 326
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
-    "heredoc start"            shift, and go to state 82
-    "'...'"                    shift, and go to state 327
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 324
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
+    "heredoc start"            shift, and go to state 82
+    "'...'"                    shift, and go to state 325
+    "'&'"                      shift, and go to state 326
+    "amp"                      shift, and go to state 327
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
     '`'                        shift, and go to state 87
@@ -9102,33 +8957,33 @@
     internal_functions_in_yacc    go to state 127
 
 
-State 310
+State 303
 
-  523 fully_dereferenceable: dereferenceable_scalar .
-  529 callable_expr: dereferenceable_scalar .
+  523 fully_dereferenceable: dereferenceable_scalar •
+  529 callable_expr: dereferenceable_scalar •
 
     '('       reduce using rule 529 (callable_expr)
     $default  reduce using rule 523 (fully_dereferenceable)
 
 
-State 311
+State 304
 
-  526 array_object_dereferenceable: constant .
+  526 array_object_dereferenceable: constant •
 
     $default  reduce using rule 526 (array_object_dereferenceable)
 
 
-State 312
+State 305
 
-  524 fully_dereferenceable: class_constant .
+  524 fully_dereferenceable: class_constant •
 
     $default  reduce using rule 524 (fully_dereferenceable)
 
 
-State 313
+State 306
 
-  397 expr: "'++'" variable .
-  521 fully_dereferenceable: variable .
+  397 expr: "'++'" variable •
+  521 fully_dereferenceable: variable •
 
     "'->'"    reduce using rule 521 (fully_dereferenceable)
     "'?->'"   reduce using rule 521 (fully_dereferenceable)
@@ -9138,10 +8993,10 @@
     $default  reduce using rule 397 (expr)
 
 
-State 314
+State 307
 
-  399 expr: "'--'" variable .
-  521 fully_dereferenceable: variable .
+  399 expr: "'--'" variable •
+  521 fully_dereferenceable: variable •
 
     "'->'"    reduce using rule 521 (fully_dereferenceable)
     "'?->'"   reduce using rule 521 (fully_dereferenceable)
@@ -9151,12 +9006,292 @@
     $default  reduce using rule 399 (expr)
 
 
+State 308
+
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+  438     | "'(int)'" expr •
+
+    "'**'"  shift, and go to state 380
+
+    $default  reduce using rule 438 (expr)
+
+
+State 309
+
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+  439     | "'(double)'" expr •
+
+    "'**'"  shift, and go to state 380
+
+    $default  reduce using rule 439 (expr)
+
+
+State 310
+
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+  440     | "'(string)'" expr •
+
+    "'**'"  shift, and go to state 380
+
+    $default  reduce using rule 440 (expr)
+
+
+State 311
+
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+  441     | "'(array)'" expr •
+
+    "'**'"  shift, and go to state 380
+
+    $default  reduce using rule 441 (expr)
+
+
+State 312
+
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+  442     | "'(object)'" expr •
+
+    "'**'"  shift, and go to state 380
+
+    $default  reduce using rule 442 (expr)
+
+
+State 313
+
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+  443     | "'(bool)'" expr •
+
+    "'**'"  shift, and go to state 380
+
+    $default  reduce using rule 443 (expr)
+
+
+State 314
+
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+  444     | "'(unset)'" expr •
+
+    "'**'"  shift, and go to state 380
+
+    $default  reduce using rule 444 (expr)
+
+
 State 315
 
-  574 encaps_var: "variable" .
-  575           | "variable" . '' encaps_var_offset ''
-  576           | "variable" . "'->'" "identifier"
-  577           | "variable" . "'?->'" "identifier"
+  574 encaps_var: "variable" •
+  575           | "variable" • '' encaps_var_offset ''
+  576           | "variable" • "'->'" "identifier"
+  577           | "variable" • "'?->'" "identifier"
 
     "'->'"   shift, and go to state 516
     "'?->'"  shift, and go to state 517
@@ -9167,8 +9302,8 @@
 
 State 316
 
-  499 scalar: "heredoc start" "string content" . "heredoc end"
-  573 encaps_list: "string content" . encaps_var
+  499 scalar: "heredoc start" "string content" • "heredoc end"
+  573 encaps_list: "string content" • encaps_var
 
     "variable"     shift, and go to state 315
     "heredoc end"  shift, and go to state 519
@@ -9180,70 +9315,70 @@
 
 State 317
 
-  500 scalar: "heredoc start" "heredoc end" .
+  500 scalar: "heredoc start" "heredoc end" •
 
     $default  reduce using rule 500 (scalar)
 
 
 State 318
 
-  578 encaps_var: "'${'" . expr '}'
-  579           | "'${'" . "variable name" '}'
-  580           | "'${'" . "variable name" '' expr '' '}'
-
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
+  578 encaps_var: "'${'" • expr '}'
+  579           | "'${'" • "variable name" '}'
+  580           | "'${'" • "variable name" '' expr '' '}'
+
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
     "variable name"            shift, and go to state 521
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -9279,36 +9414,36 @@
 
 State 319
 
-  581 encaps_var: "'{$'" . variable '}'
+  581 encaps_var: "'{$'" • variable '}'
 
     "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'static'"                 shift, and go to state 156
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'static'"                 shift, and go to state 147
     "'readonly'"               shift, and go to state 130
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    '('                        shift, and go to state 308
-    ''                        shift, and go to state 309
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    '('                        shift, and go to state 301
+    ''                        shift, and go to state 302
     '"'                        shift, and go to state 88
     '$'                        shift, and go to state 89
 
     name                          go to state 90
     function_call                 go to state 113
     class_name                    go to state 114
-    dereferenceable_scalar        go to state 310
-    constant                      go to state 311
-    class_constant                go to state 312
+    dereferenceable_scalar        go to state 303
+    constant                      go to state 304
+    class_constant                go to state 305
     variable_class_name           go to state 119
     fully_dereferenceable         go to state 120
     array_object_dereferenceable  go to state 121
@@ -9321,9 +9456,9 @@
 
 State 320
 
-  501 scalar: "heredoc start" encaps_list . "heredoc end"
-  570 encaps_list: encaps_list . encaps_var
-  571            | encaps_list . "string content"
+  501 scalar: "heredoc start" encaps_list • "heredoc end"
+  570 encaps_list: encaps_list • encaps_var
+  571            | encaps_list • "string content"
 
     "variable"        shift, and go to state 315
     "string content"  shift, and go to state 524
@@ -9336,161 +9471,161 @@
 
 State 321
 
-  572 encaps_list: encaps_var .
+  572 encaps_list: encaps_var •
 
     $default  reduce using rule 572 (encaps_list)
 
 
 State 322
 
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  432     | '(' expr . ')'
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-  522 fully_dereferenceable: '(' expr . ')'
-  528 callable_expr: '(' expr . ')'
-
-    "'or'"          shift, and go to state 353
-    "'xor'"         shift, and go to state 354
-    "'and'"         shift, and go to state 355
-    '?'             shift, and go to state 356
-    "'??'"          shift, and go to state 357
-    "'||'"          shift, and go to state 358
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  432     | '(' expr • ')'
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+  522 fully_dereferenceable: '(' expr • ')'
+  528 callable_expr: '(' expr • ')'
+
+    '?'             shift, and go to state 353
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'or'"          shift, and go to state 364
+    "'xor'"         shift, and go to state 365
+    "'and'"         shift, and go to state 366
+    "'instanceof'"  shift, and go to state 367
+    "'||'"          shift, and go to state 368
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'??'"          shift, and go to state 379
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
     ')'             shift, and go to state 527
 
 
 State 323
 
-  142 inner_statement_list: inner_statement_list . inner_statement
-  148 statement: '{' inner_statement_list . '}'
+  142 inner_statement_list: inner_statement_list • inner_statement
+  148 statement: '{' inner_statement_list • '}'
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 27
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    T_INLINE_HTML              shift, and go to state 32
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'if'"                     shift, and go to state 37
-    "'echo'"                   shift, and go to state 38
-    "'do'"                     shift, and go to state 39
-    "'while'"                  shift, and go to state 40
-    "'for'"                    shift, and go to state 41
-    "'foreach'"                shift, and go to state 42
-    "'declare'"                shift, and go to state 43
-    "'switch'"                 shift, and go to state 44
-    "'match'"                  shift, and go to state 45
-    "'break'"                  shift, and go to state 46
-    "'continue'"               shift, and go to state 47
-    "'goto'"                   shift, and go to state 48
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'return'"                 shift, and go to state 52
-    "'try'"                    shift, and go to state 53
-    "'global'"                 shift, and go to state 55
-    "'static'"                 shift, and go to state 56
-    "'abstract'"               shift, and go to state 57
-    "'final'"                  shift, and go to state 58
-    "'readonly'"               shift, and go to state 59
-    "'unset'"                  shift, and go to state 60
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 11
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    T_INLINE_HTML              shift, and go to state 16
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'if'"                     shift, and go to state 29
+    "'echo'"                   shift, and go to state 30
+    "'do'"                     shift, and go to state 31
+    "'while'"                  shift, and go to state 32
+    "'for'"                    shift, and go to state 33
+    "'foreach'"                shift, and go to state 34
+    "'declare'"                shift, and go to state 35
+    "'switch'"                 shift, and go to state 36
+    "'match'"                  shift, and go to state 37
+    "'break'"                  shift, and go to state 38
+    "'continue'"               shift, and go to state 39
+    "'goto'"                   shift, and go to state 40
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'return'"                 shift, and go to state 44
+    "'try'"                    shift, and go to state 45
+    "'throw'"                  shift, and go to state 46
+    "'global'"                 shift, and go to state 48
+    "'static'"                 shift, and go to state 49
+    "'abstract'"               shift, and go to state 50
+    "'final'"                  shift, and go to state 51
+    "'readonly'"               shift, and go to state 52
+    "'unset'"                  shift, and go to state 53
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
     "'__halt_compiler'"        shift, and go to state 528
-    "'class'"                  shift, and go to state 64
-    "'trait'"                  shift, and go to state 65
-    "'interface'"              shift, and go to state 66
-    "'enum'"                   shift, and go to state 67
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    "'class'"                  shift, and go to state 57
+    "'trait'"                  shift, and go to state 58
+    "'interface'"              shift, and go to state 59
+    "'enum'"                   shift, and go to state 60
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ';'                        shift, and go to state 84
@@ -9543,82 +9678,68 @@
 
 State 324
 
-   81 ampersand: "amp" .
-
-    $default  reduce using rule 81 (ampersand)
-
-
-State 325
-
-   80 ampersand: "'&'" .
-
-    $default  reduce using rule 80 (ampersand)
-
-
-State 326
-
-  378 expr: "'list'" . '(' array_pair_list ')' '=' expr
-  569 array_pair: "'list'" . '(' array_pair_list ')'
+  378 expr: "'list'" • '(' array_pair_list ')' '=' expr
+  569 array_pair: "'list'" • '(' array_pair_list ')'
 
     '('  shift, and go to state 534
 
 
-State 327
+State 325
 
-  567 array_pair: "'...'" . expr
+  567 array_pair: "'...'" • expr
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -9652,38 +9773,52 @@
     internal_functions_in_yacc    go to state 127
 
 
+State 326
+
+   80 ampersand: "'&'" •
+
+    $default  reduce using rule 80 (ampersand)
+
+
+State 327
+
+   81 ampersand: "amp" •
+
+    $default  reduce using rule 81 (ampersand)
+
+
 State 328
 
-  566 array_pair: ampersand . variable
+  566 array_pair: ampersand • variable
 
     "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'static'"                 shift, and go to state 156
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'static'"                 shift, and go to state 147
     "'readonly'"               shift, and go to state 130
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    '('                        shift, and go to state 308
-    ''                        shift, and go to state 309
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    '('                        shift, and go to state 301
+    ''                        shift, and go to state 302
     '"'                        shift, and go to state 88
     '$'                        shift, and go to state 89
 
     name                          go to state 90
     function_call                 go to state 113
     class_name                    go to state 114
-    dereferenceable_scalar        go to state 310
-    constant                      go to state 311
-    class_constant                go to state 312
+    dereferenceable_scalar        go to state 303
+    constant                      go to state 304
+    class_constant                go to state 305
     variable_class_name           go to state 119
     fully_dereferenceable         go to state 120
     array_object_dereferenceable  go to state 121
@@ -9696,96 +9831,96 @@
 
 State 329
 
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-  563 array_pair: expr . "'=>'" expr
-  564           | expr .
-  565           | expr . "'=>'" ampersand variable
-  568           | expr . "'=>'" "'list'" '(' array_pair_list ')'
-
-    "'or'"          shift, and go to state 353
-    "'xor'"         shift, and go to state 354
-    "'and'"         shift, and go to state 355
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+  563 array_pair: expr • "'=>'" expr
+  564           | expr •
+  565           | expr • "'=>'" ampersand variable
+  568           | expr • "'=>'" "'list'" '(' array_pair_list ')'
+
+    '?'             shift, and go to state 353
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'or'"          shift, and go to state 364
+    "'xor'"         shift, and go to state 365
+    "'and'"         shift, and go to state 366
+    "'instanceof'"  shift, and go to state 367
+    "'||'"          shift, and go to state 368
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
     "'=>'"          shift, and go to state 537
-    '?'             shift, and go to state 356
-    "'??'"          shift, and go to state 357
-    "'||'"          shift, and go to state 358
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+    "'??'"          shift, and go to state 379
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
 
     $default  reduce using rule 564 (array_pair)
 
 
 State 330
 
-  379 expr: '' array_pair_list . '' '=' expr
-  494 dereferenceable_scalar: '' array_pair_list . ''
+  379 expr: '' array_pair_list • '' '=' expr
+  494 dereferenceable_scalar: '' array_pair_list • ''
 
     ''  shift, and go to state 538
 
 
 State 331
 
-  562 non_empty_array_pair_list: possible_array_pair .
+  562 non_empty_array_pair_list: possible_array_pair •
 
     $default  reduce using rule 562 (non_empty_array_pair_list)
 
 
 State 332
 
-  558 array_pair_list: non_empty_array_pair_list .
-  561 non_empty_array_pair_list: non_empty_array_pair_list . ',' possible_array_pair
+  558 array_pair_list: non_empty_array_pair_list •
+  561 non_empty_array_pair_list: non_empty_array_pair_list • ',' possible_array_pair
 
     ','  shift, and go to state 539
 
@@ -9794,15 +9929,15 @@
 
 State 333
 
-  560 possible_array_pair: array_pair .
+  560 possible_array_pair: array_pair •
 
     $default  reduce using rule 560 (possible_array_pair)
 
 
 State 334
 
-  489 backticks_expr: "string content" .
-  573 encaps_list: "string content" . encaps_var
+  489 backticks_expr: "string content" •
+  573 encaps_list: "string content" • encaps_var
 
     "variable"  shift, and go to state 315
     "'${'"      shift, and go to state 318
@@ -9815,16 +9950,16 @@
 
 State 335
 
-  448 expr: '`' backticks_expr . '`'
+  448 expr: '`' backticks_expr • '`'
 
     '`'  shift, and go to state 540
 
 
 State 336
 
-  490 backticks_expr: encaps_list .
-  570 encaps_list: encaps_list . encaps_var
-  571            | encaps_list . "string content"
+  490 backticks_expr: encaps_list •
+  570 encaps_list: encaps_list • encaps_var
+  571            | encaps_list • "string content"
 
     "variable"        shift, and go to state 315
     "string content"  shift, and go to state 524
@@ -9838,7 +9973,7 @@
 
 State 337
 
-  573 encaps_list: "string content" . encaps_var
+  573 encaps_list: "string content" • encaps_var
 
     "variable"  shift, and go to state 315
     "'${'"      shift, and go to state 318
@@ -9849,9 +9984,9 @@
 
 State 338
 
-  496 dereferenceable_scalar: '"' encaps_list . '"'
-  570 encaps_list: encaps_list . encaps_var
-  571            | encaps_list . "string content"
+  496 dereferenceable_scalar: '"' encaps_list • '"'
+  570 encaps_list: encaps_list • encaps_var
+  571            | encaps_list • "string content"
 
     "variable"        shift, and go to state 315
     "string content"  shift, and go to state 524
@@ -9864,60 +9999,60 @@
 
 State 339
 
-  541 simple_variable: '$' '{' . expr '}'
+  541 simple_variable: '$' '{' • expr '}'
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -9953,24 +10088,24 @@
 
 State 340
 
-  542 simple_variable: '$' simple_variable .
+  542 simple_variable: '$' simple_variable •
 
     $default  reduce using rule 542 (simple_variable)
 
 
 State 341
 
-  475 function_call: name argument_list .
+  475 function_call: name argument_list •
 
     $default  reduce using rule 475 (function_call)
 
 
 State 342
 
-  458 expr: attributes "'static'" . inline_function
+  458 expr: attributes "'static'" • inline_function
 
-    "'function'"  shift, and go to state 49
-    "'fn'"        shift, and go to state 50
+    "'function'"  shift, and go to state 41
+    "'fn'"        shift, and go to state 42
 
     inline_function  go to state 543
     fn               go to state 111
@@ -9979,28 +10114,28 @@
 
 State 343
 
-  102 attributes: attributes attribute .
+  102 attributes: attributes attribute •
 
     $default  reduce using rule 102 (attributes)
 
 
 State 344
 
-  110 top_statement: attributes attributed_statement .
+  110 top_statement: attributes attributed_statement •
 
     $default  reduce using rule 110 (top_statement)
 
 
 State 345
 
-  456 expr: attributes inline_function .
+  456 expr: attributes inline_function •
 
     $default  reduce using rule 456 (expr)
 
 
 State 346
 
-  191 class_declaration_statement: class_modifiers "'class'" . @4 "identifier" extends_from implements_list backup_doc_comment '{' class_statement_list '}'
+  191 class_declaration_statement: class_modifiers "'class'" • @4 "identifier" extends_from implements_list backup_doc_comment '{' class_statement_list '}'
 
     $default  reduce using rule 190 (@4)
 
@@ -10009,90 +10144,90 @@
 
 State 347
 
-  195 class_modifiers: class_modifiers class_modifier .
+  195 class_modifiers: class_modifiers class_modifier •
 
     $default  reduce using rule 195 (class_modifiers)
 
 
 State 348
 
-  251 if_stmt_without_else: if_stmt_without_else "'elseif'" . '(' expr ')' statement
+  251 if_stmt_without_else: if_stmt_without_else "'elseif'" • '(' expr ')' statement
 
     '('  shift, and go to state 545
 
 
 State 349
 
-  253 if_stmt: if_stmt_without_else "'else'" . statement
+  253 if_stmt: if_stmt_without_else "'else'" • statement
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 27
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    T_INLINE_HTML              shift, and go to state 32
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'if'"                     shift, and go to state 37
-    "'echo'"                   shift, and go to state 38
-    "'do'"                     shift, and go to state 39
-    "'while'"                  shift, and go to state 40
-    "'for'"                    shift, and go to state 41
-    "'foreach'"                shift, and go to state 42
-    "'declare'"                shift, and go to state 43
-    "'switch'"                 shift, and go to state 44
-    "'match'"                  shift, and go to state 45
-    "'break'"                  shift, and go to state 46
-    "'continue'"               shift, and go to state 47
-    "'goto'"                   shift, and go to state 48
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'return'"                 shift, and go to state 52
-    "'try'"                    shift, and go to state 53
-    "'global'"                 shift, and go to state 55
-    "'static'"                 shift, and go to state 56
-    "'readonly'"               shift, and go to state 130
-    "'unset'"                  shift, and go to state 60
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 11
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    T_INLINE_HTML              shift, and go to state 16
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'if'"                     shift, and go to state 29
+    "'echo'"                   shift, and go to state 30
+    "'do'"                     shift, and go to state 31
+    "'while'"                  shift, and go to state 32
+    "'for'"                    shift, and go to state 33
+    "'foreach'"                shift, and go to state 34
+    "'declare'"                shift, and go to state 35
+    "'switch'"                 shift, and go to state 36
+    "'match'"                  shift, and go to state 37
+    "'break'"                  shift, and go to state 38
+    "'continue'"               shift, and go to state 39
+    "'goto'"                   shift, and go to state 40
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'return'"                 shift, and go to state 44
+    "'try'"                    shift, and go to state 45
+    "'throw'"                  shift, and go to state 46
+    "'global'"                 shift, and go to state 48
+    "'static'"                 shift, and go to state 49
+    "'readonly'"               shift, and go to state 130
+    "'unset'"                  shift, and go to state 53
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ';'                        shift, and go to state 84
@@ -10135,81 +10270,83 @@
 
 State 350
 
-  255 alt_if_stmt_without_else: alt_if_stmt_without_else "'elseif'" . '(' expr ')' ':' inner_statement_list
+  255 alt_if_stmt_without_else: alt_if_stmt_without_else "'elseif'" • '(' expr ')' ':' inner_statement_list
 
     '('  shift, and go to state 547
 
 
 State 351
 
-  257 alt_if_stmt: alt_if_stmt_without_else "'else'" . ':' inner_statement_list "'endif'" ';'
+  257 alt_if_stmt: alt_if_stmt_without_else "'else'" • ':' inner_statement_list "'endif'" ';'
 
     ':'  shift, and go to state 548
 
 
 State 352
 
-  256 alt_if_stmt: alt_if_stmt_without_else "'endif'" . ';'
+  256 alt_if_stmt: alt_if_stmt_without_else "'endif'" • ';'
 
     ';'  shift, and go to state 549
 
 
 State 353
 
-  402 expr: expr "'or'" . expr
+  434 expr: expr '?' • expr ':' expr
+  435     | expr '?' • ':' expr
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    ':'                        shift, and go to state 550
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -10222,7 +10359,7 @@
     attributes                    go to state 131
     match                         go to state 103
     new_expr                      go to state 108
-    expr                          go to state 550
+    expr                          go to state 551
     inline_function               go to state 110
     fn                            go to state 111
     function                      go to state 133
@@ -10245,60 +10382,60 @@
 
 State 354
 
-  404 expr: expr "'xor'" . expr
+  405 expr: expr '|' • expr
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -10311,7 +10448,7 @@
     attributes                    go to state 131
     match                         go to state 103
     new_expr                      go to state 108
-    expr                          go to state 551
+    expr                          go to state 552
     inline_function               go to state 110
     fn                            go to state 111
     function                      go to state 133
@@ -10334,60 +10471,60 @@
 
 State 355
 
-  403 expr: expr "'and'" . expr
+  408 expr: expr '^' • expr
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -10400,7 +10537,7 @@
     attributes                    go to state 131
     match                         go to state 103
     new_expr                      go to state 108
-    expr                          go to state 552
+    expr                          go to state 553
     inline_function               go to state 110
     fn                            go to state 111
     function                      go to state 133
@@ -10423,62 +10560,60 @@
 
 State 356
 
-  434 expr: expr '?' . expr ':' expr
-  435     | expr '?' . ':' expr
+  426 expr: expr '<' • expr
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    ':'                        shift, and go to state 553
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -10514,60 +10649,60 @@
 
 State 357
 
-  436 expr: expr "'??'" . expr
+  428 expr: expr '>' • expr
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -10603,60 +10738,60 @@
 
 State 358
 
-  400 expr: expr "'||'" . expr
+  409 expr: expr '.' • expr
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -10692,60 +10827,60 @@
 
 State 359
 
-  401 expr: expr "'&&'" . expr
+  410 expr: expr '+' • expr
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -10781,60 +10916,60 @@
 
 State 360
 
-  405 expr: expr '|' . expr
+  411 expr: expr '-' • expr
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -10870,60 +11005,60 @@
 
 State 361
 
-  408 expr: expr '^' . expr
+  412 expr: expr '*' • expr
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -10959,60 +11094,60 @@
 
 State 362
 
-  406 expr: expr "amp" . expr
+  414 expr: expr '/' • expr
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -11048,60 +11183,60 @@
 
 State 363
 
-  407 expr: expr "'&'" . expr
+  415 expr: expr '%' • expr
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -11137,60 +11272,60 @@
 
 State 364
 
-  424 expr: expr "'=='" . expr
+  402 expr: expr "'or'" • expr
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -11226,60 +11361,60 @@
 
 State 365
 
-  425 expr: expr "'!='" . expr
+  404 expr: expr "'xor'" • expr
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -11315,60 +11450,60 @@
 
 State 366
 
-  422 expr: expr "'==='" . expr
+  403 expr: expr "'and'" • expr
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -11404,149 +11539,80 @@
 
 State 367
 
-  423 expr: expr "'!=='" . expr
+  431 expr: expr "'instanceof'" • class_name_reference
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
-    "heredoc start"            shift, and go to state 82
-    '('                        shift, and go to state 83
-    ''                        shift, and go to state 86
-    '`'                        shift, and go to state 87
-    '"'                        shift, and go to state 88
-    '$'                        shift, and go to state 89
-
-    name                          go to state 90
-    attribute                     go to state 91
-    attributes                    go to state 131
-    match                         go to state 103
-    new_expr                      go to state 108
-    expr                          go to state 565
-    inline_function               go to state 110
-    fn                            go to state 111
-    function                      go to state 133
-    function_call                 go to state 113
-    class_name                    go to state 114
-    dereferenceable_scalar        go to state 115
-    scalar                        go to state 116
-    constant                      go to state 117
-    class_constant                go to state 118
-    variable_class_name           go to state 119
-    fully_dereferenceable         go to state 120
-    array_object_dereferenceable  go to state 121
-    callable_expr                 go to state 122
-    callable_variable             go to state 123
-    variable                      go to state 124
-    simple_variable               go to state 125
-    static_member                 go to state 126
-    internal_functions_in_yacc    go to state 127
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "'static'"                 shift, and go to state 147
+    '('                        shift, and go to state 149
+    '$'                        shift, and go to state 89
+
+    name                  go to state 150
+    class_name            go to state 156
+    class_name_reference  go to state 565
+    simple_variable       go to state 158
+    new_variable          go to state 159
 
 
 State 368
 
-  430 expr: expr "'<=>'" . expr
+  400 expr: expr "'||'" • expr
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -11582,60 +11648,60 @@
 
 State 369
 
-  426 expr: expr '<' . expr
+  401 expr: expr "'&&'" • expr
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -11671,60 +11737,60 @@
 
 State 370
 
-  427 expr: expr "'<='" . expr
+  424 expr: expr "'=='" • expr
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -11760,60 +11826,60 @@
 
 State 371
 
-  428 expr: expr '>' . expr
+  425 expr: expr "'!='" • expr
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -11849,60 +11915,60 @@
 
 State 372
 
-  429 expr: expr "'>='" . expr
+  422 expr: expr "'==='" • expr
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -11938,60 +12004,60 @@
 
 State 373
 
-  409 expr: expr '.' . expr
+  423 expr: expr "'!=='" • expr
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -12027,60 +12093,60 @@
 
 State 374
 
-  416 expr: expr "'<<'" . expr
+  427 expr: expr "'<='" • expr
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -12116,60 +12182,60 @@
 
 State 375
 
-  417 expr: expr "'>>'" . expr
+  429 expr: expr "'>='" • expr
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -12205,60 +12271,60 @@
 
 State 376
 
-  410 expr: expr '+' . expr
+  430 expr: expr "'<=>'" • expr
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -12294,60 +12360,60 @@
 
 State 377
 
-  411 expr: expr '-' . expr
+  416 expr: expr "'<<'" • expr
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -12383,60 +12449,60 @@
 
 State 378
 
-  412 expr: expr '*' . expr
+  417 expr: expr "'>>'" • expr
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -12472,60 +12538,60 @@
 
 State 379
 
-  414 expr: expr '/' . expr
+  436 expr: expr "'??'" • expr
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -12561,60 +12627,60 @@
 
 State 380
 
-  415 expr: expr '%' . expr
+  413 expr: expr "'**'" • expr
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -12650,80 +12716,149 @@
 
 State 381
 
-  431 expr: expr "'instanceof'" . class_name_reference
+  407 expr: expr "'&'" • expr
 
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "'static'"                 shift, and go to state 156
-    '('                        shift, and go to state 158
-    '$'                        shift, and go to state 89
-
-    name                  go to state 159
-    class_name            go to state 165
-    class_name_reference  go to state 579
-    simple_variable       go to state 167
-    new_variable          go to state 168
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
+    "heredoc start"            shift, and go to state 82
+    '('                        shift, and go to state 83
+    ''                        shift, and go to state 86
+    '`'                        shift, and go to state 87
+    '"'                        shift, and go to state 88
+    '$'                        shift, and go to state 89
+
+    name                          go to state 90
+    attribute                     go to state 91
+    attributes                    go to state 131
+    match                         go to state 103
+    new_expr                      go to state 108
+    expr                          go to state 579
+    inline_function               go to state 110
+    fn                            go to state 111
+    function                      go to state 133
+    function_call                 go to state 113
+    class_name                    go to state 114
+    dereferenceable_scalar        go to state 115
+    scalar                        go to state 116
+    constant                      go to state 117
+    class_constant                go to state 118
+    variable_class_name           go to state 119
+    fully_dereferenceable         go to state 120
+    array_object_dereferenceable  go to state 121
+    callable_expr                 go to state 122
+    callable_variable             go to state 123
+    variable                      go to state 124
+    simple_variable               go to state 125
+    static_member                 go to state 126
+    internal_functions_in_yacc    go to state 127
 
 
 State 382
 
-  413 expr: expr "'**'" . expr
+  406 expr: expr "amp" • expr
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -12759,21 +12894,21 @@
 
 State 383
 
-  162 statement: expr ';' .
+  162 statement: expr ';' •
 
     $default  reduce using rule 162 (statement)
 
 
 State 384
 
-  468 returns_ref: ampersand .
+  468 returns_ref: ampersand •
 
     $default  reduce using rule 468 (returns_ref)
 
 
 State 385
 
-  461 inline_function: fn returns_ref . backup_doc_comment '(' parameter_list ')' return_type "'=>'" backup_fn_flags backup_lex_pos expr backup_fn_flags
+  461 inline_function: fn returns_ref • backup_doc_comment '(' parameter_list ')' return_type "'=>'" backup_fn_flags backup_lex_pos expr backup_fn_flags
 
     $default  reduce using rule 464 (backup_doc_comment)
 
@@ -12782,8 +12917,8 @@
 
 State 386
 
-  185 function_declaration_statement: function returns_ref . function_name backup_doc_comment '(' parameter_list ')' return_type backup_fn_flags '{' inner_statement_list '}' backup_fn_flags
-  460 inline_function: function returns_ref . backup_doc_comment '(' parameter_list ')' lexical_vars return_type backup_fn_flags '{' inner_statement_list '}' backup_fn_flags
+  185 function_declaration_statement: function returns_ref • function_name backup_doc_comment '(' parameter_list ')' return_type backup_fn_flags '{' inner_statement_list '}' backup_fn_flags
+  460 inline_function: function returns_ref • backup_doc_comment '(' parameter_list ')' lexical_vars return_type backup_fn_flags '{' inner_statement_list '}' backup_fn_flags
 
     "identifier"  shift, and go to state 582
     "'readonly'"  shift, and go to state 583
@@ -12796,95 +12931,95 @@
 
 State 387
 
-  477 function_call: class_name "'::'" . member_name argument_list
-  514 class_constant: class_name "'::'" . identifier
-  516               | class_name "'::'" . '{' expr '}'
-  543 static_member: class_name "'::'" . simple_variable
-
-    "'throw'"          shift, and go to state 219
-    "'include'"        shift, and go to state 220
-    "'include_once'"   shift, and go to state 221
-    "'require'"        shift, and go to state 222
-    "'require_once'"   shift, and go to state 223
-    "'or'"             shift, and go to state 224
-    "'xor'"            shift, and go to state 225
-    "'and'"            shift, and go to state 226
-    "'print'"          shift, and go to state 227
-    "'yield'"          shift, and go to state 228
-    "'instanceof'"     shift, and go to state 229
-    "'clone'"          shift, and go to state 230
-    "'elseif'"         shift, and go to state 231
-    "'else'"           shift, and go to state 232
-    "identifier"       shift, and go to state 233
-    "variable"         shift, and go to state 31
-    "'eval'"           shift, and go to state 235
-    "'new'"            shift, and go to state 236
-    "'exit'"           shift, and go to state 237
-    "'if'"             shift, and go to state 238
-    "'endif'"          shift, and go to state 239
-    "'echo'"           shift, and go to state 240
-    "'do'"             shift, and go to state 241
-    "'while'"          shift, and go to state 242
-    "'endwhile'"       shift, and go to state 243
-    "'for'"            shift, and go to state 244
-    "'endfor'"         shift, and go to state 245
-    "'foreach'"        shift, and go to state 246
-    "'endforeach'"     shift, and go to state 247
-    "'declare'"        shift, and go to state 248
-    "'enddeclare'"     shift, and go to state 249
-    "'as'"             shift, and go to state 250
-    "'switch'"         shift, and go to state 251
-    "'endswitch'"      shift, and go to state 252
-    "'case'"           shift, and go to state 253
-    "'default'"        shift, and go to state 254
-    "'match'"          shift, and go to state 255
-    "'break'"          shift, and go to state 256
-    "'continue'"       shift, and go to state 257
-    "'goto'"           shift, and go to state 258
-    "'function'"       shift, and go to state 259
-    "'fn'"             shift, and go to state 260
-    "'const'"          shift, and go to state 261
-    "'return'"         shift, and go to state 262
-    "'try'"            shift, and go to state 263
-    "'catch'"          shift, and go to state 264
-    "'finally'"        shift, and go to state 265
-    "'use'"            shift, and go to state 266
-    "'insteadof'"      shift, and go to state 267
-    "'global'"         shift, and go to state 268
-    "'static'"         shift, and go to state 269
-    "'abstract'"       shift, and go to state 270
-    "'final'"          shift, and go to state 271
-    "'private'"        shift, and go to state 272
-    "'protected'"      shift, and go to state 273
-    "'public'"         shift, and go to state 274
-    "'readonly'"       shift, and go to state 275
-    "'var'"            shift, and go to state 276
-    "'unset'"          shift, and go to state 277
-    "'isset'"          shift, and go to state 278
-    "'empty'"          shift, and go to state 279
-    "'class'"          shift, and go to state 280
-    "'trait'"          shift, and go to state 281
-    "'interface'"      shift, and go to state 282
-    "'enum'"           shift, and go to state 283
-    "'extends'"        shift, and go to state 284
-    "'implements'"     shift, and go to state 285
-    "'namespace'"      shift, and go to state 286
-    "'list'"           shift, and go to state 287
-    "'array'"          shift, and go to state 288
-    "'callable'"       shift, and go to state 289
-    "'__LINE__'"       shift, and go to state 290
-    "'__FILE__'"       shift, and go to state 291
-    "'__DIR__'"        shift, and go to state 292
-    "'__CLASS__'"      shift, and go to state 293
-    "'__TRAIT__'"      shift, and go to state 294
-    "'__METHOD__'"     shift, and go to state 295
-    "'__FUNCTION__'"   shift, and go to state 296
-    "'__NAMESPACE__'"  shift, and go to state 297
+  477 function_call: class_name "'::'" • member_name argument_list
+  514 class_constant: class_name "'::'" • identifier
+  516               | class_name "'::'" • '{' expr '}'
+  543 static_member: class_name "'::'" • simple_variable
+
+    "identifier"       shift, and go to state 212
+    "variable"         shift, and go to state 15
+    "'include'"        shift, and go to state 214
+    "'include_once'"   shift, and go to state 215
+    "'eval'"           shift, and go to state 216
+    "'require'"        shift, and go to state 217
+    "'require_once'"   shift, and go to state 218
+    "'or'"             shift, and go to state 219
+    "'xor'"            shift, and go to state 220
+    "'and'"            shift, and go to state 221
+    "'print'"          shift, and go to state 222
+    "'yield'"          shift, and go to state 223
+    "'instanceof'"     shift, and go to state 224
+    "'new'"            shift, and go to state 225
+    "'clone'"          shift, and go to state 226
+    "'exit'"           shift, and go to state 227
+    "'if'"             shift, and go to state 228
+    "'elseif'"         shift, and go to state 229
+    "'else'"           shift, and go to state 230
+    "'endif'"          shift, and go to state 231
+    "'echo'"           shift, and go to state 232
+    "'do'"             shift, and go to state 233
+    "'while'"          shift, and go to state 234
+    "'endwhile'"       shift, and go to state 235
+    "'for'"            shift, and go to state 236
+    "'endfor'"         shift, and go to state 237
+    "'foreach'"        shift, and go to state 238
+    "'endforeach'"     shift, and go to state 239
+    "'declare'"        shift, and go to state 240
+    "'enddeclare'"     shift, and go to state 241
+    "'as'"             shift, and go to state 242
+    "'switch'"         shift, and go to state 243
+    "'endswitch'"      shift, and go to state 244
+    "'case'"           shift, and go to state 245
+    "'default'"        shift, and go to state 246
+    "'match'"          shift, and go to state 247
+    "'break'"          shift, and go to state 248
+    "'continue'"       shift, and go to state 249
+    "'goto'"           shift, and go to state 250
+    "'function'"       shift, and go to state 251
+    "'fn'"             shift, and go to state 252
+    "'const'"          shift, and go to state 253
+    "'return'"         shift, and go to state 254
+    "'try'"            shift, and go to state 255
+    "'catch'"          shift, and go to state 256
+    "'finally'"        shift, and go to state 257
+    "'throw'"          shift, and go to state 258
+    "'use'"            shift, and go to state 259
+    "'insteadof'"      shift, and go to state 260
+    "'global'"         shift, and go to state 261
+    "'static'"         shift, and go to state 262
+    "'abstract'"       shift, and go to state 263
+    "'final'"          shift, and go to state 264
+    "'private'"        shift, and go to state 265
+    "'protected'"      shift, and go to state 266
+    "'public'"         shift, and go to state 267
+    "'readonly'"       shift, and go to state 268
+    "'var'"            shift, and go to state 269
+    "'unset'"          shift, and go to state 270
+    "'isset'"          shift, and go to state 271
+    "'empty'"          shift, and go to state 272
+    "'class'"          shift, and go to state 273
+    "'trait'"          shift, and go to state 274
+    "'interface'"      shift, and go to state 275
+    "'enum'"           shift, and go to state 276
+    "'extends'"        shift, and go to state 277
+    "'implements'"     shift, and go to state 278
+    "'namespace'"      shift, and go to state 279
+    "'list'"           shift, and go to state 280
+    "'array'"          shift, and go to state 281
+    "'callable'"       shift, and go to state 282
+    "'__LINE__'"       shift, and go to state 283
+    "'__FILE__'"       shift, and go to state 284
+    "'__DIR__'"        shift, and go to state 285
+    "'__CLASS__'"      shift, and go to state 286
+    "'__TRAIT__'"      shift, and go to state 287
+    "'__METHOD__'"     shift, and go to state 288
+    "'__FUNCTION__'"   shift, and go to state 289
+    "'__NAMESPACE__'"  shift, and go to state 290
     '{'                shift, and go to state 586
     '$'                shift, and go to state 89
 
-    reserved_non_modifiers  go to state 298
-    semi_reserved           go to state 299
+    reserved_non_modifiers  go to state 291
+    semi_reserved           go to state 292
     identifier              go to state 587
     simple_variable         go to state 588
     member_name             go to state 589
@@ -12892,95 +13027,95 @@
 
 State 388
 
-  478 function_call: variable_class_name "'::'" . member_name argument_list
-  515 class_constant: variable_class_name "'::'" . identifier
-  517               | variable_class_name "'::'" . '{' expr '}'
-  544 static_member: variable_class_name "'::'" . simple_variable
-
-    "'throw'"          shift, and go to state 219
-    "'include'"        shift, and go to state 220
-    "'include_once'"   shift, and go to state 221
-    "'require'"        shift, and go to state 222
-    "'require_once'"   shift, and go to state 223
-    "'or'"             shift, and go to state 224
-    "'xor'"            shift, and go to state 225
-    "'and'"            shift, and go to state 226
-    "'print'"          shift, and go to state 227
-    "'yield'"          shift, and go to state 228
-    "'instanceof'"     shift, and go to state 229
-    "'clone'"          shift, and go to state 230
-    "'elseif'"         shift, and go to state 231
-    "'else'"           shift, and go to state 232
-    "identifier"       shift, and go to state 233
-    "variable"         shift, and go to state 31
-    "'eval'"           shift, and go to state 235
-    "'new'"            shift, and go to state 236
-    "'exit'"           shift, and go to state 237
-    "'if'"             shift, and go to state 238
-    "'endif'"          shift, and go to state 239
-    "'echo'"           shift, and go to state 240
-    "'do'"             shift, and go to state 241
-    "'while'"          shift, and go to state 242
-    "'endwhile'"       shift, and go to state 243
-    "'for'"            shift, and go to state 244
-    "'endfor'"         shift, and go to state 245
-    "'foreach'"        shift, and go to state 246
-    "'endforeach'"     shift, and go to state 247
-    "'declare'"        shift, and go to state 248
-    "'enddeclare'"     shift, and go to state 249
-    "'as'"             shift, and go to state 250
-    "'switch'"         shift, and go to state 251
-    "'endswitch'"      shift, and go to state 252
-    "'case'"           shift, and go to state 253
-    "'default'"        shift, and go to state 254
-    "'match'"          shift, and go to state 255
-    "'break'"          shift, and go to state 256
-    "'continue'"       shift, and go to state 257
-    "'goto'"           shift, and go to state 258
-    "'function'"       shift, and go to state 259
-    "'fn'"             shift, and go to state 260
-    "'const'"          shift, and go to state 261
-    "'return'"         shift, and go to state 262
-    "'try'"            shift, and go to state 263
-    "'catch'"          shift, and go to state 264
-    "'finally'"        shift, and go to state 265
-    "'use'"            shift, and go to state 266
-    "'insteadof'"      shift, and go to state 267
-    "'global'"         shift, and go to state 268
-    "'static'"         shift, and go to state 269
-    "'abstract'"       shift, and go to state 270
-    "'final'"          shift, and go to state 271
-    "'private'"        shift, and go to state 272
-    "'protected'"      shift, and go to state 273
-    "'public'"         shift, and go to state 274
-    "'readonly'"       shift, and go to state 275
-    "'var'"            shift, and go to state 276
-    "'unset'"          shift, and go to state 277
-    "'isset'"          shift, and go to state 278
-    "'empty'"          shift, and go to state 279
-    "'class'"          shift, and go to state 280
-    "'trait'"          shift, and go to state 281
-    "'interface'"      shift, and go to state 282
-    "'enum'"           shift, and go to state 283
-    "'extends'"        shift, and go to state 284
-    "'implements'"     shift, and go to state 285
-    "'namespace'"      shift, and go to state 286
-    "'list'"           shift, and go to state 287
-    "'array'"          shift, and go to state 288
-    "'callable'"       shift, and go to state 289
-    "'__LINE__'"       shift, and go to state 290
-    "'__FILE__'"       shift, and go to state 291
-    "'__DIR__'"        shift, and go to state 292
-    "'__CLASS__'"      shift, and go to state 293
-    "'__TRAIT__'"      shift, and go to state 294
-    "'__METHOD__'"     shift, and go to state 295
-    "'__FUNCTION__'"   shift, and go to state 296
-    "'__NAMESPACE__'"  shift, and go to state 297
+  478 function_call: variable_class_name "'::'" • member_name argument_list
+  515 class_constant: variable_class_name "'::'" • identifier
+  517               | variable_class_name "'::'" • '{' expr '}'
+  544 static_member: variable_class_name "'::'" • simple_variable
+
+    "identifier"       shift, and go to state 212
+    "variable"         shift, and go to state 15
+    "'include'"        shift, and go to state 214
+    "'include_once'"   shift, and go to state 215
+    "'eval'"           shift, and go to state 216
+    "'require'"        shift, and go to state 217
+    "'require_once'"   shift, and go to state 218
+    "'or'"             shift, and go to state 219
+    "'xor'"            shift, and go to state 220
+    "'and'"            shift, and go to state 221
+    "'print'"          shift, and go to state 222
+    "'yield'"          shift, and go to state 223
+    "'instanceof'"     shift, and go to state 224
+    "'new'"            shift, and go to state 225
+    "'clone'"          shift, and go to state 226
+    "'exit'"           shift, and go to state 227
+    "'if'"             shift, and go to state 228
+    "'elseif'"         shift, and go to state 229
+    "'else'"           shift, and go to state 230
+    "'endif'"          shift, and go to state 231
+    "'echo'"           shift, and go to state 232
+    "'do'"             shift, and go to state 233
+    "'while'"          shift, and go to state 234
+    "'endwhile'"       shift, and go to state 235
+    "'for'"            shift, and go to state 236
+    "'endfor'"         shift, and go to state 237
+    "'foreach'"        shift, and go to state 238
+    "'endforeach'"     shift, and go to state 239
+    "'declare'"        shift, and go to state 240
+    "'enddeclare'"     shift, and go to state 241
+    "'as'"             shift, and go to state 242
+    "'switch'"         shift, and go to state 243
+    "'endswitch'"      shift, and go to state 244
+    "'case'"           shift, and go to state 245
+    "'default'"        shift, and go to state 246
+    "'match'"          shift, and go to state 247
+    "'break'"          shift, and go to state 248
+    "'continue'"       shift, and go to state 249
+    "'goto'"           shift, and go to state 250
+    "'function'"       shift, and go to state 251
+    "'fn'"             shift, and go to state 252
+    "'const'"          shift, and go to state 253
+    "'return'"         shift, and go to state 254
+    "'try'"            shift, and go to state 255
+    "'catch'"          shift, and go to state 256
+    "'finally'"        shift, and go to state 257
+    "'throw'"          shift, and go to state 258
+    "'use'"            shift, and go to state 259
+    "'insteadof'"      shift, and go to state 260
+    "'global'"         shift, and go to state 261
+    "'static'"         shift, and go to state 262
+    "'abstract'"       shift, and go to state 263
+    "'final'"          shift, and go to state 264
+    "'private'"        shift, and go to state 265
+    "'protected'"      shift, and go to state 266
+    "'public'"         shift, and go to state 267
+    "'readonly'"       shift, and go to state 268
+    "'var'"            shift, and go to state 269
+    "'unset'"          shift, and go to state 270
+    "'isset'"          shift, and go to state 271
+    "'empty'"          shift, and go to state 272
+    "'class'"          shift, and go to state 273
+    "'trait'"          shift, and go to state 274
+    "'interface'"      shift, and go to state 275
+    "'enum'"           shift, and go to state 276
+    "'extends'"        shift, and go to state 277
+    "'implements'"     shift, and go to state 278
+    "'namespace'"      shift, and go to state 279
+    "'list'"           shift, and go to state 280
+    "'array'"          shift, and go to state 281
+    "'callable'"       shift, and go to state 282
+    "'__LINE__'"       shift, and go to state 283
+    "'__FILE__'"       shift, and go to state 284
+    "'__DIR__'"        shift, and go to state 285
+    "'__CLASS__'"      shift, and go to state 286
+    "'__TRAIT__'"      shift, and go to state 287
+    "'__METHOD__'"     shift, and go to state 288
+    "'__FUNCTION__'"   shift, and go to state 289
+    "'__NAMESPACE__'"  shift, and go to state 290
     '{'                shift, and go to state 590
     '$'                shift, and go to state 89
 
-    reserved_non_modifiers  go to state 298
-    semi_reserved           go to state 299
+    reserved_non_modifiers  go to state 291
+    semi_reserved           go to state 292
     identifier              go to state 591
     simple_variable         go to state 592
     member_name             go to state 593
@@ -12988,11 +13123,11 @@
 
 State 389
 
-  533 callable_variable: array_object_dereferenceable "'->'" . property_name argument_list
-  538 variable: array_object_dereferenceable "'->'" . property_name
+  533 callable_variable: array_object_dereferenceable "'->'" • property_name argument_list
+  538 variable: array_object_dereferenceable "'->'" • property_name
 
     "identifier"  shift, and go to state 594
-    "variable"    shift, and go to state 31
+    "variable"    shift, and go to state 15
     '{'           shift, and go to state 595
     '$'           shift, and go to state 89
 
@@ -13002,11 +13137,11 @@
 
 State 390
 
-  534 callable_variable: array_object_dereferenceable "'?->'" . property_name argument_list
-  539 variable: array_object_dereferenceable "'?->'" . property_name
+  534 callable_variable: array_object_dereferenceable "'?->'" • property_name argument_list
+  539 variable: array_object_dereferenceable "'?->'" • property_name
 
     "identifier"  shift, and go to state 594
-    "variable"    shift, and go to state 31
+    "variable"    shift, and go to state 15
     '{'           shift, and go to state 595
     '$'           shift, and go to state 89
 
@@ -13016,60 +13151,60 @@
 
 State 391
 
-  532 callable_variable: array_object_dereferenceable '{' . expr '}'
+  532 callable_variable: array_object_dereferenceable '{' • expr '}'
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -13105,60 +13240,60 @@
 
 State 392
 
-  531 callable_variable: array_object_dereferenceable '' . optional_expr ''
+  531 callable_variable: array_object_dereferenceable '' • optional_expr ''
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -13173,7 +13308,7 @@
     attributes                    go to state 131
     match                         go to state 103
     new_expr                      go to state 108
-    expr                          go to state 182
+    expr                          go to state 174
     inline_function               go to state 110
     fn                            go to state 111
     function                      go to state 133
@@ -13197,73 +13332,73 @@
 
 State 393
 
-  480 function_call: callable_expr @10 . argument_list
+  480 function_call: callable_expr @10 • argument_list
 
-    '('  shift, and go to state 209
+    '('  shift, and go to state 202
 
     argument_list  go to state 601
 
 
 State 394
 
-  380 expr: variable '=' . expr
-  381     | variable '=' . ampersand variable
+  380 expr: variable '=' • expr
+  381     | variable '=' • ampersand variable
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    "amp"                      shift, and go to state 324
-    "'&'"                      shift, and go to state 325
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
+    "'&'"                      shift, and go to state 326
+    "amp"                      shift, and go to state 327
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
     '`'                        shift, and go to state 87
@@ -13299,60 +13434,60 @@
 
 State 395
 
-  383 expr: variable "'+='" . expr
+  383 expr: variable "'+='" • expr
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -13388,60 +13523,60 @@
 
 State 396
 
-  384 expr: variable "'-='" . expr
+  384 expr: variable "'-='" • expr
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -13477,60 +13612,60 @@
 
 State 397
 
-  385 expr: variable "'*='" . expr
+  385 expr: variable "'*='" • expr
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -13566,60 +13701,60 @@
 
 State 398
 
-  387 expr: variable "'/='" . expr
+  387 expr: variable "'/='" • expr
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -13655,60 +13790,60 @@
 
 State 399
 
-  388 expr: variable "'.='" . expr
+  388 expr: variable "'.='" • expr
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -13744,60 +13879,60 @@
 
 State 400
 
-  389 expr: variable "'%='" . expr
+  389 expr: variable "'%='" • expr
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -13833,60 +13968,60 @@
 
 State 401
 
-  390 expr: variable "'&='" . expr
+  390 expr: variable "'&='" • expr
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -13922,60 +14057,60 @@
 
 State 402
 
-  391 expr: variable "'|='" . expr
+  391 expr: variable "'|='" • expr
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -14011,60 +14146,60 @@
 
 State 403
 
-  392 expr: variable "'^='" . expr
+  392 expr: variable "'^='" • expr
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -14100,60 +14235,60 @@
 
 State 404
 
-  393 expr: variable "'<<='" . expr
+  393 expr: variable "'<<='" • expr
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -14189,60 +14324,60 @@
 
 State 405
 
-  394 expr: variable "'>>='" . expr
+  394 expr: variable "'>>='" • expr
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -14278,60 +14413,60 @@
 
 State 406
 
-  386 expr: variable "'**='" . expr
+  395 expr: variable "'??='" • expr
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -14367,60 +14502,74 @@
 
 State 407
 
-  395 expr: variable "'??='" . expr
+  396 expr: variable "'++'" •
+
+    $default  reduce using rule 396 (expr)
+
+
+State 408
+
+  398 expr: variable "'--'" •
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    $default  reduce using rule 398 (expr)
+
+
+State 409
+
+  386 expr: variable "'**='" • expr
+
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -14454,23 +14603,9 @@
     internal_functions_in_yacc    go to state 127
 
 
-State 408
-
-  396 expr: variable "'++'" .
-
-    $default  reduce using rule 396 (expr)
-
-
-State 409
-
-  398 expr: variable "'--'" .
-
-    $default  reduce using rule 398 (expr)
-
-
 State 410
 
-  460 inline_function: function returns_ref . backup_doc_comment '(' parameter_list ')' lexical_vars return_type backup_fn_flags '{' inner_statement_list '}' backup_fn_flags
+  460 inline_function: function returns_ref • backup_doc_comment '(' parameter_list ')' lexical_vars return_type backup_fn_flags '{' inner_statement_list '}' backup_fn_flags
 
     $default  reduce using rule 464 (backup_doc_comment)
 
@@ -14479,60 +14614,128 @@
 
 State 411
 
-  452 expr: "'yield'" expr "'=>'" . expr
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+  590 internal_functions_in_yacc: "'eval'" '(' expr • ')'
+
+    '?'             shift, and go to state 353
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'or'"          shift, and go to state 364
+    "'xor'"         shift, and go to state 365
+    "'and'"         shift, and go to state 366
+    "'instanceof'"  shift, and go to state 367
+    "'||'"          shift, and go to state 368
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'??'"          shift, and go to state 379
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
+    ')'             shift, and go to state 617
+
+
+State 412
+
+  452 expr: "'yield'" expr "'=>'" • expr
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -14545,7 +14748,7 @@
     attributes                    go to state 131
     match                         go to state 103
     new_expr                      go to state 108
-    expr                          go to state 617
+    expr                          go to state 618
     inline_function               go to state 110
     fn                            go to state 111
     function                      go to state 133
@@ -14566,159 +14769,91 @@
     internal_functions_in_yacc    go to state 127
 
 
-State 412
-
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-  590 internal_functions_in_yacc: "'eval'" '(' expr . ')'
-
-    "'or'"          shift, and go to state 353
-    "'xor'"         shift, and go to state 354
-    "'and'"         shift, and go to state 355
-    '?'             shift, and go to state 356
-    "'??'"          shift, and go to state 357
-    "'||'"          shift, and go to state 358
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
-    ')'             shift, and go to state 618
-
-
 State 413
 
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-  485 class_name_reference: '(' expr . ')'
-
-    "'or'"          shift, and go to state 353
-    "'xor'"         shift, and go to state 354
-    "'and'"         shift, and go to state 355
-    '?'             shift, and go to state 356
-    "'??'"          shift, and go to state 357
-    "'||'"          shift, and go to state 358
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+  485 class_name_reference: '(' expr • ')'
+
+    '?'             shift, and go to state 353
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'or'"          shift, and go to state 364
+    "'xor'"         shift, and go to state 365
+    "'and'"         shift, and go to state 366
+    "'instanceof'"  shift, and go to state 367
+    "'||'"          shift, and go to state 368
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'??'"          shift, and go to state 379
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
     ')'             shift, and go to state 619
 
 
 State 414
 
-  376 new_expr: "'new'" attributes anonymous_class .
+  376 new_expr: "'new'" attributes anonymous_class •
 
     $default  reduce using rule 376 (new_expr)
 
 
 State 415
 
-  197 anonymous_class_modifiers: anonymous_class_modifiers class_modifier .
+  197 anonymous_class_modifiers: anonymous_class_modifiers class_modifier •
 
     $default  reduce using rule 197 (anonymous_class_modifiers)
 
 
 State 416
 
-  373 anonymous_class: anonymous_class_modifiers_optional "'class'" . @9 ctor_arguments extends_from implements_list backup_doc_comment '{' class_statement_list '}'
+  373 anonymous_class: anonymous_class_modifiers_optional "'class'" • @9 ctor_arguments extends_from implements_list backup_doc_comment '{' class_statement_list '}'
 
     $default  reduce using rule 372 (@9)
 
@@ -14727,9 +14862,9 @@
 
 State 417
 
-  550 new_variable: class_name "'::'" . simple_variable
+  550 new_variable: class_name "'::'" • simple_variable
 
-    "variable"  shift, and go to state 31
+    "variable"  shift, and go to state 15
     '$'         shift, and go to state 89
 
     simple_variable  go to state 621
@@ -14737,24 +14872,24 @@
 
 State 418
 
-  492 ctor_arguments: argument_list .
+  492 ctor_arguments: argument_list •
 
     $default  reduce using rule 492 (ctor_arguments)
 
 
 State 419
 
-  374 new_expr: "'new'" class_name_reference ctor_arguments .
+  374 new_expr: "'new'" class_name_reference ctor_arguments •
 
     $default  reduce using rule 374 (new_expr)
 
 
 State 420
 
-  548 new_variable: new_variable "'->'" . property_name
+  548 new_variable: new_variable "'->'" • property_name
 
     "identifier"  shift, and go to state 594
-    "variable"    shift, and go to state 31
+    "variable"    shift, and go to state 15
     '{'           shift, and go to state 595
     '$'           shift, and go to state 89
 
@@ -14764,10 +14899,10 @@
 
 State 421
 
-  549 new_variable: new_variable "'?->'" . property_name
+  549 new_variable: new_variable "'?->'" • property_name
 
     "identifier"  shift, and go to state 594
-    "variable"    shift, and go to state 31
+    "variable"    shift, and go to state 15
     '{'           shift, and go to state 595
     '$'           shift, and go to state 89
 
@@ -14777,9 +14912,9 @@
 
 State 422
 
-  551 new_variable: new_variable "'::'" . simple_variable
+  551 new_variable: new_variable "'::'" • simple_variable
 
-    "variable"  shift, and go to state 31
+    "variable"  shift, and go to state 15
     '$'         shift, and go to state 89
 
     simple_variable  go to state 624
@@ -14787,60 +14922,60 @@
 
 State 423
 
-  547 new_variable: new_variable '{' . expr '}'
+  547 new_variable: new_variable '{' • expr '}'
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -14876,60 +15011,60 @@
 
 State 424
 
-  546 new_variable: new_variable '' . optional_expr ''
+  546 new_variable: new_variable '' • optional_expr ''
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -14944,7 +15079,7 @@
     attributes                    go to state 131
     match                         go to state 103
     new_expr                      go to state 108
-    expr                          go to state 182
+    expr                          go to state 174
     inline_function               go to state 110
     fn                            go to state 111
     function                      go to state 133
@@ -14968,136 +15103,136 @@
 
 State 425
 
-  487 exit_expr: '(' optional_expr . ')'
+  487 exit_expr: '(' optional_expr • ')'
 
     ')'  shift, and go to state 627
 
 
 State 426
 
-  250 if_stmt_without_else: "'if'" '(' expr . ')' statement
-  254 alt_if_stmt_without_else: "'if'" '(' expr . ')' ':' inner_statement_list
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-
-    "'or'"          shift, and go to state 353
-    "'xor'"         shift, and go to state 354
-    "'and'"         shift, and go to state 355
-    '?'             shift, and go to state 356
-    "'??'"          shift, and go to state 357
-    "'||'"          shift, and go to state 358
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  250 if_stmt_without_else: "'if'" '(' expr • ')' statement
+  254 alt_if_stmt_without_else: "'if'" '(' expr • ')' ':' inner_statement_list
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+
+    '?'             shift, and go to state 353
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'or'"          shift, and go to state 364
+    "'xor'"         shift, and go to state 365
+    "'and'"         shift, and go to state 366
+    "'instanceof'"  shift, and go to state 367
+    "'||'"          shift, and go to state 368
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'??'"          shift, and go to state 379
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
     ')'             shift, and go to state 628
 
 
 State 427
 
-  365 echo_expr_list: echo_expr_list ',' . echo_expr
+  365 echo_expr_list: echo_expr_list ',' • echo_expr
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -15111,7 +15246,7 @@
     match                         go to state 103
     echo_expr                     go to state 629
     new_expr                      go to state 108
-    expr                          go to state 174
+    expr                          go to state 166
     inline_function               go to state 110
     fn                            go to state 111
     function                      go to state 133
@@ -15134,97 +15269,97 @@
 
 State 428
 
-  160 statement: "'echo'" echo_expr_list ';' .
+  160 statement: "'echo'" echo_expr_list ';' •
 
     $default  reduce using rule 160 (statement)
 
 
 State 429
 
-  152 statement: "'do'" statement "'while'" . '(' expr ')' ';'
+  152 statement: "'do'" statement "'while'" • '(' expr ')' ';'
 
     '('  shift, and go to state 630
 
 
 State 430
 
-  151 statement: "'while'" '(' expr . ')' while_statement
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-
-    "'or'"          shift, and go to state 353
-    "'xor'"         shift, and go to state 354
-    "'and'"         shift, and go to state 355
-    '?'             shift, and go to state 356
-    "'??'"          shift, and go to state 357
-    "'||'"          shift, and go to state 358
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  151 statement: "'while'" '(' expr • ')' while_statement
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+
+    '?'             shift, and go to state 353
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'or'"          shift, and go to state 364
+    "'xor'"         shift, and go to state 365
+    "'and'"         shift, and go to state 366
+    "'instanceof'"  shift, and go to state 367
+    "'||'"          shift, and go to state 368
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'??'"          shift, and go to state 379
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
     ')'             shift, and go to state 631
 
 
 State 431
 
-  153 statement: "'for'" '(' for_exprs . ';' for_exprs ';' for_exprs ')' for_statement
+  153 statement: "'for'" '(' for_exprs • ';' for_exprs ';' for_exprs ')' for_statement
 
     ';'  shift, and go to state 632
 
 
 State 432
 
-  369 for_exprs: non_empty_for_exprs .
-  370 non_empty_for_exprs: non_empty_for_exprs . ',' expr
+  369 for_exprs: non_empty_for_exprs •
+  370 non_empty_for_exprs: non_empty_for_exprs • ',' expr
 
     ','  shift, and go to state 633
 
@@ -15233,146 +15368,146 @@
 
 State 433
 
-  371 non_empty_for_exprs: expr .
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-
-    "'or'"          shift, and go to state 353
-    "'xor'"         shift, and go to state 354
-    "'and'"         shift, and go to state 355
-    '?'             shift, and go to state 356
-    "'??'"          shift, and go to state 357
-    "'||'"          shift, and go to state 358
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  371 non_empty_for_exprs: expr •
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+
+    '?'             shift, and go to state 353
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'or'"          shift, and go to state 364
+    "'xor'"         shift, and go to state 365
+    "'and'"         shift, and go to state 366
+    "'instanceof'"  shift, and go to state 367
+    "'||'"          shift, and go to state 368
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'??'"          shift, and go to state 379
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
 
     $default  reduce using rule 371 (non_empty_for_exprs)
 
 
 State 434
 
-  164 statement: "'foreach'" '(' expr . "'as'" foreach_variable ')' foreach_statement
-  165          | "'foreach'" '(' expr . "'as'" foreach_variable "'=>'" foreach_variable ')' foreach_statement
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-
-    "'or'"          shift, and go to state 353
-    "'xor'"         shift, and go to state 354
-    "'and'"         shift, and go to state 355
-    '?'             shift, and go to state 356
-    "'??'"          shift, and go to state 357
-    "'||'"          shift, and go to state 358
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  164 statement: "'foreach'" '(' expr • "'as'" foreach_variable ')' foreach_statement
+  165          | "'foreach'" '(' expr • "'as'" foreach_variable "'=>'" foreach_variable ')' foreach_statement
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+
+    '?'             shift, and go to state 353
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'or'"          shift, and go to state 364
+    "'xor'"         shift, and go to state 365
+    "'and'"         shift, and go to state 366
+    "'instanceof'"  shift, and go to state 367
     "'as'"          shift, and go to state 634
+    "'||'"          shift, and go to state 368
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'??'"          shift, and go to state 379
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
 
 
 State 435
 
-  140 const_list: const_list . ',' const_decl
-  167 statement: "'declare'" '(' const_list . ')' $@3 declare_statement
+  140 const_list: const_list • ',' const_decl
+  167 statement: "'declare'" '(' const_list • ')' $@3 declare_statement
 
     ','  shift, and go to state 442
     ')'  shift, and go to state 635
@@ -15380,217 +15515,217 @@
 
 State 436
 
-  154 statement: "'switch'" '(' expr . ')' switch_case_list
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-
-    "'or'"          shift, and go to state 353
-    "'xor'"         shift, and go to state 354
-    "'and'"         shift, and go to state 355
-    '?'             shift, and go to state 356
-    "'??'"          shift, and go to state 357
-    "'||'"          shift, and go to state 358
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  154 statement: "'switch'" '(' expr • ')' switch_case_list
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+
+    '?'             shift, and go to state 353
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'or'"          shift, and go to state 364
+    "'xor'"         shift, and go to state 365
+    "'and'"         shift, and go to state 366
+    "'instanceof'"  shift, and go to state 367
+    "'||'"          shift, and go to state 368
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'??'"          shift, and go to state 379
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
     ')'             shift, and go to state 636
 
 
 State 437
 
-  239 match: "'match'" '(' expr . ')' '{' match_arm_list '}'
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-
-    "'or'"          shift, and go to state 353
-    "'xor'"         shift, and go to state 354
-    "'and'"         shift, and go to state 355
-    '?'             shift, and go to state 356
-    "'??'"          shift, and go to state 357
-    "'||'"          shift, and go to state 358
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  239 match: "'match'" '(' expr • ')' '{' match_arm_list '}'
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+
+    '?'             shift, and go to state 353
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'or'"          shift, and go to state 364
+    "'xor'"         shift, and go to state 365
+    "'and'"         shift, and go to state 366
+    "'instanceof'"  shift, and go to state 367
+    "'||'"          shift, and go to state 368
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'??'"          shift, and go to state 379
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
     ')'             shift, and go to state 637
 
 
 State 438
 
-  155 statement: "'break'" optional_expr ';' .
+  155 statement: "'break'" optional_expr ';' •
 
     $default  reduce using rule 155 (statement)
 
 
 State 439
 
-  156 statement: "'continue'" optional_expr ';' .
+  156 statement: "'continue'" optional_expr ';' •
 
     $default  reduce using rule 156 (statement)
 
 
 State 440
 
-  170 statement: "'goto'" "identifier" ';' .
+  170 statement: "'goto'" "identifier" ';' •
 
     $default  reduce using rule 170 (statement)
 
 
 State 441
 
-  364 const_decl: "identifier" '=' . expr backup_doc_comment
+  364 const_decl: "identifier" '=' • expr backup_doc_comment
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -15626,107 +15761,107 @@
 
 State 442
 
-  140 const_list: const_list ',' . const_decl
+  140 const_list: const_list ',' • const_decl
 
-    "identifier"  shift, and go to state 186
+    "identifier"  shift, and go to state 178
 
     const_decl  go to state 639
 
 
 State 443
 
-  121 top_statement: "'const'" const_list ';' .
+  121 top_statement: "'const'" const_list ';' •
 
     $default  reduce using rule 121 (top_statement)
 
 
 State 444
 
-  157 statement: "'return'" optional_expr ';' .
+  157 statement: "'return'" optional_expr ';' •
 
     $default  reduce using rule 157 (statement)
 
 
 State 445
 
-  142 inner_statement_list: inner_statement_list . inner_statement
-  169 statement: "'try'" '{' inner_statement_list . '}' catch_list finally_statement
+  142 inner_statement_list: inner_statement_list • inner_statement
+  169 statement: "'try'" '{' inner_statement_list • '}' catch_list finally_statement
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 27
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    T_INLINE_HTML              shift, and go to state 32
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'if'"                     shift, and go to state 37
-    "'echo'"                   shift, and go to state 38
-    "'do'"                     shift, and go to state 39
-    "'while'"                  shift, and go to state 40
-    "'for'"                    shift, and go to state 41
-    "'foreach'"                shift, and go to state 42
-    "'declare'"                shift, and go to state 43
-    "'switch'"                 shift, and go to state 44
-    "'match'"                  shift, and go to state 45
-    "'break'"                  shift, and go to state 46
-    "'continue'"               shift, and go to state 47
-    "'goto'"                   shift, and go to state 48
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'return'"                 shift, and go to state 52
-    "'try'"                    shift, and go to state 53
-    "'global'"                 shift, and go to state 55
-    "'static'"                 shift, and go to state 56
-    "'abstract'"               shift, and go to state 57
-    "'final'"                  shift, and go to state 58
-    "'readonly'"               shift, and go to state 59
-    "'unset'"                  shift, and go to state 60
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 11
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    T_INLINE_HTML              shift, and go to state 16
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'if'"                     shift, and go to state 29
+    "'echo'"                   shift, and go to state 30
+    "'do'"                     shift, and go to state 31
+    "'while'"                  shift, and go to state 32
+    "'for'"                    shift, and go to state 33
+    "'foreach'"                shift, and go to state 34
+    "'declare'"                shift, and go to state 35
+    "'switch'"                 shift, and go to state 36
+    "'match'"                  shift, and go to state 37
+    "'break'"                  shift, and go to state 38
+    "'continue'"               shift, and go to state 39
+    "'goto'"                   shift, and go to state 40
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'return'"                 shift, and go to state 44
+    "'try'"                    shift, and go to state 45
+    "'throw'"                  shift, and go to state 46
+    "'global'"                 shift, and go to state 48
+    "'static'"                 shift, and go to state 49
+    "'abstract'"               shift, and go to state 50
+    "'final'"                  shift, and go to state 51
+    "'readonly'"               shift, and go to state 52
+    "'unset'"                  shift, and go to state 53
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
     "'__halt_compiler'"        shift, and go to state 528
-    "'class'"                  shift, and go to state 64
-    "'trait'"                  shift, and go to state 65
-    "'interface'"              shift, and go to state 66
-    "'enum'"                   shift, and go to state 67
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    "'class'"                  shift, and go to state 57
+    "'trait'"                  shift, and go to state 58
+    "'interface'"              shift, and go to state 59
+    "'enum'"                   shift, and go to state 60
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ';'                        shift, and go to state 84
@@ -15779,23 +15914,23 @@
 
 State 446
 
-  139 use_declaration: legacy_namespace_name "'as'" . "identifier"
+  139 use_declaration: legacy_namespace_name "'as'" • "identifier"
 
     "identifier"  shift, and go to state 641
 
 
 State 447
 
-  125 mixed_group_use_declaration: legacy_namespace_name "'\\'" . '{' inline_use_declarations possible_comma '}'
+  125 mixed_group_use_declaration: legacy_namespace_name "'\\'" • '{' inline_use_declarations possible_comma '}'
 
     '{'  shift, and go to state 642
 
 
 State 448
 
-  124 group_use_declaration: legacy_namespace_name . "'\\'" '{' unprefixed_use_declarations possible_comma '}'
-  138 use_declaration: legacy_namespace_name .
-  139                | legacy_namespace_name . "'as'" "identifier"
+  124 group_use_declaration: legacy_namespace_name • "'\\'" '{' unprefixed_use_declarations possible_comma '}'
+  138 use_declaration: legacy_namespace_name •
+  139                | legacy_namespace_name • "'as'" "identifier"
 
     "'as'"  shift, and go to state 446
     "'\\'"  shift, and go to state 643
@@ -15805,15 +15940,15 @@
 
 State 449
 
-  118 top_statement: "'use'" use_type group_use_declaration . ';'
+  118 top_statement: "'use'" use_type group_use_declaration • ';'
 
     ';'  shift, and go to state 644
 
 
 State 450
 
-  120 top_statement: "'use'" use_type use_declarations . ';'
-  132 use_declarations: use_declarations . ',' use_declaration
+  120 top_statement: "'use'" use_type use_declarations • ';'
+  132 use_declarations: use_declarations • ',' use_declaration
 
     ','  shift, and go to state 452
     ';'  shift, and go to state 645
@@ -15821,105 +15956,105 @@
 
 State 451
 
-  117 top_statement: "'use'" mixed_group_use_declaration ';' .
+  117 top_statement: "'use'" mixed_group_use_declaration ';' •
 
     $default  reduce using rule 117 (top_statement)
 
 
 State 452
 
-  132 use_declarations: use_declarations ',' . use_declaration
+  132 use_declarations: use_declarations ',' • use_declaration
 
-    "identifier"            shift, and go to state 191
-    "fully qualified name"  shift, and go to state 192
-    "namespaced name"       shift, and go to state 193
+    "identifier"            shift, and go to state 184
+    "fully qualified name"  shift, and go to state 185
+    "namespaced name"       shift, and go to state 186
 
-    namespace_name         go to state 196
+    namespace_name         go to state 189
     legacy_namespace_name  go to state 646
     use_declaration        go to state 647
 
 
 State 453
 
-  119 top_statement: "'use'" use_declarations ';' .
+  119 top_statement: "'use'" use_declarations ';' •
 
     $default  reduce using rule 119 (top_statement)
 
 
 State 454
 
-  305 global_var_list: global_var_list ',' . global_var
+  305 global_var_list: global_var_list ',' • global_var
 
-    "variable"  shift, and go to state 31
+    "variable"  shift, and go to state 15
     '$'         shift, and go to state 89
 
     global_var       go to state 648
-    simple_variable  go to state 204
+    simple_variable  go to state 197
 
 
 State 455
 
-  158 statement: "'global'" global_var_list ';' .
+  158 statement: "'global'" global_var_list ';' •
 
     $default  reduce using rule 158 (statement)
 
 
 State 456
 
-  311 static_var: "variable" '=' . expr
+  311 static_var: "variable" '=' • expr
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -15955,169 +16090,87 @@
 
 State 457
 
-  308 static_var_list: static_var_list ',' . static_var
+  308 static_var_list: static_var_list ',' • static_var
 
-    "variable"  shift, and go to state 205
+    "variable"  shift, and go to state 198
 
     static_var  go to state 650
 
 
 State 458
 
-  159 statement: "'static'" static_var_list ';' .
+  159 statement: "'static'" static_var_list ';' •
 
     $default  reduce using rule 159 (statement)
 
 
 State 459
 
-   32 reserved_non_modifiers: "'throw'" .
-  454 expr: "'throw'" . expr
+   82 identifier: "identifier" •
+   92 name: "identifier" •
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
-    "heredoc start"            shift, and go to state 82
-    '('                        shift, and go to state 83
-    ''                        shift, and go to state 86
-    '`'                        shift, and go to state 87
-    '"'                        shift, and go to state 88
-    '$'                        shift, and go to state 89
-
-    $default  reduce using rule 32 (reserved_non_modifiers)
-
-    name                          go to state 90
-    attribute                     go to state 91
-    attributes                    go to state 131
-    match                         go to state 103
-    new_expr                      go to state 108
-    expr                          go to state 132
-    inline_function               go to state 110
-    fn                            go to state 111
-    function                      go to state 133
-    function_call                 go to state 113
-    class_name                    go to state 114
-    dereferenceable_scalar        go to state 115
-    scalar                        go to state 116
-    constant                      go to state 117
-    class_constant                go to state 118
-    variable_class_name           go to state 119
-    fully_dereferenceable         go to state 120
-    array_object_dereferenceable  go to state 121
-    callable_expr                 go to state 122
-    callable_variable             go to state 123
-    variable                      go to state 124
-    simple_variable               go to state 125
-    static_member                 go to state 126
-    internal_functions_in_yacc    go to state 127
+    ':'       reduce using rule 82 (identifier)
+    "'as'"    reduce using rule 82 (identifier)
+    $default  reduce using rule 92 (name)
 
 
 State 460
 
-    2 reserved_non_modifiers: "'include'" .
-  588 internal_functions_in_yacc: "'include'" . expr
+    2 reserved_non_modifiers: "'include'" •
+  588 internal_functions_in_yacc: "'include'" • expr
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -16132,7 +16185,7 @@
     attributes                    go to state 131
     match                         go to state 103
     new_expr                      go to state 108
-    expr                          go to state 134
+    expr                          go to state 139
     inline_function               go to state 110
     fn                            go to state 111
     function                      go to state 133
@@ -16155,61 +16208,61 @@
 
 State 461
 
-    3 reserved_non_modifiers: "'include_once'" .
-  589 internal_functions_in_yacc: "'include_once'" . expr
+    3 reserved_non_modifiers: "'include_once'" •
+  589 internal_functions_in_yacc: "'include_once'" • expr
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -16224,7 +16277,7 @@
     attributes                    go to state 131
     match                         go to state 103
     new_expr                      go to state 108
-    expr                          go to state 135
+    expr                          go to state 140
     inline_function               go to state 110
     fn                            go to state 111
     function                      go to state 133
@@ -16247,61 +16300,71 @@
 
 State 462
 
-    5 reserved_non_modifiers: "'require'" .
-  591 internal_functions_in_yacc: "'require'" . expr
+    4 reserved_non_modifiers: "'eval'" •
+  590 internal_functions_in_yacc: "'eval'" • '(' expr ')'
+
+    '('  shift, and go to state 141
+
+    $default  reduce using rule 4 (reserved_non_modifiers)
+
+
+State 463
+
+    5 reserved_non_modifiers: "'require'" •
+  591 internal_functions_in_yacc: "'require'" • expr
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -16316,7 +16379,7 @@
     attributes                    go to state 131
     match                         go to state 103
     new_expr                      go to state 108
-    expr                          go to state 136
+    expr                          go to state 142
     inline_function               go to state 110
     fn                            go to state 111
     function                      go to state 133
@@ -16337,63 +16400,63 @@
     internal_functions_in_yacc    go to state 127
 
 
-State 463
+State 464
 
-    6 reserved_non_modifiers: "'require_once'" .
-  592 internal_functions_in_yacc: "'require_once'" . expr
+    6 reserved_non_modifiers: "'require_once'" •
+  592 internal_functions_in_yacc: "'require_once'" • expr
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -16408,7 +16471,7 @@
     attributes                    go to state 131
     match                         go to state 103
     new_expr                      go to state 108
-    expr                          go to state 137
+    expr                          go to state 143
     inline_function               go to state 110
     fn                            go to state 111
     function                      go to state 133
@@ -16429,63 +16492,63 @@
     internal_functions_in_yacc    go to state 127
 
 
-State 464
+State 465
 
-   45 reserved_non_modifiers: "'print'" .
-  449 expr: "'print'" . expr
+   45 reserved_non_modifiers: "'print'" •
+  449 expr: "'print'" • expr
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -16500,7 +16563,7 @@
     attributes                    go to state 131
     match                         go to state 103
     new_expr                      go to state 108
-    expr                          go to state 138
+    expr                          go to state 144
     inline_function               go to state 110
     fn                            go to state 111
     function                      go to state 133
@@ -16521,65 +16584,65 @@
     internal_functions_in_yacc    go to state 127
 
 
-State 465
+State 466
 
-   46 reserved_non_modifiers: "'yield'" .
-  450 expr: "'yield'" .
-  451     | "'yield'" . expr
-  452     | "'yield'" . expr "'=>'" expr
-
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+   46 reserved_non_modifiers: "'yield'" •
+  450 expr: "'yield'" •
+  451     | "'yield'" • expr
+  452     | "'yield'" • expr "'=>'" expr
+
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -16595,7 +16658,7 @@
     attributes                    go to state 131
     match                         go to state 103
     new_expr                      go to state 108
-    expr                          go to state 139
+    expr                          go to state 145
     inline_function               go to state 110
     fn                            go to state 111
     function                      go to state 133
@@ -16616,63 +16679,99 @@
     internal_functions_in_yacc    go to state 127
 
 
-State 466
+State 467
 
-   12 reserved_non_modifiers: "'clone'" .
-  382 expr: "'clone'" . expr
+   11 reserved_non_modifiers: "'new'" •
+  374 new_expr: "'new'" • class_name_reference ctor_arguments
+  375         | "'new'" • anonymous_class
+  376         | "'new'" • attributes anonymous_class
+
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "'static'"                 shift, and go to state 147
+    "'abstract'"               shift, and go to state 50
+    "'final'"                  shift, and go to state 51
+    "'readonly'"               shift, and go to state 148
+    "'#'"                     shift, and go to state 72
+    '('                        shift, and go to state 149
+    '$'                        shift, and go to state 89
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    "'class'"  reduce using rule 198 (anonymous_class_modifiers_optional)
+    $default   reduce using rule 11 (reserved_non_modifiers)
+
+    name                                go to state 150
+    attribute                           go to state 91
+    attributes                          go to state 151
+    anonymous_class_modifiers           go to state 152
+    anonymous_class_modifiers_optional  go to state 153
+    class_modifier                      go to state 154
+    anonymous_class                     go to state 155
+    class_name                          go to state 156
+    class_name_reference                go to state 157
+    simple_variable                     go to state 158
+    new_variable                        go to state 159
+
+
+State 468
+
+   12 reserved_non_modifiers: "'clone'" •
+  382 expr: "'clone'" • expr
+
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -16687,7 +16786,7 @@
     attributes                    go to state 131
     match                         go to state 103
     new_expr                      go to state 108
-    expr                          go to state 153
+    expr                          go to state 160
     inline_function               go to state 110
     fn                            go to state 111
     function                      go to state 133
@@ -16708,176 +16807,212 @@
     internal_functions_in_yacc    go to state 127
 
 
-State 467
-
-   82 identifier: "identifier" .
-   92 name: "identifier" .
-
-    ':'       reduce using rule 82 (identifier)
-    "'as'"    reduce using rule 82 (identifier)
-    $default  reduce using rule 92 (name)
-
-
-State 468
-
-    4 reserved_non_modifiers: "'eval'" .
-  590 internal_functions_in_yacc: "'eval'" . '(' expr ')'
-
-    '('  shift, and go to state 155
-
-    $default  reduce using rule 4 (reserved_non_modifiers)
-
-
 State 469
 
-   11 reserved_non_modifiers: "'new'" .
-  374 new_expr: "'new'" . class_name_reference ctor_arguments
-  375         | "'new'" . anonymous_class
-  376         | "'new'" . attributes anonymous_class
-
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "'static'"                 shift, and go to state 156
-    "'abstract'"               shift, and go to state 57
-    "'final'"                  shift, and go to state 58
-    "'readonly'"               shift, and go to state 157
-    "'#'"                     shift, and go to state 79
-    '('                        shift, and go to state 158
-    '$'                        shift, and go to state 89
+   13 reserved_non_modifiers: "'exit'" •
+  445 expr: "'exit'" • exit_expr
 
-    "'class'"  reduce using rule 198 (anonymous_class_modifiers_optional)
-    $default   reduce using rule 11 (reserved_non_modifiers)
-
-    name                                go to state 159
-    attribute                           go to state 91
-    attributes                          go to state 160
-    anonymous_class_modifiers           go to state 161
-    anonymous_class_modifiers_optional  go to state 162
-    class_modifier                      go to state 163
-    anonymous_class                     go to state 164
-    class_name                          go to state 165
-    class_name_reference                go to state 166
-    simple_variable                     go to state 167
-    new_variable                        go to state 168
-
-
-State 470
-
-   13 reserved_non_modifiers: "'exit'" .
-  445 expr: "'exit'" . exit_expr
-
-    '('  shift, and go to state 169
+    '('  shift, and go to state 161
 
     ':'       reduce using rule 13 (reserved_non_modifiers)
     $default  reduce using rule 486 (exit_expr)
 
-    exit_expr  go to state 170
+    exit_expr  go to state 162
 
 
-State 471
+State 470
 
-   70 reserved_non_modifiers: "'match'" .
-  239 match: "'match'" . '(' expr ')' '{' match_arm_list '}'
+   70 reserved_non_modifiers: "'match'" •
+  239 match: "'match'" • '(' expr ')' '{' match_arm_list '}'
 
-    '('  shift, and go to state 181
+    '('  shift, and go to state 173
 
     $default  reduce using rule 70 (reserved_non_modifiers)
 
 
-State 472
+State 471
 
-   42 reserved_non_modifiers: "'function'" .
-  463 function: "'function'" .
+   42 reserved_non_modifiers: "'function'" •
+  463 function: "'function'" •
 
     ':'       reduce using rule 42 (reserved_non_modifiers)
     $default  reduce using rule 463 (function)
 
 
-State 473
+State 472
 
-   69 reserved_non_modifiers: "'fn'" .
-  462 fn: "'fn'" .
+   69 reserved_non_modifiers: "'fn'" •
+  462 fn: "'fn'" •
 
     ':'       reduce using rule 69 (reserved_non_modifiers)
     $default  reduce using rule 462 (fn)
 
 
+State 473
+
+   32 reserved_non_modifiers: "'throw'" •
+  454 expr: "'throw'" • expr
+
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
+    "heredoc start"            shift, and go to state 82
+    '('                        shift, and go to state 83
+    ''                        shift, and go to state 86
+    '`'                        shift, and go to state 87
+    '"'                        shift, and go to state 88
+    '$'                        shift, and go to state 89
+
+    $default  reduce using rule 32 (reserved_non_modifiers)
+
+    name                          go to state 90
+    attribute                     go to state 91
+    attributes                    go to state 131
+    match                         go to state 103
+    new_expr                      go to state 108
+    expr                          go to state 183
+    inline_function               go to state 110
+    fn                            go to state 111
+    function                      go to state 133
+    function_call                 go to state 113
+    class_name                    go to state 114
+    dereferenceable_scalar        go to state 115
+    scalar                        go to state 116
+    constant                      go to state 117
+    class_constant                go to state 118
+    variable_class_name           go to state 119
+    fully_dereferenceable         go to state 120
+    array_object_dereferenceable  go to state 121
+    callable_expr                 go to state 122
+    callable_variable             go to state 123
+    variable                      go to state 124
+    simple_variable               go to state 125
+    static_member                 go to state 126
+    internal_functions_in_yacc    go to state 127
+
+
 State 474
 
-   73 semi_reserved: "'static'" .
-  457 expr: "'static'" . inline_function
-  481 class_name: "'static'" .
+   73 semi_reserved: "'static'" •
+  457 expr: "'static'" • inline_function
+  481 class_name: "'static'" •
 
-    "'function'"  shift, and go to state 49
-    "'fn'"        shift, and go to state 50
+    "'function'"  shift, and go to state 41
+    "'fn'"        shift, and go to state 42
 
     "'::'"    reduce using rule 481 (class_name)
     $default  reduce using rule 73 (semi_reserved)
 
-    inline_function  go to state 208
+    inline_function  go to state 201
     fn               go to state 111
     function         go to state 133
 
 
 State 475
 
-   79 semi_reserved: "'readonly'" .
-  476 function_call: "'readonly'" . argument_list
+   79 semi_reserved: "'readonly'" •
+  476 function_call: "'readonly'" • argument_list
 
-    '('  shift, and go to state 209
+    '('  shift, and go to state 202
 
     $default  reduce using rule 79 (semi_reserved)
 
-    argument_list  go to state 210
+    argument_list  go to state 203
 
 
 State 476
 
-   38 reserved_non_modifiers: "'isset'" .
-  586 internal_functions_in_yacc: "'isset'" . '(' isset_variables possible_comma ')'
+   38 reserved_non_modifiers: "'isset'" •
+  586 internal_functions_in_yacc: "'isset'" • '(' isset_variables possible_comma ')'
 
-    '('  shift, and go to state 212
+    '('  shift, and go to state 205
 
     $default  reduce using rule 38 (reserved_non_modifiers)
 
 
 State 477
 
-   39 reserved_non_modifiers: "'empty'" .
-  587 internal_functions_in_yacc: "'empty'" . '(' expr ')'
+   39 reserved_non_modifiers: "'empty'" •
+  587 internal_functions_in_yacc: "'empty'" • '(' expr ')'
 
-    '('  shift, and go to state 213
+    '('  shift, and go to state 206
 
     $default  reduce using rule 39 (reserved_non_modifiers)
 
 
 State 478
 
-   47 reserved_non_modifiers: "'list'" .
-  378 expr: "'list'" . '(' array_pair_list ')' '=' expr
+   47 reserved_non_modifiers: "'list'" •
+  378 expr: "'list'" • '(' array_pair_list ')' '=' expr
 
-    '('  shift, and go to state 303
+    '('  shift, and go to state 296
 
     $default  reduce using rule 47 (reserved_non_modifiers)
 
 
 State 479
 
-   53 reserved_non_modifiers: "'array'" .
-  493 dereferenceable_scalar: "'array'" . '(' array_pair_list ')'
+   53 reserved_non_modifiers: "'array'" •
+  493 dereferenceable_scalar: "'array'" • '(' array_pair_list ')'
 
-    '('  shift, and go to state 304
+    '('  shift, and go to state 297
 
     $default  reduce using rule 53 (reserved_non_modifiers)
 
 
 State 480
 
-   65 reserved_non_modifiers: "'__LINE__'" .
-  506 constant: "'__LINE__'" .
+   65 reserved_non_modifiers: "'__LINE__'" •
+  506 constant: "'__LINE__'" •
 
     ':'       reduce using rule 65 (reserved_non_modifiers)
     $default  reduce using rule 506 (constant)
@@ -16885,8 +17020,8 @@
 
 State 481
 
-   66 reserved_non_modifiers: "'__FILE__'" .
-  507 constant: "'__FILE__'" .
+   66 reserved_non_modifiers: "'__FILE__'" •
+  507 constant: "'__FILE__'" •
 
     ':'       reduce using rule 66 (reserved_non_modifiers)
     $default  reduce using rule 507 (constant)
@@ -16894,8 +17029,8 @@
 
 State 482
 
-   67 reserved_non_modifiers: "'__DIR__'" .
-  508 constant: "'__DIR__'" .
+   67 reserved_non_modifiers: "'__DIR__'" •
+  508 constant: "'__DIR__'" •
 
     ':'       reduce using rule 67 (reserved_non_modifiers)
     $default  reduce using rule 508 (constant)
@@ -16903,8 +17038,8 @@
 
 State 483
 
-   61 reserved_non_modifiers: "'__CLASS__'" .
-  513 constant: "'__CLASS__'" .
+   61 reserved_non_modifiers: "'__CLASS__'" •
+  513 constant: "'__CLASS__'" •
 
     ':'       reduce using rule 61 (reserved_non_modifiers)
     $default  reduce using rule 513 (constant)
@@ -16912,8 +17047,8 @@
 
 State 484
 
-   62 reserved_non_modifiers: "'__TRAIT__'" .
-  509 constant: "'__TRAIT__'" .
+   62 reserved_non_modifiers: "'__TRAIT__'" •
+  509 constant: "'__TRAIT__'" •
 
     ':'       reduce using rule 62 (reserved_non_modifiers)
     $default  reduce using rule 509 (constant)
@@ -16921,8 +17056,8 @@
 
 State 485
 
-   64 reserved_non_modifiers: "'__METHOD__'" .
-  510 constant: "'__METHOD__'" .
+   64 reserved_non_modifiers: "'__METHOD__'" •
+  510 constant: "'__METHOD__'" •
 
     ':'       reduce using rule 64 (reserved_non_modifiers)
     $default  reduce using rule 510 (constant)
@@ -16930,8 +17065,8 @@
 
 State 486
 
-   63 reserved_non_modifiers: "'__FUNCTION__'" .
-  511 constant: "'__FUNCTION__'" .
+   63 reserved_non_modifiers: "'__FUNCTION__'" •
+  511 constant: "'__FUNCTION__'" •
 
     ':'       reduce using rule 63 (reserved_non_modifiers)
     $default  reduce using rule 511 (constant)
@@ -16939,8 +17074,8 @@
 
 State 487
 
-   68 reserved_non_modifiers: "'__NAMESPACE__'" .
-  512 constant: "'__NAMESPACE__'" .
+   68 reserved_non_modifiers: "'__NAMESPACE__'" •
+  512 constant: "'__NAMESPACE__'" •
 
     ':'       reduce using rule 68 (reserved_non_modifiers)
     $default  reduce using rule 512 (constant)
@@ -16948,61 +17083,61 @@
 
 State 488
 
-  299 argument_list: '(' "'...'" . ')'
-  304 argument: "'...'" . expr
+  299 argument_list: '(' "'...'" • ')'
+  304 argument: "'...'" • expr
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ')'                        shift, and go to state 651
@@ -17039,22 +17174,22 @@
 
 State 489
 
-  297 argument_list: '(' ')' .
+  297 argument_list: '(' ')' •
 
     $default  reduce using rule 297 (argument_list)
 
 
 State 490
 
-  303 argument: identifier . ':' expr
+  303 argument: identifier • ':' expr
 
     ':'  shift, and go to state 653
 
 
 State 491
 
-  298 argument_list: '(' non_empty_argument_list . possible_comma ')'
-  301 non_empty_argument_list: non_empty_argument_list . ',' argument
+  298 argument_list: '(' non_empty_argument_list • possible_comma ')'
+  301 non_empty_argument_list: non_empty_argument_list • ',' argument
 
     ','  shift, and go to state 654
 
@@ -17065,84 +17200,84 @@
 
 State 492
 
-  300 non_empty_argument_list: argument .
+  300 non_empty_argument_list: argument •
 
     $default  reduce using rule 300 (non_empty_argument_list)
 
 
 State 493
 
-  302 argument: expr .
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-
-    "'or'"          shift, and go to state 353
-    "'xor'"         shift, and go to state 354
-    "'and'"         shift, and go to state 355
-    '?'             shift, and go to state 356
-    "'??'"          shift, and go to state 357
-    "'||'"          shift, and go to state 358
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  302 argument: expr •
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+
+    '?'             shift, and go to state 353
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'or'"          shift, and go to state 364
+    "'xor'"         shift, and go to state 365
+    "'and'"         shift, and go to state 366
+    "'instanceof'"  shift, and go to state 367
+    "'||'"          shift, and go to state 368
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'??'"          shift, and go to state 379
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
 
     $default  reduce using rule 302 (argument)
 
 
 State 494
 
-  163 statement: "'unset'" '(' unset_variables . possible_comma ')' ';'
-  181 unset_variables: unset_variables . ',' unset_variable
+  163 statement: "'unset'" '(' unset_variables • possible_comma ')' ';'
+  181 unset_variables: unset_variables • ',' unset_variable
 
     ','  shift, and go to state 656
 
@@ -17153,15 +17288,15 @@
 
 State 495
 
-  180 unset_variables: unset_variable .
+  180 unset_variables: unset_variable •
 
     $default  reduce using rule 180 (unset_variables)
 
 
 State 496
 
-  182 unset_variable: variable .
-  521 fully_dereferenceable: variable .
+  182 unset_variable: variable •
+  521 fully_dereferenceable: variable •
 
     ','       reduce using rule 182 (unset_variable)
     ')'       reduce using rule 182 (unset_variable)
@@ -17170,77 +17305,77 @@
 
 State 497
 
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-  595 isset_variable: expr .
-
-    "'or'"          shift, and go to state 353
-    "'xor'"         shift, and go to state 354
-    "'and'"         shift, and go to state 355
-    '?'             shift, and go to state 356
-    "'??'"          shift, and go to state 357
-    "'||'"          shift, and go to state 358
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+  595 isset_variable: expr •
+
+    '?'             shift, and go to state 353
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'or'"          shift, and go to state 364
+    "'xor'"         shift, and go to state 365
+    "'and'"         shift, and go to state 366
+    "'instanceof'"  shift, and go to state 367
+    "'||'"          shift, and go to state 368
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'??'"          shift, and go to state 379
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
 
     $default  reduce using rule 595 (isset_variable)
 
 
 State 498
 
-  586 internal_functions_in_yacc: "'isset'" '(' isset_variables . possible_comma ')'
-  594 isset_variables: isset_variables . ',' isset_variable
+  586 internal_functions_in_yacc: "'isset'" '(' isset_variables • possible_comma ')'
+  594 isset_variables: isset_variables • ',' isset_variable
 
     ','  shift, and go to state 658
 
@@ -17251,89 +17386,89 @@
 
 State 499
 
-  593 isset_variables: isset_variable .
+  593 isset_variables: isset_variable •
 
     $default  reduce using rule 593 (isset_variables)
 
 
 State 500
 
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-  587 internal_functions_in_yacc: "'empty'" '(' expr . ')'
-
-    "'or'"          shift, and go to state 353
-    "'xor'"         shift, and go to state 354
-    "'and'"         shift, and go to state 355
-    '?'             shift, and go to state 356
-    "'??'"          shift, and go to state 357
-    "'||'"          shift, and go to state 358
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+  587 internal_functions_in_yacc: "'empty'" '(' expr • ')'
+
+    '?'             shift, and go to state 353
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'or'"          shift, and go to state 364
+    "'xor'"         shift, and go to state 365
+    "'and'"         shift, and go to state 366
+    "'instanceof'"  shift, and go to state 367
+    "'||'"          shift, and go to state 368
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'??'"          shift, and go to state 379
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
     ')'             shift, and go to state 660
 
 
 State 501
 
-  111 top_statement: "'__halt_compiler'" '(' ')' . ';'
+  111 top_statement: "'__halt_compiler'" '(' ')' • ';'
 
     ';'  shift, and go to state 661
 
 
 State 502
 
-  193 class_declaration_statement: "'class'" @5 "identifier" . extends_from implements_list backup_doc_comment '{' class_statement_list '}'
+  193 class_declaration_statement: "'class'" @5 "identifier" • extends_from implements_list backup_doc_comment '{' class_statement_list '}'
 
     "'extends'"  shift, and go to state 662
 
@@ -17344,7 +17479,7 @@
 
 State 503
 
-  204 trait_declaration_statement: "'trait'" @6 "identifier" . backup_doc_comment '{' class_statement_list '}'
+  204 trait_declaration_statement: "'trait'" @6 "identifier" • backup_doc_comment '{' class_statement_list '}'
 
     $default  reduce using rule 464 (backup_doc_comment)
 
@@ -17353,7 +17488,7 @@
 
 State 504
 
-  206 interface_declaration_statement: "'interface'" @7 "identifier" . interface_extends_list backup_doc_comment '{' class_statement_list '}'
+  206 interface_declaration_statement: "'interface'" @7 "identifier" • interface_extends_list backup_doc_comment '{' class_statement_list '}'
 
     "'extends'"  shift, and go to state 665
 
@@ -17364,7 +17499,7 @@
 
 State 505
 
-  208 enum_declaration_statement: "'enum'" @8 "identifier" . enum_backing_type implements_list backup_doc_comment '{' class_statement_list '}'
+  208 enum_declaration_statement: "'enum'" @8 "identifier" • enum_backing_type implements_list backup_doc_comment '{' class_statement_list '}'
 
     ':'  shift, and go to state 667
 
@@ -17375,21 +17510,21 @@
 
 State 506
 
-  112 top_statement: "'namespace'" namespace_declaration_name ';' .
+  112 top_statement: "'namespace'" namespace_declaration_name ';' •
 
     $default  reduce using rule 112 (top_statement)
 
 
 State 507
 
-  114 top_statement: "'namespace'" namespace_declaration_name $@1 . '{' top_statement_list '}'
+  114 top_statement: "'namespace'" namespace_declaration_name $@1 • '{' top_statement_list '}'
 
     '{'  shift, and go to state 669
 
 
 State 508
 
-  116 top_statement: "'namespace'" $@2 '{' . top_statement_list '}'
+  116 top_statement: "'namespace'" $@2 '{' • top_statement_list '}'
 
     $default  reduce using rule 85 (top_statement_list)
 
@@ -17398,143 +17533,143 @@
 
 State 509
 
-  378 expr: "'list'" '(' array_pair_list . ')' '=' expr
+  378 expr: "'list'" '(' array_pair_list • ')' '=' expr
 
     ')'  shift, and go to state 671
 
 
 State 510
 
-  493 dereferenceable_scalar: "'array'" '(' array_pair_list . ')'
+  493 dereferenceable_scalar: "'array'" '(' array_pair_list • ')'
 
     ')'  shift, and go to state 672
 
 
 State 511
 
-   99 attribute_group: attribute_group ',' . attribute_decl
-  127 possible_comma: ',' .
+   99 attribute_group: attribute_group ',' • attribute_decl
+  127 possible_comma: ',' •
 
     "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "'static'"                 shift, and go to state 156
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "'static'"                 shift, and go to state 147
 
     $default  reduce using rule 127 (possible_comma)
 
-    name            go to state 159
+    name            go to state 150
     attribute_decl  go to state 673
-    class_name      go to state 307
+    class_name      go to state 300
 
 
 State 512
 
-  100 attribute: "'#'" attribute_group possible_comma . ''
+  100 attribute: "'#'" attribute_group possible_comma • ''
 
     ''  shift, and go to state 674
 
 
 State 513
 
-   97 attribute_decl: class_name argument_list .
+   97 attribute_decl: class_name argument_list •
 
     $default  reduce using rule 97 (attribute_decl)
 
 
 State 514
 
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-  522 fully_dereferenceable: '(' expr . ')'
-  528 callable_expr: '(' expr . ')'
-
-    "'or'"          shift, and go to state 353
-    "'xor'"         shift, and go to state 354
-    "'and'"         shift, and go to state 355
-    '?'             shift, and go to state 356
-    "'??'"          shift, and go to state 357
-    "'||'"          shift, and go to state 358
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+  522 fully_dereferenceable: '(' expr • ')'
+  528 callable_expr: '(' expr • ')'
+
+    '?'             shift, and go to state 353
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'or'"          shift, and go to state 364
+    "'xor'"         shift, and go to state 365
+    "'and'"         shift, and go to state 366
+    "'instanceof'"  shift, and go to state 367
+    "'||'"          shift, and go to state 368
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'??'"          shift, and go to state 379
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
     ')'             shift, and go to state 675
 
 
 State 515
 
-  494 dereferenceable_scalar: '' array_pair_list . ''
+  494 dereferenceable_scalar: '' array_pair_list • ''
 
     ''  shift, and go to state 676
 
 
 State 516
 
-  576 encaps_var: "variable" "'->'" . "identifier"
+  576 encaps_var: "variable" "'->'" • "identifier"
 
     "identifier"  shift, and go to state 677
 
 
 State 517
 
-  577 encaps_var: "variable" "'?->'" . "identifier"
+  577 encaps_var: "variable" "'?->'" • "identifier"
 
     "identifier"  shift, and go to state 678
 
 
 State 518
 
-  575 encaps_var: "variable" '' . encaps_var_offset ''
+  575 encaps_var: "variable" '' • encaps_var_offset ''
 
     '-'           shift, and go to state 679
     "identifier"  shift, and go to state 680
@@ -17546,22 +17681,22 @@
 
 State 519
 
-  499 scalar: "heredoc start" "string content" "heredoc end" .
+  499 scalar: "heredoc start" "string content" "heredoc end" •
 
     $default  reduce using rule 499 (scalar)
 
 
 State 520
 
-  573 encaps_list: "string content" encaps_var .
+  573 encaps_list: "string content" encaps_var •
 
     $default  reduce using rule 573 (encaps_list)
 
 
 State 521
 
-  579 encaps_var: "'${'" "variable name" . '}'
-  580           | "'${'" "variable name" . '' expr '' '}'
+  579 encaps_var: "'${'" "variable name" • '}'
+  580           | "'${'" "variable name" • '' expr '' '}'
 
     '}'  shift, and go to state 684
     ''  shift, and go to state 685
@@ -17569,76 +17704,76 @@
 
 State 522
 
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-  578 encaps_var: "'${'" expr . '}'
-
-    "'or'"          shift, and go to state 353
-    "'xor'"         shift, and go to state 354
-    "'and'"         shift, and go to state 355
-    '?'             shift, and go to state 356
-    "'??'"          shift, and go to state 357
-    "'||'"          shift, and go to state 358
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+  578 encaps_var: "'${'" expr • '}'
+
+    '?'             shift, and go to state 353
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'or'"          shift, and go to state 364
+    "'xor'"         shift, and go to state 365
+    "'and'"         shift, and go to state 366
+    "'instanceof'"  shift, and go to state 367
+    "'||'"          shift, and go to state 368
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'??'"          shift, and go to state 379
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
     '}'             shift, and go to state 686
 
 
 State 523
 
-  521 fully_dereferenceable: variable .
-  581 encaps_var: "'{$'" variable . '}'
+  521 fully_dereferenceable: variable •
+  581 encaps_var: "'{$'" variable • '}'
 
     '}'  shift, and go to state 687
 
@@ -17647,30 +17782,30 @@
 
 State 524
 
-  571 encaps_list: encaps_list "string content" .
+  571 encaps_list: encaps_list "string content" •
 
     $default  reduce using rule 571 (encaps_list)
 
 
 State 525
 
-  501 scalar: "heredoc start" encaps_list "heredoc end" .
+  501 scalar: "heredoc start" encaps_list "heredoc end" •
 
     $default  reduce using rule 501 (scalar)
 
 
 State 526
 
-  570 encaps_list: encaps_list encaps_var .
+  570 encaps_list: encaps_list encaps_var •
 
     $default  reduce using rule 570 (encaps_list)
 
 
 State 527
 
-  432 expr: '(' expr ')' .
-  522 fully_dereferenceable: '(' expr ')' .
-  528 callable_expr: '(' expr ')' .
+  432 expr: '(' expr ')' •
+  522 fully_dereferenceable: '(' expr ')' •
+  528 callable_expr: '(' expr ')' •
 
     "'->'"    reduce using rule 522 (fully_dereferenceable)
     "'?->'"   reduce using rule 522 (fully_dereferenceable)
@@ -17683,36 +17818,36 @@
 
 State 528
 
-  147 inner_statement: "'__halt_compiler'" . '(' ')' ';'
+  147 inner_statement: "'__halt_compiler'" • '(' ')' ';'
 
     '('  shift, and go to state 688
 
 
 State 529
 
-  148 statement: '{' inner_statement_list '}' .
+  148 statement: '{' inner_statement_list '}' •
 
     $default  reduce using rule 148 (statement)
 
 
 State 530
 
-  102 attributes: attributes . attribute
-  146 inner_statement: attributes . attributed_statement
-  456 expr: attributes . inline_function
-  458     | attributes . "'static'" inline_function
+  102 attributes: attributes • attribute
+  146 inner_statement: attributes • attributed_statement
+  456 expr: attributes • inline_function
+  458     | attributes • "'static'" inline_function
 
-    "'function'"   shift, and go to state 49
-    "'fn'"         shift, and go to state 50
+    "'function'"   shift, and go to state 41
+    "'fn'"         shift, and go to state 42
     "'static'"     shift, and go to state 342
-    "'abstract'"   shift, and go to state 57
-    "'final'"      shift, and go to state 58
-    "'readonly'"   shift, and go to state 157
-    "'class'"      shift, and go to state 64
-    "'trait'"      shift, and go to state 65
-    "'interface'"  shift, and go to state 66
-    "'enum'"       shift, and go to state 67
-    "'#'"         shift, and go to state 79
+    "'abstract'"   shift, and go to state 50
+    "'final'"      shift, and go to state 51
+    "'readonly'"   shift, and go to state 148
+    "'class'"      shift, and go to state 57
+    "'trait'"      shift, and go to state 58
+    "'interface'"  shift, and go to state 59
+    "'enum'"       shift, and go to state 60
+    "'#'"         shift, and go to state 72
 
     attribute                        go to state 343
     attributed_statement             go to state 689
@@ -17730,86 +17865,86 @@
 
 State 531
 
-  145 inner_statement: attributed_statement .
+  145 inner_statement: attributed_statement •
 
     $default  reduce using rule 145 (inner_statement)
 
 
 State 532
 
-  142 inner_statement_list: inner_statement_list inner_statement .
+  142 inner_statement_list: inner_statement_list inner_statement •
 
     $default  reduce using rule 142 (inner_statement_list)
 
 
 State 533
 
-  144 inner_statement: statement .
+  144 inner_statement: statement •
 
     $default  reduce using rule 144 (inner_statement)
 
 
 State 534
 
-  378 expr: "'list'" '(' . array_pair_list ')' '=' expr
-  569 array_pair: "'list'" '(' . array_pair_list ')'
+  378 expr: "'list'" '(' • array_pair_list ')' '=' expr
+  569 array_pair: "'list'" '(' • array_pair_list ')'
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    "amp"                      shift, and go to state 324
-    "'&'"                      shift, and go to state 325
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 326
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
-    "heredoc start"            shift, and go to state 82
-    "'...'"                    shift, and go to state 327
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 324
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
+    "heredoc start"            shift, and go to state 82
+    "'...'"                    shift, and go to state 325
+    "'&'"                      shift, and go to state 326
+    "amp"                      shift, and go to state 327
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
     '`'                        shift, and go to state 87
@@ -17851,77 +17986,77 @@
 
 State 535
 
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-  567 array_pair: "'...'" expr .
-
-    "'or'"          shift, and go to state 353
-    "'xor'"         shift, and go to state 354
-    "'and'"         shift, and go to state 355
-    '?'             shift, and go to state 356
-    "'??'"          shift, and go to state 357
-    "'||'"          shift, and go to state 358
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+  567 array_pair: "'...'" expr •
+
+    '?'             shift, and go to state 353
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'or'"          shift, and go to state 364
+    "'xor'"         shift, and go to state 365
+    "'and'"         shift, and go to state 366
+    "'instanceof'"  shift, and go to state 367
+    "'||'"          shift, and go to state 368
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'??'"          shift, and go to state 379
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
 
     $default  reduce using rule 567 (array_pair)
 
 
 State 536
 
-  521 fully_dereferenceable: variable .
-  566 array_pair: ampersand variable .
+  521 fully_dereferenceable: variable •
+  566 array_pair: ampersand variable •
 
     ','       reduce using rule 566 (array_pair)
     ''       reduce using rule 566 (array_pair)
@@ -17931,65 +18066,65 @@
 
 State 537
 
-  563 array_pair: expr "'=>'" . expr
-  565           | expr "'=>'" . ampersand variable
-  568           | expr "'=>'" . "'list'" '(' array_pair_list ')'
-
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    "amp"                      shift, and go to state 324
-    "'&'"                      shift, and go to state 325
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
+  563 array_pair: expr "'=>'" • expr
+  565           | expr "'=>'" • ampersand variable
+  568           | expr "'=>'" • "'list'" '(' array_pair_list ')'
+
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
     "'static'"                 shift, and go to state 129
     "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
     "'list'"                   shift, and go to state 691
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
+    "'&'"                      shift, and go to state 326
+    "amp"                      shift, and go to state 327
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
     '`'                        shift, and go to state 87
@@ -18025,8 +18160,8 @@
 
 State 538
 
-  379 expr: '' array_pair_list '' . '=' expr
-  494 dereferenceable_scalar: '' array_pair_list '' .
+  379 expr: '' array_pair_list '' • '=' expr
+  494 dereferenceable_scalar: '' array_pair_list '' •
 
     '='  shift, and go to state 694
 
@@ -18035,64 +18170,64 @@
 
 State 539
 
-  561 non_empty_array_pair_list: non_empty_array_pair_list ',' . possible_array_pair
+  561 non_empty_array_pair_list: non_empty_array_pair_list ',' • possible_array_pair
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    "amp"                      shift, and go to state 324
-    "'&'"                      shift, and go to state 325
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 326
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
-    "heredoc start"            shift, and go to state 82
-    "'...'"                    shift, and go to state 327
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 324
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
+    "heredoc start"            shift, and go to state 82
+    "'...'"                    shift, and go to state 325
+    "'&'"                      shift, and go to state 326
+    "amp"                      shift, and go to state 327
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
     '`'                        shift, and go to state 87
@@ -18132,156 +18267,156 @@
 
 State 540
 
-  448 expr: '`' backticks_expr '`' .
+  448 expr: '`' backticks_expr '`' •
 
     $default  reduce using rule 448 (expr)
 
 
 State 541
 
-  496 dereferenceable_scalar: '"' encaps_list '"' .
+  496 dereferenceable_scalar: '"' encaps_list '"' •
 
     $default  reduce using rule 496 (dereferenceable_scalar)
 
 
 State 542
 
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-  541 simple_variable: '$' '{' expr . '}'
-
-    "'or'"          shift, and go to state 353
-    "'xor'"         shift, and go to state 354
-    "'and'"         shift, and go to state 355
-    '?'             shift, and go to state 356
-    "'??'"          shift, and go to state 357
-    "'||'"          shift, and go to state 358
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+  541 simple_variable: '$' '{' expr • '}'
+
+    '?'             shift, and go to state 353
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'or'"          shift, and go to state 364
+    "'xor'"         shift, and go to state 365
+    "'and'"         shift, and go to state 366
+    "'instanceof'"  shift, and go to state 367
+    "'||'"          shift, and go to state 368
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'??'"          shift, and go to state 379
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
     '}'             shift, and go to state 696
 
 
 State 543
 
-  458 expr: attributes "'static'" inline_function .
+  458 expr: attributes "'static'" inline_function •
 
     $default  reduce using rule 458 (expr)
 
 
 State 544
 
-  191 class_declaration_statement: class_modifiers "'class'" @4 . "identifier" extends_from implements_list backup_doc_comment '{' class_statement_list '}'
+  191 class_declaration_statement: class_modifiers "'class'" @4 • "identifier" extends_from implements_list backup_doc_comment '{' class_statement_list '}'
 
     "identifier"  shift, and go to state 697
 
 
 State 545
 
-  251 if_stmt_without_else: if_stmt_without_else "'elseif'" '(' . expr ')' statement
+  251 if_stmt_without_else: if_stmt_without_else "'elseif'" '(' • expr ')' statement
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -18317,67 +18452,67 @@
 
 State 546
 
-  253 if_stmt: if_stmt_without_else "'else'" statement .
+  253 if_stmt: if_stmt_without_else "'else'" statement •
 
     $default  reduce using rule 253 (if_stmt)
 
 
 State 547
 
-  255 alt_if_stmt_without_else: alt_if_stmt_without_else "'elseif'" '(' . expr ')' ':' inner_statement_list
+  255 alt_if_stmt_without_else: alt_if_stmt_without_else "'elseif'" '(' • expr ')' ':' inner_statement_list
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -18413,7 +18548,7 @@
 
 State 548
 
-  257 alt_if_stmt: alt_if_stmt_without_else "'else'" ':' . inner_statement_list "'endif'" ';'
+  257 alt_if_stmt: alt_if_stmt_without_else "'else'" ':' • inner_statement_list "'endif'" ';'
 
     $default  reduce using rule 143 (inner_statement_list)
 
@@ -18422,268 +18557,67 @@
 
 State 549
 
-  256 alt_if_stmt: alt_if_stmt_without_else "'endif'" ';' .
+  256 alt_if_stmt: alt_if_stmt_without_else "'endif'" ';' •
 
     $default  reduce using rule 256 (alt_if_stmt)
 
 
 State 550
 
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  402     | expr "'or'" expr .
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-
-    "'xor'"         shift, and go to state 354
-    "'and'"         shift, and go to state 355
-    '?'             shift, and go to state 356
-    "'??'"          shift, and go to state 357
-    "'||'"          shift, and go to state 358
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
-
-    $default  reduce using rule 402 (expr)
-
-
-State 551
-
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  404     | expr "'xor'" expr .
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-
-    "'and'"         shift, and go to state 355
-    '?'             shift, and go to state 356
-    "'??'"          shift, and go to state 357
-    "'||'"          shift, and go to state 358
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
-
-    $default  reduce using rule 404 (expr)
-
-
-State 552
-
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  403     | expr "'and'" expr .
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-
-    '?'             shift, and go to state 356
-    "'??'"          shift, and go to state 357
-    "'||'"          shift, and go to state 358
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
-
-    $default  reduce using rule 403 (expr)
-
-
-State 553
+  435 expr: expr '?' ':' • expr
 
-  435 expr: expr '?' ':' . expr
-
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -18717,609 +18651,944 @@
     internal_functions_in_yacc    go to state 127
 
 
-State 554
+State 551
+
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  434     | expr '?' expr • ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
 
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  434     | expr '?' expr . ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-
-    "'or'"          shift, and go to state 353
-    "'xor'"         shift, and go to state 354
-    "'and'"         shift, and go to state 355
-    '?'             shift, and go to state 356
+    '?'             shift, and go to state 353
     ':'             shift, and go to state 702
-    "'??'"          shift, and go to state 357
-    "'||'"          shift, and go to state 358
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'or'"          shift, and go to state 364
+    "'xor'"         shift, and go to state 365
+    "'and'"         shift, and go to state 366
+    "'instanceof'"  shift, and go to state 367
+    "'||'"          shift, and go to state 368
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'??'"          shift, and go to state 379
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
+
+
+State 552
+
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  405     | expr '|' expr •
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'instanceof'"  shift, and go to state 367
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
+
+    $default  reduce using rule 405 (expr)
+
+
+State 553
+
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  408     | expr '^' expr •
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'instanceof'"  shift, and go to state 367
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
+
+    $default  reduce using rule 408 (expr)
+
+
+State 554
+
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  426     | expr '<' expr •
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'instanceof'"  shift, and go to state 367
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'**'"          shift, and go to state 380
+
+    '<'     error (nonassociative)
+    '>'     error (nonassociative)
+    "'<='"  error (nonassociative)
+    "'>='"  error (nonassociative)
+
+    $default  reduce using rule 426 (expr)
 
 
 State 555
 
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-  436     | expr "'??'" expr .
-
-    "'??'"          shift, and go to state 357
-    "'||'"          shift, and go to state 358
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  428     | expr '>' expr •
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'instanceof'"  shift, and go to state 367
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'**'"          shift, and go to state 380
 
-    $default  reduce using rule 436 (expr)
+    '<'     error (nonassociative)
+    '>'     error (nonassociative)
+    "'<='"  error (nonassociative)
+    "'>='"  error (nonassociative)
+
+    $default  reduce using rule 428 (expr)
 
 
 State 556
 
-  400 expr: expr . "'||'" expr
-  400     | expr "'||'" expr .
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  409     | expr '.' expr •
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'instanceof'"  shift, and go to state 367
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'**'"          shift, and go to state 380
 
-    $default  reduce using rule 400 (expr)
+    $default  reduce using rule 409 (expr)
 
 
 State 557
 
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  401     | expr "'&&'" expr .
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  410     | expr '+' expr •
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'instanceof'"  shift, and go to state 367
+    "'**'"          shift, and go to state 380
 
-    $default  reduce using rule 401 (expr)
+    $default  reduce using rule 410 (expr)
 
 
 State 558
 
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  405     | expr '|' expr .
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  411     | expr '-' expr •
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'instanceof'"  shift, and go to state 367
+    "'**'"          shift, and go to state 380
 
-    $default  reduce using rule 405 (expr)
+    $default  reduce using rule 411 (expr)
 
 
 State 559
 
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  408     | expr '^' expr .
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  412     | expr '*' expr •
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
 
-    $default  reduce using rule 408 (expr)
+    "'instanceof'"  shift, and go to state 367
+    "'**'"          shift, and go to state 380
+
+    $default  reduce using rule 412 (expr)
 
 
 State 560
 
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  406     | expr "amp" expr .
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  414     | expr '/' expr •
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
 
-    $default  reduce using rule 406 (expr)
+    "'instanceof'"  shift, and go to state 367
+    "'**'"          shift, and go to state 380
+
+    $default  reduce using rule 414 (expr)
 
 
 State 561
 
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  407     | expr "'&'" expr .
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  415     | expr '%' expr •
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
 
-    $default  reduce using rule 407 (expr)
+    "'instanceof'"  shift, and go to state 367
+    "'**'"          shift, and go to state 380
 
+    $default  reduce using rule 415 (expr)
 
-State 562
 
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  424     | expr "'=='" expr .
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+State 562
 
-    "'=='"   error (nonassociative)
-    "'!='"   error (nonassociative)
-    "'==='"  error (nonassociative)
-    "'!=='"  error (nonassociative)
-    "'<=>'"  error (nonassociative)
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  402     | expr "'or'" expr •
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+
+    '?'             shift, and go to state 353
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'xor'"         shift, and go to state 365
+    "'and'"         shift, and go to state 366
+    "'instanceof'"  shift, and go to state 367
+    "'||'"          shift, and go to state 368
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'??'"          shift, and go to state 379
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
 
-    $default  reduce using rule 424 (expr)
+    $default  reduce using rule 402 (expr)
 
 
 State 563
 
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  425     | expr "'!='" expr .
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  404     | expr "'xor'" expr •
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+
+    '?'             shift, and go to state 353
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'and'"         shift, and go to state 366
+    "'instanceof'"  shift, and go to state 367
+    "'||'"          shift, and go to state 368
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'??'"          shift, and go to state 379
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
+
+    $default  reduce using rule 404 (expr)
+
+
+State 564
+
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  403     | expr "'and'" expr •
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+
+    '?'             shift, and go to state 353
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'instanceof'"  shift, and go to state 367
+    "'||'"          shift, and go to state 368
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'??'"          shift, and go to state 379
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
+
+    $default  reduce using rule 403 (expr)
+
+
+State 565
+
+  431 expr: expr "'instanceof'" class_name_reference •
+
+    $default  reduce using rule 431 (expr)
+
+
+State 566
+
+  400 expr: expr • "'||'" expr
+  400     | expr "'||'" expr •
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'instanceof'"  shift, and go to state 367
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
+
+    $default  reduce using rule 400 (expr)
+
+
+State 567
+
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  401     | expr "'&&'" expr •
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'instanceof'"  shift, and go to state 367
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
+
+    $default  reduce using rule 401 (expr)
+
+
+State 568
+
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  424     | expr "'=='" expr •
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'instanceof'"  shift, and go to state 367
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'**'"          shift, and go to state 380
 
     "'=='"   error (nonassociative)
     "'!='"   error (nonassociative)
@@ -19327,58 +19596,58 @@
     "'!=='"  error (nonassociative)
     "'<=>'"  error (nonassociative)
 
-    $default  reduce using rule 425 (expr)
+    $default  reduce using rule 424 (expr)
 
 
-State 564
+State 569
 
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  422     | expr "'==='" expr .
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  425     | expr "'!='" expr •
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'instanceof'"  shift, and go to state 367
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'**'"          shift, and go to state 380
 
     "'=='"   error (nonassociative)
     "'!='"   error (nonassociative)
@@ -19386,58 +19655,58 @@
     "'!=='"  error (nonassociative)
     "'<=>'"  error (nonassociative)
 
-    $default  reduce using rule 422 (expr)
+    $default  reduce using rule 425 (expr)
 
 
-State 565
+State 570
 
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  423     | expr "'!=='" expr .
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  422     | expr "'==='" expr •
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'instanceof'"  shift, and go to state 367
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'**'"          shift, and go to state 380
 
     "'=='"   error (nonassociative)
     "'!='"   error (nonassociative)
@@ -19445,58 +19714,58 @@
     "'!=='"  error (nonassociative)
     "'<=>'"  error (nonassociative)
 
-    $default  reduce using rule 423 (expr)
+    $default  reduce using rule 422 (expr)
 
 
-State 566
+State 571
 
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  430     | expr "'<=>'" expr .
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  423     | expr "'!=='" expr •
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'instanceof'"  shift, and go to state 367
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'**'"          shift, and go to state 380
 
     "'=='"   error (nonassociative)
     "'!='"   error (nonassociative)
@@ -19504,647 +19773,513 @@
     "'!=='"  error (nonassociative)
     "'<=>'"  error (nonassociative)
 
-    $default  reduce using rule 430 (expr)
+    $default  reduce using rule 423 (expr)
 
 
-State 567
+State 572
 
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  426     | expr '<' expr .
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  427     | expr "'<='" expr •
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'instanceof'"  shift, and go to state 367
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'**'"          shift, and go to state 380
 
     '<'     error (nonassociative)
-    "'<='"  error (nonassociative)
     '>'     error (nonassociative)
-    "'>='"  error (nonassociative)
-
-    $default  reduce using rule 426 (expr)
-
-
-State 568
-
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  427     | expr "'<='" expr .
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
-
-    '<'     error (nonassociative)
     "'<='"  error (nonassociative)
-    '>'     error (nonassociative)
     "'>='"  error (nonassociative)
 
     $default  reduce using rule 427 (expr)
 
 
-State 569
+State 573
 
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  428     | expr '>' expr .
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  429     | expr "'>='" expr •
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'instanceof'"  shift, and go to state 367
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'**'"          shift, and go to state 380
 
     '<'     error (nonassociative)
-    "'<='"  error (nonassociative)
     '>'     error (nonassociative)
-    "'>='"  error (nonassociative)
-
-    $default  reduce using rule 428 (expr)
-
-
-State 570
-
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  429     | expr "'>='" expr .
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
-
-    '<'     error (nonassociative)
     "'<='"  error (nonassociative)
-    '>'     error (nonassociative)
     "'>='"  error (nonassociative)
 
     $default  reduce using rule 429 (expr)
 
 
-State 571
-
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  409     | expr '.' expr .
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
-
-    $default  reduce using rule 409 (expr)
-
-
-State 572
-
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  416     | expr "'<<'" expr .
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
-
-    $default  reduce using rule 416 (expr)
-
-
-State 573
-
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  417     | expr "'>>'" expr .
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
-
-    $default  reduce using rule 417 (expr)
-
-
 State 574
 
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  410     | expr '+' expr .
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  430     | expr "'<=>'" expr •
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'instanceof'"  shift, and go to state 367
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'**'"          shift, and go to state 380
 
-    $default  reduce using rule 410 (expr)
+    "'=='"   error (nonassociative)
+    "'!='"   error (nonassociative)
+    "'==='"  error (nonassociative)
+    "'!=='"  error (nonassociative)
+    "'<=>'"  error (nonassociative)
+
+    $default  reduce using rule 430 (expr)
 
 
 State 575
 
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  411     | expr '-' expr .
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  416     | expr "'<<'" expr •
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'instanceof'"  shift, and go to state 367
+    "'**'"          shift, and go to state 380
 
-    $default  reduce using rule 411 (expr)
+    $default  reduce using rule 416 (expr)
 
 
 State 576
 
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  412     | expr '*' expr .
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  417     | expr "'>>'" expr •
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'instanceof'"  shift, and go to state 367
+    "'**'"          shift, and go to state 380
 
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
-
-    $default  reduce using rule 412 (expr)
+    $default  reduce using rule 417 (expr)
 
 
 State 577
 
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  414     | expr '/' expr .
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+  436     | expr "'??'" expr •
+
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'instanceof'"  shift, and go to state 367
+    "'||'"          shift, and go to state 368
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'??'"          shift, and go to state 379
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
 
-    $default  reduce using rule 414 (expr)
+    $default  reduce using rule 436 (expr)
 
 
 State 578
 
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  415     | expr '%' expr .
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  413     | expr "'**'" expr •
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
 
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+    "'**'"  shift, and go to state 380
 
-    $default  reduce using rule 415 (expr)
+    $default  reduce using rule 413 (expr)
 
 
 State 579
 
-  431 expr: expr "'instanceof'" class_name_reference .
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  407     | expr "'&'" expr •
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'instanceof'"  shift, and go to state 367
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'**'"          shift, and go to state 380
 
-    $default  reduce using rule 431 (expr)
+    $default  reduce using rule 407 (expr)
 
 
 State 580
 
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  413     | expr "'**'" expr .
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  406     | expr "amp" expr •
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'instanceof'"  shift, and go to state 367
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'**'"          shift, and go to state 380
 
-    "'**'"  shift, and go to state 382
-
-    $default  reduce using rule 413 (expr)
+    $default  reduce using rule 406 (expr)
 
 
 State 581
 
-  461 inline_function: fn returns_ref backup_doc_comment . '(' parameter_list ')' return_type "'=>'" backup_fn_flags backup_lex_pos expr backup_fn_flags
+  461 inline_function: fn returns_ref backup_doc_comment • '(' parameter_list ')' return_type "'=>'" backup_fn_flags backup_lex_pos expr backup_fn_flags
 
     '('  shift, and go to state 703
 
 
 State 582
 
-  183 function_name: "identifier" .
+  183 function_name: "identifier" •
 
     $default  reduce using rule 183 (function_name)
 
 
 State 583
 
-  184 function_name: "'readonly'" .
+  184 function_name: "'readonly'" •
 
     $default  reduce using rule 184 (function_name)
 
 
 State 584
 
-  185 function_declaration_statement: function returns_ref function_name . backup_doc_comment '(' parameter_list ')' return_type backup_fn_flags '{' inner_statement_list '}' backup_fn_flags
+  185 function_declaration_statement: function returns_ref function_name • backup_doc_comment '(' parameter_list ')' return_type backup_fn_flags '{' inner_statement_list '}' backup_fn_flags
 
     $default  reduce using rule 464 (backup_doc_comment)
 
@@ -20153,68 +20288,68 @@
 
 State 585
 
-  460 inline_function: function returns_ref backup_doc_comment . '(' parameter_list ')' lexical_vars return_type backup_fn_flags '{' inner_statement_list '}' backup_fn_flags
+  460 inline_function: function returns_ref backup_doc_comment • '(' parameter_list ')' lexical_vars return_type backup_fn_flags '{' inner_statement_list '}' backup_fn_flags
 
     '('  shift, and go to state 705
 
 
 State 586
 
-  516 class_constant: class_name "'::'" '{' . expr '}'
-  553 member_name: '{' . expr '}'
+  516 class_constant: class_name "'::'" '{' • expr '}'
+  553 member_name: '{' • expr '}'
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -20250,8 +20385,8 @@
 
 State 587
 
-  514 class_constant: class_name "'::'" identifier .
-  552 member_name: identifier .
+  514 class_constant: class_name "'::'" identifier •
+  552 member_name: identifier •
 
     '('       reduce using rule 552 (member_name)
     $default  reduce using rule 514 (class_constant)
@@ -20259,8 +20394,8 @@
 
 State 588
 
-  543 static_member: class_name "'::'" simple_variable .
-  554 member_name: simple_variable .
+  543 static_member: class_name "'::'" simple_variable •
+  554 member_name: simple_variable •
 
     '('       reduce using rule 554 (member_name)
     $default  reduce using rule 543 (static_member)
@@ -20268,70 +20403,70 @@
 
 State 589
 
-  477 function_call: class_name "'::'" member_name . argument_list
+  477 function_call: class_name "'::'" member_name • argument_list
 
-    '('  shift, and go to state 209
+    '('  shift, and go to state 202
 
     argument_list  go to state 707
 
 
 State 590
 
-  517 class_constant: variable_class_name "'::'" '{' . expr '}'
-  553 member_name: '{' . expr '}'
+  517 class_constant: variable_class_name "'::'" '{' • expr '}'
+  553 member_name: '{' • expr '}'
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -20367,8 +20502,8 @@
 
 State 591
 
-  515 class_constant: variable_class_name "'::'" identifier .
-  552 member_name: identifier .
+  515 class_constant: variable_class_name "'::'" identifier •
+  552 member_name: identifier •
 
     '('       reduce using rule 552 (member_name)
     $default  reduce using rule 515 (class_constant)
@@ -20376,8 +20511,8 @@
 
 State 592
 
-  544 static_member: variable_class_name "'::'" simple_variable .
-  554 member_name: simple_variable .
+  544 static_member: variable_class_name "'::'" simple_variable •
+  554 member_name: simple_variable •
 
     '('       reduce using rule 554 (member_name)
     $default  reduce using rule 544 (static_member)
@@ -20385,76 +20520,76 @@
 
 State 593
 
-  478 function_call: variable_class_name "'::'" member_name . argument_list
+  478 function_call: variable_class_name "'::'" member_name • argument_list
 
-    '('  shift, and go to state 209
+    '('  shift, and go to state 202
 
     argument_list  go to state 709
 
 
 State 594
 
-  555 property_name: "identifier" .
+  555 property_name: "identifier" •
 
     $default  reduce using rule 555 (property_name)
 
 
 State 595
 
-  556 property_name: '{' . expr '}'
+  556 property_name: '{' • expr '}'
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -20490,17 +20625,17 @@
 
 State 596
 
-  557 property_name: simple_variable .
+  557 property_name: simple_variable •
 
     $default  reduce using rule 557 (property_name)
 
 
 State 597
 
-  533 callable_variable: array_object_dereferenceable "'->'" property_name . argument_list
-  538 variable: array_object_dereferenceable "'->'" property_name .
+  533 callable_variable: array_object_dereferenceable "'->'" property_name • argument_list
+  538 variable: array_object_dereferenceable "'->'" property_name •
 
-    '('  shift, and go to state 209
+    '('  shift, and go to state 202
 
     $default  reduce using rule 538 (variable)
 
@@ -20509,10 +20644,10 @@
 
 State 598
 
-  534 callable_variable: array_object_dereferenceable "'?->'" property_name . argument_list
-  539 variable: array_object_dereferenceable "'?->'" property_name .
+  534 callable_variable: array_object_dereferenceable "'?->'" property_name • argument_list
+  539 variable: array_object_dereferenceable "'?->'" property_name •
 
-    '('  shift, and go to state 209
+    '('  shift, and go to state 202
 
     $default  reduce using rule 539 (variable)
 
@@ -20521,118 +20656,118 @@
 
 State 599
 
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-  532 callable_variable: array_object_dereferenceable '{' expr . '}'
-
-    "'or'"          shift, and go to state 353
-    "'xor'"         shift, and go to state 354
-    "'and'"         shift, and go to state 355
-    '?'             shift, and go to state 356
-    "'??'"          shift, and go to state 357
-    "'||'"          shift, and go to state 358
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+  532 callable_variable: array_object_dereferenceable '{' expr • '}'
+
+    '?'             shift, and go to state 353
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'or'"          shift, and go to state 364
+    "'xor'"         shift, and go to state 365
+    "'and'"         shift, and go to state 366
+    "'instanceof'"  shift, and go to state 367
+    "'||'"          shift, and go to state 368
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'??'"          shift, and go to state 379
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
     '}'             shift, and go to state 713
 
 
 State 600
 
-  531 callable_variable: array_object_dereferenceable '' optional_expr . ''
+  531 callable_variable: array_object_dereferenceable '' optional_expr • ''
 
     ''  shift, and go to state 714
 
 
 State 601
 
-  480 function_call: callable_expr @10 argument_list .
+  480 function_call: callable_expr @10 argument_list •
 
     $default  reduce using rule 480 (function_call)
 
 
 State 602
 
-  381 expr: variable '=' ampersand . variable
+  381 expr: variable '=' ampersand • variable
 
     "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'static'"                 shift, and go to state 156
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'static'"                 shift, and go to state 147
     "'readonly'"               shift, and go to state 130
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    '('                        shift, and go to state 308
-    ''                        shift, and go to state 309
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    '('                        shift, and go to state 301
+    ''                        shift, and go to state 302
     '"'                        shift, and go to state 88
     '$'                        shift, and go to state 89
 
     name                          go to state 90
     function_call                 go to state 113
     class_name                    go to state 114
-    dereferenceable_scalar        go to state 310
-    constant                      go to state 311
-    class_constant                go to state 312
+    dereferenceable_scalar        go to state 303
+    constant                      go to state 304
+    class_constant                go to state 305
     variable_class_name           go to state 119
     fully_dereferenceable         go to state 120
     array_object_dereferenceable  go to state 121
@@ -20645,1013 +20780,1013 @@
 
 State 603
 
-  380 expr: variable '=' expr .
-  400     | expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-
-    '?'             shift, and go to state 356
-    "'??'"          shift, and go to state 357
-    "'||'"          shift, and go to state 358
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  380 expr: variable '=' expr •
+  400     | expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+
+    '?'             shift, and go to state 353
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'instanceof'"  shift, and go to state 367
+    "'||'"          shift, and go to state 368
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'??'"          shift, and go to state 379
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
 
     $default  reduce using rule 380 (expr)
 
 
 State 604
 
-  383 expr: variable "'+='" expr .
-  400     | expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-
-    '?'             shift, and go to state 356
-    "'??'"          shift, and go to state 357
-    "'||'"          shift, and go to state 358
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  383 expr: variable "'+='" expr •
+  400     | expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+
+    '?'             shift, and go to state 353
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'instanceof'"  shift, and go to state 367
+    "'||'"          shift, and go to state 368
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'??'"          shift, and go to state 379
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
 
     $default  reduce using rule 383 (expr)
 
 
 State 605
 
-  384 expr: variable "'-='" expr .
-  400     | expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-
-    '?'             shift, and go to state 356
-    "'??'"          shift, and go to state 357
-    "'||'"          shift, and go to state 358
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  384 expr: variable "'-='" expr •
+  400     | expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+
+    '?'             shift, and go to state 353
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'instanceof'"  shift, and go to state 367
+    "'||'"          shift, and go to state 368
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'??'"          shift, and go to state 379
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
 
     $default  reduce using rule 384 (expr)
 
 
 State 606
 
-  385 expr: variable "'*='" expr .
-  400     | expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-
-    '?'             shift, and go to state 356
-    "'??'"          shift, and go to state 357
-    "'||'"          shift, and go to state 358
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  385 expr: variable "'*='" expr •
+  400     | expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+
+    '?'             shift, and go to state 353
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'instanceof'"  shift, and go to state 367
+    "'||'"          shift, and go to state 368
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'??'"          shift, and go to state 379
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
 
     $default  reduce using rule 385 (expr)
 
 
 State 607
 
-  387 expr: variable "'/='" expr .
-  400     | expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-
-    '?'             shift, and go to state 356
-    "'??'"          shift, and go to state 357
-    "'||'"          shift, and go to state 358
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  387 expr: variable "'/='" expr •
+  400     | expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+
+    '?'             shift, and go to state 353
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'instanceof'"  shift, and go to state 367
+    "'||'"          shift, and go to state 368
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'??'"          shift, and go to state 379
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
 
     $default  reduce using rule 387 (expr)
 
 
 State 608
 
-  388 expr: variable "'.='" expr .
-  400     | expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-
-    '?'             shift, and go to state 356
-    "'??'"          shift, and go to state 357
-    "'||'"          shift, and go to state 358
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  388 expr: variable "'.='" expr •
+  400     | expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+
+    '?'             shift, and go to state 353
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'instanceof'"  shift, and go to state 367
+    "'||'"          shift, and go to state 368
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'??'"          shift, and go to state 379
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
 
     $default  reduce using rule 388 (expr)
 
 
 State 609
 
-  389 expr: variable "'%='" expr .
-  400     | expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-
-    '?'             shift, and go to state 356
-    "'??'"          shift, and go to state 357
-    "'||'"          shift, and go to state 358
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  389 expr: variable "'%='" expr •
+  400     | expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+
+    '?'             shift, and go to state 353
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'instanceof'"  shift, and go to state 367
+    "'||'"          shift, and go to state 368
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'??'"          shift, and go to state 379
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
 
     $default  reduce using rule 389 (expr)
 
 
 State 610
 
-  390 expr: variable "'&='" expr .
-  400     | expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-
-    '?'             shift, and go to state 356
-    "'??'"          shift, and go to state 357
-    "'||'"          shift, and go to state 358
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  390 expr: variable "'&='" expr •
+  400     | expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+
+    '?'             shift, and go to state 353
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'instanceof'"  shift, and go to state 367
+    "'||'"          shift, and go to state 368
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'??'"          shift, and go to state 379
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
 
     $default  reduce using rule 390 (expr)
 
 
 State 611
 
-  391 expr: variable "'|='" expr .
-  400     | expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-
-    '?'             shift, and go to state 356
-    "'??'"          shift, and go to state 357
-    "'||'"          shift, and go to state 358
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  391 expr: variable "'|='" expr •
+  400     | expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+
+    '?'             shift, and go to state 353
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'instanceof'"  shift, and go to state 367
+    "'||'"          shift, and go to state 368
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'??'"          shift, and go to state 379
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
 
     $default  reduce using rule 391 (expr)
 
 
 State 612
 
-  392 expr: variable "'^='" expr .
-  400     | expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-
-    '?'             shift, and go to state 356
-    "'??'"          shift, and go to state 357
-    "'||'"          shift, and go to state 358
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  392 expr: variable "'^='" expr •
+  400     | expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+
+    '?'             shift, and go to state 353
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'instanceof'"  shift, and go to state 367
+    "'||'"          shift, and go to state 368
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'??'"          shift, and go to state 379
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
 
     $default  reduce using rule 392 (expr)
 
 
 State 613
 
-  393 expr: variable "'<<='" expr .
-  400     | expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-
-    '?'             shift, and go to state 356
-    "'??'"          shift, and go to state 357
-    "'||'"          shift, and go to state 358
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  393 expr: variable "'<<='" expr •
+  400     | expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+
+    '?'             shift, and go to state 353
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'instanceof'"  shift, and go to state 367
+    "'||'"          shift, and go to state 368
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'??'"          shift, and go to state 379
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
 
     $default  reduce using rule 393 (expr)
 
 
 State 614
 
-  394 expr: variable "'>>='" expr .
-  400     | expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-
-    '?'             shift, and go to state 356
-    "'??'"          shift, and go to state 357
-    "'||'"          shift, and go to state 358
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  394 expr: variable "'>>='" expr •
+  400     | expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+
+    '?'             shift, and go to state 353
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'instanceof'"  shift, and go to state 367
+    "'||'"          shift, and go to state 368
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'??'"          shift, and go to state 379
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
 
     $default  reduce using rule 394 (expr)
 
 
 State 615
 
-  386 expr: variable "'**='" expr .
-  400     | expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-
-    '?'             shift, and go to state 356
-    "'??'"          shift, and go to state 357
-    "'||'"          shift, and go to state 358
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  395 expr: variable "'??='" expr •
+  400     | expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+
+    '?'             shift, and go to state 353
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'instanceof'"  shift, and go to state 367
+    "'||'"          shift, and go to state 368
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'??'"          shift, and go to state 379
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
 
-    $default  reduce using rule 386 (expr)
+    $default  reduce using rule 395 (expr)
 
 
 State 616
 
-  395 expr: variable "'??='" expr .
-  400     | expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-
-    '?'             shift, and go to state 356
-    "'??'"          shift, and go to state 357
-    "'||'"          shift, and go to state 358
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  386 expr: variable "'**='" expr •
+  400     | expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+
+    '?'             shift, and go to state 353
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'instanceof'"  shift, and go to state 367
+    "'||'"          shift, and go to state 368
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'??'"          shift, and go to state 379
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
 
-    $default  reduce using rule 395 (expr)
+    $default  reduce using rule 386 (expr)
 
 
 State 617
 
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-  452     | "'yield'" expr "'=>'" expr .
-
-    '?'             shift, and go to state 356
-    "'??'"          shift, and go to state 357
-    "'||'"          shift, and go to state 358
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  590 internal_functions_in_yacc: "'eval'" '(' expr ')' •
 
-    $default  reduce using rule 452 (expr)
+    $default  reduce using rule 590 (internal_functions_in_yacc)
 
 
 State 618
 
-  590 internal_functions_in_yacc: "'eval'" '(' expr ')' .
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+  452     | "'yield'" expr "'=>'" expr •
+
+    '?'             shift, and go to state 353
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'instanceof'"  shift, and go to state 367
+    "'||'"          shift, and go to state 368
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'??'"          shift, and go to state 379
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
 
-    $default  reduce using rule 590 (internal_functions_in_yacc)
+    $default  reduce using rule 452 (expr)
 
 
 State 619
 
-  485 class_name_reference: '(' expr ')' .
+  485 class_name_reference: '(' expr ')' •
 
     $default  reduce using rule 485 (class_name_reference)
 
 
 State 620
 
-  373 anonymous_class: anonymous_class_modifiers_optional "'class'" @9 . ctor_arguments extends_from implements_list backup_doc_comment '{' class_statement_list '}'
+  373 anonymous_class: anonymous_class_modifiers_optional "'class'" @9 • ctor_arguments extends_from implements_list backup_doc_comment '{' class_statement_list '}'
 
-    '('  shift, and go to state 209
+    '('  shift, and go to state 202
 
     $default  reduce using rule 491 (ctor_arguments)
 
@@ -21661,188 +21796,188 @@
 
 State 621
 
-  550 new_variable: class_name "'::'" simple_variable .
+  550 new_variable: class_name "'::'" simple_variable •
 
     $default  reduce using rule 550 (new_variable)
 
 
 State 622
 
-  548 new_variable: new_variable "'->'" property_name .
+  548 new_variable: new_variable "'->'" property_name •
 
     $default  reduce using rule 548 (new_variable)
 
 
 State 623
 
-  549 new_variable: new_variable "'?->'" property_name .
+  549 new_variable: new_variable "'?->'" property_name •
 
     $default  reduce using rule 549 (new_variable)
 
 
 State 624
 
-  551 new_variable: new_variable "'::'" simple_variable .
+  551 new_variable: new_variable "'::'" simple_variable •
 
     $default  reduce using rule 551 (new_variable)
 
 
 State 625
 
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-  547 new_variable: new_variable '{' expr . '}'
-
-    "'or'"          shift, and go to state 353
-    "'xor'"         shift, and go to state 354
-    "'and'"         shift, and go to state 355
-    '?'             shift, and go to state 356
-    "'??'"          shift, and go to state 357
-    "'||'"          shift, and go to state 358
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+  547 new_variable: new_variable '{' expr • '}'
+
+    '?'             shift, and go to state 353
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'or'"          shift, and go to state 364
+    "'xor'"         shift, and go to state 365
+    "'and'"         shift, and go to state 366
+    "'instanceof'"  shift, and go to state 367
+    "'||'"          shift, and go to state 368
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'??'"          shift, and go to state 379
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
     '}'             shift, and go to state 717
 
 
 State 626
 
-  546 new_variable: new_variable '' optional_expr . ''
+  546 new_variable: new_variable '' optional_expr • ''
 
     ''  shift, and go to state 718
 
 
 State 627
 
-  487 exit_expr: '(' optional_expr ')' .
+  487 exit_expr: '(' optional_expr ')' •
 
     $default  reduce using rule 487 (exit_expr)
 
 
 State 628
 
-  250 if_stmt_without_else: "'if'" '(' expr ')' . statement
-  254 alt_if_stmt_without_else: "'if'" '(' expr ')' . ':' inner_statement_list
+  250 if_stmt_without_else: "'if'" '(' expr ')' • statement
+  254 alt_if_stmt_without_else: "'if'" '(' expr ')' • ':' inner_statement_list
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
     ':'                        shift, and go to state 719
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 27
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    T_INLINE_HTML              shift, and go to state 32
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'if'"                     shift, and go to state 37
-    "'echo'"                   shift, and go to state 38
-    "'do'"                     shift, and go to state 39
-    "'while'"                  shift, and go to state 40
-    "'for'"                    shift, and go to state 41
-    "'foreach'"                shift, and go to state 42
-    "'declare'"                shift, and go to state 43
-    "'switch'"                 shift, and go to state 44
-    "'match'"                  shift, and go to state 45
-    "'break'"                  shift, and go to state 46
-    "'continue'"               shift, and go to state 47
-    "'goto'"                   shift, and go to state 48
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'return'"                 shift, and go to state 52
-    "'try'"                    shift, and go to state 53
-    "'global'"                 shift, and go to state 55
-    "'static'"                 shift, and go to state 56
-    "'readonly'"               shift, and go to state 130
-    "'unset'"                  shift, and go to state 60
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 11
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    T_INLINE_HTML              shift, and go to state 16
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'if'"                     shift, and go to state 29
+    "'echo'"                   shift, and go to state 30
+    "'do'"                     shift, and go to state 31
+    "'while'"                  shift, and go to state 32
+    "'for'"                    shift, and go to state 33
+    "'foreach'"                shift, and go to state 34
+    "'declare'"                shift, and go to state 35
+    "'switch'"                 shift, and go to state 36
+    "'match'"                  shift, and go to state 37
+    "'break'"                  shift, and go to state 38
+    "'continue'"               shift, and go to state 39
+    "'goto'"                   shift, and go to state 40
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'return'"                 shift, and go to state 44
+    "'try'"                    shift, and go to state 45
+    "'throw'"                  shift, and go to state 46
+    "'global'"                 shift, and go to state 48
+    "'static'"                 shift, and go to state 49
+    "'readonly'"               shift, and go to state 130
+    "'unset'"                  shift, and go to state 53
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ';'                        shift, and go to state 84
@@ -21885,67 +22020,67 @@
 
 State 629
 
-  365 echo_expr_list: echo_expr_list ',' echo_expr .
+  365 echo_expr_list: echo_expr_list ',' echo_expr •
 
     $default  reduce using rule 365 (echo_expr_list)
 
 
 State 630
 
-  152 statement: "'do'" statement "'while'" '(' . expr ')' ';'
+  152 statement: "'do'" statement "'while'" '(' • expr ')' ';'
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -21981,77 +22116,77 @@
 
 State 631
 
-  151 statement: "'while'" '(' expr ')' . while_statement
+  151 statement: "'while'" '(' expr ')' • while_statement
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
     ':'                        shift, and go to state 722
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 27
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    T_INLINE_HTML              shift, and go to state 32
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'if'"                     shift, and go to state 37
-    "'echo'"                   shift, and go to state 38
-    "'do'"                     shift, and go to state 39
-    "'while'"                  shift, and go to state 40
-    "'for'"                    shift, and go to state 41
-    "'foreach'"                shift, and go to state 42
-    "'declare'"                shift, and go to state 43
-    "'switch'"                 shift, and go to state 44
-    "'match'"                  shift, and go to state 45
-    "'break'"                  shift, and go to state 46
-    "'continue'"               shift, and go to state 47
-    "'goto'"                   shift, and go to state 48
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'return'"                 shift, and go to state 52
-    "'try'"                    shift, and go to state 53
-    "'global'"                 shift, and go to state 55
-    "'static'"                 shift, and go to state 56
-    "'readonly'"               shift, and go to state 130
-    "'unset'"                  shift, and go to state 60
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 11
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    T_INLINE_HTML              shift, and go to state 16
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'if'"                     shift, and go to state 29
+    "'echo'"                   shift, and go to state 30
+    "'do'"                     shift, and go to state 31
+    "'while'"                  shift, and go to state 32
+    "'for'"                    shift, and go to state 33
+    "'foreach'"                shift, and go to state 34
+    "'declare'"                shift, and go to state 35
+    "'switch'"                 shift, and go to state 36
+    "'match'"                  shift, and go to state 37
+    "'break'"                  shift, and go to state 38
+    "'continue'"               shift, and go to state 39
+    "'goto'"                   shift, and go to state 40
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'return'"                 shift, and go to state 44
+    "'try'"                    shift, and go to state 45
+    "'throw'"                  shift, and go to state 46
+    "'global'"                 shift, and go to state 48
+    "'static'"                 shift, and go to state 49
+    "'readonly'"               shift, and go to state 130
+    "'unset'"                  shift, and go to state 53
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ';'                        shift, and go to state 84
@@ -22095,60 +22230,60 @@
 
 State 632
 
-  153 statement: "'for'" '(' for_exprs ';' . for_exprs ';' for_exprs ')' for_statement
+  153 statement: "'for'" '(' for_exprs ';' • for_exprs ';' for_exprs ')' for_statement
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -22188,60 +22323,60 @@
 
 State 633
 
-  370 non_empty_for_exprs: non_empty_for_exprs ',' . expr
+  370 non_empty_for_exprs: non_empty_for_exprs ',' • expr
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -22277,30 +22412,30 @@
 
 State 634
 
-  164 statement: "'foreach'" '(' expr "'as'" . foreach_variable ')' foreach_statement
-  165          | "'foreach'" '(' expr "'as'" . foreach_variable "'=>'" foreach_variable ')' foreach_statement
+  164 statement: "'foreach'" '(' expr "'as'" • foreach_variable ')' foreach_statement
+  165          | "'foreach'" '(' expr "'as'" • foreach_variable "'=>'" foreach_variable ')' foreach_statement
 
-    "amp"                      shift, and go to state 324
-    "'&'"                      shift, and go to state 325
     "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'static'"                 shift, and go to state 156
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'static'"                 shift, and go to state 147
     "'readonly'"               shift, and go to state 130
     "'list'"                   shift, and go to state 727
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    '('                        shift, and go to state 308
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'&'"                      shift, and go to state 326
+    "amp"                      shift, and go to state 327
+    '('                        shift, and go to state 301
     ''                        shift, and go to state 728
     '"'                        shift, and go to state 88
     '$'                        shift, and go to state 89
@@ -22310,9 +22445,9 @@
     foreach_variable              go to state 730
     function_call                 go to state 113
     class_name                    go to state 114
-    dereferenceable_scalar        go to state 310
-    constant                      go to state 311
-    class_constant                go to state 312
+    dereferenceable_scalar        go to state 303
+    constant                      go to state 304
+    class_constant                go to state 305
     variable_class_name           go to state 119
     fully_dereferenceable         go to state 120
     array_object_dereferenceable  go to state 121
@@ -22325,7 +22460,7 @@
 
 State 635
 
-  167 statement: "'declare'" '(' const_list ')' . $@3 declare_statement
+  167 statement: "'declare'" '(' const_list ')' • $@3 declare_statement
 
     $default  reduce using rule 166 ($@3)
 
@@ -22334,7 +22469,7 @@
 
 State 636
 
-  154 statement: "'switch'" '(' expr ')' . switch_case_list
+  154 statement: "'switch'" '(' expr ')' • switch_case_list
 
     ':'  shift, and go to state 733
     '{'  shift, and go to state 734
@@ -22344,76 +22479,76 @@
 
 State 637
 
-  239 match: "'match'" '(' expr ')' . '{' match_arm_list '}'
+  239 match: "'match'" '(' expr ')' • '{' match_arm_list '}'
 
     '{'  shift, and go to state 736
 
 
 State 638
 
-  364 const_decl: "identifier" '=' expr . backup_doc_comment
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-
-    "'or'"          shift, and go to state 353
-    "'xor'"         shift, and go to state 354
-    "'and'"         shift, and go to state 355
-    '?'             shift, and go to state 356
-    "'??'"          shift, and go to state 357
-    "'||'"          shift, and go to state 358
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  364 const_decl: "identifier" '=' expr • backup_doc_comment
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+
+    '?'             shift, and go to state 353
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'or'"          shift, and go to state 364
+    "'xor'"         shift, and go to state 365
+    "'and'"         shift, and go to state 366
+    "'instanceof'"  shift, and go to state 367
+    "'||'"          shift, and go to state 368
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'??'"          shift, and go to state 379
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
 
     $default  reduce using rule 464 (backup_doc_comment)
 
@@ -22422,14 +22557,14 @@
 
 State 639
 
-  140 const_list: const_list ',' const_decl .
+  140 const_list: const_list ',' const_decl •
 
     $default  reduce using rule 140 (const_list)
 
 
 State 640
 
-  169 statement: "'try'" '{' inner_statement_list '}' . catch_list finally_statement
+  169 statement: "'try'" '{' inner_statement_list '}' • catch_list finally_statement
 
     $default  reduce using rule 172 (catch_list)
 
@@ -22438,19 +22573,19 @@
 
 State 641
 
-  139 use_declaration: legacy_namespace_name "'as'" "identifier" .
+  139 use_declaration: legacy_namespace_name "'as'" "identifier" •
 
     $default  reduce using rule 139 (use_declaration)
 
 
 State 642
 
-  125 mixed_group_use_declaration: legacy_namespace_name "'\\'" '{' . inline_use_declarations possible_comma '}'
+  125 mixed_group_use_declaration: legacy_namespace_name "'\\'" '{' • inline_use_declarations possible_comma '}'
 
-    "identifier"       shift, and go to state 191
-    "namespaced name"  shift, and go to state 193
-    "'function'"       shift, and go to state 194
-    "'const'"          shift, and go to state 195
+    "identifier"       shift, and go to state 184
+    "namespaced name"  shift, and go to state 186
+    "'function'"       shift, and go to state 187
+    "'const'"          shift, and go to state 188
 
     namespace_name              go to state 739
     use_type                    go to state 740
@@ -22461,29 +22596,29 @@
 
 State 643
 
-  124 group_use_declaration: legacy_namespace_name "'\\'" . '{' unprefixed_use_declarations possible_comma '}'
+  124 group_use_declaration: legacy_namespace_name "'\\'" • '{' unprefixed_use_declarations possible_comma '}'
 
     '{'  shift, and go to state 744
 
 
 State 644
 
-  118 top_statement: "'use'" use_type group_use_declaration ';' .
+  118 top_statement: "'use'" use_type group_use_declaration ';' •
 
     $default  reduce using rule 118 (top_statement)
 
 
 State 645
 
-  120 top_statement: "'use'" use_type use_declarations ';' .
+  120 top_statement: "'use'" use_type use_declarations ';' •
 
     $default  reduce using rule 120 (top_statement)
 
 
 State 646
 
-  138 use_declaration: legacy_namespace_name .
-  139                | legacy_namespace_name . "'as'" "identifier"
+  138 use_declaration: legacy_namespace_name •
+  139                | legacy_namespace_name • "'as'" "identifier"
 
     "'as'"  shift, and go to state 446
 
@@ -22492,226 +22627,226 @@
 
 State 647
 
-  132 use_declarations: use_declarations ',' use_declaration .
+  132 use_declarations: use_declarations ',' use_declaration •
 
     $default  reduce using rule 132 (use_declarations)
 
 
 State 648
 
-  305 global_var_list: global_var_list ',' global_var .
+  305 global_var_list: global_var_list ',' global_var •
 
     $default  reduce using rule 305 (global_var_list)
 
 
 State 649
 
-  311 static_var: "variable" '=' expr .
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-
-    "'or'"          shift, and go to state 353
-    "'xor'"         shift, and go to state 354
-    "'and'"         shift, and go to state 355
-    '?'             shift, and go to state 356
-    "'??'"          shift, and go to state 357
-    "'||'"          shift, and go to state 358
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  311 static_var: "variable" '=' expr •
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+
+    '?'             shift, and go to state 353
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'or'"          shift, and go to state 364
+    "'xor'"         shift, and go to state 365
+    "'and'"         shift, and go to state 366
+    "'instanceof'"  shift, and go to state 367
+    "'||'"          shift, and go to state 368
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'??'"          shift, and go to state 379
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
 
     $default  reduce using rule 311 (static_var)
 
 
 State 650
 
-  308 static_var_list: static_var_list ',' static_var .
+  308 static_var_list: static_var_list ',' static_var •
 
     $default  reduce using rule 308 (static_var_list)
 
 
 State 651
 
-  299 argument_list: '(' "'...'" ')' .
+  299 argument_list: '(' "'...'" ')' •
 
     $default  reduce using rule 299 (argument_list)
 
 
 State 652
 
-  304 argument: "'...'" expr .
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-
-    "'or'"          shift, and go to state 353
-    "'xor'"         shift, and go to state 354
-    "'and'"         shift, and go to state 355
-    '?'             shift, and go to state 356
-    "'??'"          shift, and go to state 357
-    "'||'"          shift, and go to state 358
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  304 argument: "'...'" expr •
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+
+    '?'             shift, and go to state 353
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'or'"          shift, and go to state 364
+    "'xor'"         shift, and go to state 365
+    "'and'"         shift, and go to state 366
+    "'instanceof'"  shift, and go to state 367
+    "'||'"          shift, and go to state 368
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'??'"          shift, and go to state 379
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
 
     $default  reduce using rule 304 (argument)
 
 
 State 653
 
-  303 argument: identifier ':' . expr
+  303 argument: identifier ':' • expr
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -22747,99 +22882,92 @@
 
 State 654
 
-  127 possible_comma: ',' .
-  301 non_empty_argument_list: non_empty_argument_list ',' . argument
+  127 possible_comma: ',' •
+  301 non_empty_argument_list: non_empty_argument_list ',' • argument
 
-    "'throw'"                  shift, and go to state 459
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 459
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
     "'include'"                shift, and go to state 460
     "'include_once'"           shift, and go to state 461
-    "'require'"                shift, and go to state 462
-    "'require_once'"           shift, and go to state 463
-    "'or'"                     shift, and go to state 224
-    "'xor'"                    shift, and go to state 225
-    "'and'"                    shift, and go to state 226
-    "'print'"                  shift, and go to state 464
-    "'yield'"                  shift, and go to state 465
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    "'instanceof'"             shift, and go to state 229
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 466
-    "'elseif'"                 shift, and go to state 231
-    "'else'"                   shift, and go to state 232
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 467
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 468
-    "'new'"                    shift, and go to state 469
-    "'exit'"                   shift, and go to state 470
-    "'if'"                     shift, and go to state 238
-    "'endif'"                  shift, and go to state 239
-    "'echo'"                   shift, and go to state 240
-    "'do'"                     shift, and go to state 241
-    "'while'"                  shift, and go to state 242
-    "'endwhile'"               shift, and go to state 243
-    "'for'"                    shift, and go to state 244
-    "'endfor'"                 shift, and go to state 245
-    "'foreach'"                shift, and go to state 246
-    "'endforeach'"             shift, and go to state 247
-    "'declare'"                shift, and go to state 248
-    "'enddeclare'"             shift, and go to state 249
-    "'as'"                     shift, and go to state 250
-    "'switch'"                 shift, and go to state 251
-    "'endswitch'"              shift, and go to state 252
-    "'case'"                   shift, and go to state 253
-    "'default'"                shift, and go to state 254
-    "'match'"                  shift, and go to state 471
-    "'break'"                  shift, and go to state 256
-    "'continue'"               shift, and go to state 257
-    "'goto'"                   shift, and go to state 258
-    "'function'"               shift, and go to state 472
-    "'fn'"                     shift, and go to state 473
-    "'const'"                  shift, and go to state 261
-    "'return'"                 shift, and go to state 262
-    "'try'"                    shift, and go to state 263
-    "'catch'"                  shift, and go to state 264
-    "'finally'"                shift, and go to state 265
-    "'use'"                    shift, and go to state 266
-    "'insteadof'"              shift, and go to state 267
-    "'global'"                 shift, and go to state 268
+    "'eval'"                   shift, and go to state 462
+    "'require'"                shift, and go to state 463
+    "'require_once'"           shift, and go to state 464
+    "'or'"                     shift, and go to state 219
+    "'xor'"                    shift, and go to state 220
+    "'and'"                    shift, and go to state 221
+    "'print'"                  shift, and go to state 465
+    "'yield'"                  shift, and go to state 466
+    "'yield from'"             shift, and go to state 25
+    "'instanceof'"             shift, and go to state 224
+    "'new'"                    shift, and go to state 467
+    "'clone'"                  shift, and go to state 468
+    "'exit'"                   shift, and go to state 469
+    "'if'"                     shift, and go to state 228
+    "'elseif'"                 shift, and go to state 229
+    "'else'"                   shift, and go to state 230
+    "'endif'"                  shift, and go to state 231
+    "'echo'"                   shift, and go to state 232
+    "'do'"                     shift, and go to state 233
+    "'while'"                  shift, and go to state 234
+    "'endwhile'"               shift, and go to state 235
+    "'for'"                    shift, and go to state 236
+    "'endfor'"                 shift, and go to state 237
+    "'foreach'"                shift, and go to state 238
+    "'endforeach'"             shift, and go to state 239
+    "'declare'"                shift, and go to state 240
+    "'enddeclare'"             shift, and go to state 241
+    "'as'"                     shift, and go to state 242
+    "'switch'"                 shift, and go to state 243
+    "'endswitch'"              shift, and go to state 244
+    "'case'"                   shift, and go to state 245
+    "'default'"                shift, and go to state 246
+    "'match'"                  shift, and go to state 470
+    "'break'"                  shift, and go to state 248
+    "'continue'"               shift, and go to state 249
+    "'goto'"                   shift, and go to state 250
+    "'function'"               shift, and go to state 471
+    "'fn'"                     shift, and go to state 472
+    "'const'"                  shift, and go to state 253
+    "'return'"                 shift, and go to state 254
+    "'try'"                    shift, and go to state 255
+    "'catch'"                  shift, and go to state 256
+    "'finally'"                shift, and go to state 257
+    "'throw'"                  shift, and go to state 473
+    "'use'"                    shift, and go to state 259
+    "'insteadof'"              shift, and go to state 260
+    "'global'"                 shift, and go to state 261
     "'static'"                 shift, and go to state 474
-    "'abstract'"               shift, and go to state 270
-    "'final'"                  shift, and go to state 271
-    "'private'"                shift, and go to state 272
-    "'protected'"              shift, and go to state 273
-    "'public'"                 shift, and go to state 274
+    "'abstract'"               shift, and go to state 263
+    "'final'"                  shift, and go to state 264
+    "'private'"                shift, and go to state 265
+    "'protected'"              shift, and go to state 266
+    "'public'"                 shift, and go to state 267
     "'readonly'"               shift, and go to state 475
-    "'var'"                    shift, and go to state 276
-    "'unset'"                  shift, and go to state 277
+    "'var'"                    shift, and go to state 269
+    "'unset'"                  shift, and go to state 270
     "'isset'"                  shift, and go to state 476
     "'empty'"                  shift, and go to state 477
-    "'class'"                  shift, and go to state 280
-    "'trait'"                  shift, and go to state 281
-    "'interface'"              shift, and go to state 282
-    "'enum'"                   shift, and go to state 283
-    "'extends'"                shift, and go to state 284
-    "'implements'"             shift, and go to state 285
-    "'namespace'"              shift, and go to state 286
+    "'class'"                  shift, and go to state 273
+    "'trait'"                  shift, and go to state 274
+    "'interface'"              shift, and go to state 275
+    "'enum'"                   shift, and go to state 276
+    "'extends'"                shift, and go to state 277
+    "'implements'"             shift, and go to state 278
+    "'namespace'"              shift, and go to state 279
     "'list'"                   shift, and go to state 478
     "'array'"                  shift, and go to state 479
-    "'callable'"               shift, and go to state 289
+    "'callable'"               shift, and go to state 282
     "'__LINE__'"               shift, and go to state 480
     "'__FILE__'"               shift, and go to state 481
     "'__DIR__'"                shift, and go to state 482
@@ -22848,9 +22976,16 @@
     "'__METHOD__'"             shift, and go to state 485
     "'__FUNCTION__'"           shift, and go to state 486
     "'__NAMESPACE__'"          shift, and go to state 487
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     "'...'"                    shift, and go to state 746
     '('                        shift, and go to state 83
@@ -22861,8 +22996,8 @@
 
     $default  reduce using rule 127 (possible_comma)
 
-    reserved_non_modifiers        go to state 298
-    semi_reserved                 go to state 299
+    reserved_non_modifiers        go to state 291
+    semi_reserved                 go to state 292
     identifier                    go to state 490
     name                          go to state 90
     attribute                     go to state 91
@@ -22893,35 +23028,35 @@
 
 State 655
 
-  298 argument_list: '(' non_empty_argument_list possible_comma . ')'
+  298 argument_list: '(' non_empty_argument_list possible_comma • ')'
 
     ')'  shift, and go to state 748
 
 
 State 656
 
-  127 possible_comma: ',' .
-  181 unset_variables: unset_variables ',' . unset_variable
+  127 possible_comma: ',' •
+  181 unset_variables: unset_variables ',' • unset_variable
 
     "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'static'"                 shift, and go to state 156
-    "'readonly'"               shift, and go to state 130
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    '('                        shift, and go to state 308
-    ''                        shift, and go to state 309
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'static'"                 shift, and go to state 147
+    "'readonly'"               shift, and go to state 130
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    '('                        shift, and go to state 301
+    ''                        shift, and go to state 302
     '"'                        shift, and go to state 88
     '$'                        shift, and go to state 89
 
@@ -22931,9 +23066,9 @@
     unset_variable                go to state 749
     function_call                 go to state 113
     class_name                    go to state 114
-    dereferenceable_scalar        go to state 310
-    constant                      go to state 311
-    class_constant                go to state 312
+    dereferenceable_scalar        go to state 303
+    constant                      go to state 304
+    class_constant                go to state 305
     variable_class_name           go to state 119
     fully_dereferenceable         go to state 120
     array_object_dereferenceable  go to state 121
@@ -22946,68 +23081,68 @@
 
 State 657
 
-  163 statement: "'unset'" '(' unset_variables possible_comma . ')' ';'
+  163 statement: "'unset'" '(' unset_variables possible_comma • ')' ';'
 
     ')'  shift, and go to state 750
 
 
 State 658
 
-  127 possible_comma: ',' .
-  594 isset_variables: isset_variables ',' . isset_variable
+  127 possible_comma: ',' •
+  594 isset_variables: isset_variables ',' • isset_variable
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -23046,42 +23181,42 @@
 
 State 659
 
-  586 internal_functions_in_yacc: "'isset'" '(' isset_variables possible_comma . ')'
+  586 internal_functions_in_yacc: "'isset'" '(' isset_variables possible_comma • ')'
 
     ')'  shift, and go to state 752
 
 
 State 660
 
-  587 internal_functions_in_yacc: "'empty'" '(' expr ')' .
+  587 internal_functions_in_yacc: "'empty'" '(' expr ')' •
 
     $default  reduce using rule 587 (internal_functions_in_yacc)
 
 
 State 661
 
-  111 top_statement: "'__halt_compiler'" '(' ')' ';' .
+  111 top_statement: "'__halt_compiler'" '(' ')' ';' •
 
     $default  reduce using rule 111 (top_statement)
 
 
 State 662
 
-  215 extends_from: "'extends'" . class_name
+  215 extends_from: "'extends'" • class_name
 
     "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "'static'"                 shift, and go to state 156
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "'static'"                 shift, and go to state 147
 
-    name        go to state 159
+    name        go to state 150
     class_name  go to state 753
 
 
 State 663
 
-  193 class_declaration_statement: "'class'" @5 "identifier" extends_from . implements_list backup_doc_comment '{' class_statement_list '}'
+  193 class_declaration_statement: "'class'" @5 "identifier" extends_from • implements_list backup_doc_comment '{' class_statement_list '}'
 
     "'implements'"  shift, and go to state 754
 
@@ -23092,29 +23227,29 @@
 
 State 664
 
-  204 trait_declaration_statement: "'trait'" @6 "identifier" backup_doc_comment . '{' class_statement_list '}'
+  204 trait_declaration_statement: "'trait'" @6 "identifier" backup_doc_comment • '{' class_statement_list '}'
 
     '{'  shift, and go to state 756
 
 
 State 665
 
-  217 interface_extends_list: "'extends'" . class_name_list
+  217 interface_extends_list: "'extends'" • class_name_list
 
     "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "'static'"                 shift, and go to state 156
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "'static'"                 shift, and go to state 147
 
-    name             go to state 159
+    name             go to state 150
     class_name_list  go to state 757
     class_name       go to state 758
 
 
 State 666
 
-  206 interface_declaration_statement: "'interface'" @7 "identifier" interface_extends_list . backup_doc_comment '{' class_statement_list '}'
+  206 interface_declaration_statement: "'interface'" @7 "identifier" interface_extends_list • backup_doc_comment '{' class_statement_list '}'
 
     $default  reduce using rule 464 (backup_doc_comment)
 
@@ -23123,13 +23258,13 @@
 
 State 667
 
-  210 enum_backing_type: ':' . type_expr
+  210 enum_backing_type: ':' • type_expr
 
     '?'                        shift, and go to state 760
     "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
     "'static'"                 shift, and go to state 761
     "'array'"                  shift, and go to state 762
     "'callable'"               shift, and go to state 763
@@ -23146,7 +23281,7 @@
 
 State 668
 
-  208 enum_declaration_statement: "'enum'" @8 "identifier" enum_backing_type . implements_list backup_doc_comment '{' class_statement_list '}'
+  208 enum_declaration_statement: "'enum'" @8 "identifier" enum_backing_type • implements_list backup_doc_comment '{' class_statement_list '}'
 
     "'implements'"  shift, and go to state 754
 
@@ -23157,7 +23292,7 @@
 
 State 669
 
-  114 top_statement: "'namespace'" namespace_declaration_name $@1 '{' . top_statement_list '}'
+  114 top_statement: "'namespace'" namespace_declaration_name $@1 '{' • top_statement_list '}'
 
     $default  reduce using rule 85 (top_statement_list)
 
@@ -23166,87 +23301,87 @@
 
 State 670
 
-   84 top_statement_list: top_statement_list . top_statement
-  116 top_statement: "'namespace'" $@2 '{' top_statement_list . '}'
+   84 top_statement_list: top_statement_list • top_statement
+  116 top_statement: "'namespace'" $@2 '{' top_statement_list • '}'
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 27
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    T_INLINE_HTML              shift, and go to state 32
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'if'"                     shift, and go to state 37
-    "'echo'"                   shift, and go to state 38
-    "'do'"                     shift, and go to state 39
-    "'while'"                  shift, and go to state 40
-    "'for'"                    shift, and go to state 41
-    "'foreach'"                shift, and go to state 42
-    "'declare'"                shift, and go to state 43
-    "'switch'"                 shift, and go to state 44
-    "'match'"                  shift, and go to state 45
-    "'break'"                  shift, and go to state 46
-    "'continue'"               shift, and go to state 47
-    "'goto'"                   shift, and go to state 48
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'const'"                  shift, and go to state 51
-    "'return'"                 shift, and go to state 52
-    "'try'"                    shift, and go to state 53
-    "'use'"                    shift, and go to state 54
-    "'global'"                 shift, and go to state 55
-    "'static'"                 shift, and go to state 56
-    "'abstract'"               shift, and go to state 57
-    "'final'"                  shift, and go to state 58
-    "'readonly'"               shift, and go to state 59
-    "'unset'"                  shift, and go to state 60
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'__halt_compiler'"        shift, and go to state 63
-    "'class'"                  shift, and go to state 64
-    "'trait'"                  shift, and go to state 65
-    "'interface'"              shift, and go to state 66
-    "'enum'"                   shift, and go to state 67
-    "'namespace'"              shift, and go to state 68
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 11
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    T_INLINE_HTML              shift, and go to state 16
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'if'"                     shift, and go to state 29
+    "'echo'"                   shift, and go to state 30
+    "'do'"                     shift, and go to state 31
+    "'while'"                  shift, and go to state 32
+    "'for'"                    shift, and go to state 33
+    "'foreach'"                shift, and go to state 34
+    "'declare'"                shift, and go to state 35
+    "'switch'"                 shift, and go to state 36
+    "'match'"                  shift, and go to state 37
+    "'break'"                  shift, and go to state 38
+    "'continue'"               shift, and go to state 39
+    "'goto'"                   shift, and go to state 40
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'const'"                  shift, and go to state 43
+    "'return'"                 shift, and go to state 44
+    "'try'"                    shift, and go to state 45
+    "'throw'"                  shift, and go to state 46
+    "'use'"                    shift, and go to state 47
+    "'global'"                 shift, and go to state 48
+    "'static'"                 shift, and go to state 49
+    "'abstract'"               shift, and go to state 50
+    "'final'"                  shift, and go to state 51
+    "'readonly'"               shift, and go to state 52
+    "'unset'"                  shift, and go to state 53
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'__halt_compiler'"        shift, and go to state 56
+    "'class'"                  shift, and go to state 57
+    "'trait'"                  shift, and go to state 58
+    "'interface'"              shift, and go to state 59
+    "'enum'"                   shift, and go to state 60
+    "'namespace'"              shift, and go to state 61
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ';'                        shift, and go to state 84
@@ -23299,36 +23434,36 @@
 
 State 671
 
-  378 expr: "'list'" '(' array_pair_list ')' . '=' expr
+  378 expr: "'list'" '(' array_pair_list ')' • '=' expr
 
     '='  shift, and go to state 775
 
 
 State 672
 
-  493 dereferenceable_scalar: "'array'" '(' array_pair_list ')' .
+  493 dereferenceable_scalar: "'array'" '(' array_pair_list ')' •
 
     $default  reduce using rule 493 (dereferenceable_scalar)
 
 
 State 673
 
-   99 attribute_group: attribute_group ',' attribute_decl .
+   99 attribute_group: attribute_group ',' attribute_decl •
 
     $default  reduce using rule 99 (attribute_group)
 
 
 State 674
 
-  100 attribute: "'#'" attribute_group possible_comma '' .
+  100 attribute: "'#'" attribute_group possible_comma '' •
 
     $default  reduce using rule 100 (attribute)
 
 
 State 675
 
-  522 fully_dereferenceable: '(' expr ')' .
-  528 callable_expr: '(' expr ')' .
+  522 fully_dereferenceable: '(' expr ')' •
+  528 callable_expr: '(' expr ')' •
 
     '('       reduce using rule 528 (callable_expr)
     $default  reduce using rule 522 (fully_dereferenceable)
@@ -23336,123 +23471,123 @@
 
 State 676
 
-  494 dereferenceable_scalar: '' array_pair_list '' .
+  494 dereferenceable_scalar: '' array_pair_list '' •
 
     $default  reduce using rule 494 (dereferenceable_scalar)
 
 
 State 677
 
-  576 encaps_var: "variable" "'->'" "identifier" .
+  576 encaps_var: "variable" "'->'" "identifier" •
 
     $default  reduce using rule 576 (encaps_var)
 
 
 State 678
 
-  577 encaps_var: "variable" "'?->'" "identifier" .
+  577 encaps_var: "variable" "'?->'" "identifier" •
 
     $default  reduce using rule 577 (encaps_var)
 
 
 State 679
 
-  584 encaps_var_offset: '-' . "number"
+  584 encaps_var_offset: '-' • "number"
 
     "number"  shift, and go to state 776
 
 
 State 680
 
-  582 encaps_var_offset: "identifier" .
+  582 encaps_var_offset: "identifier" •
 
     $default  reduce using rule 582 (encaps_var_offset)
 
 
 State 681
 
-  585 encaps_var_offset: "variable" .
+  585 encaps_var_offset: "variable" •
 
     $default  reduce using rule 585 (encaps_var_offset)
 
 
 State 682
 
-  583 encaps_var_offset: "number" .
+  583 encaps_var_offset: "number" •
 
     $default  reduce using rule 583 (encaps_var_offset)
 
 
 State 683
 
-  575 encaps_var: "variable" '' encaps_var_offset . ''
+  575 encaps_var: "variable" '' encaps_var_offset • ''
 
     ''  shift, and go to state 777
 
 
 State 684
 
-  579 encaps_var: "'${'" "variable name" '}' .
+  579 encaps_var: "'${'" "variable name" '}' •
 
     $default  reduce using rule 579 (encaps_var)
 
 
 State 685
 
-  580 encaps_var: "'${'" "variable name" '' . expr '' '}'
+  580 encaps_var: "'${'" "variable name" '' • expr '' '}'
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -23488,80 +23623,80 @@
 
 State 686
 
-  578 encaps_var: "'${'" expr '}' .
+  578 encaps_var: "'${'" expr '}' •
 
     $default  reduce using rule 578 (encaps_var)
 
 
 State 687
 
-  581 encaps_var: "'{$'" variable '}' .
+  581 encaps_var: "'{$'" variable '}' •
 
     $default  reduce using rule 581 (encaps_var)
 
 
 State 688
 
-  147 inner_statement: "'__halt_compiler'" '(' . ')' ';'
+  147 inner_statement: "'__halt_compiler'" '(' • ')' ';'
 
     ')'  shift, and go to state 779
 
 
 State 689
 
-  146 inner_statement: attributes attributed_statement .
+  146 inner_statement: attributes attributed_statement •
 
     $default  reduce using rule 146 (inner_statement)
 
 
 State 690
 
-  378 expr: "'list'" '(' array_pair_list . ')' '=' expr
-  569 array_pair: "'list'" '(' array_pair_list . ')'
+  378 expr: "'list'" '(' array_pair_list • ')' '=' expr
+  569 array_pair: "'list'" '(' array_pair_list • ')'
 
     ')'  shift, and go to state 780
 
 
 State 691
 
-  378 expr: "'list'" . '(' array_pair_list ')' '=' expr
-  568 array_pair: expr "'=>'" "'list'" . '(' array_pair_list ')'
+  378 expr: "'list'" • '(' array_pair_list ')' '=' expr
+  568 array_pair: expr "'=>'" "'list'" • '(' array_pair_list ')'
 
     '('  shift, and go to state 781
 
 
 State 692
 
-  565 array_pair: expr "'=>'" ampersand . variable
+  565 array_pair: expr "'=>'" ampersand • variable
 
     "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'static'"                 shift, and go to state 156
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'static'"                 shift, and go to state 147
     "'readonly'"               shift, and go to state 130
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    '('                        shift, and go to state 308
-    ''                        shift, and go to state 309
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    '('                        shift, and go to state 301
+    ''                        shift, and go to state 302
     '"'                        shift, and go to state 88
     '$'                        shift, and go to state 89
 
     name                          go to state 90
     function_call                 go to state 113
     class_name                    go to state 114
-    dereferenceable_scalar        go to state 310
-    constant                      go to state 311
-    class_constant                go to state 312
+    dereferenceable_scalar        go to state 303
+    constant                      go to state 304
+    class_constant                go to state 305
     variable_class_name           go to state 119
     fully_dereferenceable         go to state 120
     array_object_dereferenceable  go to state 121
@@ -23574,129 +23709,129 @@
 
 State 693
 
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-  563 array_pair: expr "'=>'" expr .
-
-    "'or'"          shift, and go to state 353
-    "'xor'"         shift, and go to state 354
-    "'and'"         shift, and go to state 355
-    '?'             shift, and go to state 356
-    "'??'"          shift, and go to state 357
-    "'||'"          shift, and go to state 358
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+  563 array_pair: expr "'=>'" expr •
+
+    '?'             shift, and go to state 353
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'or'"          shift, and go to state 364
+    "'xor'"         shift, and go to state 365
+    "'and'"         shift, and go to state 366
+    "'instanceof'"  shift, and go to state 367
+    "'||'"          shift, and go to state 368
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'??'"          shift, and go to state 379
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
 
     $default  reduce using rule 563 (array_pair)
 
 
 State 694
 
-  379 expr: '' array_pair_list '' '=' . expr
+  379 expr: '' array_pair_list '' '=' • expr
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -23732,21 +23867,21 @@
 
 State 695
 
-  561 non_empty_array_pair_list: non_empty_array_pair_list ',' possible_array_pair .
+  561 non_empty_array_pair_list: non_empty_array_pair_list ',' possible_array_pair •
 
     $default  reduce using rule 561 (non_empty_array_pair_list)
 
 
 State 696
 
-  541 simple_variable: '$' '{' expr '}' .
+  541 simple_variable: '$' '{' expr '}' •
 
     $default  reduce using rule 541 (simple_variable)
 
 
 State 697
 
-  191 class_declaration_statement: class_modifiers "'class'" @4 "identifier" . extends_from implements_list backup_doc_comment '{' class_statement_list '}'
+  191 class_declaration_statement: class_modifiers "'class'" @4 "identifier" • extends_from implements_list backup_doc_comment '{' class_statement_list '}'
 
     "'extends'"  shift, and go to state 662
 
@@ -23757,221 +23892,221 @@
 
 State 698
 
-  251 if_stmt_without_else: if_stmt_without_else "'elseif'" '(' expr . ')' statement
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-
-    "'or'"          shift, and go to state 353
-    "'xor'"         shift, and go to state 354
-    "'and'"         shift, and go to state 355
-    '?'             shift, and go to state 356
-    "'??'"          shift, and go to state 357
-    "'||'"          shift, and go to state 358
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  251 if_stmt_without_else: if_stmt_without_else "'elseif'" '(' expr • ')' statement
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+
+    '?'             shift, and go to state 353
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'or'"          shift, and go to state 364
+    "'xor'"         shift, and go to state 365
+    "'and'"         shift, and go to state 366
+    "'instanceof'"  shift, and go to state 367
+    "'||'"          shift, and go to state 368
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'??'"          shift, and go to state 379
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
     ')'             shift, and go to state 785
 
 
 State 699
 
-  255 alt_if_stmt_without_else: alt_if_stmt_without_else "'elseif'" '(' expr . ')' ':' inner_statement_list
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-
-    "'or'"          shift, and go to state 353
-    "'xor'"         shift, and go to state 354
-    "'and'"         shift, and go to state 355
-    '?'             shift, and go to state 356
-    "'??'"          shift, and go to state 357
-    "'||'"          shift, and go to state 358
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  255 alt_if_stmt_without_else: alt_if_stmt_without_else "'elseif'" '(' expr • ')' ':' inner_statement_list
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+
+    '?'             shift, and go to state 353
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'or'"          shift, and go to state 364
+    "'xor'"         shift, and go to state 365
+    "'and'"         shift, and go to state 366
+    "'instanceof'"  shift, and go to state 367
+    "'||'"          shift, and go to state 368
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'??'"          shift, and go to state 379
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
     ')'             shift, and go to state 786
 
 
 State 700
 
-  142 inner_statement_list: inner_statement_list . inner_statement
-  257 alt_if_stmt: alt_if_stmt_without_else "'else'" ':' inner_statement_list . "'endif'" ';'
+  142 inner_statement_list: inner_statement_list • inner_statement
+  257 alt_if_stmt: alt_if_stmt_without_else "'else'" ':' inner_statement_list • "'endif'" ';'
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 27
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    T_INLINE_HTML              shift, and go to state 32
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'if'"                     shift, and go to state 37
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 11
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    T_INLINE_HTML              shift, and go to state 16
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'if'"                     shift, and go to state 29
     "'endif'"                  shift, and go to state 787
-    "'echo'"                   shift, and go to state 38
-    "'do'"                     shift, and go to state 39
-    "'while'"                  shift, and go to state 40
-    "'for'"                    shift, and go to state 41
-    "'foreach'"                shift, and go to state 42
-    "'declare'"                shift, and go to state 43
-    "'switch'"                 shift, and go to state 44
-    "'match'"                  shift, and go to state 45
-    "'break'"                  shift, and go to state 46
-    "'continue'"               shift, and go to state 47
-    "'goto'"                   shift, and go to state 48
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'return'"                 shift, and go to state 52
-    "'try'"                    shift, and go to state 53
-    "'global'"                 shift, and go to state 55
-    "'static'"                 shift, and go to state 56
-    "'abstract'"               shift, and go to state 57
-    "'final'"                  shift, and go to state 58
-    "'readonly'"               shift, and go to state 59
-    "'unset'"                  shift, and go to state 60
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
+    "'echo'"                   shift, and go to state 30
+    "'do'"                     shift, and go to state 31
+    "'while'"                  shift, and go to state 32
+    "'for'"                    shift, and go to state 33
+    "'foreach'"                shift, and go to state 34
+    "'declare'"                shift, and go to state 35
+    "'switch'"                 shift, and go to state 36
+    "'match'"                  shift, and go to state 37
+    "'break'"                  shift, and go to state 38
+    "'continue'"               shift, and go to state 39
+    "'goto'"                   shift, and go to state 40
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'return'"                 shift, and go to state 44
+    "'try'"                    shift, and go to state 45
+    "'throw'"                  shift, and go to state 46
+    "'global'"                 shift, and go to state 48
+    "'static'"                 shift, and go to state 49
+    "'abstract'"               shift, and go to state 50
+    "'final'"                  shift, and go to state 51
+    "'readonly'"               shift, and go to state 52
+    "'unset'"                  shift, and go to state 53
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
     "'__halt_compiler'"        shift, and go to state 528
-    "'class'"                  shift, and go to state 64
-    "'trait'"                  shift, and go to state 65
-    "'interface'"              shift, and go to state 66
-    "'enum'"                   shift, and go to state 67
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    "'class'"                  shift, and go to state 57
+    "'trait'"                  shift, and go to state 58
+    "'interface'"              shift, and go to state 59
+    "'enum'"                   shift, and go to state 60
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ';'                        shift, and go to state 84
@@ -24023,125 +24158,125 @@
 
 State 701
 
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  435     | expr '?' ':' expr .
-  436     | expr . "'??'" expr
-
-    "'??'"          shift, and go to state 357
-    "'||'"          shift, and go to state 358
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  435     | expr '?' ':' expr •
+  436     | expr • "'??'" expr
+
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'instanceof'"  shift, and go to state 367
+    "'||'"          shift, and go to state 368
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'??'"          shift, and go to state 379
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
 
     $default  reduce using rule 435 (expr)
 
 
 State 702
 
-  434 expr: expr '?' expr ':' . expr
+  434 expr: expr '?' expr ':' • expr
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -24177,7 +24312,7 @@
 
 State 703
 
-  461 inline_function: fn returns_ref backup_doc_comment '(' . parameter_list ')' return_type "'=>'" backup_fn_flags backup_lex_pos expr backup_fn_flags
+  461 inline_function: fn returns_ref backup_doc_comment '(' • parameter_list ')' return_type "'=>'" backup_fn_flags backup_lex_pos expr backup_fn_flags
 
     "'static'"     shift, and go to state 789
     "'abstract'"   shift, and go to state 790
@@ -24186,7 +24321,7 @@
     "'protected'"  shift, and go to state 793
     "'public'"     shift, and go to state 794
     "'readonly'"   shift, and go to state 795
-    "'#'"         shift, and go to state 79
+    "'#'"         shift, and go to state 72
 
     ')'       reduce using rule 259 (parameter_list)
     $default  reduce using rule 264 (optional_cpp_modifiers)
@@ -24204,14 +24339,14 @@
 
 State 704
 
-  185 function_declaration_statement: function returns_ref function_name backup_doc_comment . '(' parameter_list ')' return_type backup_fn_flags '{' inner_statement_list '}' backup_fn_flags
+  185 function_declaration_statement: function returns_ref function_name backup_doc_comment • '(' parameter_list ')' return_type backup_fn_flags '{' inner_statement_list '}' backup_fn_flags
 
     '('  shift, and go to state 804
 
 
 State 705
 
-  460 inline_function: function returns_ref backup_doc_comment '(' . parameter_list ')' lexical_vars return_type backup_fn_flags '{' inner_statement_list '}' backup_fn_flags
+  460 inline_function: function returns_ref backup_doc_comment '(' • parameter_list ')' lexical_vars return_type backup_fn_flags '{' inner_statement_list '}' backup_fn_flags
 
     "'static'"     shift, and go to state 789
     "'abstract'"   shift, and go to state 790
@@ -24220,7 +24355,7 @@
     "'protected'"  shift, and go to state 793
     "'public'"     shift, and go to state 794
     "'readonly'"   shift, and go to state 795
-    "'#'"         shift, and go to state 79
+    "'#'"         shift, and go to state 72
 
     ')'       reduce using rule 259 (parameter_list)
     $default  reduce using rule 264 (optional_cpp_modifiers)
@@ -24238,256 +24373,256 @@
 
 State 706
 
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-  516 class_constant: class_name "'::'" '{' expr . '}'
-  553 member_name: '{' expr . '}'
-
-    "'or'"          shift, and go to state 353
-    "'xor'"         shift, and go to state 354
-    "'and'"         shift, and go to state 355
-    '?'             shift, and go to state 356
-    "'??'"          shift, and go to state 357
-    "'||'"          shift, and go to state 358
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+  516 class_constant: class_name "'::'" '{' expr • '}'
+  553 member_name: '{' expr • '}'
+
+    '?'             shift, and go to state 353
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'or'"          shift, and go to state 364
+    "'xor'"         shift, and go to state 365
+    "'and'"         shift, and go to state 366
+    "'instanceof'"  shift, and go to state 367
+    "'||'"          shift, and go to state 368
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'??'"          shift, and go to state 379
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
     '}'             shift, and go to state 806
 
 
 State 707
 
-  477 function_call: class_name "'::'" member_name argument_list .
+  477 function_call: class_name "'::'" member_name argument_list •
 
     $default  reduce using rule 477 (function_call)
 
 
 State 708
 
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-  517 class_constant: variable_class_name "'::'" '{' expr . '}'
-  553 member_name: '{' expr . '}'
-
-    "'or'"          shift, and go to state 353
-    "'xor'"         shift, and go to state 354
-    "'and'"         shift, and go to state 355
-    '?'             shift, and go to state 356
-    "'??'"          shift, and go to state 357
-    "'||'"          shift, and go to state 358
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+  517 class_constant: variable_class_name "'::'" '{' expr • '}'
+  553 member_name: '{' expr • '}'
+
+    '?'             shift, and go to state 353
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'or'"          shift, and go to state 364
+    "'xor'"         shift, and go to state 365
+    "'and'"         shift, and go to state 366
+    "'instanceof'"  shift, and go to state 367
+    "'||'"          shift, and go to state 368
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'??'"          shift, and go to state 379
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
     '}'             shift, and go to state 807
 
 
 State 709
 
-  478 function_call: variable_class_name "'::'" member_name argument_list .
+  478 function_call: variable_class_name "'::'" member_name argument_list •
 
     $default  reduce using rule 478 (function_call)
 
 
 State 710
 
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-  556 property_name: '{' expr . '}'
-
-    "'or'"          shift, and go to state 353
-    "'xor'"         shift, and go to state 354
-    "'and'"         shift, and go to state 355
-    '?'             shift, and go to state 356
-    "'??'"          shift, and go to state 357
-    "'||'"          shift, and go to state 358
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+  556 property_name: '{' expr • '}'
+
+    '?'             shift, and go to state 353
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'or'"          shift, and go to state 364
+    "'xor'"         shift, and go to state 365
+    "'and'"         shift, and go to state 366
+    "'instanceof'"  shift, and go to state 367
+    "'||'"          shift, and go to state 368
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'??'"          shift, and go to state 379
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
     '}'             shift, and go to state 808
 
 
 State 711
 
-  533 callable_variable: array_object_dereferenceable "'->'" property_name argument_list .
+  533 callable_variable: array_object_dereferenceable "'->'" property_name argument_list •
 
     $default  reduce using rule 533 (callable_variable)
 
 
 State 712
 
-  534 callable_variable: array_object_dereferenceable "'?->'" property_name argument_list .
+  534 callable_variable: array_object_dereferenceable "'?->'" property_name argument_list •
 
     $default  reduce using rule 534 (callable_variable)
 
 
 State 713
 
-  532 callable_variable: array_object_dereferenceable '{' expr '}' .
+  532 callable_variable: array_object_dereferenceable '{' expr '}' •
 
     $default  reduce using rule 532 (callable_variable)
 
 
 State 714
 
-  531 callable_variable: array_object_dereferenceable '' optional_expr '' .
+  531 callable_variable: array_object_dereferenceable '' optional_expr '' •
 
     $default  reduce using rule 531 (callable_variable)
 
 
 State 715
 
-  381 expr: variable '=' ampersand variable .
-  521 fully_dereferenceable: variable .
+  381 expr: variable '=' ampersand variable •
+  521 fully_dereferenceable: variable •
 
     "'->'"    reduce using rule 521 (fully_dereferenceable)
     "'?->'"   reduce using rule 521 (fully_dereferenceable)
@@ -24499,7 +24634,7 @@
 
 State 716
 
-  373 anonymous_class: anonymous_class_modifiers_optional "'class'" @9 ctor_arguments . extends_from implements_list backup_doc_comment '{' class_statement_list '}'
+  373 anonymous_class: anonymous_class_modifiers_optional "'class'" @9 ctor_arguments • extends_from implements_list backup_doc_comment '{' class_statement_list '}'
 
     "'extends'"  shift, and go to state 662
 
@@ -24510,21 +24645,21 @@
 
 State 717
 
-  547 new_variable: new_variable '{' expr '}' .
+  547 new_variable: new_variable '{' expr '}' •
 
     $default  reduce using rule 547 (new_variable)
 
 
 State 718
 
-  546 new_variable: new_variable '' optional_expr '' .
+  546 new_variable: new_variable '' optional_expr '' •
 
     $default  reduce using rule 546 (new_variable)
 
 
 State 719
 
-  254 alt_if_stmt_without_else: "'if'" '(' expr ')' ':' . inner_statement_list
+  254 alt_if_stmt_without_else: "'if'" '(' expr ')' ':' • inner_statement_list
 
     $default  reduce using rule 143 (inner_statement_list)
 
@@ -24533,82 +24668,82 @@
 
 State 720
 
-  250 if_stmt_without_else: "'if'" '(' expr ')' statement .
+  250 if_stmt_without_else: "'if'" '(' expr ')' statement •
 
     $default  reduce using rule 250 (if_stmt_without_else)
 
 
 State 721
 
-  152 statement: "'do'" statement "'while'" '(' expr . ')' ';'
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-
-    "'or'"          shift, and go to state 353
-    "'xor'"         shift, and go to state 354
-    "'and'"         shift, and go to state 355
-    '?'             shift, and go to state 356
-    "'??'"          shift, and go to state 357
-    "'||'"          shift, and go to state 358
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  152 statement: "'do'" statement "'while'" '(' expr • ')' ';'
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+
+    '?'             shift, and go to state 353
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'or'"          shift, and go to state 364
+    "'xor'"         shift, and go to state 365
+    "'and'"         shift, and go to state 366
+    "'instanceof'"  shift, and go to state 367
+    "'||'"          shift, and go to state 368
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'??'"          shift, and go to state 379
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
     ')'             shift, and go to state 811
 
 
 State 722
 
-  249 while_statement: ':' . inner_statement_list "'endwhile'" ';'
+  249 while_statement: ':' • inner_statement_list "'endwhile'" ';'
 
     $default  reduce using rule 143 (inner_statement_list)
 
@@ -24617,162 +24752,162 @@
 
 State 723
 
-  248 while_statement: statement .
+  248 while_statement: statement •
 
     $default  reduce using rule 248 (while_statement)
 
 
 State 724
 
-  151 statement: "'while'" '(' expr ')' while_statement .
+  151 statement: "'while'" '(' expr ')' while_statement •
 
     $default  reduce using rule 151 (statement)
 
 
 State 725
 
-  153 statement: "'for'" '(' for_exprs ';' for_exprs . ';' for_exprs ')' for_statement
+  153 statement: "'for'" '(' for_exprs ';' for_exprs • ';' for_exprs ')' for_statement
 
     ';'  shift, and go to state 813
 
 
 State 726
 
-  370 non_empty_for_exprs: non_empty_for_exprs ',' expr .
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-
-    "'or'"          shift, and go to state 353
-    "'xor'"         shift, and go to state 354
-    "'and'"         shift, and go to state 355
-    '?'             shift, and go to state 356
-    "'??'"          shift, and go to state 357
-    "'||'"          shift, and go to state 358
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  370 non_empty_for_exprs: non_empty_for_exprs ',' expr •
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+
+    '?'             shift, and go to state 353
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'or'"          shift, and go to state 364
+    "'xor'"         shift, and go to state 365
+    "'and'"         shift, and go to state 366
+    "'instanceof'"  shift, and go to state 367
+    "'||'"          shift, and go to state 368
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'??'"          shift, and go to state 379
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
 
     $default  reduce using rule 370 (non_empty_for_exprs)
 
 
 State 727
 
-  222 foreach_variable: "'list'" . '(' array_pair_list ')'
+  222 foreach_variable: "'list'" • '(' array_pair_list ')'
 
     '('  shift, and go to state 814
 
 
 State 728
 
-  223 foreach_variable: '' . array_pair_list ''
-  494 dereferenceable_scalar: '' . array_pair_list ''
+  223 foreach_variable: '' • array_pair_list ''
+  494 dereferenceable_scalar: '' • array_pair_list ''
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    "amp"                      shift, and go to state 324
-    "'&'"                      shift, and go to state 325
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 326
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
-    "heredoc start"            shift, and go to state 82
-    "'...'"                    shift, and go to state 327
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 324
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
+    "heredoc start"            shift, and go to state 82
+    "'...'"                    shift, and go to state 325
+    "'&'"                      shift, and go to state 326
+    "amp"                      shift, and go to state 327
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
     '`'                        shift, and go to state 87
@@ -24814,36 +24949,36 @@
 
 State 729
 
-  221 foreach_variable: ampersand . variable
+  221 foreach_variable: ampersand • variable
 
     "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'static'"                 shift, and go to state 156
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'static'"                 shift, and go to state 147
     "'readonly'"               shift, and go to state 130
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    '('                        shift, and go to state 308
-    ''                        shift, and go to state 309
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    '('                        shift, and go to state 301
+    ''                        shift, and go to state 302
     '"'                        shift, and go to state 88
     '$'                        shift, and go to state 89
 
     name                          go to state 90
     function_call                 go to state 113
     class_name                    go to state 114
-    dereferenceable_scalar        go to state 310
-    constant                      go to state 311
-    class_constant                go to state 312
+    dereferenceable_scalar        go to state 303
+    constant                      go to state 304
+    class_constant                go to state 305
     variable_class_name           go to state 119
     fully_dereferenceable         go to state 120
     array_object_dereferenceable  go to state 121
@@ -24856,8 +24991,8 @@
 
 State 730
 
-  164 statement: "'foreach'" '(' expr "'as'" foreach_variable . ')' foreach_statement
-  165          | "'foreach'" '(' expr "'as'" foreach_variable . "'=>'" foreach_variable ')' foreach_statement
+  164 statement: "'foreach'" '(' expr "'as'" foreach_variable • ')' foreach_statement
+  165          | "'foreach'" '(' expr "'as'" foreach_variable • "'=>'" foreach_variable ')' foreach_statement
 
     "'=>'"  shift, and go to state 817
     ')'     shift, and go to state 818
@@ -24865,8 +25000,8 @@
 
 State 731
 
-  220 foreach_variable: variable .
-  521 fully_dereferenceable: variable .
+  220 foreach_variable: variable •
+  521 fully_dereferenceable: variable •
 
     "'=>'"    reduce using rule 220 (foreach_variable)
     ')'       reduce using rule 220 (foreach_variable)
@@ -24875,77 +25010,77 @@
 
 State 732
 
-  167 statement: "'declare'" '(' const_list ')' $@3 . declare_statement
+  167 statement: "'declare'" '(' const_list ')' $@3 • declare_statement
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
     ':'                        shift, and go to state 819
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 27
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    T_INLINE_HTML              shift, and go to state 32
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'if'"                     shift, and go to state 37
-    "'echo'"                   shift, and go to state 38
-    "'do'"                     shift, and go to state 39
-    "'while'"                  shift, and go to state 40
-    "'for'"                    shift, and go to state 41
-    "'foreach'"                shift, and go to state 42
-    "'declare'"                shift, and go to state 43
-    "'switch'"                 shift, and go to state 44
-    "'match'"                  shift, and go to state 45
-    "'break'"                  shift, and go to state 46
-    "'continue'"               shift, and go to state 47
-    "'goto'"                   shift, and go to state 48
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'return'"                 shift, and go to state 52
-    "'try'"                    shift, and go to state 53
-    "'global'"                 shift, and go to state 55
-    "'static'"                 shift, and go to state 56
-    "'readonly'"               shift, and go to state 130
-    "'unset'"                  shift, and go to state 60
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 11
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    T_INLINE_HTML              shift, and go to state 16
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'if'"                     shift, and go to state 29
+    "'echo'"                   shift, and go to state 30
+    "'do'"                     shift, and go to state 31
+    "'while'"                  shift, and go to state 32
+    "'for'"                    shift, and go to state 33
+    "'foreach'"                shift, and go to state 34
+    "'declare'"                shift, and go to state 35
+    "'switch'"                 shift, and go to state 36
+    "'match'"                  shift, and go to state 37
+    "'break'"                  shift, and go to state 38
+    "'continue'"               shift, and go to state 39
+    "'goto'"                   shift, and go to state 40
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'return'"                 shift, and go to state 44
+    "'try'"                    shift, and go to state 45
+    "'throw'"                  shift, and go to state 46
+    "'global'"                 shift, and go to state 48
+    "'static'"                 shift, and go to state 49
+    "'readonly'"               shift, and go to state 130
+    "'unset'"                  shift, and go to state 53
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ';'                        shift, and go to state 84
@@ -24989,8 +25124,8 @@
 
 State 733
 
-  232 switch_case_list: ':' . case_list "'endswitch'" ';'
-  233                 | ':' . ';' case_list "'endswitch'" ';'
+  232 switch_case_list: ':' • case_list "'endswitch'" ';'
+  233                 | ':' • ';' case_list "'endswitch'" ';'
 
     ';'  shift, and go to state 822
 
@@ -25001,8 +25136,8 @@
 
 State 734
 
-  230 switch_case_list: '{' . case_list '}'
-  231                 | '{' . ';' case_list '}'
+  230 switch_case_list: '{' • case_list '}'
+  231                 | '{' • ';' case_list '}'
 
     ';'  shift, and go to state 824
 
@@ -25013,68 +25148,68 @@
 
 State 735
 
-  154 statement: "'switch'" '(' expr ')' switch_case_list .
+  154 statement: "'switch'" '(' expr ')' switch_case_list •
 
     $default  reduce using rule 154 (statement)
 
 
 State 736
 
-  239 match: "'match'" '(' expr ')' '{' . match_arm_list '}'
+  239 match: "'match'" '(' expr ')' '{' • match_arm_list '}'
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
     "'default'"                shift, and go to state 826
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -25116,15 +25251,15 @@
 
 State 737
 
-  364 const_decl: "identifier" '=' expr backup_doc_comment .
+  364 const_decl: "identifier" '=' expr backup_doc_comment •
 
     $default  reduce using rule 364 (const_decl)
 
 
 State 738
 
-  169 statement: "'try'" '{' inner_statement_list '}' catch_list . finally_statement
-  173 catch_list: catch_list . "'catch'" '(' catch_name_list optional_variable ')' '{' inner_statement_list '}'
+  169 statement: "'try'" '{' inner_statement_list '}' catch_list • finally_statement
+  173 catch_list: catch_list • "'catch'" '(' catch_name_list optional_variable ')' '{' inner_statement_list '}'
 
     "'catch'"    shift, and go to state 832
     "'finally'"  shift, and go to state 833
@@ -25136,8 +25271,8 @@
 
 State 739
 
-  136 unprefixed_use_declaration: namespace_name .
-  137                           | namespace_name . "'as'" "identifier"
+  136 unprefixed_use_declaration: namespace_name •
+  137                           | namespace_name • "'as'" "identifier"
 
     "'as'"  shift, and go to state 835
 
@@ -25146,10 +25281,10 @@
 
 State 740
 
-  135 inline_use_declaration: use_type . unprefixed_use_declaration
+  135 inline_use_declaration: use_type • unprefixed_use_declaration
 
-    "identifier"       shift, and go to state 191
-    "namespaced name"  shift, and go to state 193
+    "identifier"       shift, and go to state 184
+    "namespaced name"  shift, and go to state 186
 
     namespace_name              go to state 739
     unprefixed_use_declaration  go to state 836
@@ -25157,8 +25292,8 @@
 
 State 741
 
-  125 mixed_group_use_declaration: legacy_namespace_name "'\\'" '{' inline_use_declarations . possible_comma '}'
-  128 inline_use_declarations: inline_use_declarations . ',' inline_use_declaration
+  125 mixed_group_use_declaration: legacy_namespace_name "'\\'" '{' inline_use_declarations • possible_comma '}'
+  128 inline_use_declarations: inline_use_declarations • ',' inline_use_declaration
 
     ','  shift, and go to state 837
 
@@ -25169,24 +25304,24 @@
 
 State 742
 
-  129 inline_use_declarations: inline_use_declaration .
+  129 inline_use_declarations: inline_use_declaration •
 
     $default  reduce using rule 129 (inline_use_declarations)
 
 
 State 743
 
-  134 inline_use_declaration: unprefixed_use_declaration .
+  134 inline_use_declaration: unprefixed_use_declaration •
 
     $default  reduce using rule 134 (inline_use_declaration)
 
 
 State 744
 
-  124 group_use_declaration: legacy_namespace_name "'\\'" '{' . unprefixed_use_declarations possible_comma '}'
+  124 group_use_declaration: legacy_namespace_name "'\\'" '{' • unprefixed_use_declarations possible_comma '}'
 
-    "identifier"       shift, and go to state 191
-    "namespaced name"  shift, and go to state 193
+    "identifier"       shift, and go to state 184
+    "namespaced name"  shift, and go to state 186
 
     namespace_name               go to state 739
     unprefixed_use_declarations  go to state 839
@@ -25195,129 +25330,129 @@
 
 State 745
 
-  303 argument: identifier ':' expr .
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-
-    "'or'"          shift, and go to state 353
-    "'xor'"         shift, and go to state 354
-    "'and'"         shift, and go to state 355
-    '?'             shift, and go to state 356
-    "'??'"          shift, and go to state 357
-    "'||'"          shift, and go to state 358
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  303 argument: identifier ':' expr •
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+
+    '?'             shift, and go to state 353
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'or'"          shift, and go to state 364
+    "'xor'"         shift, and go to state 365
+    "'and'"         shift, and go to state 366
+    "'instanceof'"  shift, and go to state 367
+    "'||'"          shift, and go to state 368
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'??'"          shift, and go to state 379
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
 
     $default  reduce using rule 303 (argument)
 
 
 State 746
 
-  304 argument: "'...'" . expr
+  304 argument: "'...'" • expr
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -25353,71 +25488,71 @@
 
 State 747
 
-  301 non_empty_argument_list: non_empty_argument_list ',' argument .
+  301 non_empty_argument_list: non_empty_argument_list ',' argument •
 
     $default  reduce using rule 301 (non_empty_argument_list)
 
 
 State 748
 
-  298 argument_list: '(' non_empty_argument_list possible_comma ')' .
+  298 argument_list: '(' non_empty_argument_list possible_comma ')' •
 
     $default  reduce using rule 298 (argument_list)
 
 
 State 749
 
-  181 unset_variables: unset_variables ',' unset_variable .
+  181 unset_variables: unset_variables ',' unset_variable •
 
     $default  reduce using rule 181 (unset_variables)
 
 
 State 750
 
-  163 statement: "'unset'" '(' unset_variables possible_comma ')' . ';'
+  163 statement: "'unset'" '(' unset_variables possible_comma ')' • ';'
 
     ';'  shift, and go to state 841
 
 
 State 751
 
-  594 isset_variables: isset_variables ',' isset_variable .
+  594 isset_variables: isset_variables ',' isset_variable •
 
     $default  reduce using rule 594 (isset_variables)
 
 
 State 752
 
-  586 internal_functions_in_yacc: "'isset'" '(' isset_variables possible_comma ')' .
+  586 internal_functions_in_yacc: "'isset'" '(' isset_variables possible_comma ')' •
 
     $default  reduce using rule 586 (internal_functions_in_yacc)
 
 
 State 753
 
-  215 extends_from: "'extends'" class_name .
+  215 extends_from: "'extends'" class_name •
 
     $default  reduce using rule 215 (extends_from)
 
 
 State 754
 
-  219 implements_list: "'implements'" . class_name_list
+  219 implements_list: "'implements'" • class_name_list
 
     "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "'static'"                 shift, and go to state 156
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "'static'"                 shift, and go to state 147
 
-    name             go to state 159
+    name             go to state 150
     class_name_list  go to state 842
     class_name       go to state 758
 
 
 State 755
 
-  193 class_declaration_statement: "'class'" @5 "identifier" extends_from implements_list . backup_doc_comment '{' class_statement_list '}'
+  193 class_declaration_statement: "'class'" @5 "identifier" extends_from implements_list • backup_doc_comment '{' class_statement_list '}'
 
     $default  reduce using rule 464 (backup_doc_comment)
 
@@ -25426,7 +25561,7 @@
 
 State 756
 
-  204 trait_declaration_statement: "'trait'" @6 "identifier" backup_doc_comment '{' . class_statement_list '}'
+  204 trait_declaration_statement: "'trait'" @6 "identifier" backup_doc_comment '{' • class_statement_list '}'
 
     $default  reduce using rule 313 (class_statement_list)
 
@@ -25435,8 +25570,8 @@
 
 State 757
 
-  217 interface_extends_list: "'extends'" class_name_list .
-  323 class_name_list: class_name_list . ',' class_name
+  217 interface_extends_list: "'extends'" class_name_list •
+  323 class_name_list: class_name_list • ',' class_name
 
     ','  shift, and go to state 845
 
@@ -25445,26 +25580,26 @@
 
 State 758
 
-  322 class_name_list: class_name .
+  322 class_name_list: class_name •
 
     $default  reduce using rule 322 (class_name_list)
 
 
 State 759
 
-  206 interface_declaration_statement: "'interface'" @7 "identifier" interface_extends_list backup_doc_comment . '{' class_statement_list '}'
+  206 interface_declaration_statement: "'interface'" @7 "identifier" interface_extends_list backup_doc_comment • '{' class_statement_list '}'
 
     '{'  shift, and go to state 846
 
 
 State 760
 
-  271 type_expr: '?' . type
+  271 type_expr: '?' • type
 
     "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
     "'static'"                 shift, and go to state 761
     "'array'"                  shift, and go to state 762
     "'callable'"               shift, and go to state 763
@@ -25476,33 +25611,33 @@
 
 State 761
 
-  275 type: "'static'" .
+  275 type: "'static'" •
 
     $default  reduce using rule 275 (type)
 
 
 State 762
 
-  286 type_without_static: "'array'" .
+  286 type_without_static: "'array'" •
 
     $default  reduce using rule 286 (type_without_static)
 
 
 State 763
 
-  287 type_without_static: "'callable'" .
+  287 type_without_static: "'callable'" •
 
     $default  reduce using rule 287 (type_without_static)
 
 
 State 764
 
-  277 union_type_element: '(' . intersection_type ')'
+  277 union_type_element: '(' • intersection_type ')'
 
     "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
     "'static'"                 shift, and go to state 761
     "'array'"                  shift, and go to state 762
     "'callable'"               shift, and go to state 763
@@ -25515,23 +25650,23 @@
 
 State 765
 
-  288 type_without_static: name .
+  288 type_without_static: name •
 
     $default  reduce using rule 288 (type_without_static)
 
 
 State 766
 
-  210 enum_backing_type: ':' type_expr .
+  210 enum_backing_type: ':' type_expr •
 
     $default  reduce using rule 210 (enum_backing_type)
 
 
 State 767
 
-  270 type_expr: type .
-  276 union_type_element: type .
-  280 intersection_type: type . "amp" type
+  270 type_expr: type •
+  276 union_type_element: type •
+  280 intersection_type: type • "amp" type
 
     "amp"  shift, and go to state 850
 
@@ -25541,15 +25676,15 @@
 
 State 768
 
-  278 union_type: union_type_element . '|' union_type_element
+  278 union_type: union_type_element • '|' union_type_element
 
     '|'  shift, and go to state 851
 
 
 State 769
 
-  272 type_expr: union_type .
-  279 union_type: union_type . '|' union_type_element
+  272 type_expr: union_type •
+  279 union_type: union_type • '|' union_type_element
 
     '|'  shift, and go to state 852
 
@@ -25558,8 +25693,8 @@
 
 State 770
 
-  273 type_expr: intersection_type .
-  281 intersection_type: intersection_type . "amp" type
+  273 type_expr: intersection_type •
+  281 intersection_type: intersection_type • "amp" type
 
     "amp"  shift, and go to state 853
 
@@ -25568,14 +25703,14 @@
 
 State 771
 
-  274 type: type_without_static .
+  274 type: type_without_static •
 
     $default  reduce using rule 274 (type)
 
 
 State 772
 
-  208 enum_declaration_statement: "'enum'" @8 "identifier" enum_backing_type implements_list . backup_doc_comment '{' class_statement_list '}'
+  208 enum_declaration_statement: "'enum'" @8 "identifier" enum_backing_type implements_list • backup_doc_comment '{' class_statement_list '}'
 
     $default  reduce using rule 464 (backup_doc_comment)
 
@@ -25584,87 +25719,87 @@
 
 State 773
 
-   84 top_statement_list: top_statement_list . top_statement
-  114 top_statement: "'namespace'" namespace_declaration_name $@1 '{' top_statement_list . '}'
+   84 top_statement_list: top_statement_list • top_statement
+  114 top_statement: "'namespace'" namespace_declaration_name $@1 '{' top_statement_list • '}'
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 27
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    T_INLINE_HTML              shift, and go to state 32
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'if'"                     shift, and go to state 37
-    "'echo'"                   shift, and go to state 38
-    "'do'"                     shift, and go to state 39
-    "'while'"                  shift, and go to state 40
-    "'for'"                    shift, and go to state 41
-    "'foreach'"                shift, and go to state 42
-    "'declare'"                shift, and go to state 43
-    "'switch'"                 shift, and go to state 44
-    "'match'"                  shift, and go to state 45
-    "'break'"                  shift, and go to state 46
-    "'continue'"               shift, and go to state 47
-    "'goto'"                   shift, and go to state 48
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'const'"                  shift, and go to state 51
-    "'return'"                 shift, and go to state 52
-    "'try'"                    shift, and go to state 53
-    "'use'"                    shift, and go to state 54
-    "'global'"                 shift, and go to state 55
-    "'static'"                 shift, and go to state 56
-    "'abstract'"               shift, and go to state 57
-    "'final'"                  shift, and go to state 58
-    "'readonly'"               shift, and go to state 59
-    "'unset'"                  shift, and go to state 60
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'__halt_compiler'"        shift, and go to state 63
-    "'class'"                  shift, and go to state 64
-    "'trait'"                  shift, and go to state 65
-    "'interface'"              shift, and go to state 66
-    "'enum'"                   shift, and go to state 67
-    "'namespace'"              shift, and go to state 68
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 11
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    T_INLINE_HTML              shift, and go to state 16
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'if'"                     shift, and go to state 29
+    "'echo'"                   shift, and go to state 30
+    "'do'"                     shift, and go to state 31
+    "'while'"                  shift, and go to state 32
+    "'for'"                    shift, and go to state 33
+    "'foreach'"                shift, and go to state 34
+    "'declare'"                shift, and go to state 35
+    "'switch'"                 shift, and go to state 36
+    "'match'"                  shift, and go to state 37
+    "'break'"                  shift, and go to state 38
+    "'continue'"               shift, and go to state 39
+    "'goto'"                   shift, and go to state 40
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'const'"                  shift, and go to state 43
+    "'return'"                 shift, and go to state 44
+    "'try'"                    shift, and go to state 45
+    "'throw'"                  shift, and go to state 46
+    "'use'"                    shift, and go to state 47
+    "'global'"                 shift, and go to state 48
+    "'static'"                 shift, and go to state 49
+    "'abstract'"               shift, and go to state 50
+    "'final'"                  shift, and go to state 51
+    "'readonly'"               shift, and go to state 52
+    "'unset'"                  shift, and go to state 53
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'__halt_compiler'"        shift, and go to state 56
+    "'class'"                  shift, and go to state 57
+    "'trait'"                  shift, and go to state 58
+    "'interface'"              shift, and go to state 59
+    "'enum'"                   shift, and go to state 60
+    "'namespace'"              shift, and go to state 61
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ';'                        shift, and go to state 84
@@ -25717,67 +25852,67 @@
 
 State 774
 
-  116 top_statement: "'namespace'" $@2 '{' top_statement_list '}' .
+  116 top_statement: "'namespace'" $@2 '{' top_statement_list '}' •
 
     $default  reduce using rule 116 (top_statement)
 
 
 State 775
 
-  378 expr: "'list'" '(' array_pair_list ')' '=' . expr
+  378 expr: "'list'" '(' array_pair_list ')' '=' • expr
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -25813,97 +25948,97 @@
 
 State 776
 
-  584 encaps_var_offset: '-' "number" .
+  584 encaps_var_offset: '-' "number" •
 
     $default  reduce using rule 584 (encaps_var_offset)
 
 
 State 777
 
-  575 encaps_var: "variable" '' encaps_var_offset '' .
+  575 encaps_var: "variable" '' encaps_var_offset '' •
 
     $default  reduce using rule 575 (encaps_var)
 
 
 State 778
 
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-  580 encaps_var: "'${'" "variable name" '' expr . '' '}'
-
-    "'or'"          shift, and go to state 353
-    "'xor'"         shift, and go to state 354
-    "'and'"         shift, and go to state 355
-    '?'             shift, and go to state 356
-    "'??'"          shift, and go to state 357
-    "'||'"          shift, and go to state 358
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+  580 encaps_var: "'${'" "variable name" '' expr • '' '}'
+
+    '?'             shift, and go to state 353
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'or'"          shift, and go to state 364
+    "'xor'"         shift, and go to state 365
+    "'and'"         shift, and go to state 366
+    "'instanceof'"  shift, and go to state 367
+    "'||'"          shift, and go to state 368
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'??'"          shift, and go to state 379
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
     ''             shift, and go to state 857
 
 
 State 779
 
-  147 inner_statement: "'__halt_compiler'" '(' ')' . ';'
+  147 inner_statement: "'__halt_compiler'" '(' ')' • ';'
 
     ';'  shift, and go to state 858
 
 
 State 780
 
-  378 expr: "'list'" '(' array_pair_list ')' . '=' expr
-  569 array_pair: "'list'" '(' array_pair_list ')' .
+  378 expr: "'list'" '(' array_pair_list ')' • '=' expr
+  569 array_pair: "'list'" '(' array_pair_list ')' •
 
     '='  shift, and go to state 775
 
@@ -25912,65 +26047,65 @@
 
 State 781
 
-  378 expr: "'list'" '(' . array_pair_list ')' '=' expr
-  568 array_pair: expr "'=>'" "'list'" '(' . array_pair_list ')'
+  378 expr: "'list'" '(' • array_pair_list ')' '=' expr
+  568 array_pair: expr "'=>'" "'list'" '(' • array_pair_list ')'
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    "amp"                      shift, and go to state 324
-    "'&'"                      shift, and go to state 325
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 326
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
-    "heredoc start"            shift, and go to state 82
-    "'...'"                    shift, and go to state 327
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 324
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
+    "heredoc start"            shift, and go to state 82
+    "'...'"                    shift, and go to state 325
+    "'&'"                      shift, and go to state 326
+    "amp"                      shift, and go to state 327
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
     '`'                        shift, and go to state 87
@@ -26012,8 +26147,8 @@
 
 State 782
 
-  521 fully_dereferenceable: variable .
-  565 array_pair: expr "'=>'" ampersand variable .
+  521 fully_dereferenceable: variable •
+  565 array_pair: expr "'=>'" ampersand variable •
 
     ','       reduce using rule 565 (array_pair)
     ''       reduce using rule 565 (array_pair)
@@ -26023,73 +26158,73 @@
 
 State 783
 
-  379 expr: '' array_pair_list '' '=' expr .
-  400     | expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-
-    '?'             shift, and go to state 356
-    "'??'"          shift, and go to state 357
-    "'||'"          shift, and go to state 358
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  379 expr: '' array_pair_list '' '=' expr •
+  400     | expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+
+    '?'             shift, and go to state 353
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'instanceof'"  shift, and go to state 367
+    "'||'"          shift, and go to state 368
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'??'"          shift, and go to state 379
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
 
     $default  reduce using rule 379 (expr)
 
 
 State 784
 
-  191 class_declaration_statement: class_modifiers "'class'" @4 "identifier" extends_from . implements_list backup_doc_comment '{' class_statement_list '}'
+  191 class_declaration_statement: class_modifiers "'class'" @4 "identifier" extends_from • implements_list backup_doc_comment '{' class_statement_list '}'
 
     "'implements'"  shift, and go to state 754
 
@@ -26100,76 +26235,76 @@
 
 State 785
 
-  251 if_stmt_without_else: if_stmt_without_else "'elseif'" '(' expr ')' . statement
+  251 if_stmt_without_else: if_stmt_without_else "'elseif'" '(' expr ')' • statement
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 27
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    T_INLINE_HTML              shift, and go to state 32
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'if'"                     shift, and go to state 37
-    "'echo'"                   shift, and go to state 38
-    "'do'"                     shift, and go to state 39
-    "'while'"                  shift, and go to state 40
-    "'for'"                    shift, and go to state 41
-    "'foreach'"                shift, and go to state 42
-    "'declare'"                shift, and go to state 43
-    "'switch'"                 shift, and go to state 44
-    "'match'"                  shift, and go to state 45
-    "'break'"                  shift, and go to state 46
-    "'continue'"               shift, and go to state 47
-    "'goto'"                   shift, and go to state 48
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'return'"                 shift, and go to state 52
-    "'try'"                    shift, and go to state 53
-    "'global'"                 shift, and go to state 55
-    "'static'"                 shift, and go to state 56
-    "'readonly'"               shift, and go to state 130
-    "'unset'"                  shift, and go to state 60
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 11
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    T_INLINE_HTML              shift, and go to state 16
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'if'"                     shift, and go to state 29
+    "'echo'"                   shift, and go to state 30
+    "'do'"                     shift, and go to state 31
+    "'while'"                  shift, and go to state 32
+    "'for'"                    shift, and go to state 33
+    "'foreach'"                shift, and go to state 34
+    "'declare'"                shift, and go to state 35
+    "'switch'"                 shift, and go to state 36
+    "'match'"                  shift, and go to state 37
+    "'break'"                  shift, and go to state 38
+    "'continue'"               shift, and go to state 39
+    "'goto'"                   shift, and go to state 40
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'return'"                 shift, and go to state 44
+    "'try'"                    shift, and go to state 45
+    "'throw'"                  shift, and go to state 46
+    "'global'"                 shift, and go to state 48
+    "'static'"                 shift, and go to state 49
+    "'readonly'"               shift, and go to state 130
+    "'unset'"                  shift, and go to state 53
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ';'                        shift, and go to state 84
@@ -26212,136 +26347,136 @@
 
 State 786
 
-  255 alt_if_stmt_without_else: alt_if_stmt_without_else "'elseif'" '(' expr ')' . ':' inner_statement_list
+  255 alt_if_stmt_without_else: alt_if_stmt_without_else "'elseif'" '(' expr ')' • ':' inner_statement_list
 
     ':'  shift, and go to state 862
 
 
 State 787
 
-  257 alt_if_stmt: alt_if_stmt_without_else "'else'" ':' inner_statement_list "'endif'" . ';'
+  257 alt_if_stmt: alt_if_stmt_without_else "'else'" ':' inner_statement_list "'endif'" • ';'
 
     ';'  shift, and go to state 863
 
 
 State 788
 
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  434     | expr '?' expr ':' expr .
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-
-    "'??'"          shift, and go to state 357
-    "'||'"          shift, and go to state 358
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  434     | expr '?' expr ':' expr •
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'instanceof'"  shift, and go to state 367
+    "'||'"          shift, and go to state 368
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'??'"          shift, and go to state 379
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
 
     $default  reduce using rule 434 (expr)
 
 
 State 789
 
-  352 member_modifier: "'static'" .
+  352 member_modifier: "'static'" •
 
     $default  reduce using rule 352 (member_modifier)
 
 
 State 790
 
-  353 member_modifier: "'abstract'" .
+  353 member_modifier: "'abstract'" •
 
     $default  reduce using rule 353 (member_modifier)
 
 
 State 791
 
-  354 member_modifier: "'final'" .
+  354 member_modifier: "'final'" •
 
     $default  reduce using rule 354 (member_modifier)
 
 
 State 792
 
-  351 member_modifier: "'private'" .
+  351 member_modifier: "'private'" •
 
     $default  reduce using rule 351 (member_modifier)
 
 
 State 793
 
-  350 member_modifier: "'protected'" .
+  350 member_modifier: "'protected'" •
 
     $default  reduce using rule 350 (member_modifier)
 
 
 State 794
 
-  349 member_modifier: "'public'" .
+  349 member_modifier: "'public'" •
 
     $default  reduce using rule 349 (member_modifier)
 
 
 State 795
 
-  355 member_modifier: "'readonly'" .
+  355 member_modifier: "'readonly'" •
 
     $default  reduce using rule 355 (member_modifier)
 
 
 State 796
 
-  102 attributes: attributes . attribute
-  262 attributed_parameter: attributes . parameter
+  102 attributes: attributes • attribute
+  262 attributed_parameter: attributes • parameter
 
     "'static'"     shift, and go to state 789
     "'abstract'"   shift, and go to state 790
@@ -26350,7 +26485,7 @@
     "'protected'"  shift, and go to state 793
     "'public'"     shift, and go to state 794
     "'readonly'"   shift, and go to state 795
-    "'#'"         shift, and go to state 79
+    "'#'"         shift, and go to state 72
 
     $default  reduce using rule 264 (optional_cpp_modifiers)
 
@@ -26363,15 +26498,15 @@
 
 State 797
 
-  461 inline_function: fn returns_ref backup_doc_comment '(' parameter_list . ')' return_type "'=>'" backup_fn_flags backup_lex_pos expr backup_fn_flags
+  461 inline_function: fn returns_ref backup_doc_comment '(' parameter_list • ')' return_type "'=>'" backup_fn_flags backup_lex_pos expr backup_fn_flags
 
     ')'  shift, and go to state 865
 
 
 State 798
 
-  258 parameter_list: non_empty_parameter_list . possible_comma
-  261 non_empty_parameter_list: non_empty_parameter_list . ',' attributed_parameter
+  258 parameter_list: non_empty_parameter_list • possible_comma
+  261 non_empty_parameter_list: non_empty_parameter_list • ',' attributed_parameter
 
     ','  shift, and go to state 866
 
@@ -26382,21 +26517,21 @@
 
 State 799
 
-  260 non_empty_parameter_list: attributed_parameter .
+  260 non_empty_parameter_list: attributed_parameter •
 
     $default  reduce using rule 260 (non_empty_parameter_list)
 
 
 State 800
 
-  266 parameter: optional_cpp_modifiers . optional_type_without_static is_reference is_variadic "variable" backup_doc_comment
-  267          | optional_cpp_modifiers . optional_type_without_static is_reference is_variadic "variable" backup_doc_comment '=' expr
+  266 parameter: optional_cpp_modifiers • optional_type_without_static is_reference is_variadic "variable" backup_doc_comment
+  267          | optional_cpp_modifiers • optional_type_without_static is_reference is_variadic "variable" backup_doc_comment '=' expr
 
     '?'                        shift, and go to state 868
     "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
     "'array'"                  shift, and go to state 762
     "'callable'"               shift, and go to state 763
     '('                        shift, and go to state 869
@@ -26414,15 +26549,15 @@
 
 State 801
 
-  263 attributed_parameter: parameter .
+  263 attributed_parameter: parameter •
 
     $default  reduce using rule 263 (attributed_parameter)
 
 
 State 802
 
-  265 optional_cpp_modifiers: non_empty_member_modifiers .
-  348 non_empty_member_modifiers: non_empty_member_modifiers . member_modifier
+  265 optional_cpp_modifiers: non_empty_member_modifiers •
+  348 non_empty_member_modifiers: non_empty_member_modifiers • member_modifier
 
     "'static'"     shift, and go to state 789
     "'abstract'"   shift, and go to state 790
@@ -26439,14 +26574,14 @@
 
 State 803
 
-  347 non_empty_member_modifiers: member_modifier .
+  347 non_empty_member_modifiers: member_modifier •
 
     $default  reduce using rule 347 (non_empty_member_modifiers)
 
 
 State 804
 
-  185 function_declaration_statement: function returns_ref function_name backup_doc_comment '(' . parameter_list ')' return_type backup_fn_flags '{' inner_statement_list '}' backup_fn_flags
+  185 function_declaration_statement: function returns_ref function_name backup_doc_comment '(' • parameter_list ')' return_type backup_fn_flags '{' inner_statement_list '}' backup_fn_flags
 
     "'static'"     shift, and go to state 789
     "'abstract'"   shift, and go to state 790
@@ -26455,7 +26590,7 @@
     "'protected'"  shift, and go to state 793
     "'public'"     shift, and go to state 794
     "'readonly'"   shift, and go to state 795
-    "'#'"         shift, and go to state 79
+    "'#'"         shift, and go to state 72
 
     ')'       reduce using rule 259 (parameter_list)
     $default  reduce using rule 264 (optional_cpp_modifiers)
@@ -26473,15 +26608,15 @@
 
 State 805
 
-  460 inline_function: function returns_ref backup_doc_comment '(' parameter_list . ')' lexical_vars return_type backup_fn_flags '{' inner_statement_list '}' backup_fn_flags
+  460 inline_function: function returns_ref backup_doc_comment '(' parameter_list • ')' lexical_vars return_type backup_fn_flags '{' inner_statement_list '}' backup_fn_flags
 
     ')'  shift, and go to state 878
 
 
 State 806
 
-  516 class_constant: class_name "'::'" '{' expr '}' .
-  553 member_name: '{' expr '}' .
+  516 class_constant: class_name "'::'" '{' expr '}' •
+  553 member_name: '{' expr '}' •
 
     '('       reduce using rule 553 (member_name)
     $default  reduce using rule 516 (class_constant)
@@ -26489,8 +26624,8 @@
 
 State 807
 
-  517 class_constant: variable_class_name "'::'" '{' expr '}' .
-  553 member_name: '{' expr '}' .
+  517 class_constant: variable_class_name "'::'" '{' expr '}' •
+  553 member_name: '{' expr '}' •
 
     '('       reduce using rule 553 (member_name)
     $default  reduce using rule 517 (class_constant)
@@ -26498,14 +26633,14 @@
 
 State 808
 
-  556 property_name: '{' expr '}' .
+  556 property_name: '{' expr '}' •
 
     $default  reduce using rule 556 (property_name)
 
 
 State 809
 
-  373 anonymous_class: anonymous_class_modifiers_optional "'class'" @9 ctor_arguments extends_from . implements_list backup_doc_comment '{' class_statement_list '}'
+  373 anonymous_class: anonymous_class_modifiers_optional "'class'" @9 ctor_arguments extends_from • implements_list backup_doc_comment '{' class_statement_list '}'
 
     "'implements'"  shift, and go to state 754
 
@@ -26516,84 +26651,84 @@
 
 State 810
 
-  142 inner_statement_list: inner_statement_list . inner_statement
-  254 alt_if_stmt_without_else: "'if'" '(' expr ')' ':' inner_statement_list .
+  142 inner_statement_list: inner_statement_list • inner_statement
+  254 alt_if_stmt_without_else: "'if'" '(' expr ')' ':' inner_statement_list •
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 27
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    T_INLINE_HTML              shift, and go to state 32
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'if'"                     shift, and go to state 37
-    "'echo'"                   shift, and go to state 38
-    "'do'"                     shift, and go to state 39
-    "'while'"                  shift, and go to state 40
-    "'for'"                    shift, and go to state 41
-    "'foreach'"                shift, and go to state 42
-    "'declare'"                shift, and go to state 43
-    "'switch'"                 shift, and go to state 44
-    "'match'"                  shift, and go to state 45
-    "'break'"                  shift, and go to state 46
-    "'continue'"               shift, and go to state 47
-    "'goto'"                   shift, and go to state 48
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'return'"                 shift, and go to state 52
-    "'try'"                    shift, and go to state 53
-    "'global'"                 shift, and go to state 55
-    "'static'"                 shift, and go to state 56
-    "'abstract'"               shift, and go to state 57
-    "'final'"                  shift, and go to state 58
-    "'readonly'"               shift, and go to state 59
-    "'unset'"                  shift, and go to state 60
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 11
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    T_INLINE_HTML              shift, and go to state 16
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'if'"                     shift, and go to state 29
+    "'echo'"                   shift, and go to state 30
+    "'do'"                     shift, and go to state 31
+    "'while'"                  shift, and go to state 32
+    "'for'"                    shift, and go to state 33
+    "'foreach'"                shift, and go to state 34
+    "'declare'"                shift, and go to state 35
+    "'switch'"                 shift, and go to state 36
+    "'match'"                  shift, and go to state 37
+    "'break'"                  shift, and go to state 38
+    "'continue'"               shift, and go to state 39
+    "'goto'"                   shift, and go to state 40
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'return'"                 shift, and go to state 44
+    "'try'"                    shift, and go to state 45
+    "'throw'"                  shift, and go to state 46
+    "'global'"                 shift, and go to state 48
+    "'static'"                 shift, and go to state 49
+    "'abstract'"               shift, and go to state 50
+    "'final'"                  shift, and go to state 51
+    "'readonly'"               shift, and go to state 52
+    "'unset'"                  shift, and go to state 53
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
     "'__halt_compiler'"        shift, and go to state 528
-    "'class'"                  shift, and go to state 64
-    "'trait'"                  shift, and go to state 65
-    "'interface'"              shift, and go to state 66
-    "'enum'"                   shift, and go to state 67
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    "'class'"                  shift, and go to state 57
+    "'trait'"                  shift, and go to state 58
+    "'interface'"              shift, and go to state 59
+    "'enum'"                   shift, and go to state 60
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ';'                        shift, and go to state 84
@@ -26647,92 +26782,92 @@
 
 State 811
 
-  152 statement: "'do'" statement "'while'" '(' expr ')' . ';'
+  152 statement: "'do'" statement "'while'" '(' expr ')' • ';'
 
     ';'  shift, and go to state 880
 
 
 State 812
 
-  142 inner_statement_list: inner_statement_list . inner_statement
-  249 while_statement: ':' inner_statement_list . "'endwhile'" ';'
+  142 inner_statement_list: inner_statement_list • inner_statement
+  249 while_statement: ':' inner_statement_list • "'endwhile'" ';'
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 27
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    T_INLINE_HTML              shift, and go to state 32
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'if'"                     shift, and go to state 37
-    "'echo'"                   shift, and go to state 38
-    "'do'"                     shift, and go to state 39
-    "'while'"                  shift, and go to state 40
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 11
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    T_INLINE_HTML              shift, and go to state 16
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'if'"                     shift, and go to state 29
+    "'echo'"                   shift, and go to state 30
+    "'do'"                     shift, and go to state 31
+    "'while'"                  shift, and go to state 32
     "'endwhile'"               shift, and go to state 881
-    "'for'"                    shift, and go to state 41
-    "'foreach'"                shift, and go to state 42
-    "'declare'"                shift, and go to state 43
-    "'switch'"                 shift, and go to state 44
-    "'match'"                  shift, and go to state 45
-    "'break'"                  shift, and go to state 46
-    "'continue'"               shift, and go to state 47
-    "'goto'"                   shift, and go to state 48
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'return'"                 shift, and go to state 52
-    "'try'"                    shift, and go to state 53
-    "'global'"                 shift, and go to state 55
-    "'static'"                 shift, and go to state 56
-    "'abstract'"               shift, and go to state 57
-    "'final'"                  shift, and go to state 58
-    "'readonly'"               shift, and go to state 59
-    "'unset'"                  shift, and go to state 60
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
+    "'for'"                    shift, and go to state 33
+    "'foreach'"                shift, and go to state 34
+    "'declare'"                shift, and go to state 35
+    "'switch'"                 shift, and go to state 36
+    "'match'"                  shift, and go to state 37
+    "'break'"                  shift, and go to state 38
+    "'continue'"               shift, and go to state 39
+    "'goto'"                   shift, and go to state 40
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'return'"                 shift, and go to state 44
+    "'try'"                    shift, and go to state 45
+    "'throw'"                  shift, and go to state 46
+    "'global'"                 shift, and go to state 48
+    "'static'"                 shift, and go to state 49
+    "'abstract'"               shift, and go to state 50
+    "'final'"                  shift, and go to state 51
+    "'readonly'"               shift, and go to state 52
+    "'unset'"                  shift, and go to state 53
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
     "'__halt_compiler'"        shift, and go to state 528
-    "'class'"                  shift, and go to state 64
-    "'trait'"                  shift, and go to state 65
-    "'interface'"              shift, and go to state 66
-    "'enum'"                   shift, and go to state 67
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    "'class'"                  shift, and go to state 57
+    "'trait'"                  shift, and go to state 58
+    "'interface'"              shift, and go to state 59
+    "'enum'"                   shift, and go to state 60
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ';'                        shift, and go to state 84
@@ -26784,60 +26919,60 @@
 
 State 813
 
-  153 statement: "'for'" '(' for_exprs ';' for_exprs ';' . for_exprs ')' for_statement
+  153 statement: "'for'" '(' for_exprs ';' for_exprs ';' • for_exprs ')' for_statement
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -26877,64 +27012,64 @@
 
 State 814
 
-  222 foreach_variable: "'list'" '(' . array_pair_list ')'
+  222 foreach_variable: "'list'" '(' • array_pair_list ')'
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    "amp"                      shift, and go to state 324
-    "'&'"                      shift, and go to state 325
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 326
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
-    "heredoc start"            shift, and go to state 82
-    "'...'"                    shift, and go to state 327
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 324
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
+    "heredoc start"            shift, and go to state 82
+    "'...'"                    shift, and go to state 325
+    "'&'"                      shift, and go to state 326
+    "amp"                      shift, and go to state 327
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
     '`'                        shift, and go to state 87
@@ -26976,16 +27111,16 @@
 
 State 815
 
-  223 foreach_variable: '' array_pair_list . ''
-  494 dereferenceable_scalar: '' array_pair_list . ''
+  223 foreach_variable: '' array_pair_list • ''
+  494 dereferenceable_scalar: '' array_pair_list • ''
 
     ''  shift, and go to state 884
 
 
 State 816
 
-  221 foreach_variable: ampersand variable .
-  521 fully_dereferenceable: variable .
+  221 foreach_variable: ampersand variable •
+  521 fully_dereferenceable: variable •
 
     "'=>'"    reduce using rule 221 (foreach_variable)
     ')'       reduce using rule 221 (foreach_variable)
@@ -26994,29 +27129,29 @@
 
 State 817
 
-  165 statement: "'foreach'" '(' expr "'as'" foreach_variable "'=>'" . foreach_variable ')' foreach_statement
+  165 statement: "'foreach'" '(' expr "'as'" foreach_variable "'=>'" • foreach_variable ')' foreach_statement
 
-    "amp"                      shift, and go to state 324
-    "'&'"                      shift, and go to state 325
     "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'static'"                 shift, and go to state 156
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'static'"                 shift, and go to state 147
     "'readonly'"               shift, and go to state 130
     "'list'"                   shift, and go to state 727
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    '('                        shift, and go to state 308
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'&'"                      shift, and go to state 326
+    "amp"                      shift, and go to state 327
+    '('                        shift, and go to state 301
     ''                        shift, and go to state 728
     '"'                        shift, and go to state 88
     '$'                        shift, and go to state 89
@@ -27026,9 +27161,9 @@
     foreach_variable              go to state 885
     function_call                 go to state 113
     class_name                    go to state 114
-    dereferenceable_scalar        go to state 310
-    constant                      go to state 311
-    class_constant                go to state 312
+    dereferenceable_scalar        go to state 303
+    constant                      go to state 304
+    class_constant                go to state 305
     variable_class_name           go to state 119
     fully_dereferenceable         go to state 120
     array_object_dereferenceable  go to state 121
@@ -27041,77 +27176,77 @@
 
 State 818
 
-  164 statement: "'foreach'" '(' expr "'as'" foreach_variable ')' . foreach_statement
+  164 statement: "'foreach'" '(' expr "'as'" foreach_variable ')' • foreach_statement
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
     ':'                        shift, and go to state 886
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 27
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    T_INLINE_HTML              shift, and go to state 32
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'if'"                     shift, and go to state 37
-    "'echo'"                   shift, and go to state 38
-    "'do'"                     shift, and go to state 39
-    "'while'"                  shift, and go to state 40
-    "'for'"                    shift, and go to state 41
-    "'foreach'"                shift, and go to state 42
-    "'declare'"                shift, and go to state 43
-    "'switch'"                 shift, and go to state 44
-    "'match'"                  shift, and go to state 45
-    "'break'"                  shift, and go to state 46
-    "'continue'"               shift, and go to state 47
-    "'goto'"                   shift, and go to state 48
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'return'"                 shift, and go to state 52
-    "'try'"                    shift, and go to state 53
-    "'global'"                 shift, and go to state 55
-    "'static'"                 shift, and go to state 56
-    "'readonly'"               shift, and go to state 130
-    "'unset'"                  shift, and go to state 60
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 11
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    T_INLINE_HTML              shift, and go to state 16
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'if'"                     shift, and go to state 29
+    "'echo'"                   shift, and go to state 30
+    "'do'"                     shift, and go to state 31
+    "'while'"                  shift, and go to state 32
+    "'for'"                    shift, and go to state 33
+    "'foreach'"                shift, and go to state 34
+    "'declare'"                shift, and go to state 35
+    "'switch'"                 shift, and go to state 36
+    "'match'"                  shift, and go to state 37
+    "'break'"                  shift, and go to state 38
+    "'continue'"               shift, and go to state 39
+    "'goto'"                   shift, and go to state 40
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'return'"                 shift, and go to state 44
+    "'try'"                    shift, and go to state 45
+    "'throw'"                  shift, and go to state 46
+    "'global'"                 shift, and go to state 48
+    "'static'"                 shift, and go to state 49
+    "'readonly'"               shift, and go to state 130
+    "'unset'"                  shift, and go to state 53
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ';'                        shift, and go to state 84
@@ -27155,7 +27290,7 @@
 
 State 819
 
-  229 declare_statement: ':' . inner_statement_list "'enddeclare'" ';'
+  229 declare_statement: ':' • inner_statement_list "'enddeclare'" ';'
 
     $default  reduce using rule 143 (inner_statement_list)
 
@@ -27164,21 +27299,21 @@
 
 State 820
 
-  228 declare_statement: statement .
+  228 declare_statement: statement •
 
     $default  reduce using rule 228 (declare_statement)
 
 
 State 821
 
-  167 statement: "'declare'" '(' const_list ')' $@3 declare_statement .
+  167 statement: "'declare'" '(' const_list ')' $@3 declare_statement •
 
     $default  reduce using rule 167 (statement)
 
 
 State 822
 
-  233 switch_case_list: ':' ';' . case_list "'endswitch'" ';'
+  233 switch_case_list: ':' ';' • case_list "'endswitch'" ';'
 
     $default  reduce using rule 234 (case_list)
 
@@ -27187,9 +27322,9 @@
 
 State 823
 
-  232 switch_case_list: ':' case_list . "'endswitch'" ';'
-  235 case_list: case_list . "'case'" expr case_separator inner_statement_list
-  236          | case_list . "'default'" case_separator inner_statement_list
+  232 switch_case_list: ':' case_list • "'endswitch'" ';'
+  235 case_list: case_list • "'case'" expr case_separator inner_statement_list
+  236          | case_list • "'default'" case_separator inner_statement_list
 
     "'endswitch'"  shift, and go to state 891
     "'case'"       shift, and go to state 892
@@ -27198,7 +27333,7 @@
 
 State 824
 
-  231 switch_case_list: '{' ';' . case_list '}'
+  231 switch_case_list: '{' ';' • case_list '}'
 
     $default  reduce using rule 234 (case_list)
 
@@ -27207,9 +27342,9 @@
 
 State 825
 
-  230 switch_case_list: '{' case_list . '}'
-  235 case_list: case_list . "'case'" expr case_separator inner_statement_list
-  236          | case_list . "'default'" case_separator inner_statement_list
+  230 switch_case_list: '{' case_list • '}'
+  235 case_list: case_list • "'case'" expr case_separator inner_statement_list
+  236          | case_list • "'default'" case_separator inner_statement_list
 
     "'case'"     shift, and go to state 892
     "'default'"  shift, and go to state 893
@@ -27218,7 +27353,7 @@
 
 State 826
 
-  245 match_arm: "'default'" . possible_comma "'=>'" expr
+  245 match_arm: "'default'" • possible_comma "'=>'" expr
 
     ','  shift, and go to state 896
 
@@ -27229,15 +27364,15 @@
 
 State 827
 
-  239 match: "'match'" '(' expr ')' '{' match_arm_list . '}'
+  239 match: "'match'" '(' expr ')' '{' match_arm_list • '}'
 
     '}'  shift, and go to state 898
 
 
 State 828
 
-  241 match_arm_list: non_empty_match_arm_list . possible_comma
-  243 non_empty_match_arm_list: non_empty_match_arm_list . ',' match_arm
+  241 match_arm_list: non_empty_match_arm_list • possible_comma
+  243 non_empty_match_arm_list: non_empty_match_arm_list • ',' match_arm
 
     ','  shift, and go to state 899
 
@@ -27248,15 +27383,15 @@
 
 State 829
 
-  242 non_empty_match_arm_list: match_arm .
+  242 non_empty_match_arm_list: match_arm •
 
     $default  reduce using rule 242 (non_empty_match_arm_list)
 
 
 State 830
 
-  244 match_arm: match_arm_cond_list . possible_comma "'=>'" expr
-  247 match_arm_cond_list: match_arm_cond_list . ',' expr
+  244 match_arm: match_arm_cond_list • possible_comma "'=>'" expr
+  247 match_arm_cond_list: match_arm_cond_list • ',' expr
 
     ','  shift, and go to state 901
 
@@ -27267,117 +27402,117 @@
 
 State 831
 
-  246 match_arm_cond_list: expr .
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-
-    "'or'"          shift, and go to state 353
-    "'xor'"         shift, and go to state 354
-    "'and'"         shift, and go to state 355
-    '?'             shift, and go to state 356
-    "'??'"          shift, and go to state 357
-    "'||'"          shift, and go to state 358
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  246 match_arm_cond_list: expr •
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+
+    '?'             shift, and go to state 353
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'or'"          shift, and go to state 364
+    "'xor'"         shift, and go to state 365
+    "'and'"         shift, and go to state 366
+    "'instanceof'"  shift, and go to state 367
+    "'||'"          shift, and go to state 368
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'??'"          shift, and go to state 379
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
 
     $default  reduce using rule 246 (match_arm_cond_list)
 
 
 State 832
 
-  173 catch_list: catch_list "'catch'" . '(' catch_name_list optional_variable ')' '{' inner_statement_list '}'
+  173 catch_list: catch_list "'catch'" • '(' catch_name_list optional_variable ')' '{' inner_statement_list '}'
 
     '('  shift, and go to state 903
 
 
 State 833
 
-  179 finally_statement: "'finally'" . '{' inner_statement_list '}'
+  179 finally_statement: "'finally'" • '{' inner_statement_list '}'
 
     '{'  shift, and go to state 904
 
 
 State 834
 
-  169 statement: "'try'" '{' inner_statement_list '}' catch_list finally_statement .
+  169 statement: "'try'" '{' inner_statement_list '}' catch_list finally_statement •
 
     $default  reduce using rule 169 (statement)
 
 
 State 835
 
-  137 unprefixed_use_declaration: namespace_name "'as'" . "identifier"
+  137 unprefixed_use_declaration: namespace_name "'as'" • "identifier"
 
     "identifier"  shift, and go to state 905
 
 
 State 836
 
-  135 inline_use_declaration: use_type unprefixed_use_declaration .
+  135 inline_use_declaration: use_type unprefixed_use_declaration •
 
     $default  reduce using rule 135 (inline_use_declaration)
 
 
 State 837
 
-  127 possible_comma: ',' .
-  128 inline_use_declarations: inline_use_declarations ',' . inline_use_declaration
+  127 possible_comma: ',' •
+  128 inline_use_declarations: inline_use_declarations ',' • inline_use_declaration
 
-    "identifier"       shift, and go to state 191
-    "namespaced name"  shift, and go to state 193
-    "'function'"       shift, and go to state 194
-    "'const'"          shift, and go to state 195
+    "identifier"       shift, and go to state 184
+    "namespaced name"  shift, and go to state 186
+    "'function'"       shift, and go to state 187
+    "'const'"          shift, and go to state 188
 
     $default  reduce using rule 127 (possible_comma)
 
@@ -27389,15 +27524,15 @@
 
 State 838
 
-  125 mixed_group_use_declaration: legacy_namespace_name "'\\'" '{' inline_use_declarations possible_comma . '}'
+  125 mixed_group_use_declaration: legacy_namespace_name "'\\'" '{' inline_use_declarations possible_comma • '}'
 
     '}'  shift, and go to state 907
 
 
 State 839
 
-  124 group_use_declaration: legacy_namespace_name "'\\'" '{' unprefixed_use_declarations . possible_comma '}'
-  130 unprefixed_use_declarations: unprefixed_use_declarations . ',' unprefixed_use_declaration
+  124 group_use_declaration: legacy_namespace_name "'\\'" '{' unprefixed_use_declarations • possible_comma '}'
+  130 unprefixed_use_declarations: unprefixed_use_declarations • ',' unprefixed_use_declaration
 
     ','  shift, and go to state 908
 
@@ -27408,22 +27543,22 @@
 
 State 840
 
-  131 unprefixed_use_declarations: unprefixed_use_declaration .
+  131 unprefixed_use_declarations: unprefixed_use_declaration •
 
     $default  reduce using rule 131 (unprefixed_use_declarations)
 
 
 State 841
 
-  163 statement: "'unset'" '(' unset_variables possible_comma ')' ';' .
+  163 statement: "'unset'" '(' unset_variables possible_comma ')' ';' •
 
     $default  reduce using rule 163 (statement)
 
 
 State 842
 
-  219 implements_list: "'implements'" class_name_list .
-  323 class_name_list: class_name_list . ',' class_name
+  219 implements_list: "'implements'" class_name_list •
+  323 class_name_list: class_name_list • ',' class_name
 
     ','  shift, and go to state 845
 
@@ -27432,15 +27567,15 @@
 
 State 843
 
-  193 class_declaration_statement: "'class'" @5 "identifier" extends_from implements_list backup_doc_comment . '{' class_statement_list '}'
+  193 class_declaration_statement: "'class'" @5 "identifier" extends_from implements_list backup_doc_comment • '{' class_statement_list '}'
 
     '{'  shift, and go to state 910
 
 
 State 844
 
-  204 trait_declaration_statement: "'trait'" @6 "identifier" backup_doc_comment '{' class_statement_list . '}'
-  312 class_statement_list: class_statement_list . class_statement
+  204 trait_declaration_statement: "'trait'" @6 "identifier" backup_doc_comment '{' class_statement_list • '}'
+  312 class_statement_list: class_statement_list • class_statement
 
     "'case'"       shift, and go to state 911
     "'use'"        shift, and go to state 912
@@ -27452,7 +27587,7 @@
     "'public'"     shift, and go to state 794
     "'readonly'"   shift, and go to state 795
     "'var'"        shift, and go to state 913
-    "'#'"         shift, and go to state 79
+    "'#'"         shift, and go to state 72
     '}'            shift, and go to state 914
 
     "'const'"  reduce using rule 345 (class_const_modifiers)
@@ -27472,21 +27607,21 @@
 
 State 845
 
-  323 class_name_list: class_name_list ',' . class_name
+  323 class_name_list: class_name_list ',' • class_name
 
     "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "'static'"                 shift, and go to state 156
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "'static'"                 shift, and go to state 147
 
-    name        go to state 159
+    name        go to state 150
     class_name  go to state 923
 
 
 State 846
 
-  206 interface_declaration_statement: "'interface'" @7 "identifier" interface_extends_list backup_doc_comment '{' . class_statement_list '}'
+  206 interface_declaration_statement: "'interface'" @7 "identifier" interface_extends_list backup_doc_comment '{' • class_statement_list '}'
 
     $default  reduce using rule 313 (class_statement_list)
 
@@ -27495,22 +27630,22 @@
 
 State 847
 
-  271 type_expr: '?' type .
+  271 type_expr: '?' type •
 
     $default  reduce using rule 271 (type_expr)
 
 
 State 848
 
-  280 intersection_type: type . "amp" type
+  280 intersection_type: type • "amp" type
 
     "amp"  shift, and go to state 850
 
 
 State 849
 
-  277 union_type_element: '(' intersection_type . ')'
-  281 intersection_type: intersection_type . "amp" type
+  277 union_type_element: '(' intersection_type • ')'
+  281 intersection_type: intersection_type • "amp" type
 
     "amp"  shift, and go to state 853
     ')'    shift, and go to state 925
@@ -27518,12 +27653,12 @@
 
 State 850
 
-  280 intersection_type: type "amp" . type
+  280 intersection_type: type "amp" • type
 
     "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
     "'static'"                 shift, and go to state 761
     "'array'"                  shift, and go to state 762
     "'callable'"               shift, and go to state 763
@@ -27535,12 +27670,12 @@
 
 State 851
 
-  278 union_type: union_type_element '|' . union_type_element
+  278 union_type: union_type_element '|' • union_type_element
 
     "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
     "'static'"                 shift, and go to state 761
     "'array'"                  shift, and go to state 762
     "'callable'"               shift, and go to state 763
@@ -27554,12 +27689,12 @@
 
 State 852
 
-  279 union_type: union_type '|' . union_type_element
+  279 union_type: union_type '|' • union_type_element
 
     "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
     "'static'"                 shift, and go to state 761
     "'array'"                  shift, and go to state 762
     "'callable'"               shift, and go to state 763
@@ -27573,12 +27708,12 @@
 
 State 853
 
-  281 intersection_type: intersection_type "amp" . type
+  281 intersection_type: intersection_type "amp" • type
 
     "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
     "'static'"                 shift, and go to state 761
     "'array'"                  shift, and go to state 762
     "'callable'"               shift, and go to state 763
@@ -27590,109 +27725,109 @@
 
 State 854
 
-  208 enum_declaration_statement: "'enum'" @8 "identifier" enum_backing_type implements_list backup_doc_comment . '{' class_statement_list '}'
+  208 enum_declaration_statement: "'enum'" @8 "identifier" enum_backing_type implements_list backup_doc_comment • '{' class_statement_list '}'
 
     '{'  shift, and go to state 931
 
 
 State 855
 
-  114 top_statement: "'namespace'" namespace_declaration_name $@1 '{' top_statement_list '}' .
+  114 top_statement: "'namespace'" namespace_declaration_name $@1 '{' top_statement_list '}' •
 
     $default  reduce using rule 114 (top_statement)
 
 
 State 856
 
-  378 expr: "'list'" '(' array_pair_list ')' '=' expr .
-  400     | expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-
-    '?'             shift, and go to state 356
-    "'??'"          shift, and go to state 357
-    "'||'"          shift, and go to state 358
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  378 expr: "'list'" '(' array_pair_list ')' '=' expr •
+  400     | expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+
+    '?'             shift, and go to state 353
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'instanceof'"  shift, and go to state 367
+    "'||'"          shift, and go to state 368
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'??'"          shift, and go to state 379
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
 
     $default  reduce using rule 378 (expr)
 
 
 State 857
 
-  580 encaps_var: "'${'" "variable name" '' expr '' . '}'
+  580 encaps_var: "'${'" "variable name" '' expr '' • '}'
 
     '}'  shift, and go to state 932
 
 
 State 858
 
-  147 inner_statement: "'__halt_compiler'" '(' ')' ';' .
+  147 inner_statement: "'__halt_compiler'" '(' ')' ';' •
 
     $default  reduce using rule 147 (inner_statement)
 
 
 State 859
 
-  378 expr: "'list'" '(' array_pair_list . ')' '=' expr
-  568 array_pair: expr "'=>'" "'list'" '(' array_pair_list . ')'
+  378 expr: "'list'" '(' array_pair_list • ')' '=' expr
+  568 array_pair: expr "'=>'" "'list'" '(' array_pair_list • ')'
 
     ')'  shift, and go to state 933
 
 
 State 860
 
-  191 class_declaration_statement: class_modifiers "'class'" @4 "identifier" extends_from implements_list . backup_doc_comment '{' class_statement_list '}'
+  191 class_declaration_statement: class_modifiers "'class'" @4 "identifier" extends_from implements_list • backup_doc_comment '{' class_statement_list '}'
 
     $default  reduce using rule 464 (backup_doc_comment)
 
@@ -27701,14 +27836,14 @@
 
 State 861
 
-  251 if_stmt_without_else: if_stmt_without_else "'elseif'" '(' expr ')' statement .
+  251 if_stmt_without_else: if_stmt_without_else "'elseif'" '(' expr ')' statement •
 
     $default  reduce using rule 251 (if_stmt_without_else)
 
 
 State 862
 
-  255 alt_if_stmt_without_else: alt_if_stmt_without_else "'elseif'" '(' expr ')' ':' . inner_statement_list
+  255 alt_if_stmt_without_else: alt_if_stmt_without_else "'elseif'" '(' expr ')' ':' • inner_statement_list
 
     $default  reduce using rule 143 (inner_statement_list)
 
@@ -27717,21 +27852,21 @@
 
 State 863
 
-  257 alt_if_stmt: alt_if_stmt_without_else "'else'" ':' inner_statement_list "'endif'" ';' .
+  257 alt_if_stmt: alt_if_stmt_without_else "'else'" ':' inner_statement_list "'endif'" ';' •
 
     $default  reduce using rule 257 (alt_if_stmt)
 
 
 State 864
 
-  262 attributed_parameter: attributes parameter .
+  262 attributed_parameter: attributes parameter •
 
     $default  reduce using rule 262 (attributed_parameter)
 
 
 State 865
 
-  461 inline_function: fn returns_ref backup_doc_comment '(' parameter_list ')' . return_type "'=>'" backup_fn_flags backup_lex_pos expr backup_fn_flags
+  461 inline_function: fn returns_ref backup_doc_comment '(' parameter_list ')' • return_type "'=>'" backup_fn_flags backup_lex_pos expr backup_fn_flags
 
     ':'  shift, and go to state 936
 
@@ -27742,8 +27877,8 @@
 
 State 866
 
-  127 possible_comma: ',' .
-  261 non_empty_parameter_list: non_empty_parameter_list ',' . attributed_parameter
+  127 possible_comma: ',' •
+  261 non_empty_parameter_list: non_empty_parameter_list ',' • attributed_parameter
 
     "'static'"     shift, and go to state 789
     "'abstract'"   shift, and go to state 790
@@ -27752,7 +27887,7 @@
     "'protected'"  shift, and go to state 793
     "'public'"     shift, and go to state 794
     "'readonly'"   shift, and go to state 795
-    "'#'"         shift, and go to state 79
+    "'#'"         shift, and go to state 72
 
     ')'       reduce using rule 127 (possible_comma)
     $default  reduce using rule 264 (optional_cpp_modifiers)
@@ -27768,19 +27903,19 @@
 
 State 867
 
-  258 parameter_list: non_empty_parameter_list possible_comma .
+  258 parameter_list: non_empty_parameter_list possible_comma •
 
     $default  reduce using rule 258 (parameter_list)
 
 
 State 868
 
-  283 type_expr_without_static: '?' . type_without_static
+  283 type_expr_without_static: '?' • type_without_static
 
     "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
     "'array'"                  shift, and go to state 762
     "'callable'"               shift, and go to state 763
 
@@ -27790,12 +27925,12 @@
 
 State 869
 
-  290 union_type_without_static_element: '(' . intersection_type_without_static ')'
+  290 union_type_without_static_element: '(' • intersection_type_without_static ')'
 
     "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
     "'array'"                  shift, and go to state 762
     "'callable'"               shift, and go to state 763
 
@@ -27806,8 +27941,8 @@
 
 State 870
 
-  266 parameter: optional_cpp_modifiers optional_type_without_static . is_reference is_variadic "variable" backup_doc_comment
-  267          | optional_cpp_modifiers optional_type_without_static . is_reference is_variadic "variable" backup_doc_comment '=' expr
+  266 parameter: optional_cpp_modifiers optional_type_without_static • is_reference is_variadic "variable" backup_doc_comment
+  267          | optional_cpp_modifiers optional_type_without_static • is_reference is_variadic "variable" backup_doc_comment '=' expr
 
     "'&'"  shift, and go to state 942
 
@@ -27818,16 +27953,16 @@
 
 State 871
 
-  269 optional_type_without_static: type_expr_without_static .
+  269 optional_type_without_static: type_expr_without_static •
 
     $default  reduce using rule 269 (optional_type_without_static)
 
 
 State 872
 
-  282 type_expr_without_static: type_without_static .
-  289 union_type_without_static_element: type_without_static .
-  293 intersection_type_without_static: type_without_static . "amp" type_without_static
+  282 type_expr_without_static: type_without_static •
+  289 union_type_without_static_element: type_without_static •
+  293 intersection_type_without_static: type_without_static • "amp" type_without_static
 
     "amp"  shift, and go to state 944
 
@@ -27837,15 +27972,15 @@
 
 State 873
 
-  291 union_type_without_static: union_type_without_static_element . '|' union_type_without_static_element
+  291 union_type_without_static: union_type_without_static_element • '|' union_type_without_static_element
 
     '|'  shift, and go to state 945
 
 
 State 874
 
-  284 type_expr_without_static: union_type_without_static .
-  292 union_type_without_static: union_type_without_static . '|' union_type_without_static_element
+  284 type_expr_without_static: union_type_without_static •
+  292 union_type_without_static: union_type_without_static • '|' union_type_without_static_element
 
     '|'  shift, and go to state 946
 
@@ -27854,8 +27989,8 @@
 
 State 875
 
-  285 type_expr_without_static: intersection_type_without_static .
-  294 intersection_type_without_static: intersection_type_without_static . "amp" type_without_static
+  285 type_expr_without_static: intersection_type_without_static •
+  294 intersection_type_without_static: intersection_type_without_static • "amp" type_without_static
 
     "amp"  shift, and go to state 947
 
@@ -27864,21 +27999,21 @@
 
 State 876
 
-  348 non_empty_member_modifiers: non_empty_member_modifiers member_modifier .
+  348 non_empty_member_modifiers: non_empty_member_modifiers member_modifier •
 
     $default  reduce using rule 348 (non_empty_member_modifiers)
 
 
 State 877
 
-  185 function_declaration_statement: function returns_ref function_name backup_doc_comment '(' parameter_list . ')' return_type backup_fn_flags '{' inner_statement_list '}' backup_fn_flags
+  185 function_declaration_statement: function returns_ref function_name backup_doc_comment '(' parameter_list • ')' return_type backup_fn_flags '{' inner_statement_list '}' backup_fn_flags
 
     ')'  shift, and go to state 948
 
 
 State 878
 
-  460 inline_function: function returns_ref backup_doc_comment '(' parameter_list ')' . lexical_vars return_type backup_fn_flags '{' inner_statement_list '}' backup_fn_flags
+  460 inline_function: function returns_ref backup_doc_comment '(' parameter_list ')' • lexical_vars return_type backup_fn_flags '{' inner_statement_list '}' backup_fn_flags
 
     "'use'"  shift, and go to state 949
 
@@ -27889,7 +28024,7 @@
 
 State 879
 
-  373 anonymous_class: anonymous_class_modifiers_optional "'class'" @9 ctor_arguments extends_from implements_list . backup_doc_comment '{' class_statement_list '}'
+  373 anonymous_class: anonymous_class_modifiers_optional "'class'" @9 ctor_arguments extends_from implements_list • backup_doc_comment '{' class_statement_list '}'
 
     $default  reduce using rule 464 (backup_doc_comment)
 
@@ -27898,36 +28033,36 @@
 
 State 880
 
-  152 statement: "'do'" statement "'while'" '(' expr ')' ';' .
+  152 statement: "'do'" statement "'while'" '(' expr ')' ';' •
 
     $default  reduce using rule 152 (statement)
 
 
 State 881
 
-  249 while_statement: ':' inner_statement_list "'endwhile'" . ';'
+  249 while_statement: ':' inner_statement_list "'endwhile'" • ';'
 
     ';'  shift, and go to state 952
 
 
 State 882
 
-  153 statement: "'for'" '(' for_exprs ';' for_exprs ';' for_exprs . ')' for_statement
+  153 statement: "'for'" '(' for_exprs ';' for_exprs ';' for_exprs • ')' for_statement
 
     ')'  shift, and go to state 953
 
 
 State 883
 
-  222 foreach_variable: "'list'" '(' array_pair_list . ')'
+  222 foreach_variable: "'list'" '(' array_pair_list • ')'
 
     ')'  shift, and go to state 954
 
 
 State 884
 
-  223 foreach_variable: '' array_pair_list '' .
-  494 dereferenceable_scalar: '' array_pair_list '' .
+  223 foreach_variable: '' array_pair_list '' •
+  494 dereferenceable_scalar: '' array_pair_list '' •
 
     "'=>'"    reduce using rule 223 (foreach_variable)
     ')'       reduce using rule 223 (foreach_variable)
@@ -27936,14 +28071,14 @@
 
 State 885
 
-  165 statement: "'foreach'" '(' expr "'as'" foreach_variable "'=>'" foreach_variable . ')' foreach_statement
+  165 statement: "'foreach'" '(' expr "'as'" foreach_variable "'=>'" foreach_variable • ')' foreach_statement
 
     ')'  shift, and go to state 955
 
 
 State 886
 
-  227 foreach_statement: ':' . inner_statement_list "'endforeach'" ';'
+  227 foreach_statement: ':' • inner_statement_list "'endforeach'" ';'
 
     $default  reduce using rule 143 (inner_statement_list)
 
@@ -27952,99 +28087,99 @@
 
 State 887
 
-  226 foreach_statement: statement .
+  226 foreach_statement: statement •
 
     $default  reduce using rule 226 (foreach_statement)
 
 
 State 888
 
-  164 statement: "'foreach'" '(' expr "'as'" foreach_variable ')' foreach_statement .
+  164 statement: "'foreach'" '(' expr "'as'" foreach_variable ')' foreach_statement •
 
     $default  reduce using rule 164 (statement)
 
 
 State 889
 
-  142 inner_statement_list: inner_statement_list . inner_statement
-  229 declare_statement: ':' inner_statement_list . "'enddeclare'" ';'
+  142 inner_statement_list: inner_statement_list • inner_statement
+  229 declare_statement: ':' inner_statement_list • "'enddeclare'" ';'
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 27
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    T_INLINE_HTML              shift, and go to state 32
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'if'"                     shift, and go to state 37
-    "'echo'"                   shift, and go to state 38
-    "'do'"                     shift, and go to state 39
-    "'while'"                  shift, and go to state 40
-    "'for'"                    shift, and go to state 41
-    "'foreach'"                shift, and go to state 42
-    "'declare'"                shift, and go to state 43
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 11
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    T_INLINE_HTML              shift, and go to state 16
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'if'"                     shift, and go to state 29
+    "'echo'"                   shift, and go to state 30
+    "'do'"                     shift, and go to state 31
+    "'while'"                  shift, and go to state 32
+    "'for'"                    shift, and go to state 33
+    "'foreach'"                shift, and go to state 34
+    "'declare'"                shift, and go to state 35
     "'enddeclare'"             shift, and go to state 957
-    "'switch'"                 shift, and go to state 44
-    "'match'"                  shift, and go to state 45
-    "'break'"                  shift, and go to state 46
-    "'continue'"               shift, and go to state 47
-    "'goto'"                   shift, and go to state 48
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'return'"                 shift, and go to state 52
-    "'try'"                    shift, and go to state 53
-    "'global'"                 shift, and go to state 55
-    "'static'"                 shift, and go to state 56
-    "'abstract'"               shift, and go to state 57
-    "'final'"                  shift, and go to state 58
-    "'readonly'"               shift, and go to state 59
-    "'unset'"                  shift, and go to state 60
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
+    "'switch'"                 shift, and go to state 36
+    "'match'"                  shift, and go to state 37
+    "'break'"                  shift, and go to state 38
+    "'continue'"               shift, and go to state 39
+    "'goto'"                   shift, and go to state 40
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'return'"                 shift, and go to state 44
+    "'try'"                    shift, and go to state 45
+    "'throw'"                  shift, and go to state 46
+    "'global'"                 shift, and go to state 48
+    "'static'"                 shift, and go to state 49
+    "'abstract'"               shift, and go to state 50
+    "'final'"                  shift, and go to state 51
+    "'readonly'"               shift, and go to state 52
+    "'unset'"                  shift, and go to state 53
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
     "'__halt_compiler'"        shift, and go to state 528
-    "'class'"                  shift, and go to state 64
-    "'trait'"                  shift, and go to state 65
-    "'interface'"              shift, and go to state 66
-    "'enum'"                   shift, and go to state 67
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    "'class'"                  shift, and go to state 57
+    "'trait'"                  shift, and go to state 58
+    "'interface'"              shift, and go to state 59
+    "'enum'"                   shift, and go to state 60
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ';'                        shift, and go to state 84
@@ -28096,9 +28231,9 @@
 
 State 890
 
-  233 switch_case_list: ':' ';' case_list . "'endswitch'" ';'
-  235 case_list: case_list . "'case'" expr case_separator inner_statement_list
-  236          | case_list . "'default'" case_separator inner_statement_list
+  233 switch_case_list: ':' ';' case_list • "'endswitch'" ';'
+  235 case_list: case_list • "'case'" expr case_separator inner_statement_list
+  236          | case_list • "'default'" case_separator inner_statement_list
 
     "'endswitch'"  shift, and go to state 958
     "'case'"       shift, and go to state 892
@@ -28107,67 +28242,67 @@
 
 State 891
 
-  232 switch_case_list: ':' case_list "'endswitch'" . ';'
+  232 switch_case_list: ':' case_list "'endswitch'" • ';'
 
     ';'  shift, and go to state 959
 
 
 State 892
 
-  235 case_list: case_list "'case'" . expr case_separator inner_statement_list
+  235 case_list: case_list "'case'" • expr case_separator inner_statement_list
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -28203,7 +28338,7 @@
 
 State 893
 
-  236 case_list: case_list "'default'" . case_separator inner_statement_list
+  236 case_list: case_list "'default'" • case_separator inner_statement_list
 
     ':'  shift, and go to state 961
     ';'  shift, and go to state 962
@@ -28213,9 +28348,9 @@
 
 State 894
 
-  231 switch_case_list: '{' ';' case_list . '}'
-  235 case_list: case_list . "'case'" expr case_separator inner_statement_list
-  236          | case_list . "'default'" case_separator inner_statement_list
+  231 switch_case_list: '{' ';' case_list • '}'
+  235 case_list: case_list • "'case'" expr case_separator inner_statement_list
+  236          | case_list • "'default'" case_separator inner_statement_list
 
     "'case'"     shift, and go to state 892
     "'default'"  shift, and go to state 893
@@ -28224,90 +28359,90 @@
 
 State 895
 
-  230 switch_case_list: '{' case_list '}' .
+  230 switch_case_list: '{' case_list '}' •
 
     $default  reduce using rule 230 (switch_case_list)
 
 
 State 896
 
-  127 possible_comma: ',' .
+  127 possible_comma: ',' •
 
     $default  reduce using rule 127 (possible_comma)
 
 
 State 897
 
-  245 match_arm: "'default'" possible_comma . "'=>'" expr
+  245 match_arm: "'default'" possible_comma • "'=>'" expr
 
     "'=>'"  shift, and go to state 965
 
 
 State 898
 
-  239 match: "'match'" '(' expr ')' '{' match_arm_list '}' .
+  239 match: "'match'" '(' expr ')' '{' match_arm_list '}' •
 
     $default  reduce using rule 239 (match)
 
 
 State 899
 
-  127 possible_comma: ',' .
-  243 non_empty_match_arm_list: non_empty_match_arm_list ',' . match_arm
+  127 possible_comma: ',' •
+  243 non_empty_match_arm_list: non_empty_match_arm_list ',' • match_arm
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
     "'default'"                shift, and go to state 826
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -28347,68 +28482,68 @@
 
 State 900
 
-  241 match_arm_list: non_empty_match_arm_list possible_comma .
+  241 match_arm_list: non_empty_match_arm_list possible_comma •
 
     $default  reduce using rule 241 (match_arm_list)
 
 
 State 901
 
-  127 possible_comma: ',' .
-  247 match_arm_cond_list: match_arm_cond_list ',' . expr
+  127 possible_comma: ',' •
+  247 match_arm_cond_list: match_arm_cond_list ',' • expr
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -28446,29 +28581,29 @@
 
 State 902
 
-  244 match_arm: match_arm_cond_list possible_comma . "'=>'" expr
+  244 match_arm: match_arm_cond_list possible_comma • "'=>'" expr
 
     "'=>'"  shift, and go to state 968
 
 
 State 903
 
-  173 catch_list: catch_list "'catch'" '(' . catch_name_list optional_variable ')' '{' inner_statement_list '}'
+  173 catch_list: catch_list "'catch'" '(' • catch_name_list optional_variable ')' '{' inner_statement_list '}'
 
     "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "'static'"                 shift, and go to state 156
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "'static'"                 shift, and go to state 147
 
-    name             go to state 159
+    name             go to state 150
     catch_name_list  go to state 969
     class_name       go to state 970
 
 
 State 904
 
-  179 finally_statement: "'finally'" '{' . inner_statement_list '}'
+  179 finally_statement: "'finally'" '{' • inner_statement_list '}'
 
     $default  reduce using rule 143 (inner_statement_list)
 
@@ -28477,32 +28612,32 @@
 
 State 905
 
-  137 unprefixed_use_declaration: namespace_name "'as'" "identifier" .
+  137 unprefixed_use_declaration: namespace_name "'as'" "identifier" •
 
     $default  reduce using rule 137 (unprefixed_use_declaration)
 
 
 State 906
 
-  128 inline_use_declarations: inline_use_declarations ',' inline_use_declaration .
+  128 inline_use_declarations: inline_use_declarations ',' inline_use_declaration •
 
     $default  reduce using rule 128 (inline_use_declarations)
 
 
 State 907
 
-  125 mixed_group_use_declaration: legacy_namespace_name "'\\'" '{' inline_use_declarations possible_comma '}' .
+  125 mixed_group_use_declaration: legacy_namespace_name "'\\'" '{' inline_use_declarations possible_comma '}' •
 
     $default  reduce using rule 125 (mixed_group_use_declaration)
 
 
 State 908
 
-  127 possible_comma: ',' .
-  130 unprefixed_use_declarations: unprefixed_use_declarations ',' . unprefixed_use_declaration
+  127 possible_comma: ',' •
+  130 unprefixed_use_declarations: unprefixed_use_declarations ',' • unprefixed_use_declaration
 
-    "identifier"       shift, and go to state 191
-    "namespaced name"  shift, and go to state 193
+    "identifier"       shift, and go to state 184
+    "namespaced name"  shift, and go to state 186
 
     $default  reduce using rule 127 (possible_comma)
 
@@ -28512,14 +28647,14 @@
 
 State 909
 
-  124 group_use_declaration: legacy_namespace_name "'\\'" '{' unprefixed_use_declarations possible_comma . '}'
+  124 group_use_declaration: legacy_namespace_name "'\\'" '{' unprefixed_use_declarations possible_comma • '}'
 
     '}'  shift, and go to state 973
 
 
 State 910
 
-  193 class_declaration_statement: "'class'" @5 "identifier" extends_from implements_list backup_doc_comment '{' . class_statement_list '}'
+  193 class_declaration_statement: "'class'" @5 "identifier" extends_from implements_list backup_doc_comment '{' • class_statement_list '}'
 
     $default  reduce using rule 313 (class_statement_list)
 
@@ -28528,7 +28663,7 @@
 
 State 911
 
-  211 enum_case: "'case'" . backup_doc_comment identifier enum_case_expr ';'
+  211 enum_case: "'case'" • backup_doc_comment identifier enum_case_expr ';'
 
     $default  reduce using rule 464 (backup_doc_comment)
 
@@ -28537,37 +28672,37 @@
 
 State 912
 
-  321 class_statement: "'use'" . class_name_list trait_adaptations
+  321 class_statement: "'use'" • class_name_list trait_adaptations
 
     "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "'static'"                 shift, and go to state 156
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "'static'"                 shift, and go to state 147
 
-    name             go to state 159
+    name             go to state 150
     class_name_list  go to state 976
     class_name       go to state 758
 
 
 State 913
 
-  342 property_modifiers: "'var'" .
+  342 property_modifiers: "'var'" •
 
     $default  reduce using rule 342 (property_modifiers)
 
 
 State 914
 
-  204 trait_declaration_statement: "'trait'" @6 "identifier" backup_doc_comment '{' class_statement_list '}' .
+  204 trait_declaration_statement: "'trait'" @6 "identifier" backup_doc_comment '{' class_statement_list '}' •
 
     $default  reduce using rule 204 (trait_declaration_statement)
 
 
 State 915
 
-  102 attributes: attributes . attribute
-  320 class_statement: attributes . attributed_class_statement
+  102 attributes: attributes • attribute
+  320 class_statement: attributes • attributed_class_statement
 
     "'case'"       shift, and go to state 911
     "'static'"     shift, and go to state 789
@@ -28578,7 +28713,7 @@
     "'public'"     shift, and go to state 794
     "'readonly'"   shift, and go to state 795
     "'var'"        shift, and go to state 913
-    "'#'"         shift, and go to state 79
+    "'#'"         shift, and go to state 72
 
     "'const'"  reduce using rule 345 (class_const_modifiers)
     $default   reduce using rule 343 (method_modifiers)
@@ -28595,34 +28730,34 @@
 
 State 916
 
-  318 attributed_class_statement: enum_case .
+  318 attributed_class_statement: enum_case •
 
     $default  reduce using rule 318 (attributed_class_statement)
 
 
 State 917
 
-  319 class_statement: attributed_class_statement .
+  319 class_statement: attributed_class_statement •
 
     $default  reduce using rule 319 (class_statement)
 
 
 State 918
 
-  312 class_statement_list: class_statement_list class_statement .
+  312 class_statement_list: class_statement_list class_statement •
 
     $default  reduce using rule 312 (class_statement_list)
 
 
 State 919
 
-  314 attributed_class_statement: property_modifiers . optional_type_without_static property_list ';'
+  314 attributed_class_statement: property_modifiers • optional_type_without_static property_list ';'
 
     '?'                        shift, and go to state 868
     "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
     "'array'"                  shift, and go to state 762
     "'callable'"               shift, and go to state 763
     '('                        shift, and go to state 869
@@ -28640,27 +28775,27 @@
 
 State 920
 
-  317 attributed_class_statement: method_modifiers . function returns_ref identifier backup_doc_comment '(' parameter_list ')' return_type backup_fn_flags method_body backup_fn_flags
+  317 attributed_class_statement: method_modifiers • function returns_ref identifier backup_doc_comment '(' parameter_list ')' return_type backup_fn_flags method_body backup_fn_flags
 
-    "'function'"  shift, and go to state 49
+    "'function'"  shift, and go to state 41
 
     function  go to state 979
 
 
 State 921
 
-  315 attributed_class_statement: class_const_modifiers . "'const'" class_const_list ';'
-  316                           | class_const_modifiers . "'const'" type_expr class_const_list ';'
+  315 attributed_class_statement: class_const_modifiers • "'const'" class_const_list ';'
+  316                           | class_const_modifiers • "'const'" type_expr class_const_list ';'
 
     "'const'"  shift, and go to state 980
 
 
 State 922
 
-  341 property_modifiers: non_empty_member_modifiers .
-  344 method_modifiers: non_empty_member_modifiers .
-  346 class_const_modifiers: non_empty_member_modifiers .
-  348 non_empty_member_modifiers: non_empty_member_modifiers . member_modifier
+  341 property_modifiers: non_empty_member_modifiers •
+  344 method_modifiers: non_empty_member_modifiers •
+  346 class_const_modifiers: non_empty_member_modifiers •
+  348 non_empty_member_modifiers: non_empty_member_modifiers • member_modifier
 
     "'static'"     shift, and go to state 789
     "'abstract'"   shift, and go to state 790
@@ -28679,15 +28814,15 @@
 
 State 923
 
-  323 class_name_list: class_name_list ',' class_name .
+  323 class_name_list: class_name_list ',' class_name •
 
     $default  reduce using rule 323 (class_name_list)
 
 
 State 924
 
-  206 interface_declaration_statement: "'interface'" @7 "identifier" interface_extends_list backup_doc_comment '{' class_statement_list . '}'
-  312 class_statement_list: class_statement_list . class_statement
+  206 interface_declaration_statement: "'interface'" @7 "identifier" interface_extends_list backup_doc_comment '{' class_statement_list • '}'
+  312 class_statement_list: class_statement_list • class_statement
 
     "'case'"       shift, and go to state 911
     "'use'"        shift, and go to state 912
@@ -28699,7 +28834,7 @@
     "'public'"     shift, and go to state 794
     "'readonly'"   shift, and go to state 795
     "'var'"        shift, and go to state 913
-    "'#'"         shift, and go to state 79
+    "'#'"         shift, and go to state 72
     '}'            shift, and go to state 981
 
     "'const'"  reduce using rule 345 (class_const_modifiers)
@@ -28719,49 +28854,49 @@
 
 State 925
 
-  277 union_type_element: '(' intersection_type ')' .
+  277 union_type_element: '(' intersection_type ')' •
 
     $default  reduce using rule 277 (union_type_element)
 
 
 State 926
 
-  280 intersection_type: type "amp" type .
+  280 intersection_type: type "amp" type •
 
     $default  reduce using rule 280 (intersection_type)
 
 
 State 927
 
-  276 union_type_element: type .
+  276 union_type_element: type •
 
     $default  reduce using rule 276 (union_type_element)
 
 
 State 928
 
-  278 union_type: union_type_element '|' union_type_element .
+  278 union_type: union_type_element '|' union_type_element •
 
     $default  reduce using rule 278 (union_type)
 
 
 State 929
 
-  279 union_type: union_type '|' union_type_element .
+  279 union_type: union_type '|' union_type_element •
 
     $default  reduce using rule 279 (union_type)
 
 
 State 930
 
-  281 intersection_type: intersection_type "amp" type .
+  281 intersection_type: intersection_type "amp" type •
 
     $default  reduce using rule 281 (intersection_type)
 
 
 State 931
 
-  208 enum_declaration_statement: "'enum'" @8 "identifier" enum_backing_type implements_list backup_doc_comment '{' . class_statement_list '}'
+  208 enum_declaration_statement: "'enum'" @8 "identifier" enum_backing_type implements_list backup_doc_comment '{' • class_statement_list '}'
 
     $default  reduce using rule 313 (class_statement_list)
 
@@ -28770,15 +28905,15 @@
 
 State 932
 
-  580 encaps_var: "'${'" "variable name" '' expr '' '}' .
+  580 encaps_var: "'${'" "variable name" '' expr '' '}' •
 
     $default  reduce using rule 580 (encaps_var)
 
 
 State 933
 
-  378 expr: "'list'" '(' array_pair_list ')' . '=' expr
-  568 array_pair: expr "'=>'" "'list'" '(' array_pair_list ')' .
+  378 expr: "'list'" '(' array_pair_list ')' • '=' expr
+  568 array_pair: expr "'=>'" "'list'" '(' array_pair_list ')' •
 
     '='  shift, and go to state 775
 
@@ -28787,91 +28922,91 @@
 
 State 934
 
-  191 class_declaration_statement: class_modifiers "'class'" @4 "identifier" extends_from implements_list backup_doc_comment . '{' class_statement_list '}'
+  191 class_declaration_statement: class_modifiers "'class'" @4 "identifier" extends_from implements_list backup_doc_comment • '{' class_statement_list '}'
 
     '{'  shift, and go to state 983
 
 
 State 935
 
-  142 inner_statement_list: inner_statement_list . inner_statement
-  255 alt_if_stmt_without_else: alt_if_stmt_without_else "'elseif'" '(' expr ')' ':' inner_statement_list .
+  142 inner_statement_list: inner_statement_list • inner_statement
+  255 alt_if_stmt_without_else: alt_if_stmt_without_else "'elseif'" '(' expr ')' ':' inner_statement_list •
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 27
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    T_INLINE_HTML              shift, and go to state 32
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'if'"                     shift, and go to state 37
-    "'echo'"                   shift, and go to state 38
-    "'do'"                     shift, and go to state 39
-    "'while'"                  shift, and go to state 40
-    "'for'"                    shift, and go to state 41
-    "'foreach'"                shift, and go to state 42
-    "'declare'"                shift, and go to state 43
-    "'switch'"                 shift, and go to state 44
-    "'match'"                  shift, and go to state 45
-    "'break'"                  shift, and go to state 46
-    "'continue'"               shift, and go to state 47
-    "'goto'"                   shift, and go to state 48
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'return'"                 shift, and go to state 52
-    "'try'"                    shift, and go to state 53
-    "'global'"                 shift, and go to state 55
-    "'static'"                 shift, and go to state 56
-    "'abstract'"               shift, and go to state 57
-    "'final'"                  shift, and go to state 58
-    "'readonly'"               shift, and go to state 59
-    "'unset'"                  shift, and go to state 60
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 11
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    T_INLINE_HTML              shift, and go to state 16
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'if'"                     shift, and go to state 29
+    "'echo'"                   shift, and go to state 30
+    "'do'"                     shift, and go to state 31
+    "'while'"                  shift, and go to state 32
+    "'for'"                    shift, and go to state 33
+    "'foreach'"                shift, and go to state 34
+    "'declare'"                shift, and go to state 35
+    "'switch'"                 shift, and go to state 36
+    "'match'"                  shift, and go to state 37
+    "'break'"                  shift, and go to state 38
+    "'continue'"               shift, and go to state 39
+    "'goto'"                   shift, and go to state 40
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'return'"                 shift, and go to state 44
+    "'try'"                    shift, and go to state 45
+    "'throw'"                  shift, and go to state 46
+    "'global'"                 shift, and go to state 48
+    "'static'"                 shift, and go to state 49
+    "'abstract'"               shift, and go to state 50
+    "'final'"                  shift, and go to state 51
+    "'readonly'"               shift, and go to state 52
+    "'unset'"                  shift, and go to state 53
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
     "'__halt_compiler'"        shift, and go to state 528
-    "'class'"                  shift, and go to state 64
-    "'trait'"                  shift, and go to state 65
-    "'interface'"              shift, and go to state 66
-    "'enum'"                   shift, and go to state 67
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    "'class'"                  shift, and go to state 57
+    "'trait'"                  shift, and go to state 58
+    "'interface'"              shift, and go to state 59
+    "'enum'"                   shift, and go to state 60
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ';'                        shift, and go to state 84
@@ -28925,13 +29060,13 @@
 
 State 936
 
-  296 return_type: ':' . type_expr
+  296 return_type: ':' • type_expr
 
     '?'                        shift, and go to state 760
     "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
     "'static'"                 shift, and go to state 761
     "'array'"                  shift, and go to state 762
     "'callable'"               shift, and go to state 763
@@ -28948,36 +29083,36 @@
 
 State 937
 
-  461 inline_function: fn returns_ref backup_doc_comment '(' parameter_list ')' return_type . "'=>'" backup_fn_flags backup_lex_pos expr backup_fn_flags
+  461 inline_function: fn returns_ref backup_doc_comment '(' parameter_list ')' return_type • "'=>'" backup_fn_flags backup_lex_pos expr backup_fn_flags
 
     "'=>'"  shift, and go to state 985
 
 
 State 938
 
-  261 non_empty_parameter_list: non_empty_parameter_list ',' attributed_parameter .
+  261 non_empty_parameter_list: non_empty_parameter_list ',' attributed_parameter •
 
     $default  reduce using rule 261 (non_empty_parameter_list)
 
 
 State 939
 
-  283 type_expr_without_static: '?' type_without_static .
+  283 type_expr_without_static: '?' type_without_static •
 
     $default  reduce using rule 283 (type_expr_without_static)
 
 
 State 940
 
-  293 intersection_type_without_static: type_without_static . "amp" type_without_static
+  293 intersection_type_without_static: type_without_static • "amp" type_without_static
 
     "amp"  shift, and go to state 944
 
 
 State 941
 
-  290 union_type_without_static_element: '(' intersection_type_without_static . ')'
-  294 intersection_type_without_static: intersection_type_without_static . "amp" type_without_static
+  290 union_type_without_static_element: '(' intersection_type_without_static • ')'
+  294 intersection_type_without_static: intersection_type_without_static • "amp" type_without_static
 
     "amp"  shift, and go to state 947
     ')'    shift, and go to state 986
@@ -28985,15 +29120,15 @@
 
 State 942
 
-  187 is_reference: "'&'" .
+  187 is_reference: "'&'" •
 
     $default  reduce using rule 187 (is_reference)
 
 
 State 943
 
-  266 parameter: optional_cpp_modifiers optional_type_without_static is_reference . is_variadic "variable" backup_doc_comment
-  267          | optional_cpp_modifiers optional_type_without_static is_reference . is_variadic "variable" backup_doc_comment '=' expr
+  266 parameter: optional_cpp_modifiers optional_type_without_static is_reference • is_variadic "variable" backup_doc_comment
+  267          | optional_cpp_modifiers optional_type_without_static is_reference • is_variadic "variable" backup_doc_comment '=' expr
 
     "'...'"  shift, and go to state 987
 
@@ -29004,12 +29139,12 @@
 
 State 944
 
-  293 intersection_type_without_static: type_without_static "amp" . type_without_static
+  293 intersection_type_without_static: type_without_static "amp" • type_without_static
 
     "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
     "'array'"                  shift, and go to state 762
     "'callable'"               shift, and go to state 763
 
@@ -29019,12 +29154,12 @@
 
 State 945
 
-  291 union_type_without_static: union_type_without_static_element '|' . union_type_without_static_element
+  291 union_type_without_static: union_type_without_static_element '|' • union_type_without_static_element
 
     "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
     "'array'"                  shift, and go to state 762
     "'callable'"               shift, and go to state 763
     '('                        shift, and go to state 869
@@ -29036,12 +29171,12 @@
 
 State 946
 
-  292 union_type_without_static: union_type_without_static '|' . union_type_without_static_element
+  292 union_type_without_static: union_type_without_static '|' • union_type_without_static_element
 
     "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
     "'array'"                  shift, and go to state 762
     "'callable'"               shift, and go to state 763
     '('                        shift, and go to state 869
@@ -29053,12 +29188,12 @@
 
 State 947
 
-  294 intersection_type_without_static: intersection_type_without_static "amp" . type_without_static
+  294 intersection_type_without_static: intersection_type_without_static "amp" • type_without_static
 
     "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
     "'array'"                  shift, and go to state 762
     "'callable'"               shift, and go to state 763
 
@@ -29068,7 +29203,7 @@
 
 State 948
 
-  185 function_declaration_statement: function returns_ref function_name backup_doc_comment '(' parameter_list ')' . return_type backup_fn_flags '{' inner_statement_list '}' backup_fn_flags
+  185 function_declaration_statement: function returns_ref function_name backup_doc_comment '(' parameter_list ')' • return_type backup_fn_flags '{' inner_statement_list '}' backup_fn_flags
 
     ':'  shift, and go to state 936
 
@@ -29079,14 +29214,14 @@
 
 State 949
 
-  470 lexical_vars: "'use'" . '(' lexical_var_list possible_comma ')'
+  470 lexical_vars: "'use'" • '(' lexical_var_list possible_comma ')'
 
     '('  shift, and go to state 995
 
 
 State 950
 
-  460 inline_function: function returns_ref backup_doc_comment '(' parameter_list ')' lexical_vars . return_type backup_fn_flags '{' inner_statement_list '}' backup_fn_flags
+  460 inline_function: function returns_ref backup_doc_comment '(' parameter_list ')' lexical_vars • return_type backup_fn_flags '{' inner_statement_list '}' backup_fn_flags
 
     ':'  shift, and go to state 936
 
@@ -29097,91 +29232,91 @@
 
 State 951
 
-  373 anonymous_class: anonymous_class_modifiers_optional "'class'" @9 ctor_arguments extends_from implements_list backup_doc_comment . '{' class_statement_list '}'
+  373 anonymous_class: anonymous_class_modifiers_optional "'class'" @9 ctor_arguments extends_from implements_list backup_doc_comment • '{' class_statement_list '}'
 
     '{'  shift, and go to state 997
 
 
 State 952
 
-  249 while_statement: ':' inner_statement_list "'endwhile'" ';' .
+  249 while_statement: ':' inner_statement_list "'endwhile'" ';' •
 
     $default  reduce using rule 249 (while_statement)
 
 
 State 953
 
-  153 statement: "'for'" '(' for_exprs ';' for_exprs ';' for_exprs ')' . for_statement
+  153 statement: "'for'" '(' for_exprs ';' for_exprs ';' for_exprs ')' • for_statement
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
     ':'                        shift, and go to state 998
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 27
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    T_INLINE_HTML              shift, and go to state 32
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'if'"                     shift, and go to state 37
-    "'echo'"                   shift, and go to state 38
-    "'do'"                     shift, and go to state 39
-    "'while'"                  shift, and go to state 40
-    "'for'"                    shift, and go to state 41
-    "'foreach'"                shift, and go to state 42
-    "'declare'"                shift, and go to state 43
-    "'switch'"                 shift, and go to state 44
-    "'match'"                  shift, and go to state 45
-    "'break'"                  shift, and go to state 46
-    "'continue'"               shift, and go to state 47
-    "'goto'"                   shift, and go to state 48
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'return'"                 shift, and go to state 52
-    "'try'"                    shift, and go to state 53
-    "'global'"                 shift, and go to state 55
-    "'static'"                 shift, and go to state 56
-    "'readonly'"               shift, and go to state 130
-    "'unset'"                  shift, and go to state 60
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 11
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    T_INLINE_HTML              shift, and go to state 16
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'if'"                     shift, and go to state 29
+    "'echo'"                   shift, and go to state 30
+    "'do'"                     shift, and go to state 31
+    "'while'"                  shift, and go to state 32
+    "'for'"                    shift, and go to state 33
+    "'foreach'"                shift, and go to state 34
+    "'declare'"                shift, and go to state 35
+    "'switch'"                 shift, and go to state 36
+    "'match'"                  shift, and go to state 37
+    "'break'"                  shift, and go to state 38
+    "'continue'"               shift, and go to state 39
+    "'goto'"                   shift, and go to state 40
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'return'"                 shift, and go to state 44
+    "'try'"                    shift, and go to state 45
+    "'throw'"                  shift, and go to state 46
+    "'global'"                 shift, and go to state 48
+    "'static'"                 shift, and go to state 49
+    "'readonly'"               shift, and go to state 130
+    "'unset'"                  shift, and go to state 53
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ';'                        shift, and go to state 84
@@ -29225,84 +29360,84 @@
 
 State 954
 
-  222 foreach_variable: "'list'" '(' array_pair_list ')' .
+  222 foreach_variable: "'list'" '(' array_pair_list ')' •
 
     $default  reduce using rule 222 (foreach_variable)
 
 
 State 955
 
-  165 statement: "'foreach'" '(' expr "'as'" foreach_variable "'=>'" foreach_variable ')' . foreach_statement
+  165 statement: "'foreach'" '(' expr "'as'" foreach_variable "'=>'" foreach_variable ')' • foreach_statement
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
     ':'                        shift, and go to state 886
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 27
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    T_INLINE_HTML              shift, and go to state 32
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'if'"                     shift, and go to state 37
-    "'echo'"                   shift, and go to state 38
-    "'do'"                     shift, and go to state 39
-    "'while'"                  shift, and go to state 40
-    "'for'"                    shift, and go to state 41
-    "'foreach'"                shift, and go to state 42
-    "'declare'"                shift, and go to state 43
-    "'switch'"                 shift, and go to state 44
-    "'match'"                  shift, and go to state 45
-    "'break'"                  shift, and go to state 46
-    "'continue'"               shift, and go to state 47
-    "'goto'"                   shift, and go to state 48
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'return'"                 shift, and go to state 52
-    "'try'"                    shift, and go to state 53
-    "'global'"                 shift, and go to state 55
-    "'static'"                 shift, and go to state 56
-    "'readonly'"               shift, and go to state 130
-    "'unset'"                  shift, and go to state 60
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 11
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    T_INLINE_HTML              shift, and go to state 16
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'if'"                     shift, and go to state 29
+    "'echo'"                   shift, and go to state 30
+    "'do'"                     shift, and go to state 31
+    "'while'"                  shift, and go to state 32
+    "'for'"                    shift, and go to state 33
+    "'foreach'"                shift, and go to state 34
+    "'declare'"                shift, and go to state 35
+    "'switch'"                 shift, and go to state 36
+    "'match'"                  shift, and go to state 37
+    "'break'"                  shift, and go to state 38
+    "'continue'"               shift, and go to state 39
+    "'goto'"                   shift, and go to state 40
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'return'"                 shift, and go to state 44
+    "'try'"                    shift, and go to state 45
+    "'throw'"                  shift, and go to state 46
+    "'global'"                 shift, and go to state 48
+    "'static'"                 shift, and go to state 49
+    "'readonly'"               shift, and go to state 130
+    "'unset'"                  shift, and go to state 53
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ';'                        shift, and go to state 84
@@ -29346,85 +29481,85 @@
 
 State 956
 
-  142 inner_statement_list: inner_statement_list . inner_statement
-  227 foreach_statement: ':' inner_statement_list . "'endforeach'" ';'
+  142 inner_statement_list: inner_statement_list • inner_statement
+  227 foreach_statement: ':' inner_statement_list • "'endforeach'" ';'
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 27
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    T_INLINE_HTML              shift, and go to state 32
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'if'"                     shift, and go to state 37
-    "'echo'"                   shift, and go to state 38
-    "'do'"                     shift, and go to state 39
-    "'while'"                  shift, and go to state 40
-    "'for'"                    shift, and go to state 41
-    "'foreach'"                shift, and go to state 42
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 11
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    T_INLINE_HTML              shift, and go to state 16
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'if'"                     shift, and go to state 29
+    "'echo'"                   shift, and go to state 30
+    "'do'"                     shift, and go to state 31
+    "'while'"                  shift, and go to state 32
+    "'for'"                    shift, and go to state 33
+    "'foreach'"                shift, and go to state 34
     "'endforeach'"             shift, and go to state 1002
-    "'declare'"                shift, and go to state 43
-    "'switch'"                 shift, and go to state 44
-    "'match'"                  shift, and go to state 45
-    "'break'"                  shift, and go to state 46
-    "'continue'"               shift, and go to state 47
-    "'goto'"                   shift, and go to state 48
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'return'"                 shift, and go to state 52
-    "'try'"                    shift, and go to state 53
-    "'global'"                 shift, and go to state 55
-    "'static'"                 shift, and go to state 56
-    "'abstract'"               shift, and go to state 57
-    "'final'"                  shift, and go to state 58
-    "'readonly'"               shift, and go to state 59
-    "'unset'"                  shift, and go to state 60
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
+    "'declare'"                shift, and go to state 35
+    "'switch'"                 shift, and go to state 36
+    "'match'"                  shift, and go to state 37
+    "'break'"                  shift, and go to state 38
+    "'continue'"               shift, and go to state 39
+    "'goto'"                   shift, and go to state 40
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'return'"                 shift, and go to state 44
+    "'try'"                    shift, and go to state 45
+    "'throw'"                  shift, and go to state 46
+    "'global'"                 shift, and go to state 48
+    "'static'"                 shift, and go to state 49
+    "'abstract'"               shift, and go to state 50
+    "'final'"                  shift, and go to state 51
+    "'readonly'"               shift, and go to state 52
+    "'unset'"                  shift, and go to state 53
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
     "'__halt_compiler'"        shift, and go to state 528
-    "'class'"                  shift, and go to state 64
-    "'trait'"                  shift, and go to state 65
-    "'interface'"              shift, and go to state 66
-    "'enum'"                   shift, and go to state 67
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    "'class'"                  shift, and go to state 57
+    "'trait'"                  shift, and go to state 58
+    "'interface'"              shift, and go to state 59
+    "'enum'"                   shift, and go to state 60
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ';'                        shift, and go to state 84
@@ -29476,91 +29611,91 @@
 
 State 957
 
-  229 declare_statement: ':' inner_statement_list "'enddeclare'" . ';'
+  229 declare_statement: ':' inner_statement_list "'enddeclare'" • ';'
 
     ';'  shift, and go to state 1003
 
 
 State 958
 
-  233 switch_case_list: ':' ';' case_list "'endswitch'" . ';'
+  233 switch_case_list: ':' ';' case_list "'endswitch'" • ';'
 
     ';'  shift, and go to state 1004
 
 
 State 959
 
-  232 switch_case_list: ':' case_list "'endswitch'" ';' .
+  232 switch_case_list: ':' case_list "'endswitch'" ';' •
 
     $default  reduce using rule 232 (switch_case_list)
 
 
 State 960
 
-  235 case_list: case_list "'case'" expr . case_separator inner_statement_list
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-
-    "'or'"          shift, and go to state 353
-    "'xor'"         shift, and go to state 354
-    "'and'"         shift, and go to state 355
-    '?'             shift, and go to state 356
+  235 case_list: case_list "'case'" expr • case_separator inner_statement_list
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+
+    '?'             shift, and go to state 353
     ':'             shift, and go to state 961
-    "'??'"          shift, and go to state 357
-    "'||'"          shift, and go to state 358
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'or'"          shift, and go to state 364
+    "'xor'"         shift, and go to state 365
+    "'and'"         shift, and go to state 366
+    "'instanceof'"  shift, and go to state 367
+    "'||'"          shift, and go to state 368
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'??'"          shift, and go to state 379
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
     ';'             shift, and go to state 962
 
     case_separator  go to state 1005
@@ -29568,21 +29703,21 @@
 
 State 961
 
-  237 case_separator: ':' .
+  237 case_separator: ':' •
 
     $default  reduce using rule 237 (case_separator)
 
 
 State 962
 
-  238 case_separator: ';' .
+  238 case_separator: ';' •
 
     $default  reduce using rule 238 (case_separator)
 
 
 State 963
 
-  236 case_list: case_list "'default'" case_separator . inner_statement_list
+  236 case_list: case_list "'default'" case_separator • inner_statement_list
 
     $default  reduce using rule 143 (inner_statement_list)
 
@@ -29591,67 +29726,67 @@
 
 State 964
 
-  231 switch_case_list: '{' ';' case_list '}' .
+  231 switch_case_list: '{' ';' case_list '}' •
 
     $default  reduce using rule 231 (switch_case_list)
 
 
 State 965
 
-  245 match_arm: "'default'" possible_comma "'=>'" . expr
+  245 match_arm: "'default'" possible_comma "'=>'" • expr
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -29687,136 +29822,136 @@
 
 State 966
 
-  243 non_empty_match_arm_list: non_empty_match_arm_list ',' match_arm .
+  243 non_empty_match_arm_list: non_empty_match_arm_list ',' match_arm •
 
     $default  reduce using rule 243 (non_empty_match_arm_list)
 
 
 State 967
 
-  247 match_arm_cond_list: match_arm_cond_list ',' expr .
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-
-    "'or'"          shift, and go to state 353
-    "'xor'"         shift, and go to state 354
-    "'and'"         shift, and go to state 355
-    '?'             shift, and go to state 356
-    "'??'"          shift, and go to state 357
-    "'||'"          shift, and go to state 358
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  247 match_arm_cond_list: match_arm_cond_list ',' expr •
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+
+    '?'             shift, and go to state 353
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'or'"          shift, and go to state 364
+    "'xor'"         shift, and go to state 365
+    "'and'"         shift, and go to state 366
+    "'instanceof'"  shift, and go to state 367
+    "'||'"          shift, and go to state 368
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'??'"          shift, and go to state 379
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
 
     $default  reduce using rule 247 (match_arm_cond_list)
 
 
 State 968
 
-  244 match_arm: match_arm_cond_list possible_comma "'=>'" . expr
+  244 match_arm: match_arm_cond_list possible_comma "'=>'" • expr
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -29852,8 +29987,8 @@
 
 State 969
 
-  173 catch_list: catch_list "'catch'" '(' catch_name_list . optional_variable ')' '{' inner_statement_list '}'
-  175 catch_name_list: catch_name_list . '|' class_name
+  173 catch_list: catch_list "'catch'" '(' catch_name_list • optional_variable ')' '{' inner_statement_list '}'
+  175 catch_name_list: catch_name_list • '|' class_name
 
     '|'         shift, and go to state 1009
     "variable"  shift, and go to state 1010
@@ -29865,91 +30000,91 @@
 
 State 970
 
-  174 catch_name_list: class_name .
+  174 catch_name_list: class_name •
 
     $default  reduce using rule 174 (catch_name_list)
 
 
 State 971
 
-  142 inner_statement_list: inner_statement_list . inner_statement
-  179 finally_statement: "'finally'" '{' inner_statement_list . '}'
+  142 inner_statement_list: inner_statement_list • inner_statement
+  179 finally_statement: "'finally'" '{' inner_statement_list • '}'
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 27
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    T_INLINE_HTML              shift, and go to state 32
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'if'"                     shift, and go to state 37
-    "'echo'"                   shift, and go to state 38
-    "'do'"                     shift, and go to state 39
-    "'while'"                  shift, and go to state 40
-    "'for'"                    shift, and go to state 41
-    "'foreach'"                shift, and go to state 42
-    "'declare'"                shift, and go to state 43
-    "'switch'"                 shift, and go to state 44
-    "'match'"                  shift, and go to state 45
-    "'break'"                  shift, and go to state 46
-    "'continue'"               shift, and go to state 47
-    "'goto'"                   shift, and go to state 48
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'return'"                 shift, and go to state 52
-    "'try'"                    shift, and go to state 53
-    "'global'"                 shift, and go to state 55
-    "'static'"                 shift, and go to state 56
-    "'abstract'"               shift, and go to state 57
-    "'final'"                  shift, and go to state 58
-    "'readonly'"               shift, and go to state 59
-    "'unset'"                  shift, and go to state 60
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 11
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    T_INLINE_HTML              shift, and go to state 16
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'if'"                     shift, and go to state 29
+    "'echo'"                   shift, and go to state 30
+    "'do'"                     shift, and go to state 31
+    "'while'"                  shift, and go to state 32
+    "'for'"                    shift, and go to state 33
+    "'foreach'"                shift, and go to state 34
+    "'declare'"                shift, and go to state 35
+    "'switch'"                 shift, and go to state 36
+    "'match'"                  shift, and go to state 37
+    "'break'"                  shift, and go to state 38
+    "'continue'"               shift, and go to state 39
+    "'goto'"                   shift, and go to state 40
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'return'"                 shift, and go to state 44
+    "'try'"                    shift, and go to state 45
+    "'throw'"                  shift, and go to state 46
+    "'global'"                 shift, and go to state 48
+    "'static'"                 shift, and go to state 49
+    "'abstract'"               shift, and go to state 50
+    "'final'"                  shift, and go to state 51
+    "'readonly'"               shift, and go to state 52
+    "'unset'"                  shift, and go to state 53
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
     "'__halt_compiler'"        shift, and go to state 528
-    "'class'"                  shift, and go to state 64
-    "'trait'"                  shift, and go to state 65
-    "'interface'"              shift, and go to state 66
-    "'enum'"                   shift, and go to state 67
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    "'class'"                  shift, and go to state 57
+    "'trait'"                  shift, and go to state 58
+    "'interface'"              shift, and go to state 59
+    "'enum'"                   shift, and go to state 60
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ';'                        shift, and go to state 84
@@ -30002,22 +30137,22 @@
 
 State 972
 
-  130 unprefixed_use_declarations: unprefixed_use_declarations ',' unprefixed_use_declaration .
+  130 unprefixed_use_declarations: unprefixed_use_declarations ',' unprefixed_use_declaration •
 
     $default  reduce using rule 130 (unprefixed_use_declarations)
 
 
 State 973
 
-  124 group_use_declaration: legacy_namespace_name "'\\'" '{' unprefixed_use_declarations possible_comma '}' .
+  124 group_use_declaration: legacy_namespace_name "'\\'" '{' unprefixed_use_declarations possible_comma '}' •
 
     $default  reduce using rule 124 (group_use_declaration)
 
 
 State 974
 
-  193 class_declaration_statement: "'class'" @5 "identifier" extends_from implements_list backup_doc_comment '{' class_statement_list . '}'
-  312 class_statement_list: class_statement_list . class_statement
+  193 class_declaration_statement: "'class'" @5 "identifier" extends_from implements_list backup_doc_comment '{' class_statement_list • '}'
+  312 class_statement_list: class_statement_list • class_statement
 
     "'case'"       shift, and go to state 911
     "'use'"        shift, and go to state 912
@@ -30029,7 +30164,7 @@
     "'public'"     shift, and go to state 794
     "'readonly'"   shift, and go to state 795
     "'var'"        shift, and go to state 913
-    "'#'"         shift, and go to state 79
+    "'#'"         shift, and go to state 72
     '}'            shift, and go to state 1013
 
     "'const'"  reduce using rule 345 (class_const_modifiers)
@@ -30049,96 +30184,96 @@
 
 State 975
 
-  211 enum_case: "'case'" backup_doc_comment . identifier enum_case_expr ';'
+  211 enum_case: "'case'" backup_doc_comment • identifier enum_case_expr ';'
 
-    "'throw'"          shift, and go to state 219
-    "'include'"        shift, and go to state 220
-    "'include_once'"   shift, and go to state 221
-    "'require'"        shift, and go to state 222
-    "'require_once'"   shift, and go to state 223
-    "'or'"             shift, and go to state 224
-    "'xor'"            shift, and go to state 225
-    "'and'"            shift, and go to state 226
-    "'print'"          shift, and go to state 227
-    "'yield'"          shift, and go to state 228
-    "'instanceof'"     shift, and go to state 229
-    "'clone'"          shift, and go to state 230
-    "'elseif'"         shift, and go to state 231
-    "'else'"           shift, and go to state 232
-    "identifier"       shift, and go to state 233
-    "'eval'"           shift, and go to state 235
-    "'new'"            shift, and go to state 236
-    "'exit'"           shift, and go to state 237
-    "'if'"             shift, and go to state 238
-    "'endif'"          shift, and go to state 239
-    "'echo'"           shift, and go to state 240
-    "'do'"             shift, and go to state 241
-    "'while'"          shift, and go to state 242
-    "'endwhile'"       shift, and go to state 243
-    "'for'"            shift, and go to state 244
-    "'endfor'"         shift, and go to state 245
-    "'foreach'"        shift, and go to state 246
-    "'endforeach'"     shift, and go to state 247
-    "'declare'"        shift, and go to state 248
-    "'enddeclare'"     shift, and go to state 249
-    "'as'"             shift, and go to state 250
-    "'switch'"         shift, and go to state 251
-    "'endswitch'"      shift, and go to state 252
-    "'case'"           shift, and go to state 253
-    "'default'"        shift, and go to state 254
-    "'match'"          shift, and go to state 255
-    "'break'"          shift, and go to state 256
-    "'continue'"       shift, and go to state 257
-    "'goto'"           shift, and go to state 258
-    "'function'"       shift, and go to state 259
-    "'fn'"             shift, and go to state 260
-    "'const'"          shift, and go to state 261
-    "'return'"         shift, and go to state 262
-    "'try'"            shift, and go to state 263
-    "'catch'"          shift, and go to state 264
-    "'finally'"        shift, and go to state 265
-    "'use'"            shift, and go to state 266
-    "'insteadof'"      shift, and go to state 267
-    "'global'"         shift, and go to state 268
-    "'static'"         shift, and go to state 269
-    "'abstract'"       shift, and go to state 270
-    "'final'"          shift, and go to state 271
-    "'private'"        shift, and go to state 272
-    "'protected'"      shift, and go to state 273
-    "'public'"         shift, and go to state 274
-    "'readonly'"       shift, and go to state 275
-    "'var'"            shift, and go to state 276
-    "'unset'"          shift, and go to state 277
-    "'isset'"          shift, and go to state 278
-    "'empty'"          shift, and go to state 279
-    "'class'"          shift, and go to state 280
-    "'trait'"          shift, and go to state 281
-    "'interface'"      shift, and go to state 282
-    "'enum'"           shift, and go to state 283
-    "'extends'"        shift, and go to state 284
-    "'implements'"     shift, and go to state 285
-    "'namespace'"      shift, and go to state 286
-    "'list'"           shift, and go to state 287
-    "'array'"          shift, and go to state 288
-    "'callable'"       shift, and go to state 289
-    "'__LINE__'"       shift, and go to state 290
-    "'__FILE__'"       shift, and go to state 291
-    "'__DIR__'"        shift, and go to state 292
-    "'__CLASS__'"      shift, and go to state 293
-    "'__TRAIT__'"      shift, and go to state 294
-    "'__METHOD__'"     shift, and go to state 295
-    "'__FUNCTION__'"   shift, and go to state 296
-    "'__NAMESPACE__'"  shift, and go to state 297
+    "identifier"       shift, and go to state 212
+    "'include'"        shift, and go to state 214
+    "'include_once'"   shift, and go to state 215
+    "'eval'"           shift, and go to state 216
+    "'require'"        shift, and go to state 217
+    "'require_once'"   shift, and go to state 218
+    "'or'"             shift, and go to state 219
+    "'xor'"            shift, and go to state 220
+    "'and'"            shift, and go to state 221
+    "'print'"          shift, and go to state 222
+    "'yield'"          shift, and go to state 223
+    "'instanceof'"     shift, and go to state 224
+    "'new'"            shift, and go to state 225
+    "'clone'"          shift, and go to state 226
+    "'exit'"           shift, and go to state 227
+    "'if'"             shift, and go to state 228
+    "'elseif'"         shift, and go to state 229
+    "'else'"           shift, and go to state 230
+    "'endif'"          shift, and go to state 231
+    "'echo'"           shift, and go to state 232
+    "'do'"             shift, and go to state 233
+    "'while'"          shift, and go to state 234
+    "'endwhile'"       shift, and go to state 235
+    "'for'"            shift, and go to state 236
+    "'endfor'"         shift, and go to state 237
+    "'foreach'"        shift, and go to state 238
+    "'endforeach'"     shift, and go to state 239
+    "'declare'"        shift, and go to state 240
+    "'enddeclare'"     shift, and go to state 241
+    "'as'"             shift, and go to state 242
+    "'switch'"         shift, and go to state 243
+    "'endswitch'"      shift, and go to state 244
+    "'case'"           shift, and go to state 245
+    "'default'"        shift, and go to state 246
+    "'match'"          shift, and go to state 247
+    "'break'"          shift, and go to state 248
+    "'continue'"       shift, and go to state 249
+    "'goto'"           shift, and go to state 250
+    "'function'"       shift, and go to state 251
+    "'fn'"             shift, and go to state 252
+    "'const'"          shift, and go to state 253
+    "'return'"         shift, and go to state 254
+    "'try'"            shift, and go to state 255
+    "'catch'"          shift, and go to state 256
+    "'finally'"        shift, and go to state 257
+    "'throw'"          shift, and go to state 258
+    "'use'"            shift, and go to state 259
+    "'insteadof'"      shift, and go to state 260
+    "'global'"         shift, and go to state 261
+    "'static'"         shift, and go to state 262
+    "'abstract'"       shift, and go to state 263
+    "'final'"          shift, and go to state 264
+    "'private'"        shift, and go to state 265
+    "'protected'"      shift, and go to state 266
+    "'public'"         shift, and go to state 267
+    "'readonly'"       shift, and go to state 268
+    "'var'"            shift, and go to state 269
+    "'unset'"          shift, and go to state 270
+    "'isset'"          shift, and go to state 271
+    "'empty'"          shift, and go to state 272
+    "'class'"          shift, and go to state 273
+    "'trait'"          shift, and go to state 274
+    "'interface'"      shift, and go to state 275
+    "'enum'"           shift, and go to state 276
+    "'extends'"        shift, and go to state 277
+    "'implements'"     shift, and go to state 278
+    "'namespace'"      shift, and go to state 279
+    "'list'"           shift, and go to state 280
+    "'array'"          shift, and go to state 281
+    "'callable'"       shift, and go to state 282
+    "'__LINE__'"       shift, and go to state 283
+    "'__FILE__'"       shift, and go to state 284
+    "'__DIR__'"        shift, and go to state 285
+    "'__CLASS__'"      shift, and go to state 286
+    "'__TRAIT__'"      shift, and go to state 287
+    "'__METHOD__'"     shift, and go to state 288
+    "'__FUNCTION__'"   shift, and go to state 289
+    "'__NAMESPACE__'"  shift, and go to state 290
 
-    reserved_non_modifiers  go to state 298
-    semi_reserved           go to state 299
+    reserved_non_modifiers  go to state 291
+    semi_reserved           go to state 292
     identifier              go to state 1014
 
 
 State 976
 
-  321 class_statement: "'use'" class_name_list . trait_adaptations
-  323 class_name_list: class_name_list . ',' class_name
+  321 class_statement: "'use'" class_name_list • trait_adaptations
+  323 class_name_list: class_name_list • ',' class_name
 
     ','  shift, and go to state 845
     ';'  shift, and go to state 1015
@@ -30149,14 +30284,14 @@
 
 State 977
 
-  320 class_statement: attributes attributed_class_statement .
+  320 class_statement: attributes attributed_class_statement •
 
     $default  reduce using rule 320 (class_statement)
 
 
 State 978
 
-  314 attributed_class_statement: property_modifiers optional_type_without_static . property_list ';'
+  314 attributed_class_statement: property_modifiers optional_type_without_static • property_list ';'
 
     "variable"  shift, and go to state 1018
 
@@ -30166,10 +30301,10 @@
 
 State 979
 
-  317 attributed_class_statement: method_modifiers function . returns_ref identifier backup_doc_comment '(' parameter_list ')' return_type backup_fn_flags method_body backup_fn_flags
+  317 attributed_class_statement: method_modifiers function • returns_ref identifier backup_doc_comment '(' parameter_list ')' return_type backup_fn_flags method_body backup_fn_flags
 
-    "amp"  shift, and go to state 324
-    "'&'"  shift, and go to state 325
+    "'&'"  shift, and go to state 326
+    "amp"  shift, and go to state 327
 
     $default  reduce using rule 467 (returns_ref)
 
@@ -30179,94 +30314,94 @@
 
 State 980
 
-  315 attributed_class_statement: class_const_modifiers "'const'" . class_const_list ';'
-  316                           | class_const_modifiers "'const'" . type_expr class_const_list ';'
+  315 attributed_class_statement: class_const_modifiers "'const'" • class_const_list ';'
+  316                           | class_const_modifiers "'const'" • type_expr class_const_list ';'
 
-    "'throw'"                  shift, and go to state 219
-    "'include'"                shift, and go to state 220
-    "'include_once'"           shift, and go to state 221
-    "'require'"                shift, and go to state 222
-    "'require_once'"           shift, and go to state 223
-    "'or'"                     shift, and go to state 224
-    "'xor'"                    shift, and go to state 225
-    "'and'"                    shift, and go to state 226
-    "'print'"                  shift, and go to state 227
-    "'yield'"                  shift, and go to state 228
     '?'                        shift, and go to state 760
-    "'instanceof'"             shift, and go to state 229
-    "'clone'"                  shift, and go to state 230
-    "'elseif'"                 shift, and go to state 231
-    "'else'"                   shift, and go to state 232
     "identifier"               shift, and go to state 1022
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "'eval'"                   shift, and go to state 235
-    "'new'"                    shift, and go to state 236
-    "'exit'"                   shift, and go to state 237
-    "'if'"                     shift, and go to state 238
-    "'endif'"                  shift, and go to state 239
-    "'echo'"                   shift, and go to state 240
-    "'do'"                     shift, and go to state 241
-    "'while'"                  shift, and go to state 242
-    "'endwhile'"               shift, and go to state 243
-    "'for'"                    shift, and go to state 244
-    "'endfor'"                 shift, and go to state 245
-    "'foreach'"                shift, and go to state 246
-    "'endforeach'"             shift, and go to state 247
-    "'declare'"                shift, and go to state 248
-    "'enddeclare'"             shift, and go to state 249
-    "'as'"                     shift, and go to state 250
-    "'switch'"                 shift, and go to state 251
-    "'endswitch'"              shift, and go to state 252
-    "'case'"                   shift, and go to state 253
-    "'default'"                shift, and go to state 254
-    "'match'"                  shift, and go to state 255
-    "'break'"                  shift, and go to state 256
-    "'continue'"               shift, and go to state 257
-    "'goto'"                   shift, and go to state 258
-    "'function'"               shift, and go to state 259
-    "'fn'"                     shift, and go to state 260
-    "'const'"                  shift, and go to state 261
-    "'return'"                 shift, and go to state 262
-    "'try'"                    shift, and go to state 263
-    "'catch'"                  shift, and go to state 264
-    "'finally'"                shift, and go to state 265
-    "'use'"                    shift, and go to state 266
-    "'insteadof'"              shift, and go to state 267
-    "'global'"                 shift, and go to state 268
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "'include'"                shift, and go to state 214
+    "'include_once'"           shift, and go to state 215
+    "'eval'"                   shift, and go to state 216
+    "'require'"                shift, and go to state 217
+    "'require_once'"           shift, and go to state 218
+    "'or'"                     shift, and go to state 219
+    "'xor'"                    shift, and go to state 220
+    "'and'"                    shift, and go to state 221
+    "'print'"                  shift, and go to state 222
+    "'yield'"                  shift, and go to state 223
+    "'instanceof'"             shift, and go to state 224
+    "'new'"                    shift, and go to state 225
+    "'clone'"                  shift, and go to state 226
+    "'exit'"                   shift, and go to state 227
+    "'if'"                     shift, and go to state 228
+    "'elseif'"                 shift, and go to state 229
+    "'else'"                   shift, and go to state 230
+    "'endif'"                  shift, and go to state 231
+    "'echo'"                   shift, and go to state 232
+    "'do'"                     shift, and go to state 233
+    "'while'"                  shift, and go to state 234
+    "'endwhile'"               shift, and go to state 235
+    "'for'"                    shift, and go to state 236
+    "'endfor'"                 shift, and go to state 237
+    "'foreach'"                shift, and go to state 238
+    "'endforeach'"             shift, and go to state 239
+    "'declare'"                shift, and go to state 240
+    "'enddeclare'"             shift, and go to state 241
+    "'as'"                     shift, and go to state 242
+    "'switch'"                 shift, and go to state 243
+    "'endswitch'"              shift, and go to state 244
+    "'case'"                   shift, and go to state 245
+    "'default'"                shift, and go to state 246
+    "'match'"                  shift, and go to state 247
+    "'break'"                  shift, and go to state 248
+    "'continue'"               shift, and go to state 249
+    "'goto'"                   shift, and go to state 250
+    "'function'"               shift, and go to state 251
+    "'fn'"                     shift, and go to state 252
+    "'const'"                  shift, and go to state 253
+    "'return'"                 shift, and go to state 254
+    "'try'"                    shift, and go to state 255
+    "'catch'"                  shift, and go to state 256
+    "'finally'"                shift, and go to state 257
+    "'throw'"                  shift, and go to state 258
+    "'use'"                    shift, and go to state 259
+    "'insteadof'"              shift, and go to state 260
+    "'global'"                 shift, and go to state 261
     "'static'"                 shift, and go to state 1023
-    "'abstract'"               shift, and go to state 270
-    "'final'"                  shift, and go to state 271
-    "'private'"                shift, and go to state 272
-    "'protected'"              shift, and go to state 273
-    "'public'"                 shift, and go to state 274
-    "'readonly'"               shift, and go to state 275
-    "'var'"                    shift, and go to state 276
-    "'unset'"                  shift, and go to state 277
-    "'isset'"                  shift, and go to state 278
-    "'empty'"                  shift, and go to state 279
-    "'class'"                  shift, and go to state 280
-    "'trait'"                  shift, and go to state 281
-    "'interface'"              shift, and go to state 282
-    "'enum'"                   shift, and go to state 283
-    "'extends'"                shift, and go to state 284
-    "'implements'"             shift, and go to state 285
-    "'namespace'"              shift, and go to state 286
-    "'list'"                   shift, and go to state 287
+    "'abstract'"               shift, and go to state 263
+    "'final'"                  shift, and go to state 264
+    "'private'"                shift, and go to state 265
+    "'protected'"              shift, and go to state 266
+    "'public'"                 shift, and go to state 267
+    "'readonly'"               shift, and go to state 268
+    "'var'"                    shift, and go to state 269
+    "'unset'"                  shift, and go to state 270
+    "'isset'"                  shift, and go to state 271
+    "'empty'"                  shift, and go to state 272
+    "'class'"                  shift, and go to state 273
+    "'trait'"                  shift, and go to state 274
+    "'interface'"              shift, and go to state 275
+    "'enum'"                   shift, and go to state 276
+    "'extends'"                shift, and go to state 277
+    "'implements'"             shift, and go to state 278
+    "'namespace'"              shift, and go to state 279
+    "'list'"                   shift, and go to state 280
     "'array'"                  shift, and go to state 1024
     "'callable'"               shift, and go to state 1025
-    "'__LINE__'"               shift, and go to state 290
-    "'__FILE__'"               shift, and go to state 291
-    "'__DIR__'"                shift, and go to state 292
-    "'__CLASS__'"              shift, and go to state 293
-    "'__TRAIT__'"              shift, and go to state 294
-    "'__METHOD__'"             shift, and go to state 295
-    "'__FUNCTION__'"           shift, and go to state 296
-    "'__NAMESPACE__'"          shift, and go to state 297
+    "'__LINE__'"               shift, and go to state 283
+    "'__FILE__'"               shift, and go to state 284
+    "'__DIR__'"                shift, and go to state 285
+    "'__CLASS__'"              shift, and go to state 286
+    "'__TRAIT__'"              shift, and go to state 287
+    "'__METHOD__'"             shift, and go to state 288
+    "'__FUNCTION__'"           shift, and go to state 289
+    "'__NAMESPACE__'"          shift, and go to state 290
     '('                        shift, and go to state 764
 
-    reserved_non_modifiers  go to state 298
+    reserved_non_modifiers  go to state 291
     semi_reserved           go to state 1026
     name                    go to state 765
     type_expr               go to state 1027
@@ -30281,15 +30416,15 @@
 
 State 981
 
-  206 interface_declaration_statement: "'interface'" @7 "identifier" interface_extends_list backup_doc_comment '{' class_statement_list '}' .
+  206 interface_declaration_statement: "'interface'" @7 "identifier" interface_extends_list backup_doc_comment '{' class_statement_list '}' •
 
     $default  reduce using rule 206 (interface_declaration_statement)
 
 
 State 982
 
-  208 enum_declaration_statement: "'enum'" @8 "identifier" enum_backing_type implements_list backup_doc_comment '{' class_statement_list . '}'
-  312 class_statement_list: class_statement_list . class_statement
+  208 enum_declaration_statement: "'enum'" @8 "identifier" enum_backing_type implements_list backup_doc_comment '{' class_statement_list • '}'
+  312 class_statement_list: class_statement_list • class_statement
 
     "'case'"       shift, and go to state 911
     "'use'"        shift, and go to state 912
@@ -30301,7 +30436,7 @@
     "'public'"     shift, and go to state 794
     "'readonly'"   shift, and go to state 795
     "'var'"        shift, and go to state 913
-    "'#'"         shift, and go to state 79
+    "'#'"         shift, and go to state 72
     '}'            shift, and go to state 1030
 
     "'const'"  reduce using rule 345 (class_const_modifiers)
@@ -30321,7 +30456,7 @@
 
 State 983
 
-  191 class_declaration_statement: class_modifiers "'class'" @4 "identifier" extends_from implements_list backup_doc_comment '{' . class_statement_list '}'
+  191 class_declaration_statement: class_modifiers "'class'" @4 "identifier" extends_from implements_list backup_doc_comment '{' • class_statement_list '}'
 
     $default  reduce using rule 313 (class_statement_list)
 
@@ -30330,14 +30465,14 @@
 
 State 984
 
-  296 return_type: ':' type_expr .
+  296 return_type: ':' type_expr •
 
     $default  reduce using rule 296 (return_type)
 
 
 State 985
 
-  461 inline_function: fn returns_ref backup_doc_comment '(' parameter_list ')' return_type "'=>'" . backup_fn_flags backup_lex_pos expr backup_fn_flags
+  461 inline_function: fn returns_ref backup_doc_comment '(' parameter_list ')' return_type "'=>'" • backup_fn_flags backup_lex_pos expr backup_fn_flags
 
     $default  reduce using rule 465 (backup_fn_flags)
 
@@ -30346,64 +30481,64 @@
 
 State 986
 
-  290 union_type_without_static_element: '(' intersection_type_without_static ')' .
+  290 union_type_without_static_element: '(' intersection_type_without_static ')' •
 
     $default  reduce using rule 290 (union_type_without_static_element)
 
 
 State 987
 
-  189 is_variadic: "'...'" .
+  189 is_variadic: "'...'" •
 
     $default  reduce using rule 189 (is_variadic)
 
 
 State 988
 
-  266 parameter: optional_cpp_modifiers optional_type_without_static is_reference is_variadic . "variable" backup_doc_comment
-  267          | optional_cpp_modifiers optional_type_without_static is_reference is_variadic . "variable" backup_doc_comment '=' expr
+  266 parameter: optional_cpp_modifiers optional_type_without_static is_reference is_variadic • "variable" backup_doc_comment
+  267          | optional_cpp_modifiers optional_type_without_static is_reference is_variadic • "variable" backup_doc_comment '=' expr
 
     "variable"  shift, and go to state 1033
 
 
 State 989
 
-  293 intersection_type_without_static: type_without_static "amp" type_without_static .
+  293 intersection_type_without_static: type_without_static "amp" type_without_static •
 
     $default  reduce using rule 293 (intersection_type_without_static)
 
 
 State 990
 
-  289 union_type_without_static_element: type_without_static .
+  289 union_type_without_static_element: type_without_static •
 
     $default  reduce using rule 289 (union_type_without_static_element)
 
 
 State 991
 
-  291 union_type_without_static: union_type_without_static_element '|' union_type_without_static_element .
+  291 union_type_without_static: union_type_without_static_element '|' union_type_without_static_element •
 
     $default  reduce using rule 291 (union_type_without_static)
 
 
 State 992
 
-  292 union_type_without_static: union_type_without_static '|' union_type_without_static_element .
+  292 union_type_without_static: union_type_without_static '|' union_type_without_static_element •
 
     $default  reduce using rule 292 (union_type_without_static)
 
 
 State 993
 
-  294 intersection_type_without_static: intersection_type_without_static "amp" type_without_static .
+  294 intersection_type_without_static: intersection_type_without_static "amp" type_without_static •
 
     $default  reduce using rule 294 (intersection_type_without_static)
 
 
 State 994
 
-  185 function_declaration_statement: function returns_ref function_name backup_doc_comment '(' parameter_list ')' return_type . backup_fn_flags '{' inner_statement_list '}' backup_fn_flags
+  185 function_declaration_statement: function returns_ref function_name backup_doc_comment '(' parameter_list ')' return_type • backup_fn_flags '{' inner_statement_list '}' backup_fn_flags
 
     $default  reduce using rule 465 (backup_fn_flags)
 
@@ -30412,11 +30547,11 @@
 
 State 995
 
-  470 lexical_vars: "'use'" '(' . lexical_var_list possible_comma ')'
+  470 lexical_vars: "'use'" '(' • lexical_var_list possible_comma ')'
 
-    "amp"       shift, and go to state 324
-    "'&'"       shift, and go to state 325
     "variable"  shift, and go to state 1035
+    "'&'"       shift, and go to state 326
+    "amp"       shift, and go to state 327
 
     ampersand         go to state 1036
     lexical_var_list  go to state 1037
@@ -30425,7 +30560,7 @@
 
 State 996
 
-  460 inline_function: function returns_ref backup_doc_comment '(' parameter_list ')' lexical_vars return_type . backup_fn_flags '{' inner_statement_list '}' backup_fn_flags
+  460 inline_function: function returns_ref backup_doc_comment '(' parameter_list ')' lexical_vars return_type • backup_fn_flags '{' inner_statement_list '}' backup_fn_flags
 
     $default  reduce using rule 465 (backup_fn_flags)
 
@@ -30434,7 +30569,7 @@
 
 State 997
 
-  373 anonymous_class: anonymous_class_modifiers_optional "'class'" @9 ctor_arguments extends_from implements_list backup_doc_comment '{' . class_statement_list '}'
+  373 anonymous_class: anonymous_class_modifiers_optional "'class'" @9 ctor_arguments extends_from implements_list backup_doc_comment '{' • class_statement_list '}'
 
     $default  reduce using rule 313 (class_statement_list)
 
@@ -30443,7 +30578,7 @@
 
 State 998
 
-  225 for_statement: ':' . inner_statement_list "'endfor'" ';'
+  225 for_statement: ':' • inner_statement_list "'endfor'" ';'
 
     $default  reduce using rule 143 (inner_statement_list)
 
@@ -30452,49 +30587,49 @@
 
 State 999
 
-  224 for_statement: statement .
+  224 for_statement: statement •
 
     $default  reduce using rule 224 (for_statement)
 
 
 State 1000
 
-  153 statement: "'for'" '(' for_exprs ';' for_exprs ';' for_exprs ')' for_statement .
+  153 statement: "'for'" '(' for_exprs ';' for_exprs ';' for_exprs ')' for_statement •
 
     $default  reduce using rule 153 (statement)
 
 
 State 1001
 
-  165 statement: "'foreach'" '(' expr "'as'" foreach_variable "'=>'" foreach_variable ')' foreach_statement .
+  165 statement: "'foreach'" '(' expr "'as'" foreach_variable "'=>'" foreach_variable ')' foreach_statement •
 
     $default  reduce using rule 165 (statement)
 
 
 State 1002
 
-  227 foreach_statement: ':' inner_statement_list "'endforeach'" . ';'
+  227 foreach_statement: ':' inner_statement_list "'endforeach'" • ';'
 
     ';'  shift, and go to state 1042
 
 
 State 1003
 
-  229 declare_statement: ':' inner_statement_list "'enddeclare'" ';' .
+  229 declare_statement: ':' inner_statement_list "'enddeclare'" ';' •
 
     $default  reduce using rule 229 (declare_statement)
 
 
 State 1004
 
-  233 switch_case_list: ':' ';' case_list "'endswitch'" ';' .
+  233 switch_case_list: ':' ';' case_list "'endswitch'" ';' •
 
     $default  reduce using rule 233 (switch_case_list)
 
 
 State 1005
 
-  235 case_list: case_list "'case'" expr case_separator . inner_statement_list
+  235 case_list: case_list "'case'" expr case_separator • inner_statement_list
 
     $default  reduce using rule 143 (inner_statement_list)
 
@@ -30503,84 +30638,84 @@
 
 State 1006
 
-  142 inner_statement_list: inner_statement_list . inner_statement
-  236 case_list: case_list "'default'" case_separator inner_statement_list .
+  142 inner_statement_list: inner_statement_list • inner_statement
+  236 case_list: case_list "'default'" case_separator inner_statement_list •
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 27
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    T_INLINE_HTML              shift, and go to state 32
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'if'"                     shift, and go to state 37
-    "'echo'"                   shift, and go to state 38
-    "'do'"                     shift, and go to state 39
-    "'while'"                  shift, and go to state 40
-    "'for'"                    shift, and go to state 41
-    "'foreach'"                shift, and go to state 42
-    "'declare'"                shift, and go to state 43
-    "'switch'"                 shift, and go to state 44
-    "'match'"                  shift, and go to state 45
-    "'break'"                  shift, and go to state 46
-    "'continue'"               shift, and go to state 47
-    "'goto'"                   shift, and go to state 48
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'return'"                 shift, and go to state 52
-    "'try'"                    shift, and go to state 53
-    "'global'"                 shift, and go to state 55
-    "'static'"                 shift, and go to state 56
-    "'abstract'"               shift, and go to state 57
-    "'final'"                  shift, and go to state 58
-    "'readonly'"               shift, and go to state 59
-    "'unset'"                  shift, and go to state 60
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 11
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    T_INLINE_HTML              shift, and go to state 16
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'if'"                     shift, and go to state 29
+    "'echo'"                   shift, and go to state 30
+    "'do'"                     shift, and go to state 31
+    "'while'"                  shift, and go to state 32
+    "'for'"                    shift, and go to state 33
+    "'foreach'"                shift, and go to state 34
+    "'declare'"                shift, and go to state 35
+    "'switch'"                 shift, and go to state 36
+    "'match'"                  shift, and go to state 37
+    "'break'"                  shift, and go to state 38
+    "'continue'"               shift, and go to state 39
+    "'goto'"                   shift, and go to state 40
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'return'"                 shift, and go to state 44
+    "'try'"                    shift, and go to state 45
+    "'throw'"                  shift, and go to state 46
+    "'global'"                 shift, and go to state 48
+    "'static'"                 shift, and go to state 49
+    "'abstract'"               shift, and go to state 50
+    "'final'"                  shift, and go to state 51
+    "'readonly'"               shift, and go to state 52
+    "'unset'"                  shift, and go to state 53
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
     "'__halt_compiler'"        shift, and go to state 528
-    "'class'"                  shift, and go to state 64
-    "'trait'"                  shift, and go to state 65
-    "'interface'"              shift, and go to state 66
-    "'enum'"                   shift, and go to state 67
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    "'class'"                  shift, and go to state 57
+    "'trait'"                  shift, and go to state 58
+    "'interface'"              shift, and go to state 59
+    "'enum'"                   shift, and go to state 60
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ';'                        shift, and go to state 84
@@ -30634,187 +30769,187 @@
 
 State 1007
 
-  245 match_arm: "'default'" possible_comma "'=>'" expr .
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-
-    "'or'"          shift, and go to state 353
-    "'xor'"         shift, and go to state 354
-    "'and'"         shift, and go to state 355
-    '?'             shift, and go to state 356
-    "'??'"          shift, and go to state 357
-    "'||'"          shift, and go to state 358
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  245 match_arm: "'default'" possible_comma "'=>'" expr •
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+
+    '?'             shift, and go to state 353
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'or'"          shift, and go to state 364
+    "'xor'"         shift, and go to state 365
+    "'and'"         shift, and go to state 366
+    "'instanceof'"  shift, and go to state 367
+    "'||'"          shift, and go to state 368
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'??'"          shift, and go to state 379
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
 
     $default  reduce using rule 245 (match_arm)
 
 
 State 1008
 
-  244 match_arm: match_arm_cond_list possible_comma "'=>'" expr .
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-
-    "'or'"          shift, and go to state 353
-    "'xor'"         shift, and go to state 354
-    "'and'"         shift, and go to state 355
-    '?'             shift, and go to state 356
-    "'??'"          shift, and go to state 357
-    "'||'"          shift, and go to state 358
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  244 match_arm: match_arm_cond_list possible_comma "'=>'" expr •
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+
+    '?'             shift, and go to state 353
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'or'"          shift, and go to state 364
+    "'xor'"         shift, and go to state 365
+    "'and'"         shift, and go to state 366
+    "'instanceof'"  shift, and go to state 367
+    "'||'"          shift, and go to state 368
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'??'"          shift, and go to state 379
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
 
     $default  reduce using rule 244 (match_arm)
 
 
 State 1009
 
-  175 catch_name_list: catch_name_list '|' . class_name
+  175 catch_name_list: catch_name_list '|' • class_name
 
     "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "'static'"                 shift, and go to state 156
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "'static'"                 shift, and go to state 147
 
-    name        go to state 159
+    name        go to state 150
     class_name  go to state 1044
 
 
 State 1010
 
-  177 optional_variable: "variable" .
+  177 optional_variable: "variable" •
 
     $default  reduce using rule 177 (optional_variable)
 
 
 State 1011
 
-  173 catch_list: catch_list "'catch'" '(' catch_name_list optional_variable . ')' '{' inner_statement_list '}'
+  173 catch_list: catch_list "'catch'" '(' catch_name_list optional_variable • ')' '{' inner_statement_list '}'
 
     ')'  shift, and go to state 1045
 
 
 State 1012
 
-  179 finally_statement: "'finally'" '{' inner_statement_list '}' .
+  179 finally_statement: "'finally'" '{' inner_statement_list '}' •
 
     $default  reduce using rule 179 (finally_statement)
 
 
 State 1013
 
-  193 class_declaration_statement: "'class'" @5 "identifier" extends_from implements_list backup_doc_comment '{' class_statement_list '}' .
+  193 class_declaration_statement: "'class'" @5 "identifier" extends_from implements_list backup_doc_comment '{' class_statement_list '}' •
 
     $default  reduce using rule 193 (class_declaration_statement)
 
 
 State 1014
 
-  211 enum_case: "'case'" backup_doc_comment identifier . enum_case_expr ';'
+  211 enum_case: "'case'" backup_doc_comment identifier • enum_case_expr ';'
 
     '='  shift, and go to state 1046
 
@@ -30825,103 +30960,103 @@
 
 State 1015
 
-  324 trait_adaptations: ';' .
+  324 trait_adaptations: ';' •
 
     $default  reduce using rule 324 (trait_adaptations)
 
 
 State 1016
 
-  325 trait_adaptations: '{' . '}'
-  326                  | '{' . trait_adaptation_list '}'
+  325 trait_adaptations: '{' • '}'
+  326                  | '{' • trait_adaptation_list '}'
 
-    "'throw'"                  shift, and go to state 219
-    "'include'"                shift, and go to state 220
-    "'include_once'"           shift, and go to state 221
-    "'require'"                shift, and go to state 222
-    "'require_once'"           shift, and go to state 223
-    "'or'"                     shift, and go to state 224
-    "'xor'"                    shift, and go to state 225
-    "'and'"                    shift, and go to state 226
-    "'print'"                  shift, and go to state 227
-    "'yield'"                  shift, and go to state 228
-    "'instanceof'"             shift, and go to state 229
-    "'clone'"                  shift, and go to state 230
-    "'elseif'"                 shift, and go to state 231
-    "'else'"                   shift, and go to state 232
-    "identifier"               shift, and go to state 467
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "'eval'"                   shift, and go to state 235
-    "'new'"                    shift, and go to state 236
-    "'exit'"                   shift, and go to state 237
-    "'if'"                     shift, and go to state 238
-    "'endif'"                  shift, and go to state 239
-    "'echo'"                   shift, and go to state 240
-    "'do'"                     shift, and go to state 241
-    "'while'"                  shift, and go to state 242
-    "'endwhile'"               shift, and go to state 243
-    "'for'"                    shift, and go to state 244
-    "'endfor'"                 shift, and go to state 245
-    "'foreach'"                shift, and go to state 246
-    "'endforeach'"             shift, and go to state 247
-    "'declare'"                shift, and go to state 248
-    "'enddeclare'"             shift, and go to state 249
-    "'as'"                     shift, and go to state 250
-    "'switch'"                 shift, and go to state 251
-    "'endswitch'"              shift, and go to state 252
-    "'case'"                   shift, and go to state 253
-    "'default'"                shift, and go to state 254
-    "'match'"                  shift, and go to state 255
-    "'break'"                  shift, and go to state 256
-    "'continue'"               shift, and go to state 257
-    "'goto'"                   shift, and go to state 258
-    "'function'"               shift, and go to state 259
-    "'fn'"                     shift, and go to state 260
-    "'const'"                  shift, and go to state 261
-    "'return'"                 shift, and go to state 262
-    "'try'"                    shift, and go to state 263
-    "'catch'"                  shift, and go to state 264
-    "'finally'"                shift, and go to state 265
-    "'use'"                    shift, and go to state 266
-    "'insteadof'"              shift, and go to state 267
-    "'global'"                 shift, and go to state 268
+    "identifier"               shift, and go to state 459
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "'include'"                shift, and go to state 214
+    "'include_once'"           shift, and go to state 215
+    "'eval'"                   shift, and go to state 216
+    "'require'"                shift, and go to state 217
+    "'require_once'"           shift, and go to state 218
+    "'or'"                     shift, and go to state 219
+    "'xor'"                    shift, and go to state 220
+    "'and'"                    shift, and go to state 221
+    "'print'"                  shift, and go to state 222
+    "'yield'"                  shift, and go to state 223
+    "'instanceof'"             shift, and go to state 224
+    "'new'"                    shift, and go to state 225
+    "'clone'"                  shift, and go to state 226
+    "'exit'"                   shift, and go to state 227
+    "'if'"                     shift, and go to state 228
+    "'elseif'"                 shift, and go to state 229
+    "'else'"                   shift, and go to state 230
+    "'endif'"                  shift, and go to state 231
+    "'echo'"                   shift, and go to state 232
+    "'do'"                     shift, and go to state 233
+    "'while'"                  shift, and go to state 234
+    "'endwhile'"               shift, and go to state 235
+    "'for'"                    shift, and go to state 236
+    "'endfor'"                 shift, and go to state 237
+    "'foreach'"                shift, and go to state 238
+    "'endforeach'"             shift, and go to state 239
+    "'declare'"                shift, and go to state 240
+    "'enddeclare'"             shift, and go to state 241
+    "'as'"                     shift, and go to state 242
+    "'switch'"                 shift, and go to state 243
+    "'endswitch'"              shift, and go to state 244
+    "'case'"                   shift, and go to state 245
+    "'default'"                shift, and go to state 246
+    "'match'"                  shift, and go to state 247
+    "'break'"                  shift, and go to state 248
+    "'continue'"               shift, and go to state 249
+    "'goto'"                   shift, and go to state 250
+    "'function'"               shift, and go to state 251
+    "'fn'"                     shift, and go to state 252
+    "'const'"                  shift, and go to state 253
+    "'return'"                 shift, and go to state 254
+    "'try'"                    shift, and go to state 255
+    "'catch'"                  shift, and go to state 256
+    "'finally'"                shift, and go to state 257
+    "'throw'"                  shift, and go to state 258
+    "'use'"                    shift, and go to state 259
+    "'insteadof'"              shift, and go to state 260
+    "'global'"                 shift, and go to state 261
     "'static'"                 shift, and go to state 1048
-    "'abstract'"               shift, and go to state 270
-    "'final'"                  shift, and go to state 271
-    "'private'"                shift, and go to state 272
-    "'protected'"              shift, and go to state 273
-    "'public'"                 shift, and go to state 274
-    "'readonly'"               shift, and go to state 275
-    "'var'"                    shift, and go to state 276
-    "'unset'"                  shift, and go to state 277
-    "'isset'"                  shift, and go to state 278
-    "'empty'"                  shift, and go to state 279
-    "'class'"                  shift, and go to state 280
-    "'trait'"                  shift, and go to state 281
-    "'interface'"              shift, and go to state 282
-    "'enum'"                   shift, and go to state 283
-    "'extends'"                shift, and go to state 284
-    "'implements'"             shift, and go to state 285
-    "'namespace'"              shift, and go to state 286
-    "'list'"                   shift, and go to state 287
-    "'array'"                  shift, and go to state 288
-    "'callable'"               shift, and go to state 289
-    "'__LINE__'"               shift, and go to state 290
-    "'__FILE__'"               shift, and go to state 291
-    "'__DIR__'"                shift, and go to state 292
-    "'__CLASS__'"              shift, and go to state 293
-    "'__TRAIT__'"              shift, and go to state 294
-    "'__METHOD__'"             shift, and go to state 295
-    "'__FUNCTION__'"           shift, and go to state 296
-    "'__NAMESPACE__'"          shift, and go to state 297
+    "'abstract'"               shift, and go to state 263
+    "'final'"                  shift, and go to state 264
+    "'private'"                shift, and go to state 265
+    "'protected'"              shift, and go to state 266
+    "'public'"                 shift, and go to state 267
+    "'readonly'"               shift, and go to state 268
+    "'var'"                    shift, and go to state 269
+    "'unset'"                  shift, and go to state 270
+    "'isset'"                  shift, and go to state 271
+    "'empty'"                  shift, and go to state 272
+    "'class'"                  shift, and go to state 273
+    "'trait'"                  shift, and go to state 274
+    "'interface'"              shift, and go to state 275
+    "'enum'"                   shift, and go to state 276
+    "'extends'"                shift, and go to state 277
+    "'implements'"             shift, and go to state 278
+    "'namespace'"              shift, and go to state 279
+    "'list'"                   shift, and go to state 280
+    "'array'"                  shift, and go to state 281
+    "'callable'"               shift, and go to state 282
+    "'__LINE__'"               shift, and go to state 283
+    "'__FILE__'"               shift, and go to state 284
+    "'__DIR__'"                shift, and go to state 285
+    "'__CLASS__'"              shift, and go to state 286
+    "'__TRAIT__'"              shift, and go to state 287
+    "'__METHOD__'"             shift, and go to state 288
+    "'__FUNCTION__'"           shift, and go to state 289
+    "'__NAMESPACE__'"          shift, and go to state 290
     '}'                        shift, and go to state 1049
 
-    reserved_non_modifiers           go to state 298
-    semi_reserved                    go to state 299
+    reserved_non_modifiers           go to state 291
+    semi_reserved                    go to state 292
     identifier                       go to state 1050
-    name                             go to state 159
+    name                             go to state 150
     trait_adaptation_list            go to state 1051
     trait_adaptation                 go to state 1052
     trait_precedence                 go to state 1053
@@ -30933,15 +31068,15 @@
 
 State 1017
 
-  321 class_statement: "'use'" class_name_list trait_adaptations .
+  321 class_statement: "'use'" class_name_list trait_adaptations •
 
     $default  reduce using rule 321 (class_statement)
 
 
 State 1018
 
-  358 property: "variable" . backup_doc_comment
-  359         | "variable" . '=' expr backup_doc_comment
+  358 property: "variable" • backup_doc_comment
+  359         | "variable" • '=' expr backup_doc_comment
 
     '='  shift, and go to state 1058
 
@@ -30952,8 +31087,8 @@
 
 State 1019
 
-  314 attributed_class_statement: property_modifiers optional_type_without_static property_list . ';'
-  356 property_list: property_list . ',' property
+  314 attributed_class_statement: property_modifiers optional_type_without_static property_list • ';'
+  356 property_list: property_list • ',' property
 
     ','  shift, and go to state 1060
     ';'  shift, and go to state 1061
@@ -30961,103 +31096,103 @@
 
 State 1020
 
-  357 property_list: property .
+  357 property_list: property •
 
     $default  reduce using rule 357 (property_list)
 
 
 State 1021
 
-  317 attributed_class_statement: method_modifiers function returns_ref . identifier backup_doc_comment '(' parameter_list ')' return_type backup_fn_flags method_body backup_fn_flags
+  317 attributed_class_statement: method_modifiers function returns_ref • identifier backup_doc_comment '(' parameter_list ')' return_type backup_fn_flags method_body backup_fn_flags
 
-    "'throw'"          shift, and go to state 219
-    "'include'"        shift, and go to state 220
-    "'include_once'"   shift, and go to state 221
-    "'require'"        shift, and go to state 222
-    "'require_once'"   shift, and go to state 223
-    "'or'"             shift, and go to state 224
-    "'xor'"            shift, and go to state 225
-    "'and'"            shift, and go to state 226
-    "'print'"          shift, and go to state 227
-    "'yield'"          shift, and go to state 228
-    "'instanceof'"     shift, and go to state 229
-    "'clone'"          shift, and go to state 230
-    "'elseif'"         shift, and go to state 231
-    "'else'"           shift, and go to state 232
-    "identifier"       shift, and go to state 233
-    "'eval'"           shift, and go to state 235
-    "'new'"            shift, and go to state 236
-    "'exit'"           shift, and go to state 237
-    "'if'"             shift, and go to state 238
-    "'endif'"          shift, and go to state 239
-    "'echo'"           shift, and go to state 240
-    "'do'"             shift, and go to state 241
-    "'while'"          shift, and go to state 242
-    "'endwhile'"       shift, and go to state 243
-    "'for'"            shift, and go to state 244
-    "'endfor'"         shift, and go to state 245
-    "'foreach'"        shift, and go to state 246
-    "'endforeach'"     shift, and go to state 247
-    "'declare'"        shift, and go to state 248
-    "'enddeclare'"     shift, and go to state 249
-    "'as'"             shift, and go to state 250
-    "'switch'"         shift, and go to state 251
-    "'endswitch'"      shift, and go to state 252
-    "'case'"           shift, and go to state 253
-    "'default'"        shift, and go to state 254
-    "'match'"          shift, and go to state 255
-    "'break'"          shift, and go to state 256
-    "'continue'"       shift, and go to state 257
-    "'goto'"           shift, and go to state 258
-    "'function'"       shift, and go to state 259
-    "'fn'"             shift, and go to state 260
-    "'const'"          shift, and go to state 261
-    "'return'"         shift, and go to state 262
-    "'try'"            shift, and go to state 263
-    "'catch'"          shift, and go to state 264
-    "'finally'"        shift, and go to state 265
-    "'use'"            shift, and go to state 266
-    "'insteadof'"      shift, and go to state 267
-    "'global'"         shift, and go to state 268
-    "'static'"         shift, and go to state 269
-    "'abstract'"       shift, and go to state 270
-    "'final'"          shift, and go to state 271
-    "'private'"        shift, and go to state 272
-    "'protected'"      shift, and go to state 273
-    "'public'"         shift, and go to state 274
-    "'readonly'"       shift, and go to state 275
-    "'var'"            shift, and go to state 276
-    "'unset'"          shift, and go to state 277
-    "'isset'"          shift, and go to state 278
-    "'empty'"          shift, and go to state 279
-    "'class'"          shift, and go to state 280
-    "'trait'"          shift, and go to state 281
-    "'interface'"      shift, and go to state 282
-    "'enum'"           shift, and go to state 283
-    "'extends'"        shift, and go to state 284
-    "'implements'"     shift, and go to state 285
-    "'namespace'"      shift, and go to state 286
-    "'list'"           shift, and go to state 287
-    "'array'"          shift, and go to state 288
-    "'callable'"       shift, and go to state 289
-    "'__LINE__'"       shift, and go to state 290
-    "'__FILE__'"       shift, and go to state 291
-    "'__DIR__'"        shift, and go to state 292
-    "'__CLASS__'"      shift, and go to state 293
-    "'__TRAIT__'"      shift, and go to state 294
-    "'__METHOD__'"     shift, and go to state 295
-    "'__FUNCTION__'"   shift, and go to state 296
-    "'__NAMESPACE__'"  shift, and go to state 297
+    "identifier"       shift, and go to state 212
+    "'include'"        shift, and go to state 214
+    "'include_once'"   shift, and go to state 215
+    "'eval'"           shift, and go to state 216
+    "'require'"        shift, and go to state 217
+    "'require_once'"   shift, and go to state 218
+    "'or'"             shift, and go to state 219
+    "'xor'"            shift, and go to state 220
+    "'and'"            shift, and go to state 221
+    "'print'"          shift, and go to state 222
+    "'yield'"          shift, and go to state 223
+    "'instanceof'"     shift, and go to state 224
+    "'new'"            shift, and go to state 225
+    "'clone'"          shift, and go to state 226
+    "'exit'"           shift, and go to state 227
+    "'if'"             shift, and go to state 228
+    "'elseif'"         shift, and go to state 229
+    "'else'"           shift, and go to state 230
+    "'endif'"          shift, and go to state 231
+    "'echo'"           shift, and go to state 232
+    "'do'"             shift, and go to state 233
+    "'while'"          shift, and go to state 234
+    "'endwhile'"       shift, and go to state 235
+    "'for'"            shift, and go to state 236
+    "'endfor'"         shift, and go to state 237
+    "'foreach'"        shift, and go to state 238
+    "'endforeach'"     shift, and go to state 239
+    "'declare'"        shift, and go to state 240
+    "'enddeclare'"     shift, and go to state 241
+    "'as'"             shift, and go to state 242
+    "'switch'"         shift, and go to state 243
+    "'endswitch'"      shift, and go to state 244
+    "'case'"           shift, and go to state 245
+    "'default'"        shift, and go to state 246
+    "'match'"          shift, and go to state 247
+    "'break'"          shift, and go to state 248
+    "'continue'"       shift, and go to state 249
+    "'goto'"           shift, and go to state 250
+    "'function'"       shift, and go to state 251
+    "'fn'"             shift, and go to state 252
+    "'const'"          shift, and go to state 253
+    "'return'"         shift, and go to state 254
+    "'try'"            shift, and go to state 255
+    "'catch'"          shift, and go to state 256
+    "'finally'"        shift, and go to state 257
+    "'throw'"          shift, and go to state 258
+    "'use'"            shift, and go to state 259
+    "'insteadof'"      shift, and go to state 260
+    "'global'"         shift, and go to state 261
+    "'static'"         shift, and go to state 262
+    "'abstract'"       shift, and go to state 263
+    "'final'"          shift, and go to state 264
+    "'private'"        shift, and go to state 265
+    "'protected'"      shift, and go to state 266
+    "'public'"         shift, and go to state 267
+    "'readonly'"       shift, and go to state 268
+    "'var'"            shift, and go to state 269
+    "'unset'"          shift, and go to state 270
+    "'isset'"          shift, and go to state 271
+    "'empty'"          shift, and go to state 272
+    "'class'"          shift, and go to state 273
+    "'trait'"          shift, and go to state 274
+    "'interface'"      shift, and go to state 275
+    "'enum'"           shift, and go to state 276
+    "'extends'"        shift, and go to state 277
+    "'implements'"     shift, and go to state 278
+    "'namespace'"      shift, and go to state 279
+    "'list'"           shift, and go to state 280
+    "'array'"          shift, and go to state 281
+    "'callable'"       shift, and go to state 282
+    "'__LINE__'"       shift, and go to state 283
+    "'__FILE__'"       shift, and go to state 284
+    "'__DIR__'"        shift, and go to state 285
+    "'__CLASS__'"      shift, and go to state 286
+    "'__TRAIT__'"      shift, and go to state 287
+    "'__METHOD__'"     shift, and go to state 288
+    "'__FUNCTION__'"   shift, and go to state 289
+    "'__NAMESPACE__'"  shift, and go to state 290
 
-    reserved_non_modifiers  go to state 298
-    semi_reserved           go to state 299
+    reserved_non_modifiers  go to state 291
+    semi_reserved           go to state 292
     identifier              go to state 1062
 
 
 State 1022
 
-   92 name: "identifier" .
-  362 class_const_decl: "identifier" . '=' expr backup_doc_comment
+   92 name: "identifier" •
+  362 class_const_decl: "identifier" • '=' expr backup_doc_comment
 
     '='  shift, and go to state 1063
 
@@ -31066,8 +31201,8 @@
 
 State 1023
 
-   73 semi_reserved: "'static'" .
-  275 type: "'static'" .
+   73 semi_reserved: "'static'" •
+  275 type: "'static'" •
 
     '='       reduce using rule 73 (semi_reserved)
     $default  reduce using rule 275 (type)
@@ -31075,8 +31210,8 @@
 
 State 1024
 
-   53 reserved_non_modifiers: "'array'" .
-  286 type_without_static: "'array'" .
+   53 reserved_non_modifiers: "'array'" •
+  286 type_without_static: "'array'" •
 
     '='       reduce using rule 53 (reserved_non_modifiers)
     $default  reduce using rule 286 (type_without_static)
@@ -31084,8 +31219,8 @@
 
 State 1025
 
-   54 reserved_non_modifiers: "'callable'" .
-  287 type_without_static: "'callable'" .
+   54 reserved_non_modifiers: "'callable'" •
+  287 type_without_static: "'callable'" •
 
     '='       reduce using rule 54 (reserved_non_modifiers)
     $default  reduce using rule 287 (type_without_static)
@@ -31093,95 +31228,95 @@
 
 State 1026
 
-  363 class_const_decl: semi_reserved . '=' expr backup_doc_comment
+  363 class_const_decl: semi_reserved • '=' expr backup_doc_comment
 
     '='  shift, and go to state 1064
 
 
 State 1027
 
-  316 attributed_class_statement: class_const_modifiers "'const'" type_expr . class_const_list ';'
+  316 attributed_class_statement: class_const_modifiers "'const'" type_expr • class_const_list ';'
 
-    "'throw'"          shift, and go to state 219
-    "'include'"        shift, and go to state 220
-    "'include_once'"   shift, and go to state 221
-    "'require'"        shift, and go to state 222
-    "'require_once'"   shift, and go to state 223
-    "'or'"             shift, and go to state 224
-    "'xor'"            shift, and go to state 225
-    "'and'"            shift, and go to state 226
-    "'print'"          shift, and go to state 227
-    "'yield'"          shift, and go to state 228
-    "'instanceof'"     shift, and go to state 229
-    "'clone'"          shift, and go to state 230
-    "'elseif'"         shift, and go to state 231
-    "'else'"           shift, and go to state 232
     "identifier"       shift, and go to state 1065
-    "'eval'"           shift, and go to state 235
-    "'new'"            shift, and go to state 236
-    "'exit'"           shift, and go to state 237
-    "'if'"             shift, and go to state 238
-    "'endif'"          shift, and go to state 239
-    "'echo'"           shift, and go to state 240
-    "'do'"             shift, and go to state 241
-    "'while'"          shift, and go to state 242
-    "'endwhile'"       shift, and go to state 243
-    "'for'"            shift, and go to state 244
-    "'endfor'"         shift, and go to state 245
-    "'foreach'"        shift, and go to state 246
-    "'endforeach'"     shift, and go to state 247
-    "'declare'"        shift, and go to state 248
-    "'enddeclare'"     shift, and go to state 249
-    "'as'"             shift, and go to state 250
-    "'switch'"         shift, and go to state 251
-    "'endswitch'"      shift, and go to state 252
-    "'case'"           shift, and go to state 253
-    "'default'"        shift, and go to state 254
-    "'match'"          shift, and go to state 255
-    "'break'"          shift, and go to state 256
-    "'continue'"       shift, and go to state 257
-    "'goto'"           shift, and go to state 258
-    "'function'"       shift, and go to state 259
-    "'fn'"             shift, and go to state 260
-    "'const'"          shift, and go to state 261
-    "'return'"         shift, and go to state 262
-    "'try'"            shift, and go to state 263
-    "'catch'"          shift, and go to state 264
-    "'finally'"        shift, and go to state 265
-    "'use'"            shift, and go to state 266
-    "'insteadof'"      shift, and go to state 267
-    "'global'"         shift, and go to state 268
-    "'static'"         shift, and go to state 269
-    "'abstract'"       shift, and go to state 270
-    "'final'"          shift, and go to state 271
-    "'private'"        shift, and go to state 272
-    "'protected'"      shift, and go to state 273
-    "'public'"         shift, and go to state 274
-    "'readonly'"       shift, and go to state 275
-    "'var'"            shift, and go to state 276
-    "'unset'"          shift, and go to state 277
-    "'isset'"          shift, and go to state 278
-    "'empty'"          shift, and go to state 279
-    "'class'"          shift, and go to state 280
-    "'trait'"          shift, and go to state 281
-    "'interface'"      shift, and go to state 282
-    "'enum'"           shift, and go to state 283
-    "'extends'"        shift, and go to state 284
-    "'implements'"     shift, and go to state 285
-    "'namespace'"      shift, and go to state 286
-    "'list'"           shift, and go to state 287
-    "'array'"          shift, and go to state 288
-    "'callable'"       shift, and go to state 289
-    "'__LINE__'"       shift, and go to state 290
-    "'__FILE__'"       shift, and go to state 291
-    "'__DIR__'"        shift, and go to state 292
-    "'__CLASS__'"      shift, and go to state 293
-    "'__TRAIT__'"      shift, and go to state 294
-    "'__METHOD__'"     shift, and go to state 295
-    "'__FUNCTION__'"   shift, and go to state 296
-    "'__NAMESPACE__'"  shift, and go to state 297
+    "'include'"        shift, and go to state 214
+    "'include_once'"   shift, and go to state 215
+    "'eval'"           shift, and go to state 216
+    "'require'"        shift, and go to state 217
+    "'require_once'"   shift, and go to state 218
+    "'or'"             shift, and go to state 219
+    "'xor'"            shift, and go to state 220
+    "'and'"            shift, and go to state 221
+    "'print'"          shift, and go to state 222
+    "'yield'"          shift, and go to state 223
+    "'instanceof'"     shift, and go to state 224
+    "'new'"            shift, and go to state 225
+    "'clone'"          shift, and go to state 226
+    "'exit'"           shift, and go to state 227
+    "'if'"             shift, and go to state 228
+    "'elseif'"         shift, and go to state 229
+    "'else'"           shift, and go to state 230
+    "'endif'"          shift, and go to state 231
+    "'echo'"           shift, and go to state 232
+    "'do'"             shift, and go to state 233
+    "'while'"          shift, and go to state 234
+    "'endwhile'"       shift, and go to state 235
+    "'for'"            shift, and go to state 236
+    "'endfor'"         shift, and go to state 237
+    "'foreach'"        shift, and go to state 238
+    "'endforeach'"     shift, and go to state 239
+    "'declare'"        shift, and go to state 240
+    "'enddeclare'"     shift, and go to state 241
+    "'as'"             shift, and go to state 242
+    "'switch'"         shift, and go to state 243
+    "'endswitch'"      shift, and go to state 244
+    "'case'"           shift, and go to state 245
+    "'default'"        shift, and go to state 246
+    "'match'"          shift, and go to state 247
+    "'break'"          shift, and go to state 248
+    "'continue'"       shift, and go to state 249
+    "'goto'"           shift, and go to state 250
+    "'function'"       shift, and go to state 251
+    "'fn'"             shift, and go to state 252
+    "'const'"          shift, and go to state 253
+    "'return'"         shift, and go to state 254
+    "'try'"            shift, and go to state 255
+    "'catch'"          shift, and go to state 256
+    "'finally'"        shift, and go to state 257
+    "'throw'"          shift, and go to state 258
+    "'use'"            shift, and go to state 259
+    "'insteadof'"      shift, and go to state 260
+    "'global'"         shift, and go to state 261
+    "'static'"         shift, and go to state 262
+    "'abstract'"       shift, and go to state 263
+    "'final'"          shift, and go to state 264
+    "'private'"        shift, and go to state 265
+    "'protected'"      shift, and go to state 266
+    "'public'"         shift, and go to state 267
+    "'readonly'"       shift, and go to state 268
+    "'var'"            shift, and go to state 269
+    "'unset'"          shift, and go to state 270
+    "'isset'"          shift, and go to state 271
+    "'empty'"          shift, and go to state 272
+    "'class'"          shift, and go to state 273
+    "'trait'"          shift, and go to state 274
+    "'interface'"      shift, and go to state 275
+    "'enum'"           shift, and go to state 276
+    "'extends'"        shift, and go to state 277
+    "'implements'"     shift, and go to state 278
+    "'namespace'"      shift, and go to state 279
+    "'list'"           shift, and go to state 280
+    "'array'"          shift, and go to state 281
+    "'callable'"       shift, and go to state 282
+    "'__LINE__'"       shift, and go to state 283
+    "'__FILE__'"       shift, and go to state 284
+    "'__DIR__'"        shift, and go to state 285
+    "'__CLASS__'"      shift, and go to state 286
+    "'__TRAIT__'"      shift, and go to state 287
+    "'__METHOD__'"     shift, and go to state 288
+    "'__FUNCTION__'"   shift, and go to state 289
+    "'__NAMESPACE__'"  shift, and go to state 290
 
-    reserved_non_modifiers  go to state 298
+    reserved_non_modifiers  go to state 291
     semi_reserved           go to state 1026
     class_const_list        go to state 1066
     class_const_decl        go to state 1029
@@ -31189,8 +31324,8 @@
 
 State 1028
 
-  315 attributed_class_statement: class_const_modifiers "'const'" class_const_list . ';'
-  360 class_const_list: class_const_list . ',' class_const_decl
+  315 attributed_class_statement: class_const_modifiers "'const'" class_const_list • ';'
+  360 class_const_list: class_const_list • ',' class_const_decl
 
     ','  shift, and go to state 1067
     ';'  shift, and go to state 1068
@@ -31198,22 +31333,22 @@
 
 State 1029
 
-  361 class_const_list: class_const_decl .
+  361 class_const_list: class_const_decl •
 
     $default  reduce using rule 361 (class_const_list)
 
 
 State 1030
 
-  208 enum_declaration_statement: "'enum'" @8 "identifier" enum_backing_type implements_list backup_doc_comment '{' class_statement_list '}' .
+  208 enum_declaration_statement: "'enum'" @8 "identifier" enum_backing_type implements_list backup_doc_comment '{' class_statement_list '}' •
 
     $default  reduce using rule 208 (enum_declaration_statement)
 
 
 State 1031
 
-  191 class_declaration_statement: class_modifiers "'class'" @4 "identifier" extends_from implements_list backup_doc_comment '{' class_statement_list . '}'
-  312 class_statement_list: class_statement_list . class_statement
+  191 class_declaration_statement: class_modifiers "'class'" @4 "identifier" extends_from implements_list backup_doc_comment '{' class_statement_list • '}'
+  312 class_statement_list: class_statement_list • class_statement
 
     "'case'"       shift, and go to state 911
     "'use'"        shift, and go to state 912
@@ -31225,7 +31360,7 @@
     "'public'"     shift, and go to state 794
     "'readonly'"   shift, and go to state 795
     "'var'"        shift, and go to state 913
-    "'#'"         shift, and go to state 79
+    "'#'"         shift, and go to state 72
     '}'            shift, and go to state 1069
 
     "'const'"  reduce using rule 345 (class_const_modifiers)
@@ -31245,7 +31380,7 @@
 
 State 1032
 
-  461 inline_function: fn returns_ref backup_doc_comment '(' parameter_list ')' return_type "'=>'" backup_fn_flags . backup_lex_pos expr backup_fn_flags
+  461 inline_function: fn returns_ref backup_doc_comment '(' parameter_list ')' return_type "'=>'" backup_fn_flags • backup_lex_pos expr backup_fn_flags
 
     $default  reduce using rule 466 (backup_lex_pos)
 
@@ -31254,8 +31389,8 @@
 
 State 1033
 
-  266 parameter: optional_cpp_modifiers optional_type_without_static is_reference is_variadic "variable" . backup_doc_comment
-  267          | optional_cpp_modifiers optional_type_without_static is_reference is_variadic "variable" . backup_doc_comment '=' expr
+  266 parameter: optional_cpp_modifiers optional_type_without_static is_reference is_variadic "variable" • backup_doc_comment
+  267          | optional_cpp_modifiers optional_type_without_static is_reference is_variadic "variable" • backup_doc_comment '=' expr
 
     $default  reduce using rule 464 (backup_doc_comment)
 
@@ -31264,29 +31399,29 @@
 
 State 1034
 
-  185 function_declaration_statement: function returns_ref function_name backup_doc_comment '(' parameter_list ')' return_type backup_fn_flags . '{' inner_statement_list '}' backup_fn_flags
+  185 function_declaration_statement: function returns_ref function_name backup_doc_comment '(' parameter_list ')' return_type backup_fn_flags • '{' inner_statement_list '}' backup_fn_flags
 
     '{'  shift, and go to state 1072
 
 
 State 1035
 
-  473 lexical_var: "variable" .
+  473 lexical_var: "variable" •
 
     $default  reduce using rule 473 (lexical_var)
 
 
 State 1036
 
-  474 lexical_var: ampersand . "variable"
+  474 lexical_var: ampersand • "variable"
 
     "variable"  shift, and go to state 1073
 
 
 State 1037
 
-  470 lexical_vars: "'use'" '(' lexical_var_list . possible_comma ')'
-  471 lexical_var_list: lexical_var_list . ',' lexical_var
+  470 lexical_vars: "'use'" '(' lexical_var_list • possible_comma ')'
+  471 lexical_var_list: lexical_var_list • ',' lexical_var
 
     ','  shift, and go to state 1074
 
@@ -31297,22 +31432,22 @@
 
 State 1038
 
-  472 lexical_var_list: lexical_var .
+  472 lexical_var_list: lexical_var •
 
     $default  reduce using rule 472 (lexical_var_list)
 
 
 State 1039
 
-  460 inline_function: function returns_ref backup_doc_comment '(' parameter_list ')' lexical_vars return_type backup_fn_flags . '{' inner_statement_list '}' backup_fn_flags
+  460 inline_function: function returns_ref backup_doc_comment '(' parameter_list ')' lexical_vars return_type backup_fn_flags • '{' inner_statement_list '}' backup_fn_flags
 
     '{'  shift, and go to state 1076
 
 
 State 1040
 
-  312 class_statement_list: class_statement_list . class_statement
-  373 anonymous_class: anonymous_class_modifiers_optional "'class'" @9 ctor_arguments extends_from implements_list backup_doc_comment '{' class_statement_list . '}'
+  312 class_statement_list: class_statement_list • class_statement
+  373 anonymous_class: anonymous_class_modifiers_optional "'class'" @9 ctor_arguments extends_from implements_list backup_doc_comment '{' class_statement_list • '}'
 
     "'case'"       shift, and go to state 911
     "'use'"        shift, and go to state 912
@@ -31324,7 +31459,7 @@
     "'public'"     shift, and go to state 794
     "'readonly'"   shift, and go to state 795
     "'var'"        shift, and go to state 913
-    "'#'"         shift, and go to state 79
+    "'#'"         shift, and go to state 72
     '}'            shift, and go to state 1077
 
     "'const'"  reduce using rule 345 (class_const_modifiers)
@@ -31344,85 +31479,85 @@
 
 State 1041
 
-  142 inner_statement_list: inner_statement_list . inner_statement
-  225 for_statement: ':' inner_statement_list . "'endfor'" ';'
+  142 inner_statement_list: inner_statement_list • inner_statement
+  225 for_statement: ':' inner_statement_list • "'endfor'" ';'
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 27
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    T_INLINE_HTML              shift, and go to state 32
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'if'"                     shift, and go to state 37
-    "'echo'"                   shift, and go to state 38
-    "'do'"                     shift, and go to state 39
-    "'while'"                  shift, and go to state 40
-    "'for'"                    shift, and go to state 41
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 11
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    T_INLINE_HTML              shift, and go to state 16
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'if'"                     shift, and go to state 29
+    "'echo'"                   shift, and go to state 30
+    "'do'"                     shift, and go to state 31
+    "'while'"                  shift, and go to state 32
+    "'for'"                    shift, and go to state 33
     "'endfor'"                 shift, and go to state 1078
-    "'foreach'"                shift, and go to state 42
-    "'declare'"                shift, and go to state 43
-    "'switch'"                 shift, and go to state 44
-    "'match'"                  shift, and go to state 45
-    "'break'"                  shift, and go to state 46
-    "'continue'"               shift, and go to state 47
-    "'goto'"                   shift, and go to state 48
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'return'"                 shift, and go to state 52
-    "'try'"                    shift, and go to state 53
-    "'global'"                 shift, and go to state 55
-    "'static'"                 shift, and go to state 56
-    "'abstract'"               shift, and go to state 57
-    "'final'"                  shift, and go to state 58
-    "'readonly'"               shift, and go to state 59
-    "'unset'"                  shift, and go to state 60
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
+    "'foreach'"                shift, and go to state 34
+    "'declare'"                shift, and go to state 35
+    "'switch'"                 shift, and go to state 36
+    "'match'"                  shift, and go to state 37
+    "'break'"                  shift, and go to state 38
+    "'continue'"               shift, and go to state 39
+    "'goto'"                   shift, and go to state 40
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'return'"                 shift, and go to state 44
+    "'try'"                    shift, and go to state 45
+    "'throw'"                  shift, and go to state 46
+    "'global'"                 shift, and go to state 48
+    "'static'"                 shift, and go to state 49
+    "'abstract'"               shift, and go to state 50
+    "'final'"                  shift, and go to state 51
+    "'readonly'"               shift, and go to state 52
+    "'unset'"                  shift, and go to state 53
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
     "'__halt_compiler'"        shift, and go to state 528
-    "'class'"                  shift, and go to state 64
-    "'trait'"                  shift, and go to state 65
-    "'interface'"              shift, and go to state 66
-    "'enum'"                   shift, and go to state 67
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    "'class'"                  shift, and go to state 57
+    "'trait'"                  shift, and go to state 58
+    "'interface'"              shift, and go to state 59
+    "'enum'"                   shift, and go to state 60
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ';'                        shift, and go to state 84
@@ -31474,91 +31609,91 @@
 
 State 1042
 
-  227 foreach_statement: ':' inner_statement_list "'endforeach'" ';' .
+  227 foreach_statement: ':' inner_statement_list "'endforeach'" ';' •
 
     $default  reduce using rule 227 (foreach_statement)
 
 
 State 1043
 
-  142 inner_statement_list: inner_statement_list . inner_statement
-  235 case_list: case_list "'case'" expr case_separator inner_statement_list .
+  142 inner_statement_list: inner_statement_list • inner_statement
+  235 case_list: case_list "'case'" expr case_separator inner_statement_list •
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 27
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    T_INLINE_HTML              shift, and go to state 32
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'if'"                     shift, and go to state 37
-    "'echo'"                   shift, and go to state 38
-    "'do'"                     shift, and go to state 39
-    "'while'"                  shift, and go to state 40
-    "'for'"                    shift, and go to state 41
-    "'foreach'"                shift, and go to state 42
-    "'declare'"                shift, and go to state 43
-    "'switch'"                 shift, and go to state 44
-    "'match'"                  shift, and go to state 45
-    "'break'"                  shift, and go to state 46
-    "'continue'"               shift, and go to state 47
-    "'goto'"                   shift, and go to state 48
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'return'"                 shift, and go to state 52
-    "'try'"                    shift, and go to state 53
-    "'global'"                 shift, and go to state 55
-    "'static'"                 shift, and go to state 56
-    "'abstract'"               shift, and go to state 57
-    "'final'"                  shift, and go to state 58
-    "'readonly'"               shift, and go to state 59
-    "'unset'"                  shift, and go to state 60
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 11
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    T_INLINE_HTML              shift, and go to state 16
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'if'"                     shift, and go to state 29
+    "'echo'"                   shift, and go to state 30
+    "'do'"                     shift, and go to state 31
+    "'while'"                  shift, and go to state 32
+    "'for'"                    shift, and go to state 33
+    "'foreach'"                shift, and go to state 34
+    "'declare'"                shift, and go to state 35
+    "'switch'"                 shift, and go to state 36
+    "'match'"                  shift, and go to state 37
+    "'break'"                  shift, and go to state 38
+    "'continue'"               shift, and go to state 39
+    "'goto'"                   shift, and go to state 40
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'return'"                 shift, and go to state 44
+    "'try'"                    shift, and go to state 45
+    "'throw'"                  shift, and go to state 46
+    "'global'"                 shift, and go to state 48
+    "'static'"                 shift, and go to state 49
+    "'abstract'"               shift, and go to state 50
+    "'final'"                  shift, and go to state 51
+    "'readonly'"               shift, and go to state 52
+    "'unset'"                  shift, and go to state 53
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
     "'__halt_compiler'"        shift, and go to state 528
-    "'class'"                  shift, and go to state 64
-    "'trait'"                  shift, and go to state 65
-    "'interface'"              shift, and go to state 66
-    "'enum'"                   shift, and go to state 67
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    "'class'"                  shift, and go to state 57
+    "'trait'"                  shift, and go to state 58
+    "'interface'"              shift, and go to state 59
+    "'enum'"                   shift, and go to state 60
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ';'                        shift, and go to state 84
@@ -31612,74 +31747,74 @@
 
 State 1044
 
-  175 catch_name_list: catch_name_list '|' class_name .
+  175 catch_name_list: catch_name_list '|' class_name •
 
     $default  reduce using rule 175 (catch_name_list)
 
 
 State 1045
 
-  173 catch_list: catch_list "'catch'" '(' catch_name_list optional_variable ')' . '{' inner_statement_list '}'
+  173 catch_list: catch_list "'catch'" '(' catch_name_list optional_variable ')' • '{' inner_statement_list '}'
 
     '{'  shift, and go to state 1079
 
 
 State 1046
 
-  213 enum_case_expr: '=' . expr
+  213 enum_case_expr: '=' • expr
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -31715,15 +31850,15 @@
 
 State 1047
 
-  211 enum_case: "'case'" backup_doc_comment identifier enum_case_expr . ';'
+  211 enum_case: "'case'" backup_doc_comment identifier enum_case_expr • ';'
 
     ';'  shift, and go to state 1081
 
 
 State 1048
 
-   73 semi_reserved: "'static'" .
-  481 class_name: "'static'" .
+   73 semi_reserved: "'static'" •
+  481 class_name: "'static'" •
 
     "'::'"    reduce using rule 481 (class_name)
     $default  reduce using rule 73 (semi_reserved)
@@ -31731,110 +31866,110 @@
 
 State 1049
 
-  325 trait_adaptations: '{' '}' .
+  325 trait_adaptations: '{' '}' •
 
     $default  reduce using rule 325 (trait_adaptations)
 
 
 State 1050
 
-  336 trait_method_reference: identifier .
+  336 trait_method_reference: identifier •
 
     $default  reduce using rule 336 (trait_method_reference)
 
 
 State 1051
 
-  326 trait_adaptations: '{' trait_adaptation_list . '}'
-  328 trait_adaptation_list: trait_adaptation_list . trait_adaptation
+  326 trait_adaptations: '{' trait_adaptation_list • '}'
+  328 trait_adaptation_list: trait_adaptation_list • trait_adaptation
 
-    "'throw'"                  shift, and go to state 219
-    "'include'"                shift, and go to state 220
-    "'include_once'"           shift, and go to state 221
-    "'require'"                shift, and go to state 222
-    "'require_once'"           shift, and go to state 223
-    "'or'"                     shift, and go to state 224
-    "'xor'"                    shift, and go to state 225
-    "'and'"                    shift, and go to state 226
-    "'print'"                  shift, and go to state 227
-    "'yield'"                  shift, and go to state 228
-    "'instanceof'"             shift, and go to state 229
-    "'clone'"                  shift, and go to state 230
-    "'elseif'"                 shift, and go to state 231
-    "'else'"                   shift, and go to state 232
-    "identifier"               shift, and go to state 467
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "'eval'"                   shift, and go to state 235
-    "'new'"                    shift, and go to state 236
-    "'exit'"                   shift, and go to state 237
-    "'if'"                     shift, and go to state 238
-    "'endif'"                  shift, and go to state 239
-    "'echo'"                   shift, and go to state 240
-    "'do'"                     shift, and go to state 241
-    "'while'"                  shift, and go to state 242
-    "'endwhile'"               shift, and go to state 243
-    "'for'"                    shift, and go to state 244
-    "'endfor'"                 shift, and go to state 245
-    "'foreach'"                shift, and go to state 246
-    "'endforeach'"             shift, and go to state 247
-    "'declare'"                shift, and go to state 248
-    "'enddeclare'"             shift, and go to state 249
-    "'as'"                     shift, and go to state 250
-    "'switch'"                 shift, and go to state 251
-    "'endswitch'"              shift, and go to state 252
-    "'case'"                   shift, and go to state 253
-    "'default'"                shift, and go to state 254
-    "'match'"                  shift, and go to state 255
-    "'break'"                  shift, and go to state 256
-    "'continue'"               shift, and go to state 257
-    "'goto'"                   shift, and go to state 258
-    "'function'"               shift, and go to state 259
-    "'fn'"                     shift, and go to state 260
-    "'const'"                  shift, and go to state 261
-    "'return'"                 shift, and go to state 262
-    "'try'"                    shift, and go to state 263
-    "'catch'"                  shift, and go to state 264
-    "'finally'"                shift, and go to state 265
-    "'use'"                    shift, and go to state 266
-    "'insteadof'"              shift, and go to state 267
-    "'global'"                 shift, and go to state 268
+    "identifier"               shift, and go to state 459
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "'include'"                shift, and go to state 214
+    "'include_once'"           shift, and go to state 215
+    "'eval'"                   shift, and go to state 216
+    "'require'"                shift, and go to state 217
+    "'require_once'"           shift, and go to state 218
+    "'or'"                     shift, and go to state 219
+    "'xor'"                    shift, and go to state 220
+    "'and'"                    shift, and go to state 221
+    "'print'"                  shift, and go to state 222
+    "'yield'"                  shift, and go to state 223
+    "'instanceof'"             shift, and go to state 224
+    "'new'"                    shift, and go to state 225
+    "'clone'"                  shift, and go to state 226
+    "'exit'"                   shift, and go to state 227
+    "'if'"                     shift, and go to state 228
+    "'elseif'"                 shift, and go to state 229
+    "'else'"                   shift, and go to state 230
+    "'endif'"                  shift, and go to state 231
+    "'echo'"                   shift, and go to state 232
+    "'do'"                     shift, and go to state 233
+    "'while'"                  shift, and go to state 234
+    "'endwhile'"               shift, and go to state 235
+    "'for'"                    shift, and go to state 236
+    "'endfor'"                 shift, and go to state 237
+    "'foreach'"                shift, and go to state 238
+    "'endforeach'"             shift, and go to state 239
+    "'declare'"                shift, and go to state 240
+    "'enddeclare'"             shift, and go to state 241
+    "'as'"                     shift, and go to state 242
+    "'switch'"                 shift, and go to state 243
+    "'endswitch'"              shift, and go to state 244
+    "'case'"                   shift, and go to state 245
+    "'default'"                shift, and go to state 246
+    "'match'"                  shift, and go to state 247
+    "'break'"                  shift, and go to state 248
+    "'continue'"               shift, and go to state 249
+    "'goto'"                   shift, and go to state 250
+    "'function'"               shift, and go to state 251
+    "'fn'"                     shift, and go to state 252
+    "'const'"                  shift, and go to state 253
+    "'return'"                 shift, and go to state 254
+    "'try'"                    shift, and go to state 255
+    "'catch'"                  shift, and go to state 256
+    "'finally'"                shift, and go to state 257
+    "'throw'"                  shift, and go to state 258
+    "'use'"                    shift, and go to state 259
+    "'insteadof'"              shift, and go to state 260
+    "'global'"                 shift, and go to state 261
     "'static'"                 shift, and go to state 1048
-    "'abstract'"               shift, and go to state 270
-    "'final'"                  shift, and go to state 271
-    "'private'"                shift, and go to state 272
-    "'protected'"              shift, and go to state 273
-    "'public'"                 shift, and go to state 274
-    "'readonly'"               shift, and go to state 275
-    "'var'"                    shift, and go to state 276
-    "'unset'"                  shift, and go to state 277
-    "'isset'"                  shift, and go to state 278
-    "'empty'"                  shift, and go to state 279
-    "'class'"                  shift, and go to state 280
-    "'trait'"                  shift, and go to state 281
-    "'interface'"              shift, and go to state 282
-    "'enum'"                   shift, and go to state 283
-    "'extends'"                shift, and go to state 284
-    "'implements'"             shift, and go to state 285
-    "'namespace'"              shift, and go to state 286
-    "'list'"                   shift, and go to state 287
-    "'array'"                  shift, and go to state 288
-    "'callable'"               shift, and go to state 289
-    "'__LINE__'"               shift, and go to state 290
-    "'__FILE__'"               shift, and go to state 291
-    "'__DIR__'"                shift, and go to state 292
-    "'__CLASS__'"              shift, and go to state 293
-    "'__TRAIT__'"              shift, and go to state 294
-    "'__METHOD__'"             shift, and go to state 295
-    "'__FUNCTION__'"           shift, and go to state 296
-    "'__NAMESPACE__'"          shift, and go to state 297
+    "'abstract'"               shift, and go to state 263
+    "'final'"                  shift, and go to state 264
+    "'private'"                shift, and go to state 265
+    "'protected'"              shift, and go to state 266
+    "'public'"                 shift, and go to state 267
+    "'readonly'"               shift, and go to state 268
+    "'var'"                    shift, and go to state 269
+    "'unset'"                  shift, and go to state 270
+    "'isset'"                  shift, and go to state 271
+    "'empty'"                  shift, and go to state 272
+    "'class'"                  shift, and go to state 273
+    "'trait'"                  shift, and go to state 274
+    "'interface'"              shift, and go to state 275
+    "'enum'"                   shift, and go to state 276
+    "'extends'"                shift, and go to state 277
+    "'implements'"             shift, and go to state 278
+    "'namespace'"              shift, and go to state 279
+    "'list'"                   shift, and go to state 280
+    "'array'"                  shift, and go to state 281
+    "'callable'"               shift, and go to state 282
+    "'__LINE__'"               shift, and go to state 283
+    "'__FILE__'"               shift, and go to state 284
+    "'__DIR__'"                shift, and go to state 285
+    "'__CLASS__'"              shift, and go to state 286
+    "'__TRAIT__'"              shift, and go to state 287
+    "'__METHOD__'"             shift, and go to state 288
+    "'__FUNCTION__'"           shift, and go to state 289
+    "'__NAMESPACE__'"          shift, and go to state 290
     '}'                        shift, and go to state 1082
 
-    reserved_non_modifiers           go to state 298
-    semi_reserved                    go to state 299
+    reserved_non_modifiers           go to state 291
+    semi_reserved                    go to state 292
     identifier                       go to state 1050
-    name                             go to state 159
+    name                             go to state 150
     trait_adaptation                 go to state 1083
     trait_precedence                 go to state 1053
     trait_alias                      go to state 1054
@@ -31845,39 +31980,39 @@
 
 State 1052
 
-  327 trait_adaptation_list: trait_adaptation .
+  327 trait_adaptation_list: trait_adaptation •
 
     $default  reduce using rule 327 (trait_adaptation_list)
 
 
 State 1053
 
-  329 trait_adaptation: trait_precedence . ';'
+  329 trait_adaptation: trait_precedence • ';'
 
     ';'  shift, and go to state 1084
 
 
 State 1054
 
-  330 trait_adaptation: trait_alias . ';'
+  330 trait_adaptation: trait_alias • ';'
 
     ';'  shift, and go to state 1085
 
 
 State 1055
 
-  332 trait_alias: trait_method_reference . "'as'" "identifier"
-  333            | trait_method_reference . "'as'" reserved_non_modifiers
-  334            | trait_method_reference . "'as'" member_modifier identifier
-  335            | trait_method_reference . "'as'" member_modifier
+  332 trait_alias: trait_method_reference • "'as'" "identifier"
+  333            | trait_method_reference • "'as'" reserved_non_modifiers
+  334            | trait_method_reference • "'as'" member_modifier identifier
+  335            | trait_method_reference • "'as'" member_modifier
 
     "'as'"  shift, and go to state 1086
 
 
 State 1056
 
-  331 trait_precedence: absolute_trait_method_reference . "'insteadof'" class_name_list
-  337 trait_method_reference: absolute_trait_method_reference .
+  331 trait_precedence: absolute_trait_method_reference • "'insteadof'" class_name_list
+  337 trait_method_reference: absolute_trait_method_reference •
 
     "'insteadof'"  shift, and go to state 1087
 
@@ -31886,67 +32021,67 @@
 
 State 1057
 
-  338 absolute_trait_method_reference: class_name . "'::'" identifier
+  338 absolute_trait_method_reference: class_name • "'::'" identifier
 
     "'::'"  shift, and go to state 1088
 
 
 State 1058
 
-  359 property: "variable" '=' . expr backup_doc_comment
+  359 property: "variable" '=' • expr backup_doc_comment
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -31982,14 +32117,14 @@
 
 State 1059
 
-  358 property: "variable" backup_doc_comment .
+  358 property: "variable" backup_doc_comment •
 
     $default  reduce using rule 358 (property)
 
 
 State 1060
 
-  356 property_list: property_list ',' . property
+  356 property_list: property_list ',' • property
 
     "variable"  shift, and go to state 1018
 
@@ -31998,14 +32133,14 @@
 
 State 1061
 
-  314 attributed_class_statement: property_modifiers optional_type_without_static property_list ';' .
+  314 attributed_class_statement: property_modifiers optional_type_without_static property_list ';' •
 
     $default  reduce using rule 314 (attributed_class_statement)
 
 
 State 1062
 
-  317 attributed_class_statement: method_modifiers function returns_ref identifier . backup_doc_comment '(' parameter_list ')' return_type backup_fn_flags method_body backup_fn_flags
+  317 attributed_class_statement: method_modifiers function returns_ref identifier • backup_doc_comment '(' parameter_list ')' return_type backup_fn_flags method_body backup_fn_flags
 
     $default  reduce using rule 464 (backup_doc_comment)
 
@@ -32014,60 +32149,60 @@
 
 State 1063
 
-  362 class_const_decl: "identifier" '=' . expr backup_doc_comment
+  362 class_const_decl: "identifier" '=' • expr backup_doc_comment
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -32103,60 +32238,60 @@
 
 State 1064
 
-  363 class_const_decl: semi_reserved '=' . expr backup_doc_comment
+  363 class_const_decl: semi_reserved '=' • expr backup_doc_comment
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -32192,15 +32327,15 @@
 
 State 1065
 
-  362 class_const_decl: "identifier" . '=' expr backup_doc_comment
+  362 class_const_decl: "identifier" • '=' expr backup_doc_comment
 
     '='  shift, and go to state 1063
 
 
 State 1066
 
-  316 attributed_class_statement: class_const_modifiers "'const'" type_expr class_const_list . ';'
-  360 class_const_list: class_const_list . ',' class_const_decl
+  316 attributed_class_statement: class_const_modifiers "'const'" type_expr class_const_list • ';'
+  360 class_const_list: class_const_list • ',' class_const_decl
 
     ','  shift, and go to state 1067
     ';'  shift, and go to state 1094
@@ -32208,162 +32343,162 @@
 
 State 1067
 
-  360 class_const_list: class_const_list ',' . class_const_decl
+  360 class_const_list: class_const_list ',' • class_const_decl
 
-    "'throw'"          shift, and go to state 219
-    "'include'"        shift, and go to state 220
-    "'include_once'"   shift, and go to state 221
-    "'require'"        shift, and go to state 222
-    "'require_once'"   shift, and go to state 223
-    "'or'"             shift, and go to state 224
-    "'xor'"            shift, and go to state 225
-    "'and'"            shift, and go to state 226
-    "'print'"          shift, and go to state 227
-    "'yield'"          shift, and go to state 228
-    "'instanceof'"     shift, and go to state 229
-    "'clone'"          shift, and go to state 230
-    "'elseif'"         shift, and go to state 231
-    "'else'"           shift, and go to state 232
     "identifier"       shift, and go to state 1065
-    "'eval'"           shift, and go to state 235
-    "'new'"            shift, and go to state 236
-    "'exit'"           shift, and go to state 237
-    "'if'"             shift, and go to state 238
-    "'endif'"          shift, and go to state 239
-    "'echo'"           shift, and go to state 240
-    "'do'"             shift, and go to state 241
-    "'while'"          shift, and go to state 242
-    "'endwhile'"       shift, and go to state 243
-    "'for'"            shift, and go to state 244
-    "'endfor'"         shift, and go to state 245
-    "'foreach'"        shift, and go to state 246
-    "'endforeach'"     shift, and go to state 247
-    "'declare'"        shift, and go to state 248
-    "'enddeclare'"     shift, and go to state 249
-    "'as'"             shift, and go to state 250
-    "'switch'"         shift, and go to state 251
-    "'endswitch'"      shift, and go to state 252
-    "'case'"           shift, and go to state 253
-    "'default'"        shift, and go to state 254
-    "'match'"          shift, and go to state 255
-    "'break'"          shift, and go to state 256
-    "'continue'"       shift, and go to state 257
-    "'goto'"           shift, and go to state 258
-    "'function'"       shift, and go to state 259
-    "'fn'"             shift, and go to state 260
-    "'const'"          shift, and go to state 261
-    "'return'"         shift, and go to state 262
-    "'try'"            shift, and go to state 263
-    "'catch'"          shift, and go to state 264
-    "'finally'"        shift, and go to state 265
-    "'use'"            shift, and go to state 266
-    "'insteadof'"      shift, and go to state 267
-    "'global'"         shift, and go to state 268
-    "'static'"         shift, and go to state 269
-    "'abstract'"       shift, and go to state 270
-    "'final'"          shift, and go to state 271
-    "'private'"        shift, and go to state 272
-    "'protected'"      shift, and go to state 273
-    "'public'"         shift, and go to state 274
-    "'readonly'"       shift, and go to state 275
-    "'var'"            shift, and go to state 276
-    "'unset'"          shift, and go to state 277
-    "'isset'"          shift, and go to state 278
-    "'empty'"          shift, and go to state 279
-    "'class'"          shift, and go to state 280
-    "'trait'"          shift, and go to state 281
-    "'interface'"      shift, and go to state 282
-    "'enum'"           shift, and go to state 283
-    "'extends'"        shift, and go to state 284
-    "'implements'"     shift, and go to state 285
-    "'namespace'"      shift, and go to state 286
-    "'list'"           shift, and go to state 287
-    "'array'"          shift, and go to state 288
-    "'callable'"       shift, and go to state 289
-    "'__LINE__'"       shift, and go to state 290
-    "'__FILE__'"       shift, and go to state 291
-    "'__DIR__'"        shift, and go to state 292
-    "'__CLASS__'"      shift, and go to state 293
-    "'__TRAIT__'"      shift, and go to state 294
-    "'__METHOD__'"     shift, and go to state 295
-    "'__FUNCTION__'"   shift, and go to state 296
-    "'__NAMESPACE__'"  shift, and go to state 297
+    "'include'"        shift, and go to state 214
+    "'include_once'"   shift, and go to state 215
+    "'eval'"           shift, and go to state 216
+    "'require'"        shift, and go to state 217
+    "'require_once'"   shift, and go to state 218
+    "'or'"             shift, and go to state 219
+    "'xor'"            shift, and go to state 220
+    "'and'"            shift, and go to state 221
+    "'print'"          shift, and go to state 222
+    "'yield'"          shift, and go to state 223
+    "'instanceof'"     shift, and go to state 224
+    "'new'"            shift, and go to state 225
+    "'clone'"          shift, and go to state 226
+    "'exit'"           shift, and go to state 227
+    "'if'"             shift, and go to state 228
+    "'elseif'"         shift, and go to state 229
+    "'else'"           shift, and go to state 230
+    "'endif'"          shift, and go to state 231
+    "'echo'"           shift, and go to state 232
+    "'do'"             shift, and go to state 233
+    "'while'"          shift, and go to state 234
+    "'endwhile'"       shift, and go to state 235
+    "'for'"            shift, and go to state 236
+    "'endfor'"         shift, and go to state 237
+    "'foreach'"        shift, and go to state 238
+    "'endforeach'"     shift, and go to state 239
+    "'declare'"        shift, and go to state 240
+    "'enddeclare'"     shift, and go to state 241
+    "'as'"             shift, and go to state 242
+    "'switch'"         shift, and go to state 243
+    "'endswitch'"      shift, and go to state 244
+    "'case'"           shift, and go to state 245
+    "'default'"        shift, and go to state 246
+    "'match'"          shift, and go to state 247
+    "'break'"          shift, and go to state 248
+    "'continue'"       shift, and go to state 249
+    "'goto'"           shift, and go to state 250
+    "'function'"       shift, and go to state 251
+    "'fn'"             shift, and go to state 252
+    "'const'"          shift, and go to state 253
+    "'return'"         shift, and go to state 254
+    "'try'"            shift, and go to state 255
+    "'catch'"          shift, and go to state 256
+    "'finally'"        shift, and go to state 257
+    "'throw'"          shift, and go to state 258
+    "'use'"            shift, and go to state 259
+    "'insteadof'"      shift, and go to state 260
+    "'global'"         shift, and go to state 261
+    "'static'"         shift, and go to state 262
+    "'abstract'"       shift, and go to state 263
+    "'final'"          shift, and go to state 264
+    "'private'"        shift, and go to state 265
+    "'protected'"      shift, and go to state 266
+    "'public'"         shift, and go to state 267
+    "'readonly'"       shift, and go to state 268
+    "'var'"            shift, and go to state 269
+    "'unset'"          shift, and go to state 270
+    "'isset'"          shift, and go to state 271
+    "'empty'"          shift, and go to state 272
+    "'class'"          shift, and go to state 273
+    "'trait'"          shift, and go to state 274
+    "'interface'"      shift, and go to state 275
+    "'enum'"           shift, and go to state 276
+    "'extends'"        shift, and go to state 277
+    "'implements'"     shift, and go to state 278
+    "'namespace'"      shift, and go to state 279
+    "'list'"           shift, and go to state 280
+    "'array'"          shift, and go to state 281
+    "'callable'"       shift, and go to state 282
+    "'__LINE__'"       shift, and go to state 283
+    "'__FILE__'"       shift, and go to state 284
+    "'__DIR__'"        shift, and go to state 285
+    "'__CLASS__'"      shift, and go to state 286
+    "'__TRAIT__'"      shift, and go to state 287
+    "'__METHOD__'"     shift, and go to state 288
+    "'__FUNCTION__'"   shift, and go to state 289
+    "'__NAMESPACE__'"  shift, and go to state 290
 
-    reserved_non_modifiers  go to state 298
+    reserved_non_modifiers  go to state 291
     semi_reserved           go to state 1026
     class_const_decl        go to state 1095
 
 
 State 1068
 
-  315 attributed_class_statement: class_const_modifiers "'const'" class_const_list ';' .
+  315 attributed_class_statement: class_const_modifiers "'const'" class_const_list ';' •
 
     $default  reduce using rule 315 (attributed_class_statement)
 
 
 State 1069
 
-  191 class_declaration_statement: class_modifiers "'class'" @4 "identifier" extends_from implements_list backup_doc_comment '{' class_statement_list '}' .
+  191 class_declaration_statement: class_modifiers "'class'" @4 "identifier" extends_from implements_list backup_doc_comment '{' class_statement_list '}' •
 
     $default  reduce using rule 191 (class_declaration_statement)
 
 
 State 1070
 
-  461 inline_function: fn returns_ref backup_doc_comment '(' parameter_list ')' return_type "'=>'" backup_fn_flags backup_lex_pos . expr backup_fn_flags
+  461 inline_function: fn returns_ref backup_doc_comment '(' parameter_list ')' return_type "'=>'" backup_fn_flags backup_lex_pos • expr backup_fn_flags
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -32399,8 +32534,8 @@
 
 State 1071
 
-  266 parameter: optional_cpp_modifiers optional_type_without_static is_reference is_variadic "variable" backup_doc_comment .
-  267          | optional_cpp_modifiers optional_type_without_static is_reference is_variadic "variable" backup_doc_comment . '=' expr
+  266 parameter: optional_cpp_modifiers optional_type_without_static is_reference is_variadic "variable" backup_doc_comment •
+  267          | optional_cpp_modifiers optional_type_without_static is_reference is_variadic "variable" backup_doc_comment • '=' expr
 
     '='  shift, and go to state 1097
 
@@ -32409,7 +32544,7 @@
 
 State 1072
 
-  185 function_declaration_statement: function returns_ref function_name backup_doc_comment '(' parameter_list ')' return_type backup_fn_flags '{' . inner_statement_list '}' backup_fn_flags
+  185 function_declaration_statement: function returns_ref function_name backup_doc_comment '(' parameter_list ')' return_type backup_fn_flags '{' • inner_statement_list '}' backup_fn_flags
 
     $default  reduce using rule 143 (inner_statement_list)
 
@@ -32418,19 +32553,19 @@
 
 State 1073
 
-  474 lexical_var: ampersand "variable" .
+  474 lexical_var: ampersand "variable" •
 
     $default  reduce using rule 474 (lexical_var)
 
 
 State 1074
 
-  127 possible_comma: ',' .
-  471 lexical_var_list: lexical_var_list ',' . lexical_var
+  127 possible_comma: ',' •
+  471 lexical_var_list: lexical_var_list ',' • lexical_var
 
-    "amp"       shift, and go to state 324
-    "'&'"       shift, and go to state 325
     "variable"  shift, and go to state 1035
+    "'&'"       shift, and go to state 326
+    "amp"       shift, and go to state 327
 
     $default  reduce using rule 127 (possible_comma)
 
@@ -32440,14 +32575,14 @@
 
 State 1075
 
-  470 lexical_vars: "'use'" '(' lexical_var_list possible_comma . ')'
+  470 lexical_vars: "'use'" '(' lexical_var_list possible_comma • ')'
 
     ')'  shift, and go to state 1100
 
 
 State 1076
 
-  460 inline_function: function returns_ref backup_doc_comment '(' parameter_list ')' lexical_vars return_type backup_fn_flags '{' . inner_statement_list '}' backup_fn_flags
+  460 inline_function: function returns_ref backup_doc_comment '(' parameter_list ')' lexical_vars return_type backup_fn_flags '{' • inner_statement_list '}' backup_fn_flags
 
     $default  reduce using rule 143 (inner_statement_list)
 
@@ -32456,21 +32591,21 @@
 
 State 1077
 
-  373 anonymous_class: anonymous_class_modifiers_optional "'class'" @9 ctor_arguments extends_from implements_list backup_doc_comment '{' class_statement_list '}' .
+  373 anonymous_class: anonymous_class_modifiers_optional "'class'" @9 ctor_arguments extends_from implements_list backup_doc_comment '{' class_statement_list '}' •
 
     $default  reduce using rule 373 (anonymous_class)
 
 
 State 1078
 
-  225 for_statement: ':' inner_statement_list "'endfor'" . ';'
+  225 for_statement: ':' inner_statement_list "'endfor'" • ';'
 
     ';'  shift, and go to state 1102
 
 
 State 1079
 
-  173 catch_list: catch_list "'catch'" '(' catch_name_list optional_variable ')' '{' . inner_statement_list '}'
+  173 catch_list: catch_list "'catch'" '(' catch_name_list optional_variable ')' '{' • inner_statement_list '}'
 
     $default  reduce using rule 143 (inner_statement_list)
 
@@ -32479,164 +32614,164 @@
 
 State 1080
 
-  213 enum_case_expr: '=' expr .
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-
-    "'or'"          shift, and go to state 353
-    "'xor'"         shift, and go to state 354
-    "'and'"         shift, and go to state 355
-    '?'             shift, and go to state 356
-    "'??'"          shift, and go to state 357
-    "'||'"          shift, and go to state 358
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  213 enum_case_expr: '=' expr •
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+
+    '?'             shift, and go to state 353
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'or'"          shift, and go to state 364
+    "'xor'"         shift, and go to state 365
+    "'and'"         shift, and go to state 366
+    "'instanceof'"  shift, and go to state 367
+    "'||'"          shift, and go to state 368
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'??'"          shift, and go to state 379
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
 
     $default  reduce using rule 213 (enum_case_expr)
 
 
 State 1081
 
-  211 enum_case: "'case'" backup_doc_comment identifier enum_case_expr ';' .
+  211 enum_case: "'case'" backup_doc_comment identifier enum_case_expr ';' •
 
     $default  reduce using rule 211 (enum_case)
 
 
 State 1082
 
-  326 trait_adaptations: '{' trait_adaptation_list '}' .
+  326 trait_adaptations: '{' trait_adaptation_list '}' •
 
     $default  reduce using rule 326 (trait_adaptations)
 
 
 State 1083
 
-  328 trait_adaptation_list: trait_adaptation_list trait_adaptation .
+  328 trait_adaptation_list: trait_adaptation_list trait_adaptation •
 
     $default  reduce using rule 328 (trait_adaptation_list)
 
 
 State 1084
 
-  329 trait_adaptation: trait_precedence ';' .
+  329 trait_adaptation: trait_precedence ';' •
 
     $default  reduce using rule 329 (trait_adaptation)
 
 
 State 1085
 
-  330 trait_adaptation: trait_alias ';' .
+  330 trait_adaptation: trait_alias ';' •
 
     $default  reduce using rule 330 (trait_adaptation)
 
 
 State 1086
 
-  332 trait_alias: trait_method_reference "'as'" . "identifier"
-  333            | trait_method_reference "'as'" . reserved_non_modifiers
-  334            | trait_method_reference "'as'" . member_modifier identifier
-  335            | trait_method_reference "'as'" . member_modifier
-
-    "'throw'"          shift, and go to state 219
-    "'include'"        shift, and go to state 220
-    "'include_once'"   shift, and go to state 221
-    "'require'"        shift, and go to state 222
-    "'require_once'"   shift, and go to state 223
-    "'or'"             shift, and go to state 224
-    "'xor'"            shift, and go to state 225
-    "'and'"            shift, and go to state 226
-    "'print'"          shift, and go to state 227
-    "'yield'"          shift, and go to state 228
-    "'instanceof'"     shift, and go to state 229
-    "'clone'"          shift, and go to state 230
-    "'elseif'"         shift, and go to state 231
-    "'else'"           shift, and go to state 232
+  332 trait_alias: trait_method_reference "'as'" • "identifier"
+  333            | trait_method_reference "'as'" • reserved_non_modifiers
+  334            | trait_method_reference "'as'" • member_modifier identifier
+  335            | trait_method_reference "'as'" • member_modifier
+
     "identifier"       shift, and go to state 1104
-    "'eval'"           shift, and go to state 235
-    "'new'"            shift, and go to state 236
-    "'exit'"           shift, and go to state 237
-    "'if'"             shift, and go to state 238
-    "'endif'"          shift, and go to state 239
-    "'echo'"           shift, and go to state 240
-    "'do'"             shift, and go to state 241
-    "'while'"          shift, and go to state 242
-    "'endwhile'"       shift, and go to state 243
-    "'for'"            shift, and go to state 244
-    "'endfor'"         shift, and go to state 245
-    "'foreach'"        shift, and go to state 246
-    "'endforeach'"     shift, and go to state 247
-    "'declare'"        shift, and go to state 248
-    "'enddeclare'"     shift, and go to state 249
-    "'as'"             shift, and go to state 250
-    "'switch'"         shift, and go to state 251
-    "'endswitch'"      shift, and go to state 252
-    "'case'"           shift, and go to state 253
-    "'default'"        shift, and go to state 254
-    "'match'"          shift, and go to state 255
-    "'break'"          shift, and go to state 256
-    "'continue'"       shift, and go to state 257
-    "'goto'"           shift, and go to state 258
-    "'function'"       shift, and go to state 259
-    "'fn'"             shift, and go to state 260
-    "'const'"          shift, and go to state 261
-    "'return'"         shift, and go to state 262
-    "'try'"            shift, and go to state 263
-    "'catch'"          shift, and go to state 264
-    "'finally'"        shift, and go to state 265
-    "'use'"            shift, and go to state 266
-    "'insteadof'"      shift, and go to state 267
-    "'global'"         shift, and go to state 268
+    "'include'"        shift, and go to state 214
+    "'include_once'"   shift, and go to state 215
+    "'eval'"           shift, and go to state 216
+    "'require'"        shift, and go to state 217
+    "'require_once'"   shift, and go to state 218
+    "'or'"             shift, and go to state 219
+    "'xor'"            shift, and go to state 220
+    "'and'"            shift, and go to state 221
+    "'print'"          shift, and go to state 222
+    "'yield'"          shift, and go to state 223
+    "'instanceof'"     shift, and go to state 224
+    "'new'"            shift, and go to state 225
+    "'clone'"          shift, and go to state 226
+    "'exit'"           shift, and go to state 227
+    "'if'"             shift, and go to state 228
+    "'elseif'"         shift, and go to state 229
+    "'else'"           shift, and go to state 230
+    "'endif'"          shift, and go to state 231
+    "'echo'"           shift, and go to state 232
+    "'do'"             shift, and go to state 233
+    "'while'"          shift, and go to state 234
+    "'endwhile'"       shift, and go to state 235
+    "'for'"            shift, and go to state 236
+    "'endfor'"         shift, and go to state 237
+    "'foreach'"        shift, and go to state 238
+    "'endforeach'"     shift, and go to state 239
+    "'declare'"        shift, and go to state 240
+    "'enddeclare'"     shift, and go to state 241
+    "'as'"             shift, and go to state 242
+    "'switch'"         shift, and go to state 243
+    "'endswitch'"      shift, and go to state 244
+    "'case'"           shift, and go to state 245
+    "'default'"        shift, and go to state 246
+    "'match'"          shift, and go to state 247
+    "'break'"          shift, and go to state 248
+    "'continue'"       shift, and go to state 249
+    "'goto'"           shift, and go to state 250
+    "'function'"       shift, and go to state 251
+    "'fn'"             shift, and go to state 252
+    "'const'"          shift, and go to state 253
+    "'return'"         shift, and go to state 254
+    "'try'"            shift, and go to state 255
+    "'catch'"          shift, and go to state 256
+    "'finally'"        shift, and go to state 257
+    "'throw'"          shift, and go to state 258
+    "'use'"            shift, and go to state 259
+    "'insteadof'"      shift, and go to state 260
+    "'global'"         shift, and go to state 261
     "'static'"         shift, and go to state 789
     "'abstract'"       shift, and go to state 790
     "'final'"          shift, and go to state 791
@@ -32644,28 +32779,28 @@
     "'protected'"      shift, and go to state 793
     "'public'"         shift, and go to state 794
     "'readonly'"       shift, and go to state 795
-    "'var'"            shift, and go to state 276
-    "'unset'"          shift, and go to state 277
-    "'isset'"          shift, and go to state 278
-    "'empty'"          shift, and go to state 279
-    "'class'"          shift, and go to state 280
-    "'trait'"          shift, and go to state 281
-    "'interface'"      shift, and go to state 282
-    "'enum'"           shift, and go to state 283
-    "'extends'"        shift, and go to state 284
-    "'implements'"     shift, and go to state 285
-    "'namespace'"      shift, and go to state 286
-    "'list'"           shift, and go to state 287
-    "'array'"          shift, and go to state 288
-    "'callable'"       shift, and go to state 289
-    "'__LINE__'"       shift, and go to state 290
-    "'__FILE__'"       shift, and go to state 291
-    "'__DIR__'"        shift, and go to state 292
-    "'__CLASS__'"      shift, and go to state 293
-    "'__TRAIT__'"      shift, and go to state 294
-    "'__METHOD__'"     shift, and go to state 295
-    "'__FUNCTION__'"   shift, and go to state 296
-    "'__NAMESPACE__'"  shift, and go to state 297
+    "'var'"            shift, and go to state 269
+    "'unset'"          shift, and go to state 270
+    "'isset'"          shift, and go to state 271
+    "'empty'"          shift, and go to state 272
+    "'class'"          shift, and go to state 273
+    "'trait'"          shift, and go to state 274
+    "'interface'"      shift, and go to state 275
+    "'enum'"           shift, and go to state 276
+    "'extends'"        shift, and go to state 277
+    "'implements'"     shift, and go to state 278
+    "'namespace'"      shift, and go to state 279
+    "'list'"           shift, and go to state 280
+    "'array'"          shift, and go to state 281
+    "'callable'"       shift, and go to state 282
+    "'__LINE__'"       shift, and go to state 283
+    "'__FILE__'"       shift, and go to state 284
+    "'__DIR__'"        shift, and go to state 285
+    "'__CLASS__'"      shift, and go to state 286
+    "'__TRAIT__'"      shift, and go to state 287
+    "'__METHOD__'"     shift, and go to state 288
+    "'__FUNCTION__'"   shift, and go to state 289
+    "'__NAMESPACE__'"  shift, and go to state 290
 
     reserved_non_modifiers  go to state 1105
     member_modifier         go to state 1106
@@ -32673,172 +32808,172 @@
 
 State 1087
 
-  331 trait_precedence: absolute_trait_method_reference "'insteadof'" . class_name_list
+  331 trait_precedence: absolute_trait_method_reference "'insteadof'" • class_name_list
 
     "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "'static'"                 shift, and go to state 156
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "'static'"                 shift, and go to state 147
 
-    name             go to state 159
+    name             go to state 150
     class_name_list  go to state 1107
     class_name       go to state 758
 
 
 State 1088
 
-  338 absolute_trait_method_reference: class_name "'::'" . identifier
+  338 absolute_trait_method_reference: class_name "'::'" • identifier
 
-    "'throw'"          shift, and go to state 219
-    "'include'"        shift, and go to state 220
-    "'include_once'"   shift, and go to state 221
-    "'require'"        shift, and go to state 222
-    "'require_once'"   shift, and go to state 223
-    "'or'"             shift, and go to state 224
-    "'xor'"            shift, and go to state 225
-    "'and'"            shift, and go to state 226
-    "'print'"          shift, and go to state 227
-    "'yield'"          shift, and go to state 228
-    "'instanceof'"     shift, and go to state 229
-    "'clone'"          shift, and go to state 230
-    "'elseif'"         shift, and go to state 231
-    "'else'"           shift, and go to state 232
-    "identifier"       shift, and go to state 233
-    "'eval'"           shift, and go to state 235
-    "'new'"            shift, and go to state 236
-    "'exit'"           shift, and go to state 237
-    "'if'"             shift, and go to state 238
-    "'endif'"          shift, and go to state 239
-    "'echo'"           shift, and go to state 240
-    "'do'"             shift, and go to state 241
-    "'while'"          shift, and go to state 242
-    "'endwhile'"       shift, and go to state 243
-    "'for'"            shift, and go to state 244
-    "'endfor'"         shift, and go to state 245
-    "'foreach'"        shift, and go to state 246
-    "'endforeach'"     shift, and go to state 247
-    "'declare'"        shift, and go to state 248
-    "'enddeclare'"     shift, and go to state 249
-    "'as'"             shift, and go to state 250
-    "'switch'"         shift, and go to state 251
-    "'endswitch'"      shift, and go to state 252
-    "'case'"           shift, and go to state 253
-    "'default'"        shift, and go to state 254
-    "'match'"          shift, and go to state 255
-    "'break'"          shift, and go to state 256
-    "'continue'"       shift, and go to state 257
-    "'goto'"           shift, and go to state 258
-    "'function'"       shift, and go to state 259
-    "'fn'"             shift, and go to state 260
-    "'const'"          shift, and go to state 261
-    "'return'"         shift, and go to state 262
-    "'try'"            shift, and go to state 263
-    "'catch'"          shift, and go to state 264
-    "'finally'"        shift, and go to state 265
-    "'use'"            shift, and go to state 266
-    "'insteadof'"      shift, and go to state 267
-    "'global'"         shift, and go to state 268
-    "'static'"         shift, and go to state 269
-    "'abstract'"       shift, and go to state 270
-    "'final'"          shift, and go to state 271
-    "'private'"        shift, and go to state 272
-    "'protected'"      shift, and go to state 273
-    "'public'"         shift, and go to state 274
-    "'readonly'"       shift, and go to state 275
-    "'var'"            shift, and go to state 276
-    "'unset'"          shift, and go to state 277
-    "'isset'"          shift, and go to state 278
-    "'empty'"          shift, and go to state 279
-    "'class'"          shift, and go to state 280
-    "'trait'"          shift, and go to state 281
-    "'interface'"      shift, and go to state 282
-    "'enum'"           shift, and go to state 283
-    "'extends'"        shift, and go to state 284
-    "'implements'"     shift, and go to state 285
-    "'namespace'"      shift, and go to state 286
-    "'list'"           shift, and go to state 287
-    "'array'"          shift, and go to state 288
-    "'callable'"       shift, and go to state 289
-    "'__LINE__'"       shift, and go to state 290
-    "'__FILE__'"       shift, and go to state 291
-    "'__DIR__'"        shift, and go to state 292
-    "'__CLASS__'"      shift, and go to state 293
-    "'__TRAIT__'"      shift, and go to state 294
-    "'__METHOD__'"     shift, and go to state 295
-    "'__FUNCTION__'"   shift, and go to state 296
-    "'__NAMESPACE__'"  shift, and go to state 297
+    "identifier"       shift, and go to state 212
+    "'include'"        shift, and go to state 214
+    "'include_once'"   shift, and go to state 215
+    "'eval'"           shift, and go to state 216
+    "'require'"        shift, and go to state 217
+    "'require_once'"   shift, and go to state 218
+    "'or'"             shift, and go to state 219
+    "'xor'"            shift, and go to state 220
+    "'and'"            shift, and go to state 221
+    "'print'"          shift, and go to state 222
+    "'yield'"          shift, and go to state 223
+    "'instanceof'"     shift, and go to state 224
+    "'new'"            shift, and go to state 225
+    "'clone'"          shift, and go to state 226
+    "'exit'"           shift, and go to state 227
+    "'if'"             shift, and go to state 228
+    "'elseif'"         shift, and go to state 229
+    "'else'"           shift, and go to state 230
+    "'endif'"          shift, and go to state 231
+    "'echo'"           shift, and go to state 232
+    "'do'"             shift, and go to state 233
+    "'while'"          shift, and go to state 234
+    "'endwhile'"       shift, and go to state 235
+    "'for'"            shift, and go to state 236
+    "'endfor'"         shift, and go to state 237
+    "'foreach'"        shift, and go to state 238
+    "'endforeach'"     shift, and go to state 239
+    "'declare'"        shift, and go to state 240
+    "'enddeclare'"     shift, and go to state 241
+    "'as'"             shift, and go to state 242
+    "'switch'"         shift, and go to state 243
+    "'endswitch'"      shift, and go to state 244
+    "'case'"           shift, and go to state 245
+    "'default'"        shift, and go to state 246
+    "'match'"          shift, and go to state 247
+    "'break'"          shift, and go to state 248
+    "'continue'"       shift, and go to state 249
+    "'goto'"           shift, and go to state 250
+    "'function'"       shift, and go to state 251
+    "'fn'"             shift, and go to state 252
+    "'const'"          shift, and go to state 253
+    "'return'"         shift, and go to state 254
+    "'try'"            shift, and go to state 255
+    "'catch'"          shift, and go to state 256
+    "'finally'"        shift, and go to state 257
+    "'throw'"          shift, and go to state 258
+    "'use'"            shift, and go to state 259
+    "'insteadof'"      shift, and go to state 260
+    "'global'"         shift, and go to state 261
+    "'static'"         shift, and go to state 262
+    "'abstract'"       shift, and go to state 263
+    "'final'"          shift, and go to state 264
+    "'private'"        shift, and go to state 265
+    "'protected'"      shift, and go to state 266
+    "'public'"         shift, and go to state 267
+    "'readonly'"       shift, and go to state 268
+    "'var'"            shift, and go to state 269
+    "'unset'"          shift, and go to state 270
+    "'isset'"          shift, and go to state 271
+    "'empty'"          shift, and go to state 272
+    "'class'"          shift, and go to state 273
+    "'trait'"          shift, and go to state 274
+    "'interface'"      shift, and go to state 275
+    "'enum'"           shift, and go to state 276
+    "'extends'"        shift, and go to state 277
+    "'implements'"     shift, and go to state 278
+    "'namespace'"      shift, and go to state 279
+    "'list'"           shift, and go to state 280
+    "'array'"          shift, and go to state 281
+    "'callable'"       shift, and go to state 282
+    "'__LINE__'"       shift, and go to state 283
+    "'__FILE__'"       shift, and go to state 284
+    "'__DIR__'"        shift, and go to state 285
+    "'__CLASS__'"      shift, and go to state 286
+    "'__TRAIT__'"      shift, and go to state 287
+    "'__METHOD__'"     shift, and go to state 288
+    "'__FUNCTION__'"   shift, and go to state 289
+    "'__NAMESPACE__'"  shift, and go to state 290
 
-    reserved_non_modifiers  go to state 298
-    semi_reserved           go to state 299
+    reserved_non_modifiers  go to state 291
+    semi_reserved           go to state 292
     identifier              go to state 1108
 
 
 State 1089
 
-  359 property: "variable" '=' expr . backup_doc_comment
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-
-    "'or'"          shift, and go to state 353
-    "'xor'"         shift, and go to state 354
-    "'and'"         shift, and go to state 355
-    '?'             shift, and go to state 356
-    "'??'"          shift, and go to state 357
-    "'||'"          shift, and go to state 358
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  359 property: "variable" '=' expr • backup_doc_comment
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+
+    '?'             shift, and go to state 353
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'or'"          shift, and go to state 364
+    "'xor'"         shift, and go to state 365
+    "'and'"         shift, and go to state 366
+    "'instanceof'"  shift, and go to state 367
+    "'||'"          shift, and go to state 368
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'??'"          shift, and go to state 379
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
 
     $default  reduce using rule 464 (backup_doc_comment)
 
@@ -32847,83 +32982,83 @@
 
 State 1090
 
-  356 property_list: property_list ',' property .
+  356 property_list: property_list ',' property •
 
     $default  reduce using rule 356 (property_list)
 
 
 State 1091
 
-  317 attributed_class_statement: method_modifiers function returns_ref identifier backup_doc_comment . '(' parameter_list ')' return_type backup_fn_flags method_body backup_fn_flags
+  317 attributed_class_statement: method_modifiers function returns_ref identifier backup_doc_comment • '(' parameter_list ')' return_type backup_fn_flags method_body backup_fn_flags
 
     '('  shift, and go to state 1110
 
 
 State 1092
 
-  362 class_const_decl: "identifier" '=' expr . backup_doc_comment
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-
-    "'or'"          shift, and go to state 353
-    "'xor'"         shift, and go to state 354
-    "'and'"         shift, and go to state 355
-    '?'             shift, and go to state 356
-    "'??'"          shift, and go to state 357
-    "'||'"          shift, and go to state 358
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  362 class_const_decl: "identifier" '=' expr • backup_doc_comment
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+
+    '?'             shift, and go to state 353
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'or'"          shift, and go to state 364
+    "'xor'"         shift, and go to state 365
+    "'and'"         shift, and go to state 366
+    "'instanceof'"  shift, and go to state 367
+    "'||'"          shift, and go to state 368
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'??'"          shift, and go to state 379
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
 
     $default  reduce using rule 464 (backup_doc_comment)
 
@@ -32932,69 +33067,69 @@
 
 State 1093
 
-  363 class_const_decl: semi_reserved '=' expr . backup_doc_comment
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-
-    "'or'"          shift, and go to state 353
-    "'xor'"         shift, and go to state 354
-    "'and'"         shift, and go to state 355
-    '?'             shift, and go to state 356
-    "'??'"          shift, and go to state 357
-    "'||'"          shift, and go to state 358
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  363 class_const_decl: semi_reserved '=' expr • backup_doc_comment
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+
+    '?'             shift, and go to state 353
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'or'"          shift, and go to state 364
+    "'xor'"         shift, and go to state 365
+    "'and'"         shift, and go to state 366
+    "'instanceof'"  shift, and go to state 367
+    "'||'"          shift, and go to state 368
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'??'"          shift, and go to state 379
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
 
     $default  reduce using rule 464 (backup_doc_comment)
 
@@ -33003,83 +33138,83 @@
 
 State 1094
 
-  316 attributed_class_statement: class_const_modifiers "'const'" type_expr class_const_list ';' .
+  316 attributed_class_statement: class_const_modifiers "'const'" type_expr class_const_list ';' •
 
     $default  reduce using rule 316 (attributed_class_statement)
 
 
 State 1095
 
-  360 class_const_list: class_const_list ',' class_const_decl .
+  360 class_const_list: class_const_list ',' class_const_decl •
 
     $default  reduce using rule 360 (class_const_list)
 
 
 State 1096
 
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-  461 inline_function: fn returns_ref backup_doc_comment '(' parameter_list ')' return_type "'=>'" backup_fn_flags backup_lex_pos expr . backup_fn_flags
-
-    "'or'"          shift, and go to state 353
-    "'xor'"         shift, and go to state 354
-    "'and'"         shift, and go to state 355
-    '?'             shift, and go to state 356
-    "'??'"          shift, and go to state 357
-    "'||'"          shift, and go to state 358
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+  461 inline_function: fn returns_ref backup_doc_comment '(' parameter_list ')' return_type "'=>'" backup_fn_flags backup_lex_pos expr • backup_fn_flags
+
+    '?'             shift, and go to state 353
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'or'"          shift, and go to state 364
+    "'xor'"         shift, and go to state 365
+    "'and'"         shift, and go to state 366
+    "'instanceof'"  shift, and go to state 367
+    "'||'"          shift, and go to state 368
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'??'"          shift, and go to state 379
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
 
     $default  reduce using rule 465 (backup_fn_flags)
 
@@ -33088,60 +33223,60 @@
 
 State 1097
 
-  267 parameter: optional_cpp_modifiers optional_type_without_static is_reference is_variadic "variable" backup_doc_comment '=' . expr
+  267 parameter: optional_cpp_modifiers optional_type_without_static is_reference is_variadic "variable" backup_doc_comment '=' • expr
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 128
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'match'"                  shift, and go to state 45
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'static'"                 shift, and go to state 129
-    "'readonly'"               shift, and go to state 130
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 128
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'match'"                  shift, and go to state 37
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'throw'"                  shift, and go to state 46
+    "'static'"                 shift, and go to state 129
+    "'readonly'"               shift, and go to state 130
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ''                        shift, and go to state 86
@@ -33177,84 +33312,84 @@
 
 State 1098
 
-  142 inner_statement_list: inner_statement_list . inner_statement
-  185 function_declaration_statement: function returns_ref function_name backup_doc_comment '(' parameter_list ')' return_type backup_fn_flags '{' inner_statement_list . '}' backup_fn_flags
+  142 inner_statement_list: inner_statement_list • inner_statement
+  185 function_declaration_statement: function returns_ref function_name backup_doc_comment '(' parameter_list ')' return_type backup_fn_flags '{' inner_statement_list • '}' backup_fn_flags
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 27
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    T_INLINE_HTML              shift, and go to state 32
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'if'"                     shift, and go to state 37
-    "'echo'"                   shift, and go to state 38
-    "'do'"                     shift, and go to state 39
-    "'while'"                  shift, and go to state 40
-    "'for'"                    shift, and go to state 41
-    "'foreach'"                shift, and go to state 42
-    "'declare'"                shift, and go to state 43
-    "'switch'"                 shift, and go to state 44
-    "'match'"                  shift, and go to state 45
-    "'break'"                  shift, and go to state 46
-    "'continue'"               shift, and go to state 47
-    "'goto'"                   shift, and go to state 48
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'return'"                 shift, and go to state 52
-    "'try'"                    shift, and go to state 53
-    "'global'"                 shift, and go to state 55
-    "'static'"                 shift, and go to state 56
-    "'abstract'"               shift, and go to state 57
-    "'final'"                  shift, and go to state 58
-    "'readonly'"               shift, and go to state 59
-    "'unset'"                  shift, and go to state 60
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 11
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    T_INLINE_HTML              shift, and go to state 16
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'if'"                     shift, and go to state 29
+    "'echo'"                   shift, and go to state 30
+    "'do'"                     shift, and go to state 31
+    "'while'"                  shift, and go to state 32
+    "'for'"                    shift, and go to state 33
+    "'foreach'"                shift, and go to state 34
+    "'declare'"                shift, and go to state 35
+    "'switch'"                 shift, and go to state 36
+    "'match'"                  shift, and go to state 37
+    "'break'"                  shift, and go to state 38
+    "'continue'"               shift, and go to state 39
+    "'goto'"                   shift, and go to state 40
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'return'"                 shift, and go to state 44
+    "'try'"                    shift, and go to state 45
+    "'throw'"                  shift, and go to state 46
+    "'global'"                 shift, and go to state 48
+    "'static'"                 shift, and go to state 49
+    "'abstract'"               shift, and go to state 50
+    "'final'"                  shift, and go to state 51
+    "'readonly'"               shift, and go to state 52
+    "'unset'"                  shift, and go to state 53
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
     "'__halt_compiler'"        shift, and go to state 528
-    "'class'"                  shift, and go to state 64
-    "'trait'"                  shift, and go to state 65
-    "'interface'"              shift, and go to state 66
-    "'enum'"                   shift, and go to state 67
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    "'class'"                  shift, and go to state 57
+    "'trait'"                  shift, and go to state 58
+    "'interface'"              shift, and go to state 59
+    "'enum'"                   shift, and go to state 60
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ';'                        shift, and go to state 84
@@ -33307,98 +33442,98 @@
 
 State 1099
 
-  471 lexical_var_list: lexical_var_list ',' lexical_var .
+  471 lexical_var_list: lexical_var_list ',' lexical_var •
 
     $default  reduce using rule 471 (lexical_var_list)
 
 
 State 1100
 
-  470 lexical_vars: "'use'" '(' lexical_var_list possible_comma ')' .
+  470 lexical_vars: "'use'" '(' lexical_var_list possible_comma ')' •
 
     $default  reduce using rule 470 (lexical_vars)
 
 
 State 1101
 
-  142 inner_statement_list: inner_statement_list . inner_statement
-  460 inline_function: function returns_ref backup_doc_comment '(' parameter_list ')' lexical_vars return_type backup_fn_flags '{' inner_statement_list . '}' backup_fn_flags
+  142 inner_statement_list: inner_statement_list • inner_statement
+  460 inline_function: function returns_ref backup_doc_comment '(' parameter_list ')' lexical_vars return_type backup_fn_flags '{' inner_statement_list • '}' backup_fn_flags
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 27
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    T_INLINE_HTML              shift, and go to state 32
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'if'"                     shift, and go to state 37
-    "'echo'"                   shift, and go to state 38
-    "'do'"                     shift, and go to state 39
-    "'while'"                  shift, and go to state 40
-    "'for'"                    shift, and go to state 41
-    "'foreach'"                shift, and go to state 42
-    "'declare'"                shift, and go to state 43
-    "'switch'"                 shift, and go to state 44
-    "'match'"                  shift, and go to state 45
-    "'break'"                  shift, and go to state 46
-    "'continue'"               shift, and go to state 47
-    "'goto'"                   shift, and go to state 48
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'return'"                 shift, and go to state 52
-    "'try'"                    shift, and go to state 53
-    "'global'"                 shift, and go to state 55
-    "'static'"                 shift, and go to state 56
-    "'abstract'"               shift, and go to state 57
-    "'final'"                  shift, and go to state 58
-    "'readonly'"               shift, and go to state 59
-    "'unset'"                  shift, and go to state 60
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 11
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    T_INLINE_HTML              shift, and go to state 16
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'if'"                     shift, and go to state 29
+    "'echo'"                   shift, and go to state 30
+    "'do'"                     shift, and go to state 31
+    "'while'"                  shift, and go to state 32
+    "'for'"                    shift, and go to state 33
+    "'foreach'"                shift, and go to state 34
+    "'declare'"                shift, and go to state 35
+    "'switch'"                 shift, and go to state 36
+    "'match'"                  shift, and go to state 37
+    "'break'"                  shift, and go to state 38
+    "'continue'"               shift, and go to state 39
+    "'goto'"                   shift, and go to state 40
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'return'"                 shift, and go to state 44
+    "'try'"                    shift, and go to state 45
+    "'throw'"                  shift, and go to state 46
+    "'global'"                 shift, and go to state 48
+    "'static'"                 shift, and go to state 49
+    "'abstract'"               shift, and go to state 50
+    "'final'"                  shift, and go to state 51
+    "'readonly'"               shift, and go to state 52
+    "'unset'"                  shift, and go to state 53
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
     "'__halt_compiler'"        shift, and go to state 528
-    "'class'"                  shift, and go to state 64
-    "'trait'"                  shift, and go to state 65
-    "'interface'"              shift, and go to state 66
-    "'enum'"                   shift, and go to state 67
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    "'class'"                  shift, and go to state 57
+    "'trait'"                  shift, and go to state 58
+    "'interface'"              shift, and go to state 59
+    "'enum'"                   shift, and go to state 60
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ';'                        shift, and go to state 84
@@ -33451,91 +33586,91 @@
 
 State 1102
 
-  225 for_statement: ':' inner_statement_list "'endfor'" ';' .
+  225 for_statement: ':' inner_statement_list "'endfor'" ';' •
 
     $default  reduce using rule 225 (for_statement)
 
 
 State 1103
 
-  142 inner_statement_list: inner_statement_list . inner_statement
-  173 catch_list: catch_list "'catch'" '(' catch_name_list optional_variable ')' '{' inner_statement_list . '}'
+  142 inner_statement_list: inner_statement_list • inner_statement
+  173 catch_list: catch_list "'catch'" '(' catch_name_list optional_variable ')' '{' inner_statement_list • '}'
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 27
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    T_INLINE_HTML              shift, and go to state 32
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'if'"                     shift, and go to state 37
-    "'echo'"                   shift, and go to state 38
-    "'do'"                     shift, and go to state 39
-    "'while'"                  shift, and go to state 40
-    "'for'"                    shift, and go to state 41
-    "'foreach'"                shift, and go to state 42
-    "'declare'"                shift, and go to state 43
-    "'switch'"                 shift, and go to state 44
-    "'match'"                  shift, and go to state 45
-    "'break'"                  shift, and go to state 46
-    "'continue'"               shift, and go to state 47
-    "'goto'"                   shift, and go to state 48
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'return'"                 shift, and go to state 52
-    "'try'"                    shift, and go to state 53
-    "'global'"                 shift, and go to state 55
-    "'static'"                 shift, and go to state 56
-    "'abstract'"               shift, and go to state 57
-    "'final'"                  shift, and go to state 58
-    "'readonly'"               shift, and go to state 59
-    "'unset'"                  shift, and go to state 60
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 11
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    T_INLINE_HTML              shift, and go to state 16
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'if'"                     shift, and go to state 29
+    "'echo'"                   shift, and go to state 30
+    "'do'"                     shift, and go to state 31
+    "'while'"                  shift, and go to state 32
+    "'for'"                    shift, and go to state 33
+    "'foreach'"                shift, and go to state 34
+    "'declare'"                shift, and go to state 35
+    "'switch'"                 shift, and go to state 36
+    "'match'"                  shift, and go to state 37
+    "'break'"                  shift, and go to state 38
+    "'continue'"               shift, and go to state 39
+    "'goto'"                   shift, and go to state 40
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'return'"                 shift, and go to state 44
+    "'try'"                    shift, and go to state 45
+    "'throw'"                  shift, and go to state 46
+    "'global'"                 shift, and go to state 48
+    "'static'"                 shift, and go to state 49
+    "'abstract'"               shift, and go to state 50
+    "'final'"                  shift, and go to state 51
+    "'readonly'"               shift, and go to state 52
+    "'unset'"                  shift, and go to state 53
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
     "'__halt_compiler'"        shift, and go to state 528
-    "'class'"                  shift, and go to state 64
-    "'trait'"                  shift, and go to state 65
-    "'interface'"              shift, and go to state 66
-    "'enum'"                   shift, and go to state 67
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    "'class'"                  shift, and go to state 57
+    "'trait'"                  shift, and go to state 58
+    "'interface'"              shift, and go to state 59
+    "'enum'"                   shift, and go to state 60
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ';'                        shift, and go to state 84
@@ -33588,113 +33723,113 @@
 
 State 1104
 
-  332 trait_alias: trait_method_reference "'as'" "identifier" .
+  332 trait_alias: trait_method_reference "'as'" "identifier" •
 
     $default  reduce using rule 332 (trait_alias)
 
 
 State 1105
 
-  333 trait_alias: trait_method_reference "'as'" reserved_non_modifiers .
+  333 trait_alias: trait_method_reference "'as'" reserved_non_modifiers •
 
     $default  reduce using rule 333 (trait_alias)
 
 
 State 1106
 
-  334 trait_alias: trait_method_reference "'as'" member_modifier . identifier
-  335            | trait_method_reference "'as'" member_modifier .
+  334 trait_alias: trait_method_reference "'as'" member_modifier • identifier
+  335            | trait_method_reference "'as'" member_modifier •
 
-    "'throw'"          shift, and go to state 219
-    "'include'"        shift, and go to state 220
-    "'include_once'"   shift, and go to state 221
-    "'require'"        shift, and go to state 222
-    "'require_once'"   shift, and go to state 223
-    "'or'"             shift, and go to state 224
-    "'xor'"            shift, and go to state 225
-    "'and'"            shift, and go to state 226
-    "'print'"          shift, and go to state 227
-    "'yield'"          shift, and go to state 228
-    "'instanceof'"     shift, and go to state 229
-    "'clone'"          shift, and go to state 230
-    "'elseif'"         shift, and go to state 231
-    "'else'"           shift, and go to state 232
-    "identifier"       shift, and go to state 233
-    "'eval'"           shift, and go to state 235
-    "'new'"            shift, and go to state 236
-    "'exit'"           shift, and go to state 237
-    "'if'"             shift, and go to state 238
-    "'endif'"          shift, and go to state 239
-    "'echo'"           shift, and go to state 240
-    "'do'"             shift, and go to state 241
-    "'while'"          shift, and go to state 242
-    "'endwhile'"       shift, and go to state 243
-    "'for'"            shift, and go to state 244
-    "'endfor'"         shift, and go to state 245
-    "'foreach'"        shift, and go to state 246
-    "'endforeach'"     shift, and go to state 247
-    "'declare'"        shift, and go to state 248
-    "'enddeclare'"     shift, and go to state 249
-    "'as'"             shift, and go to state 250
-    "'switch'"         shift, and go to state 251
-    "'endswitch'"      shift, and go to state 252
-    "'case'"           shift, and go to state 253
-    "'default'"        shift, and go to state 254
-    "'match'"          shift, and go to state 255
-    "'break'"          shift, and go to state 256
-    "'continue'"       shift, and go to state 257
-    "'goto'"           shift, and go to state 258
-    "'function'"       shift, and go to state 259
-    "'fn'"             shift, and go to state 260
-    "'const'"          shift, and go to state 261
-    "'return'"         shift, and go to state 262
-    "'try'"            shift, and go to state 263
-    "'catch'"          shift, and go to state 264
-    "'finally'"        shift, and go to state 265
-    "'use'"            shift, and go to state 266
-    "'insteadof'"      shift, and go to state 267
-    "'global'"         shift, and go to state 268
-    "'static'"         shift, and go to state 269
-    "'abstract'"       shift, and go to state 270
-    "'final'"          shift, and go to state 271
-    "'private'"        shift, and go to state 272
-    "'protected'"      shift, and go to state 273
-    "'public'"         shift, and go to state 274
-    "'readonly'"       shift, and go to state 275
-    "'var'"            shift, and go to state 276
-    "'unset'"          shift, and go to state 277
-    "'isset'"          shift, and go to state 278
-    "'empty'"          shift, and go to state 279
-    "'class'"          shift, and go to state 280
-    "'trait'"          shift, and go to state 281
-    "'interface'"      shift, and go to state 282
-    "'enum'"           shift, and go to state 283
-    "'extends'"        shift, and go to state 284
-    "'implements'"     shift, and go to state 285
-    "'namespace'"      shift, and go to state 286
-    "'list'"           shift, and go to state 287
-    "'array'"          shift, and go to state 288
-    "'callable'"       shift, and go to state 289
-    "'__LINE__'"       shift, and go to state 290
-    "'__FILE__'"       shift, and go to state 291
-    "'__DIR__'"        shift, and go to state 292
-    "'__CLASS__'"      shift, and go to state 293
-    "'__TRAIT__'"      shift, and go to state 294
-    "'__METHOD__'"     shift, and go to state 295
-    "'__FUNCTION__'"   shift, and go to state 296
-    "'__NAMESPACE__'"  shift, and go to state 297
+    "identifier"       shift, and go to state 212
+    "'include'"        shift, and go to state 214
+    "'include_once'"   shift, and go to state 215
+    "'eval'"           shift, and go to state 216
+    "'require'"        shift, and go to state 217
+    "'require_once'"   shift, and go to state 218
+    "'or'"             shift, and go to state 219
+    "'xor'"            shift, and go to state 220
+    "'and'"            shift, and go to state 221
+    "'print'"          shift, and go to state 222
+    "'yield'"          shift, and go to state 223
+    "'instanceof'"     shift, and go to state 224
+    "'new'"            shift, and go to state 225
+    "'clone'"          shift, and go to state 226
+    "'exit'"           shift, and go to state 227
+    "'if'"             shift, and go to state 228
+    "'elseif'"         shift, and go to state 229
+    "'else'"           shift, and go to state 230
+    "'endif'"          shift, and go to state 231
+    "'echo'"           shift, and go to state 232
+    "'do'"             shift, and go to state 233
+    "'while'"          shift, and go to state 234
+    "'endwhile'"       shift, and go to state 235
+    "'for'"            shift, and go to state 236
+    "'endfor'"         shift, and go to state 237
+    "'foreach'"        shift, and go to state 238
+    "'endforeach'"     shift, and go to state 239
+    "'declare'"        shift, and go to state 240
+    "'enddeclare'"     shift, and go to state 241
+    "'as'"             shift, and go to state 242
+    "'switch'"         shift, and go to state 243
+    "'endswitch'"      shift, and go to state 244
+    "'case'"           shift, and go to state 245
+    "'default'"        shift, and go to state 246
+    "'match'"          shift, and go to state 247
+    "'break'"          shift, and go to state 248
+    "'continue'"       shift, and go to state 249
+    "'goto'"           shift, and go to state 250
+    "'function'"       shift, and go to state 251
+    "'fn'"             shift, and go to state 252
+    "'const'"          shift, and go to state 253
+    "'return'"         shift, and go to state 254
+    "'try'"            shift, and go to state 255
+    "'catch'"          shift, and go to state 256
+    "'finally'"        shift, and go to state 257
+    "'throw'"          shift, and go to state 258
+    "'use'"            shift, and go to state 259
+    "'insteadof'"      shift, and go to state 260
+    "'global'"         shift, and go to state 261
+    "'static'"         shift, and go to state 262
+    "'abstract'"       shift, and go to state 263
+    "'final'"          shift, and go to state 264
+    "'private'"        shift, and go to state 265
+    "'protected'"      shift, and go to state 266
+    "'public'"         shift, and go to state 267
+    "'readonly'"       shift, and go to state 268
+    "'var'"            shift, and go to state 269
+    "'unset'"          shift, and go to state 270
+    "'isset'"          shift, and go to state 271
+    "'empty'"          shift, and go to state 272
+    "'class'"          shift, and go to state 273
+    "'trait'"          shift, and go to state 274
+    "'interface'"      shift, and go to state 275
+    "'enum'"           shift, and go to state 276
+    "'extends'"        shift, and go to state 277
+    "'implements'"     shift, and go to state 278
+    "'namespace'"      shift, and go to state 279
+    "'list'"           shift, and go to state 280
+    "'array'"          shift, and go to state 281
+    "'callable'"       shift, and go to state 282
+    "'__LINE__'"       shift, and go to state 283
+    "'__FILE__'"       shift, and go to state 284
+    "'__DIR__'"        shift, and go to state 285
+    "'__CLASS__'"      shift, and go to state 286
+    "'__TRAIT__'"      shift, and go to state 287
+    "'__METHOD__'"     shift, and go to state 288
+    "'__FUNCTION__'"   shift, and go to state 289
+    "'__NAMESPACE__'"  shift, and go to state 290
 
     $default  reduce using rule 335 (trait_alias)
 
-    reserved_non_modifiers  go to state 298
-    semi_reserved           go to state 299
+    reserved_non_modifiers  go to state 291
+    semi_reserved           go to state 292
     identifier              go to state 1118
 
 
 State 1107
 
-  323 class_name_list: class_name_list . ',' class_name
-  331 trait_precedence: absolute_trait_method_reference "'insteadof'" class_name_list .
+  323 class_name_list: class_name_list • ',' class_name
+  331 trait_precedence: absolute_trait_method_reference "'insteadof'" class_name_list •
 
     ','  shift, and go to state 845
 
@@ -33703,21 +33838,21 @@
 
 State 1108
 
-  338 absolute_trait_method_reference: class_name "'::'" identifier .
+  338 absolute_trait_method_reference: class_name "'::'" identifier •
 
     $default  reduce using rule 338 (absolute_trait_method_reference)
 
 
 State 1109
 
-  359 property: "variable" '=' expr backup_doc_comment .
+  359 property: "variable" '=' expr backup_doc_comment •
 
     $default  reduce using rule 359 (property)
 
 
 State 1110
 
-  317 attributed_class_statement: method_modifiers function returns_ref identifier backup_doc_comment '(' . parameter_list ')' return_type backup_fn_flags method_body backup_fn_flags
+  317 attributed_class_statement: method_modifiers function returns_ref identifier backup_doc_comment '(' • parameter_list ')' return_type backup_fn_flags method_body backup_fn_flags
 
     "'static'"     shift, and go to state 789
     "'abstract'"   shift, and go to state 790
@@ -33726,7 +33861,7 @@
     "'protected'"  shift, and go to state 793
     "'public'"     shift, and go to state 794
     "'readonly'"   shift, and go to state 795
-    "'#'"         shift, and go to state 79
+    "'#'"         shift, and go to state 72
 
     ')'       reduce using rule 259 (parameter_list)
     $default  reduce using rule 264 (optional_cpp_modifiers)
@@ -33744,97 +33879,97 @@
 
 State 1111
 
-  362 class_const_decl: "identifier" '=' expr backup_doc_comment .
+  362 class_const_decl: "identifier" '=' expr backup_doc_comment •
 
     $default  reduce using rule 362 (class_const_decl)
 
 
 State 1112
 
-  363 class_const_decl: semi_reserved '=' expr backup_doc_comment .
+  363 class_const_decl: semi_reserved '=' expr backup_doc_comment •
 
     $default  reduce using rule 363 (class_const_decl)
 
 
 State 1113
 
-  461 inline_function: fn returns_ref backup_doc_comment '(' parameter_list ')' return_type "'=>'" backup_fn_flags backup_lex_pos expr backup_fn_flags .
+  461 inline_function: fn returns_ref backup_doc_comment '(' parameter_list ')' return_type "'=>'" backup_fn_flags backup_lex_pos expr backup_fn_flags •
 
     $default  reduce using rule 461 (inline_function)
 
 
 State 1114
 
-  267 parameter: optional_cpp_modifiers optional_type_without_static is_reference is_variadic "variable" backup_doc_comment '=' expr .
-  400 expr: expr . "'||'" expr
-  401     | expr . "'&&'" expr
-  402     | expr . "'or'" expr
-  403     | expr . "'and'" expr
-  404     | expr . "'xor'" expr
-  405     | expr . '|' expr
-  406     | expr . "amp" expr
-  407     | expr . "'&'" expr
-  408     | expr . '^' expr
-  409     | expr . '.' expr
-  410     | expr . '+' expr
-  411     | expr . '-' expr
-  412     | expr . '*' expr
-  413     | expr . "'**'" expr
-  414     | expr . '/' expr
-  415     | expr . '%' expr
-  416     | expr . "'<<'" expr
-  417     | expr . "'>>'" expr
-  422     | expr . "'==='" expr
-  423     | expr . "'!=='" expr
-  424     | expr . "'=='" expr
-  425     | expr . "'!='" expr
-  426     | expr . '<' expr
-  427     | expr . "'<='" expr
-  428     | expr . '>' expr
-  429     | expr . "'>='" expr
-  430     | expr . "'<=>'" expr
-  431     | expr . "'instanceof'" class_name_reference
-  434     | expr . '?' expr ':' expr
-  435     | expr . '?' ':' expr
-  436     | expr . "'??'" expr
-
-    "'or'"          shift, and go to state 353
-    "'xor'"         shift, and go to state 354
-    "'and'"         shift, and go to state 355
-    '?'             shift, and go to state 356
-    "'??'"          shift, and go to state 357
-    "'||'"          shift, and go to state 358
-    "'&&'"          shift, and go to state 359
-    '|'             shift, and go to state 360
-    '^'             shift, and go to state 361
-    "amp"           shift, and go to state 362
-    "'&'"           shift, and go to state 363
-    "'=='"          shift, and go to state 364
-    "'!='"          shift, and go to state 365
-    "'==='"         shift, and go to state 366
-    "'!=='"         shift, and go to state 367
-    "'<=>'"         shift, and go to state 368
-    '<'             shift, and go to state 369
-    "'<='"          shift, and go to state 370
-    '>'             shift, and go to state 371
-    "'>='"          shift, and go to state 372
-    '.'             shift, and go to state 373
-    "'<<'"          shift, and go to state 374
-    "'>>'"          shift, and go to state 375
-    '+'             shift, and go to state 376
-    '-'             shift, and go to state 377
-    '*'             shift, and go to state 378
-    '/'             shift, and go to state 379
-    '%'             shift, and go to state 380
-    "'instanceof'"  shift, and go to state 381
-    "'**'"          shift, and go to state 382
+  267 parameter: optional_cpp_modifiers optional_type_without_static is_reference is_variadic "variable" backup_doc_comment '=' expr •
+  400 expr: expr • "'||'" expr
+  401     | expr • "'&&'" expr
+  402     | expr • "'or'" expr
+  403     | expr • "'and'" expr
+  404     | expr • "'xor'" expr
+  405     | expr • '|' expr
+  406     | expr • "amp" expr
+  407     | expr • "'&'" expr
+  408     | expr • '^' expr
+  409     | expr • '.' expr
+  410     | expr • '+' expr
+  411     | expr • '-' expr
+  412     | expr • '*' expr
+  413     | expr • "'**'" expr
+  414     | expr • '/' expr
+  415     | expr • '%' expr
+  416     | expr • "'<<'" expr
+  417     | expr • "'>>'" expr
+  422     | expr • "'==='" expr
+  423     | expr • "'!=='" expr
+  424     | expr • "'=='" expr
+  425     | expr • "'!='" expr
+  426     | expr • '<' expr
+  427     | expr • "'<='" expr
+  428     | expr • '>' expr
+  429     | expr • "'>='" expr
+  430     | expr • "'<=>'" expr
+  431     | expr • "'instanceof'" class_name_reference
+  434     | expr • '?' expr ':' expr
+  435     | expr • '?' ':' expr
+  436     | expr • "'??'" expr
+
+    '?'             shift, and go to state 353
+    '|'             shift, and go to state 354
+    '^'             shift, and go to state 355
+    '<'             shift, and go to state 356
+    '>'             shift, and go to state 357
+    '.'             shift, and go to state 358
+    '+'             shift, and go to state 359
+    '-'             shift, and go to state 360
+    '*'             shift, and go to state 361
+    '/'             shift, and go to state 362
+    '%'             shift, and go to state 363
+    "'or'"          shift, and go to state 364
+    "'xor'"         shift, and go to state 365
+    "'and'"         shift, and go to state 366
+    "'instanceof'"  shift, and go to state 367
+    "'||'"          shift, and go to state 368
+    "'&&'"          shift, and go to state 369
+    "'=='"          shift, and go to state 370
+    "'!='"          shift, and go to state 371
+    "'==='"         shift, and go to state 372
+    "'!=='"         shift, and go to state 373
+    "'<='"          shift, and go to state 374
+    "'>='"          shift, and go to state 375
+    "'<=>'"         shift, and go to state 376
+    "'<<'"          shift, and go to state 377
+    "'>>'"          shift, and go to state 378
+    "'??'"          shift, and go to state 379
+    "'**'"          shift, and go to state 380
+    "'&'"           shift, and go to state 381
+    "amp"           shift, and go to state 382
 
     $default  reduce using rule 267 (parameter)
 
 
 State 1115
 
-  185 function_declaration_statement: function returns_ref function_name backup_doc_comment '(' parameter_list ')' return_type backup_fn_flags '{' inner_statement_list '}' . backup_fn_flags
+  185 function_declaration_statement: function returns_ref function_name backup_doc_comment '(' parameter_list ')' return_type backup_fn_flags '{' inner_statement_list '}' • backup_fn_flags
 
     $default  reduce using rule 465 (backup_fn_flags)
 
@@ -33843,7 +33978,7 @@
 
 State 1116
 
-  460 inline_function: function returns_ref backup_doc_comment '(' parameter_list ')' lexical_vars return_type backup_fn_flags '{' inner_statement_list '}' . backup_fn_flags
+  460 inline_function: function returns_ref backup_doc_comment '(' parameter_list ')' lexical_vars return_type backup_fn_flags '{' inner_statement_list '}' • backup_fn_flags
 
     $default  reduce using rule 465 (backup_fn_flags)
 
@@ -33852,42 +33987,42 @@
 
 State 1117
 
-  173 catch_list: catch_list "'catch'" '(' catch_name_list optional_variable ')' '{' inner_statement_list '}' .
+  173 catch_list: catch_list "'catch'" '(' catch_name_list optional_variable ')' '{' inner_statement_list '}' •
 
     $default  reduce using rule 173 (catch_list)
 
 
 State 1118
 
-  334 trait_alias: trait_method_reference "'as'" member_modifier identifier .
+  334 trait_alias: trait_method_reference "'as'" member_modifier identifier •
 
     $default  reduce using rule 334 (trait_alias)
 
 
 State 1119
 
-  317 attributed_class_statement: method_modifiers function returns_ref identifier backup_doc_comment '(' parameter_list . ')' return_type backup_fn_flags method_body backup_fn_flags
+  317 attributed_class_statement: method_modifiers function returns_ref identifier backup_doc_comment '(' parameter_list • ')' return_type backup_fn_flags method_body backup_fn_flags
 
     ')'  shift, and go to state 1122
 
 
 State 1120
 
-  185 function_declaration_statement: function returns_ref function_name backup_doc_comment '(' parameter_list ')' return_type backup_fn_flags '{' inner_statement_list '}' backup_fn_flags .
+  185 function_declaration_statement: function returns_ref function_name backup_doc_comment '(' parameter_list ')' return_type backup_fn_flags '{' inner_statement_list '}' backup_fn_flags •
 
     $default  reduce using rule 185 (function_declaration_statement)
 
 
 State 1121
 
-  460 inline_function: function returns_ref backup_doc_comment '(' parameter_list ')' lexical_vars return_type backup_fn_flags '{' inner_statement_list '}' backup_fn_flags .
+  460 inline_function: function returns_ref backup_doc_comment '(' parameter_list ')' lexical_vars return_type backup_fn_flags '{' inner_statement_list '}' backup_fn_flags •
 
     $default  reduce using rule 460 (inline_function)
 
 
 State 1122
 
-  317 attributed_class_statement: method_modifiers function returns_ref identifier backup_doc_comment '(' parameter_list ')' . return_type backup_fn_flags method_body backup_fn_flags
+  317 attributed_class_statement: method_modifiers function returns_ref identifier backup_doc_comment '(' parameter_list ')' • return_type backup_fn_flags method_body backup_fn_flags
 
     ':'  shift, and go to state 936
 
@@ -33898,7 +34033,7 @@
 
 State 1123
 
-  317 attributed_class_statement: method_modifiers function returns_ref identifier backup_doc_comment '(' parameter_list ')' return_type . backup_fn_flags method_body backup_fn_flags
+  317 attributed_class_statement: method_modifiers function returns_ref identifier backup_doc_comment '(' parameter_list ')' return_type • backup_fn_flags method_body backup_fn_flags
 
     $default  reduce using rule 465 (backup_fn_flags)
 
@@ -33907,7 +34042,7 @@
 
 State 1124
 
-  317 attributed_class_statement: method_modifiers function returns_ref identifier backup_doc_comment '(' parameter_list ')' return_type backup_fn_flags . method_body backup_fn_flags
+  317 attributed_class_statement: method_modifiers function returns_ref identifier backup_doc_comment '(' parameter_list ')' return_type backup_fn_flags • method_body backup_fn_flags
 
     ';'  shift, and go to state 1125
     '{'  shift, and go to state 1126
@@ -33917,14 +34052,14 @@
 
 State 1125
 
-  339 method_body: ';' .
+  339 method_body: ';' •
 
     $default  reduce using rule 339 (method_body)
 
 
 State 1126
 
-  340 method_body: '{' . inner_statement_list '}'
+  340 method_body: '{' • inner_statement_list '}'
 
     $default  reduce using rule 143 (inner_statement_list)
 
@@ -33933,7 +34068,7 @@
 
 State 1127
 
-  317 attributed_class_statement: method_modifiers function returns_ref identifier backup_doc_comment '(' parameter_list ')' return_type backup_fn_flags method_body . backup_fn_flags
+  317 attributed_class_statement: method_modifiers function returns_ref identifier backup_doc_comment '(' parameter_list ')' return_type backup_fn_flags method_body • backup_fn_flags
 
     $default  reduce using rule 465 (backup_fn_flags)
 
@@ -33942,84 +34077,84 @@
 
 State 1128
 
-  142 inner_statement_list: inner_statement_list . inner_statement
-  340 method_body: '{' inner_statement_list . '}'
+  142 inner_statement_list: inner_statement_list • inner_statement
+  340 method_body: '{' inner_statement_list • '}'
 
-    "'throw'"                  shift, and go to state 4
-    "'include'"                shift, and go to state 5
-    "'include_once'"           shift, and go to state 6
-    "'require'"                shift, and go to state 7
-    "'require_once'"           shift, and go to state 8
-    "'print'"                  shift, and go to state 9
-    "'yield'"                  shift, and go to state 10
-    "'yield from'"             shift, and go to state 11
-    '+'                        shift, and go to state 12
-    '-'                        shift, and go to state 13
-    '!'                        shift, and go to state 14
-    '~'                        shift, and go to state 15
-    "'(int)'"                  shift, and go to state 16
-    "'(double)'"               shift, and go to state 17
-    "'(string)'"               shift, and go to state 18
-    "'(array)'"                shift, and go to state 19
-    "'(object)'"               shift, and go to state 20
-    "'(bool)'"                 shift, and go to state 21
-    "'(unset)'"                shift, and go to state 22
-    '@'                        shift, and go to state 23
-    "'clone'"                  shift, and go to state 24
-    "integer"                  shift, and go to state 25
-    "floating-point number"    shift, and go to state 26
-    "identifier"               shift, and go to state 27
-    "fully qualified name"     shift, and go to state 28
-    "namespace-relative name"  shift, and go to state 29
-    "namespaced name"          shift, and go to state 30
-    "variable"                 shift, and go to state 31
-    T_INLINE_HTML              shift, and go to state 32
-    "quoted string"            shift, and go to state 33
-    "'eval'"                   shift, and go to state 34
-    "'new'"                    shift, and go to state 35
-    "'exit'"                   shift, and go to state 36
-    "'if'"                     shift, and go to state 37
-    "'echo'"                   shift, and go to state 38
-    "'do'"                     shift, and go to state 39
-    "'while'"                  shift, and go to state 40
-    "'for'"                    shift, and go to state 41
-    "'foreach'"                shift, and go to state 42
-    "'declare'"                shift, and go to state 43
-    "'switch'"                 shift, and go to state 44
-    "'match'"                  shift, and go to state 45
-    "'break'"                  shift, and go to state 46
-    "'continue'"               shift, and go to state 47
-    "'goto'"                   shift, and go to state 48
-    "'function'"               shift, and go to state 49
-    "'fn'"                     shift, and go to state 50
-    "'return'"                 shift, and go to state 52
-    "'try'"                    shift, and go to state 53
-    "'global'"                 shift, and go to state 55
-    "'static'"                 shift, and go to state 56
-    "'abstract'"               shift, and go to state 57
-    "'final'"                  shift, and go to state 58
-    "'readonly'"               shift, and go to state 59
-    "'unset'"                  shift, and go to state 60
-    "'isset'"                  shift, and go to state 61
-    "'empty'"                  shift, and go to state 62
+    '+'                        shift, and go to state 4
+    '-'                        shift, and go to state 5
+    '!'                        shift, and go to state 6
+    '~'                        shift, and go to state 7
+    '@'                        shift, and go to state 8
+    "integer"                  shift, and go to state 9
+    "floating-point number"    shift, and go to state 10
+    "identifier"               shift, and go to state 11
+    "fully qualified name"     shift, and go to state 12
+    "namespace-relative name"  shift, and go to state 13
+    "namespaced name"          shift, and go to state 14
+    "variable"                 shift, and go to state 15
+    T_INLINE_HTML              shift, and go to state 16
+    "quoted string"            shift, and go to state 17
+    "'include'"                shift, and go to state 18
+    "'include_once'"           shift, and go to state 19
+    "'eval'"                   shift, and go to state 20
+    "'require'"                shift, and go to state 21
+    "'require_once'"           shift, and go to state 22
+    "'print'"                  shift, and go to state 23
+    "'yield'"                  shift, and go to state 24
+    "'yield from'"             shift, and go to state 25
+    "'new'"                    shift, and go to state 26
+    "'clone'"                  shift, and go to state 27
+    "'exit'"                   shift, and go to state 28
+    "'if'"                     shift, and go to state 29
+    "'echo'"                   shift, and go to state 30
+    "'do'"                     shift, and go to state 31
+    "'while'"                  shift, and go to state 32
+    "'for'"                    shift, and go to state 33
+    "'foreach'"                shift, and go to state 34
+    "'declare'"                shift, and go to state 35
+    "'switch'"                 shift, and go to state 36
+    "'match'"                  shift, and go to state 37
+    "'break'"                  shift, and go to state 38
+    "'continue'"               shift, and go to state 39
+    "'goto'"                   shift, and go to state 40
+    "'function'"               shift, and go to state 41
+    "'fn'"                     shift, and go to state 42
+    "'return'"                 shift, and go to state 44
+    "'try'"                    shift, and go to state 45
+    "'throw'"                  shift, and go to state 46
+    "'global'"                 shift, and go to state 48
+    "'static'"                 shift, and go to state 49
+    "'abstract'"               shift, and go to state 50
+    "'final'"                  shift, and go to state 51
+    "'readonly'"               shift, and go to state 52
+    "'unset'"                  shift, and go to state 53
+    "'isset'"                  shift, and go to state 54
+    "'empty'"                  shift, and go to state 55
     "'__halt_compiler'"        shift, and go to state 528
-    "'class'"                  shift, and go to state 64
-    "'trait'"                  shift, and go to state 65
-    "'interface'"              shift, and go to state 66
-    "'enum'"                   shift, and go to state 67
-    "'list'"                   shift, and go to state 69
-    "'array'"                  shift, and go to state 70
-    "'__LINE__'"               shift, and go to state 71
-    "'__FILE__'"               shift, and go to state 72
-    "'__DIR__'"                shift, and go to state 73
-    "'__CLASS__'"              shift, and go to state 74
-    "'__TRAIT__'"              shift, and go to state 75
-    "'__METHOD__'"             shift, and go to state 76
-    "'__FUNCTION__'"           shift, and go to state 77
-    "'__NAMESPACE__'"          shift, and go to state 78
-    "'#'"                     shift, and go to state 79
-    "'++'"                     shift, and go to state 80
-    "'--'"                     shift, and go to state 81
+    "'class'"                  shift, and go to state 57
+    "'trait'"                  shift, and go to state 58
+    "'interface'"              shift, and go to state 59
+    "'enum'"                   shift, and go to state 60
+    "'list'"                   shift, and go to state 62
+    "'array'"                  shift, and go to state 63
+    "'__LINE__'"               shift, and go to state 64
+    "'__FILE__'"               shift, and go to state 65
+    "'__DIR__'"                shift, and go to state 66
+    "'__CLASS__'"              shift, and go to state 67
+    "'__TRAIT__'"              shift, and go to state 68
+    "'__METHOD__'"             shift, and go to state 69
+    "'__FUNCTION__'"           shift, and go to state 70
+    "'__NAMESPACE__'"          shift, and go to state 71
+    "'#'"                     shift, and go to state 72
+    "'++'"                     shift, and go to state 73
+    "'--'"                     shift, and go to state 74
+    "'(int)'"                  shift, and go to state 75
+    "'(double)'"               shift, and go to state 76
+    "'(string)'"               shift, and go to state 77
+    "'(array)'"                shift, and go to state 78
+    "'(object)'"               shift, and go to state 79
+    "'(bool)'"                 shift, and go to state 80
+    "'(unset)'"                shift, and go to state 81
     "heredoc start"            shift, and go to state 82
     '('                        shift, and go to state 83
     ';'                        shift, and go to state 84
@@ -34072,13 +34207,13 @@
 
 State 1129
 
-  317 attributed_class_statement: method_modifiers function returns_ref identifier backup_doc_comment '(' parameter_list ')' return_type backup_fn_flags method_body backup_fn_flags .
+  317 attributed_class_statement: method_modifiers function returns_ref identifier backup_doc_comment '(' parameter_list ')' return_type backup_fn_flags method_body backup_fn_flags •
 
     $default  reduce using rule 317 (attributed_class_statement)
 
 
 State 1130
 
-  340 method_body: '{' inner_statement_list '}' .
+  340 method_body: '{' inner_statement_list '}' •
 
     $default  reduce using rule 340 (method_body)

php-8.3.7.tar.xz/Zend/zend_language_scanner.c -> php-8.3.21.tar.xz/Zend/zend_language_scanner.c Changed

@@ -1,4 +1,4 @@
-/* Generated by re2c 1.3 */
+/* Generated by re2c 3.0 */
 /*
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
@@ -277,7 +277,7 @@
 	CG(zend_lineno) = lex_state->lineno;
 	zend_restore_compiled_filename(lex_state->filename);
 
-	if (SCNG(script_filtered)) {
+	if (SCNG(script_filtered) && SCNG(script_filtered) != lex_state->script_filtered) {
 		efree(SCNG(script_filtered));
 		SCNG(script_filtered) = NULL;
 	}
@@ -1476,133 +1476,132 @@
 		YYFILL(16);
 		yych = *YYCURSOR;
 		if (yybm256+yych & 32) {
-			goto yy4;
+			goto yy2;
 		}
 		switch (yych) {
-		case 0x00:
-		case 0x01:
-		case 0x02:
-		case 0x03:
-		case 0x04:
-		case 0x05:
-		case 0x06:
-		case 0x07:
-		case 0x08:
-		case '\t':
-		case '\n':
-		case '\v':
-		case '\f':
-		case '\r':
-		case 0x0E:
-		case 0x0F:
-		case 0x10:
-		case 0x11:
-		case 0x12:
-		case 0x13:
-		case 0x14:
-		case 0x15:
-		case 0x16:
-		case 0x17:
-		case 0x18:
-		case 0x19:
-		case 0x1A:
-		case 0x1B:
-		case 0x1C:
-		case 0x1D:
-		case 0x1E:
-		case 0x1F:
-		case 0x7F:	goto yy2;
-		case ' ':
-		case '!':	goto yy7;
-		case '"':	goto yy9;
-		case '#':	goto yy11;
-		case '$':	goto yy13;
-		case '%':	goto yy14;
-		case '&':	goto yy15;
-		case '\'':	goto yy17;
-		case '(':	goto yy19;
-		case ')':
-		case '':	goto yy21;
-		case '*':	goto yy23;
-		case '+':	goto yy24;
-		case ',':
-		case ';':
-		case '@':
-		case '~':	goto yy25;
-		case '-':	goto yy26;
-		case '.':	goto yy27;
-		case '/':	goto yy28;
-		case '0':	goto yy29;
-		case '1':
-		case '2':
-		case '3':
-		case '4':
-		case '5':
-		case '6':
-		case '7':
-		case '8':
-		case '9':	goto yy31;
-		case ':':	goto yy33;
-		case '<':	goto yy34;
-		case '=':	goto yy35;
-		case '>':	goto yy36;
-		case '?':	goto yy37;
-		case 'A':
-		case 'a':	goto yy38;
-		case 'B':
-		case 'b':	goto yy40;
-		case 'C':
-		case 'c':	goto yy41;
-		case 'D':
-		case 'd':	goto yy42;
-		case 'E':
-		case 'e':	goto yy43;
-		case 'F':
-		case 'f':	goto yy44;
-		case 'G':
-		case 'g':	goto yy45;
-		case 'I':
-		case 'i':	goto yy48;
-		case 'L':
-		case 'l':	goto yy49;
-		case 'M':
-		case 'm':	goto yy50;
-		case 'N':
-		case 'n':	goto yy51;
-		case 'O':
-		case 'o':	goto yy52;
-		case 'P':
-		case 'p':	goto yy53;
-		case 'R':
-		case 'r':	goto yy54;
-		case 'S':
-		case 's':	goto yy55;
-		case 'T':
-		case 't':	goto yy56;
-		case 'U':
-		case 'u':	goto yy57;
-		case 'V':
-		case 'v':	goto yy58;
-		case 'W':
-		case 'w':	goto yy59;
-		case 'X':
-		case 'x':	goto yy60;
-		case 'Y':
-		case 'y':	goto yy61;
-		case '':	goto yy62;
-		case '\\':	goto yy63;
-		case '^':	goto yy65;
-		case '_':	goto yy66;
-		case '`':	goto yy67;
-		case '{':	goto yy69;
-		case '|':	goto yy71;
-		case '}':	goto yy72;
-		default:	goto yy46;
+			case 0x00:
+			case 0x01:
+			case 0x02:
+			case 0x03:
+			case 0x04:
+			case 0x05:
+			case 0x06:
+			case 0x07:
+			case 0x08:
+			case '\t':
+			case '\n':
+			case '\v':
+			case '\f':
+			case '\r':
+			case 0x0E:
+			case 0x0F:
+			case 0x10:
+			case 0x11:
+			case 0x12:
+			case 0x13:
+			case 0x14:
+			case 0x15:
+			case 0x16:
+			case 0x17:
+			case 0x18:
+			case 0x19:
+			case 0x1A:
+			case 0x1B:
+			case 0x1C:
+			case 0x1D:
+			case 0x1E:
+			case 0x1F:
+			case 0x7F: goto yy1;
+			case ' ':
+			case '!': goto yy3;
+			case '"': goto yy5;
+			case '#': goto yy6;
+			case '$': goto yy8;
+			case '%': goto yy9;
+			case '&': goto yy10;
+			case '\'': goto yy12;
+			case '(': goto yy13;
+			case ')':
+			case '': goto yy15;
+			case '*': goto yy16;
+			case '+': goto yy17;
+			case ',':
+			case ';':
+			case '@':
+			case '~': goto yy18;
+			case '-': goto yy19;
+			case '.': goto yy20;
+			case '/': goto yy21;
+			case '0': goto yy22;
+			case '1':
+			case '2':
+			case '3':
+			case '4':
+			case '5':
+			case '6':
+			case '7':
+			case '8':
+			case '9': goto yy24;
+			case ':': goto yy26;
+			case '<': goto yy27;
+			case '=': goto yy28;
+			case '>': goto yy29;
+			case '?': goto yy30;
+			case 'A':
+			case 'a': goto yy31;
+			case 'B':
+			case 'b': goto yy33;
+			case 'C':
+			case 'c': goto yy34;
+			case 'D':
+			case 'd': goto yy35;
+			case 'E':
+			case 'e': goto yy36;
+			case 'F':
+			case 'f': goto yy37;
+			case 'G':
+			case 'g': goto yy38;
+			case 'I':
+			case 'i': goto yy41;
+			case 'L':
+			case 'l': goto yy42;
+			case 'M':
+			case 'm': goto yy43;
+			case 'N':
+			case 'n': goto yy44;
+			case 'O':
+			case 'o': goto yy45;
+			case 'P':
+			case 'p': goto yy46;
+			case 'R':
+			case 'r': goto yy47;
+			case 'S':
+			case 's': goto yy48;
+			case 'T':
+			case 't': goto yy49;
+			case 'U':
+			case 'u': goto yy50;
+			case 'V':
+			case 'v': goto yy51;
+			case 'W':
+			case 'w': goto yy52;
+			case 'X':
+			case 'x': goto yy53;
+			case 'Y':
+			case 'y': goto yy54;
+			case '': goto yy55;
+			case '\\': goto yy56;
+			case '^': goto yy58;
+			case '_': goto yy59;
+			case '`': goto yy60;
+			case '{': goto yy61;
+			case '|': goto yy62;
+			case '}': goto yy63;
+			default: goto yy39;
 		}
-yy2:
-		YYDEBUG(2, *YYCURSOR);
+yy1:
+		YYDEBUG(1, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(3, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	if (YYCURSOR > YYLIMIT) {
@@ -1611,34 +1610,31 @@
 
 	RETURN_TOKEN(T_BAD_CHARACTER);
 }
-yy4:
-		YYDEBUG(4, *YYCURSOR);
+yy2:
+		YYDEBUG(2, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(5, *YYCURSOR);
 		if (yybm256+yych & 32) {
-			goto yy4;
+			goto yy2;
 		}
-		YYDEBUG(6, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	goto return_whitespace;
 }
-yy7:
-		YYDEBUG(7, *YYCURSOR);
+yy3:
+		YYDEBUG(3, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == '=') goto yy74;
-yy8:
-		YYDEBUG(8, *YYCURSOR);
+		if (yych == '=') goto yy64;
+yy4:
+		YYDEBUG(4, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN(yytext0);
 }
-yy9:
-		YYDEBUG(9, *YYCURSOR);
+yy5:
+		YYDEBUG(5, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(10, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	int bprefix = (yytext0 != '"') ? 1 : 0;
@@ -1684,12 +1680,12 @@
 	BEGIN(ST_DOUBLE_QUOTES);
 	RETURN_TOKEN('"');
 }
-yy11:
-		YYDEBUG(11, *YYCURSOR);
+yy6:
+		YYDEBUG(6, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == '') goto yy76;
-yy12:
-		YYDEBUG(12, *YYCURSOR);
+		if (yych == '') goto yy66;
+yy7:
+		YYDEBUG(7, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	while (YYCURSOR < YYLIMIT) {
@@ -1714,56 +1710,55 @@
 	yyleng = YYCURSOR - SCNG(yy_text);
 	RETURN_OR_SKIP_TOKEN(T_COMMENT);
 }
-yy13:
-		YYDEBUG(13, *YYCURSOR);
+yy8:
+		YYDEBUG(8, *YYCURSOR);
 		yych = *++YYCURSOR;
 		if (yych <= '_') {
-			if (yych <= '@') goto yy8;
-			if (yych <= 'Z') goto yy78;
-			if (yych <= '^') goto yy8;
-			goto yy78;
-		} else {
-			if (yych <= '`') goto yy8;
-			if (yych <= 'z') goto yy78;
-			if (yych <= 0x7F) goto yy8;
-			goto yy78;
+			if (yych <= '@') goto yy4;
+			if (yych <= 'Z') goto yy67;
+			if (yych <= '^') goto yy4;
+			goto yy67;
+		} else {
+			if (yych <= '`') goto yy4;
+			if (yych <= 'z') goto yy67;
+			if (yych <= 0x7F) goto yy4;
+			goto yy67;
 		}
-yy14:
-		YYDEBUG(14, *YYCURSOR);
+yy9:
+		YYDEBUG(9, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == '=') goto yy81;
-		goto yy8;
-yy15:
-		YYDEBUG(15, *YYCURSOR);
+		if (yych == '=') goto yy69;
+		goto yy4;
+yy10:
+		YYDEBUG(10, *YYCURSOR);
 		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yych <= '"') {
 			if (yych <= '\f') {
-				if (yych <= 0x08) goto yy16;
-				if (yych <= '\n') goto yy84;
+				if (yych <= 0x08) goto yy11;
+				if (yych <= '\n') goto yy71;
 			} else {
-				if (yych <= '\r') goto yy84;
-				if (yych == ' ') goto yy84;
+				if (yych <= '\r') goto yy71;
+				if (yych == ' ') goto yy71;
 			}
 		} else {
 			if (yych <= '-') {
-				if (yych <= '$') goto yy84;
-				if (yych == '&') goto yy89;
+				if (yych <= '$') goto yy71;
+				if (yych == '&') goto yy76;
 			} else {
-				if (yych <= '/') goto yy84;
-				if (yych == '=') goto yy93;
+				if (yych <= '/') goto yy71;
+				if (yych == '=') goto yy79;
 			}
 		}
-yy16:
-		YYDEBUG(16, *YYCURSOR);
+yy11:
+		YYDEBUG(11, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN(T_AMPERSAND_NOT_FOLLOWED_BY_VAR_OR_VARARG);
 }
-yy17:
-		YYDEBUG(17, *YYCURSOR);
+yy12:
+		YYDEBUG(12, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(18, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	char *s, *t;
@@ -1859,141 +1854,140 @@
 	}
 	RETURN_TOKEN_WITH_VAL(T_CONSTANT_ENCAPSED_STRING);
 }
-yy19:
-		YYDEBUG(19, *YYCURSOR);
+yy13:
+		YYDEBUG(13, *YYCURSOR);
 		yyaccept = 1;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yych <= 'S') {
 			if (yych <= 'D') {
 				if (yych <= ' ') {
-					if (yych == '\t') goto yy96;
-					if (yych >= ' ') goto yy96;
+					if (yych == '\t') goto yy81;
+					if (yych >= ' ') goto yy81;
 				} else {
-					if (yych <= '@') goto yy20;
-					if (yych != 'C') goto yy96;
+					if (yych <= '@') goto yy14;
+					if (yych != 'C') goto yy81;
 				}
 			} else {
 				if (yych <= 'I') {
-					if (yych == 'F') goto yy96;
-					if (yych >= 'I') goto yy96;
+					if (yych == 'F') goto yy81;
+					if (yych >= 'I') goto yy81;
 				} else {
-					if (yych == 'O') goto yy96;
-					if (yych >= 'R') goto yy96;
+					if (yych == 'O') goto yy81;
+					if (yych >= 'R') goto yy81;
 				}
 			}
 		} else {
 			if (yych <= 'f') {
 				if (yych <= 'b') {
-					if (yych == 'U') goto yy96;
-					if (yych >= 'a') goto yy96;
+					if (yych == 'U') goto yy81;
+					if (yych >= 'a') goto yy81;
 				} else {
-					if (yych == 'd') goto yy96;
-					if (yych >= 'f') goto yy96;
+					if (yych == 'd') goto yy81;
+					if (yych >= 'f') goto yy81;
 				}
 			} else {
 				if (yych <= 'o') {
-					if (yych == 'i') goto yy96;
-					if (yych >= 'o') goto yy96;
+					if (yych == 'i') goto yy81;
+					if (yych >= 'o') goto yy81;
 				} else {
 					if (yych <= 's') {
-						if (yych >= 'r') goto yy96;
+						if (yych >= 'r') goto yy81;
 					} else {
-						if (yych == 'u') goto yy96;
+						if (yych == 'u') goto yy81;
 					}
 				}
 			}
 		}
-yy20:
-		YYDEBUG(20, *YYCURSOR);
+yy14:
+		YYDEBUG(14, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	enter_nesting(yytext0);
 	RETURN_TOKEN(yytext0);
 }
-yy21:
-		YYDEBUG(21, *YYCURSOR);
+yy15:
+		YYDEBUG(15, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(22, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	/* Check that  and ) match up properly with a preceding  or ( */
 	RETURN_EXIT_NESTING_TOKEN(yytext0);
 }
-yy23:
-		YYDEBUG(23, *YYCURSOR);
+yy16:
+		YYDEBUG(16, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == '*') goto yy106;
-		if (yych == '=') goto yy108;
-		goto yy8;
-yy24:
-		YYDEBUG(24, *YYCURSOR);
+		if (yych == '*') goto yy91;
+		if (yych == '=') goto yy92;
+		goto yy4;
+yy17:
+		YYDEBUG(17, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == '+') goto yy110;
-		if (yych == '=') goto yy112;
-		goto yy8;
-yy25:
-		YYDEBUG(25, *YYCURSOR);
+		if (yych == '+') goto yy93;
+		if (yych == '=') goto yy94;
+		goto yy4;
+yy18:
+		YYDEBUG(18, *YYCURSOR);
 		++YYCURSOR;
-		goto yy8;
-yy26:
-		YYDEBUG(26, *YYCURSOR);
+		goto yy4;
+yy19:
+		YYDEBUG(19, *YYCURSOR);
 		yych = *++YYCURSOR;
 		if (yych <= '<') {
-			if (yych == '-') goto yy114;
-			goto yy8;
+			if (yych == '-') goto yy95;
+			goto yy4;
 		} else {
-			if (yych <= '=') goto yy116;
-			if (yych <= '>') goto yy118;
-			goto yy8;
+			if (yych <= '=') goto yy96;
+			if (yych <= '>') goto yy97;
+			goto yy4;
 		}
-yy27:
-		YYDEBUG(27, *YYCURSOR);
+yy20:
+		YYDEBUG(20, *YYCURSOR);
 		yyaccept = 2;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yych <= '/') {
-			if (yych == '.') goto yy120;
-			goto yy8;
+			if (yych == '.') goto yy98;
+			goto yy4;
 		} else {
-			if (yych <= '9') goto yy121;
-			if (yych == '=') goto yy124;
-			goto yy8;
+			if (yych <= '9') goto yy99;
+			if (yych == '=') goto yy102;
+			goto yy4;
 		}
-yy28:
-		YYDEBUG(28, *YYCURSOR);
+yy21:
+		YYDEBUG(21, *YYCURSOR);
 		yych = *++YYCURSOR;
 		if (yych <= '.') {
-			if (yych == '*') goto yy126;
-			goto yy8;
+			if (yych == '*') goto yy103;
+			goto yy4;
 		} else {
-			if (yych <= '/') goto yy128;
-			if (yych == '=') goto yy129;
-			goto yy8;
+			if (yych <= '/') goto yy105;
+			if (yych == '=') goto yy106;
+			goto yy4;
 		}
-yy29:
-		YYDEBUG(29, *YYCURSOR);
+yy22:
+		YYDEBUG(22, *YYCURSOR);
 		yyaccept = 3;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yych <= 'X') {
 			if (yych <= 'N') {
-				if (yych == 'B') goto yy132;
-				goto yy32;
+				if (yych == 'B') goto yy108;
+				goto yy25;
 			} else {
-				if (yych <= 'O') goto yy134;
-				if (yych <= 'W') goto yy32;
-				goto yy135;
+				if (yych <= 'O') goto yy110;
+				if (yych <= 'W') goto yy25;
+				goto yy111;
 			}
 		} else {
 			if (yych <= 'n') {
-				if (yych == 'b') goto yy132;
-				goto yy32;
+				if (yych == 'b') goto yy108;
+				goto yy25;
 			} else {
-				if (yych <= 'o') goto yy134;
-				if (yych == 'x') goto yy135;
-				goto yy32;
+				if (yych <= 'o') goto yy110;
+				if (yych == 'x') goto yy111;
+				goto yy25;
 			}
 		}
-yy30:
-		YYDEBUG(30, *YYCURSOR);
+yy23:
+		YYDEBUG(23, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	size_t len = yyleng;
@@ -2057,471 +2051,468 @@
 	}
 	RETURN_TOKEN_WITH_VAL(T_LNUMBER);
 }
-yy31:
-		YYDEBUG(31, *YYCURSOR);
+yy24:
+		YYDEBUG(24, *YYCURSOR);
 		yyaccept = 3;
 		YYMARKER = ++YYCURSOR;
 		YYFILL(3);
 		yych = *YYCURSOR;
-yy32:
-		YYDEBUG(32, *YYCURSOR);
+yy25:
+		YYDEBUG(25, *YYCURSOR);
 		if (yybm256+yych & 64) {
-			goto yy31;
+			goto yy24;
 		}
 		if (yych <= 'E') {
-			if (yych == '.') goto yy131;
-			if (yych <= 'D') goto yy30;
-			goto yy133;
+			if (yych == '.') goto yy107;
+			if (yych <= 'D') goto yy23;
+			goto yy109;
 		} else {
 			if (yych <= '_') {
-				if (yych <= '^') goto yy30;
-				goto yy136;
+				if (yych <= '^') goto yy23;
+				goto yy112;
 			} else {
-				if (yych == 'e') goto yy133;
-				goto yy30;
+				if (yych == 'e') goto yy109;
+				goto yy23;
 			}
 		}
-yy33:
-		YYDEBUG(33, *YYCURSOR);
+yy26:
+		YYDEBUG(26, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == ':') goto yy137;
-		goto yy8;
-yy34:
-		YYDEBUG(34, *YYCURSOR);
+		if (yych == ':') goto yy113;
+		goto yy4;
+yy27:
+		YYDEBUG(27, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych <= ';') goto yy8;
-		if (yych <= '<') goto yy139;
-		if (yych <= '=') goto yy141;
-		if (yych <= '>') goto yy143;
-		goto yy8;
-yy35:
-		YYDEBUG(35, *YYCURSOR);
+		if (yych <= ';') goto yy4;
+		if (yych <= '<') goto yy114;
+		if (yych <= '=') goto yy116;
+		if (yych <= '>') goto yy117;
+		goto yy4;
+yy28:
+		YYDEBUG(28, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych <= '<') goto yy8;
-		if (yych <= '=') goto yy144;
-		if (yych <= '>') goto yy146;
-		goto yy8;
-yy36:
-		YYDEBUG(36, *YYCURSOR);
+		if (yych <= '<') goto yy4;
+		if (yych <= '=') goto yy118;
+		if (yych <= '>') goto yy119;
+		goto yy4;
+yy29:
+		YYDEBUG(29, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych <= '<') goto yy8;
-		if (yych <= '=') goto yy148;
-		if (yych <= '>') goto yy150;
-		goto yy8;
-yy37:
-		YYDEBUG(37, *YYCURSOR);
+		if (yych <= '<') goto yy4;
+		if (yych <= '=') goto yy120;
+		if (yych <= '>') goto yy121;
+		goto yy4;
+yy30:
+		YYDEBUG(30, *YYCURSOR);
 		yyaccept = 2;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yych <= '=') {
-			if (yych == '-') goto yy152;
-			goto yy8;
+			if (yych == '-') goto yy122;
+			goto yy4;
 		} else {
-			if (yych <= '>') goto yy153;
-			if (yych <= '?') goto yy155;
-			goto yy8;
+			if (yych <= '>') goto yy123;
+			if (yych <= '?') goto yy125;
+			goto yy4;
 		}
-yy38:
-		YYDEBUG(38, *YYCURSOR);
+yy31:
+		YYDEBUG(31, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yych <= 'S') {
 			if (yych <= 'M') {
-				if (yych == 'B') goto yy157;
-				goto yy47;
+				if (yych == 'B') goto yy126;
+				goto yy40;
 			} else {
-				if (yych <= 'N') goto yy158;
-				if (yych <= 'Q') goto yy47;
-				if (yych <= 'R') goto yy159;
-				goto yy160;
+				if (yych <= 'N') goto yy127;
+				if (yych <= 'Q') goto yy40;
+				if (yych <= 'R') goto yy128;
+				goto yy129;
 			}
 		} else {
 			if (yych <= 'n') {
-				if (yych == 'b') goto yy157;
-				if (yych <= 'm') goto yy47;
-				goto yy158;
-			} else {
-				if (yych <= 'q') goto yy47;
-				if (yych <= 'r') goto yy159;
-				if (yych <= 's') goto yy160;
-				goto yy47;
+				if (yych == 'b') goto yy126;
+				if (yych <= 'm') goto yy40;
+				goto yy127;
+			} else {
+				if (yych <= 'q') goto yy40;
+				if (yych <= 'r') goto yy128;
+				if (yych <= 's') goto yy129;
+				goto yy40;
 			}
 		}
-yy39:
-		YYDEBUG(39, *YYCURSOR);
+yy32:
+		YYDEBUG(32, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_STR(T_STRING, 0);
 }
-yy40:
-		YYDEBUG(40, *YYCURSOR);
+yy33:
+		YYDEBUG(33, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yych <= ';') {
 			if (yych <= '"') {
-				if (yych <= '!') goto yy47;
-				goto yy9;
+				if (yych <= '!') goto yy40;
+				goto yy5;
 			} else {
-				if (yych == '\'') goto yy17;
-				goto yy47;
+				if (yych == '\'') goto yy12;
+				goto yy40;
 			}
 		} else {
 			if (yych <= 'R') {
-				if (yych <= '<') goto yy163;
-				if (yych <= 'Q') goto yy47;
-				goto yy164;
+				if (yych <= '<') goto yy132;
+				if (yych <= 'Q') goto yy40;
+				goto yy133;
 			} else {
-				if (yych == 'r') goto yy164;
-				goto yy47;
+				if (yych == 'r') goto yy133;
+				goto yy40;
 			}
 		}
-yy41:
-		YYDEBUG(41, *YYCURSOR);
+yy34:
+		YYDEBUG(34, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yych <= 'O') {
 			if (yych <= 'K') {
-				if (yych == 'A') goto yy165;
-				goto yy47;
+				if (yych == 'A') goto yy134;
+				goto yy40;
 			} else {
-				if (yych <= 'L') goto yy166;
-				if (yych <= 'N') goto yy47;
-				goto yy167;
+				if (yych <= 'L') goto yy135;
+				if (yych <= 'N') goto yy40;
+				goto yy136;
 			}
 		} else {
 			if (yych <= 'k') {
-				if (yych == 'a') goto yy165;
-				goto yy47;
+				if (yych == 'a') goto yy134;
+				goto yy40;
 			} else {
-				if (yych <= 'l') goto yy166;
-				if (yych == 'o') goto yy167;
-				goto yy47;
+				if (yych <= 'l') goto yy135;
+				if (yych == 'o') goto yy136;
+				goto yy40;
 			}
 		}
-yy42:
-		YYDEBUG(42, *YYCURSOR);
+yy35:
+		YYDEBUG(35, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yych <= 'O') {
 			if (yych <= 'H') {
-				if (yych == 'E') goto yy168;
-				goto yy47;
+				if (yych == 'E') goto yy137;
+				goto yy40;
 			} else {
-				if (yych <= 'I') goto yy169;
-				if (yych <= 'N') goto yy47;
-				goto yy170;
+				if (yych <= 'I') goto yy138;
+				if (yych <= 'N') goto yy40;
+				goto yy139;
 			}
 		} else {
 			if (yych <= 'h') {
-				if (yych == 'e') goto yy168;
-				goto yy47;
+				if (yych == 'e') goto yy137;
+				goto yy40;
 			} else {
-				if (yych <= 'i') goto yy169;
-				if (yych == 'o') goto yy170;
-				goto yy47;
+				if (yych <= 'i') goto yy138;
+				if (yych == 'o') goto yy139;
+				goto yy40;
 			}
 		}
-yy43:
-		YYDEBUG(43, *YYCURSOR);
+yy36:
+		YYDEBUG(36, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
 		switch (yych) {
-		case 'C':
-		case 'c':	goto yy172;
-		case 'L':
-		case 'l':	goto yy173;
-		case 'M':
-		case 'm':	goto yy174;
-		case 'N':
-		case 'n':	goto yy175;
-		case 'V':
-		case 'v':	goto yy176;
-		case 'X':
-		case 'x':	goto yy177;
-		default:	goto yy47;
+			case 'C':
+			case 'c': goto yy141;
+			case 'L':
+			case 'l': goto yy142;
+			case 'M':
+			case 'm': goto yy143;
+			case 'N':
+			case 'n': goto yy144;
+			case 'V':
+			case 'v': goto yy145;
+			case 'X':
+			case 'x': goto yy146;
+			default: goto yy40;
 		}
-yy44:
-		YYDEBUG(44, *YYCURSOR);
+yy37:
+		YYDEBUG(37, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yych <= 'U') {
 			if (yych <= 'M') {
-				if (yych == 'I') goto yy178;
-				goto yy47;
+				if (yych == 'I') goto yy147;
+				goto yy40;
 			} else {
-				if (yych <= 'N') goto yy179;
-				if (yych <= 'O') goto yy181;
-				if (yych <= 'T') goto yy47;
-				goto yy182;
+				if (yych <= 'N') goto yy148;
+				if (yych <= 'O') goto yy150;
+				if (yych <= 'T') goto yy40;
+				goto yy151;
 			}
 		} else {
 			if (yych <= 'n') {
-				if (yych == 'i') goto yy178;
-				if (yych <= 'm') goto yy47;
-				goto yy179;
-			} else {
-				if (yych <= 'o') goto yy181;
-				if (yych == 'u') goto yy182;
-				goto yy47;
+				if (yych == 'i') goto yy147;
+				if (yych <= 'm') goto yy40;
+				goto yy148;
+			} else {
+				if (yych <= 'o') goto yy150;
+				if (yych == 'u') goto yy151;
+				goto yy40;
 			}
 		}
-yy45:
-		YYDEBUG(45, *YYCURSOR);
+yy38:
+		YYDEBUG(38, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yych <= 'O') {
-			if (yych == 'L') goto yy183;
-			if (yych <= 'N') goto yy47;
-			goto yy184;
+			if (yych == 'L') goto yy152;
+			if (yych <= 'N') goto yy40;
+			goto yy153;
 		} else {
 			if (yych <= 'l') {
-				if (yych <= 'k') goto yy47;
-				goto yy183;
+				if (yych <= 'k') goto yy40;
+				goto yy152;
 			} else {
-				if (yych == 'o') goto yy184;
-				goto yy47;
+				if (yych == 'o') goto yy153;
+				goto yy40;
 			}
 		}
-yy46:
-		YYDEBUG(46, *YYCURSOR);
+yy39:
+		YYDEBUG(39, *YYCURSOR);
 		yyaccept = 4;
 		YYMARKER = ++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-yy47:
-		YYDEBUG(47, *YYCURSOR);
+yy40:
+		YYDEBUG(40, *YYCURSOR);
 		if (yybm256+yych & 128) {
-			goto yy46;
+			goto yy39;
 		}
-		if (yych == '\\') goto yy162;
-		goto yy39;
-yy48:
-		YYDEBUG(48, *YYCURSOR);
+		if (yych == '\\') goto yy131;
+		goto yy32;
+yy41:
+		YYDEBUG(41, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yych <= 'S') {
 			if (yych <= 'L') {
-				if (yych == 'F') goto yy185;
-				goto yy47;
+				if (yych == 'F') goto yy154;
+				goto yy40;
 			} else {
-				if (yych <= 'M') goto yy187;
-				if (yych <= 'N') goto yy188;
-				if (yych <= 'R') goto yy47;
-				goto yy189;
+				if (yych <= 'M') goto yy156;
+				if (yych <= 'N') goto yy157;
+				if (yych <= 'R') goto yy40;
+				goto yy158;
 			}
 		} else {
 			if (yych <= 'm') {
-				if (yych == 'f') goto yy185;
-				if (yych <= 'l') goto yy47;
-				goto yy187;
-			} else {
-				if (yych <= 'n') goto yy188;
-				if (yych == 's') goto yy189;
-				goto yy47;
+				if (yych == 'f') goto yy154;
+				if (yych <= 'l') goto yy40;
+				goto yy156;
+			} else {
+				if (yych <= 'n') goto yy157;
+				if (yych == 's') goto yy158;
+				goto yy40;
 			}
 		}
-yy49:
-		YYDEBUG(49, *YYCURSOR);
+yy42:
+		YYDEBUG(42, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'I') goto yy190;
-		if (yych == 'i') goto yy190;
-		goto yy47;
-yy50:
-		YYDEBUG(50, *YYCURSOR);
+		if (yych == 'I') goto yy159;
+		if (yych == 'i') goto yy159;
+		goto yy40;
+yy43:
+		YYDEBUG(43, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'A') goto yy191;
-		if (yych == 'a') goto yy191;
-		goto yy47;
-yy51:
-		YYDEBUG(51, *YYCURSOR);
+		if (yych == 'A') goto yy160;
+		if (yych == 'a') goto yy160;
+		goto yy40;
+yy44:
+		YYDEBUG(44, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yych <= 'E') {
-			if (yych == 'A') goto yy192;
-			if (yych <= 'D') goto yy47;
-			goto yy193;
+			if (yych == 'A') goto yy161;
+			if (yych <= 'D') goto yy40;
+			goto yy162;
 		} else {
 			if (yych <= 'a') {
-				if (yych <= '`') goto yy47;
-				goto yy192;
+				if (yych <= '`') goto yy40;
+				goto yy161;
 			} else {
-				if (yych == 'e') goto yy193;
-				goto yy47;
+				if (yych == 'e') goto yy162;
+				goto yy40;
 			}
 		}
-yy52:
-		YYDEBUG(52, *YYCURSOR);
+yy45:
+		YYDEBUG(45, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'R') goto yy194;
-		if (yych == 'r') goto yy194;
-		goto yy47;
-yy53:
-		YYDEBUG(53, *YYCURSOR);
+		if (yych == 'R') goto yy163;
+		if (yych == 'r') goto yy163;
+		goto yy40;
+yy46:
+		YYDEBUG(46, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yych <= 'U') {
-			if (yych == 'R') goto yy196;
-			if (yych <= 'T') goto yy47;
-			goto yy197;
+			if (yych == 'R') goto yy165;
+			if (yych <= 'T') goto yy40;
+			goto yy166;
 		} else {
 			if (yych <= 'r') {
-				if (yych <= 'q') goto yy47;
-				goto yy196;
+				if (yych <= 'q') goto yy40;
+				goto yy165;
 			} else {
-				if (yych == 'u') goto yy197;
-				goto yy47;
+				if (yych == 'u') goto yy166;
+				goto yy40;
 			}
 		}
-yy54:
-		YYDEBUG(54, *YYCURSOR);
+yy47:
+		YYDEBUG(47, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'E') goto yy198;
-		if (yych == 'e') goto yy198;
-		goto yy47;
-yy55:
-		YYDEBUG(55, *YYCURSOR);
+		if (yych == 'E') goto yy167;
+		if (yych == 'e') goto yy167;
+		goto yy40;
+yy48:
+		YYDEBUG(48, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yych <= 'W') {
-			if (yych == 'T') goto yy199;
-			if (yych <= 'V') goto yy47;
-			goto yy200;
+			if (yych == 'T') goto yy168;
+			if (yych <= 'V') goto yy40;
+			goto yy169;
 		} else {
 			if (yych <= 't') {
-				if (yych <= 's') goto yy47;
-				goto yy199;
+				if (yych <= 's') goto yy40;
+				goto yy168;
 			} else {
-				if (yych == 'w') goto yy200;
-				goto yy47;
+				if (yych == 'w') goto yy169;
+				goto yy40;
 			}
 		}
-yy56:
-		YYDEBUG(56, *YYCURSOR);
+yy49:
+		YYDEBUG(49, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yych <= 'R') {
-			if (yych == 'H') goto yy201;
-			if (yych <= 'Q') goto yy47;
-			goto yy202;
+			if (yych == 'H') goto yy170;
+			if (yych <= 'Q') goto yy40;
+			goto yy171;
 		} else {
 			if (yych <= 'h') {
-				if (yych <= 'g') goto yy47;
-				goto yy201;
+				if (yych <= 'g') goto yy40;
+				goto yy170;
 			} else {
-				if (yych == 'r') goto yy202;
-				goto yy47;
+				if (yych == 'r') goto yy171;
+				goto yy40;
 			}
 		}
-yy57:
-		YYDEBUG(57, *YYCURSOR);
+yy50:
+		YYDEBUG(50, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yych <= 'S') {
-			if (yych == 'N') goto yy203;
-			if (yych <= 'R') goto yy47;
-			goto yy204;
+			if (yych == 'N') goto yy172;
+			if (yych <= 'R') goto yy40;
+			goto yy173;
 		} else {
 			if (yych <= 'n') {
-				if (yych <= 'm') goto yy47;
-				goto yy203;
+				if (yych <= 'm') goto yy40;
+				goto yy172;
 			} else {
-				if (yych == 's') goto yy204;
-				goto yy47;
+				if (yych == 's') goto yy173;
+				goto yy40;
 			}
 		}
-yy58:
-		YYDEBUG(58, *YYCURSOR);
+yy51:
+		YYDEBUG(51, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'A') goto yy205;
-		if (yych == 'a') goto yy205;
-		goto yy47;
-yy59:
-		YYDEBUG(59, *YYCURSOR);
+		if (yych == 'A') goto yy174;
+		if (yych == 'a') goto yy174;
+		goto yy40;
+yy52:
+		YYDEBUG(52, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'H') goto yy206;
-		if (yych == 'h') goto yy206;
-		goto yy47;
-yy60:
-		YYDEBUG(60, *YYCURSOR);
+		if (yych == 'H') goto yy175;
+		if (yych == 'h') goto yy175;
+		goto yy40;
+yy53:
+		YYDEBUG(53, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'O') goto yy207;
-		if (yych == 'o') goto yy207;
-		goto yy47;
-yy61:
-		YYDEBUG(61, *YYCURSOR);
+		if (yych == 'O') goto yy176;
+		if (yych == 'o') goto yy176;
+		goto yy40;
+yy54:
+		YYDEBUG(54, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'I') goto yy208;
-		if (yych == 'i') goto yy208;
-		goto yy47;
-yy62:
-		YYDEBUG(62, *YYCURSOR);
+		if (yych == 'I') goto yy177;
+		if (yych == 'i') goto yy177;
+		goto yy40;
+yy55:
+		YYDEBUG(55, *YYCURSOR);
 		++YYCURSOR;
-		goto yy20;
-yy63:
-		YYDEBUG(63, *YYCURSOR);
+		goto yy14;
+yy56:
+		YYDEBUG(56, *YYCURSOR);
 		yych = *++YYCURSOR;
 		if (yych <= '_') {
-			if (yych <= '@') goto yy64;
-			if (yych <= 'Z') goto yy209;
-			if (yych >= '_') goto yy209;
-		} else {
-			if (yych <= '`') goto yy64;
-			if (yych <= 'z') goto yy209;
-			if (yych >= 0x80) goto yy209;
+			if (yych <= '@') goto yy57;
+			if (yych <= 'Z') goto yy178;
+			if (yych >= '_') goto yy178;
+		} else {
+			if (yych <= '`') goto yy57;
+			if (yych <= 'z') goto yy178;
+			if (yych >= 0x80) goto yy178;
 		}
-yy64:
-		YYDEBUG(64, *YYCURSOR);
+yy57:
+		YYDEBUG(57, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN(T_NS_SEPARATOR);
 }
-yy65:
-		YYDEBUG(65, *YYCURSOR);
+yy58:
+		YYDEBUG(58, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == '=') goto yy212;
-		goto yy8;
-yy66:
-		YYDEBUG(66, *YYCURSOR);
+		if (yych == '=') goto yy180;
+		goto yy4;
+yy59:
+		YYDEBUG(59, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == '_') goto yy214;
-		goto yy47;
-yy67:
-		YYDEBUG(67, *YYCURSOR);
+		if (yych == '_') goto yy181;
+		goto yy40;
+yy60:
+		YYDEBUG(60, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(68, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	BEGIN(ST_BACKQUOTE);
 	RETURN_TOKEN('`');
 }
-yy69:
-		YYDEBUG(69, *YYCURSOR);
+yy61:
+		YYDEBUG(61, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(70, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	yy_push_state(ST_IN_SCRIPTING);
 	enter_nesting('{');
 	RETURN_TOKEN('{');
 }
-yy71:
-		YYDEBUG(71, *YYCURSOR);
+yy62:
+		YYDEBUG(62, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == '=') goto yy215;
-		if (yych == '|') goto yy217;
-		goto yy8;
-yy72:
-		YYDEBUG(72, *YYCURSOR);
+		if (yych == '=') goto yy182;
+		if (yych == '|') goto yy183;
+		goto yy4;
+yy63:
+		YYDEBUG(63, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(73, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RESET_DOC_COMMENT();
@@ -2530,88 +2521,85 @@
 	}
 	RETURN_EXIT_NESTING_TOKEN('}');
 }
-yy74:
-		YYDEBUG(74, *YYCURSOR);
+yy64:
+		YYDEBUG(64, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == '=') goto yy219;
-yy75:
-		YYDEBUG(75, *YYCURSOR);
+		if (yych == '=') goto yy184;
+yy65:
+		YYDEBUG(65, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN(T_IS_NOT_EQUAL);
 }
-yy76:
-		YYDEBUG(76, *YYCURSOR);
+yy66:
+		YYDEBUG(66, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(77, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	enter_nesting('');
 	RETURN_TOKEN(T_ATTRIBUTE);
 }
-yy78:
-		YYDEBUG(78, *YYCURSOR);
+yy67:
+		YYDEBUG(67, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(79, *YYCURSOR);
 		if (yych <= '^') {
 			if (yych <= '9') {
-				if (yych >= '0') goto yy78;
+				if (yych >= '0') goto yy67;
 			} else {
-				if (yych <= '@') goto yy80;
-				if (yych <= 'Z') goto yy78;
+				if (yych <= '@') goto yy68;
+				if (yych <= 'Z') goto yy67;
 			}
 		} else {
 			if (yych <= '`') {
-				if (yych <= '_') goto yy78;
+				if (yych <= '_') goto yy67;
 			} else {
-				if (yych <= 'z') goto yy78;
-				if (yych >= 0x80) goto yy78;
+				if (yych <= 'z') goto yy67;
+				if (yych >= 0x80) goto yy67;
 			}
 		}
-yy80:
-		YYDEBUG(80, *YYCURSOR);
+yy68:
+		YYDEBUG(68, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_STR(T_VARIABLE, 1);
 }
-yy81:
-		YYDEBUG(81, *YYCURSOR);
+yy69:
+		YYDEBUG(69, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(82, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN(T_MOD_EQUAL);
 }
-yy83:
-		YYDEBUG(83, *YYCURSOR);
+yy70:
+		YYDEBUG(70, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(3);
 		yych = *YYCURSOR;
-yy84:
-		YYDEBUG(84, *YYCURSOR);
+yy71:
+		YYDEBUG(71, *YYCURSOR);
 		if (yych <= ' ') {
 			if (yych <= '\f') {
-				if (yych <= 0x08) goto yy85;
-				if (yych <= '\n') goto yy83;
+				if (yych <= 0x08) goto yy72;
+				if (yych <= '\n') goto yy70;
 			} else {
-				if (yych <= '\r') goto yy83;
-				if (yych >= ' ') goto yy83;
+				if (yych <= '\r') goto yy70;
+				if (yych >= ' ') goto yy70;
 			}
 		} else {
 			if (yych <= '$') {
-				if (yych <= '"') goto yy85;
-				if (yych <= '#') goto yy86;
-				goto yy87;
-			} else {
-				if (yych <= '-') goto yy85;
-				if (yych <= '.') goto yy91;
-				if (yych <= '/') goto yy92;
+				if (yych <= '"') goto yy72;
+				if (yych <= '#') goto yy73;
+				goto yy74;
+			} else {
+				if (yych <= '-') goto yy72;
+				if (yych <= '.') goto yy77;
+				if (yych <= '/') goto yy78;
 			}
 		}
-yy85:
-		YYDEBUG(85, *YYCURSOR);
+yy72:
+		YYDEBUG(72, *YYCURSOR);
 		YYCURSOR = YYMARKER;
 		if (yyaccept <= 47) {
 			if (yyaccept <= 23) {
@@ -2620,44 +2608,44 @@
 						if (yyaccept <= 2) {
 							if (yyaccept <= 1) {
 								if (yyaccept == 0) {
-									goto yy16;
+									goto yy11;
 								} else {
-									goto yy20;
+									goto yy14;
 								}
 							} else {
-								goto yy8;
+								goto yy4;
 							}
 						} else {
 							if (yyaccept <= 4) {
 								if (yyaccept == 3) {
-									goto yy30;
+									goto yy23;
 								} else {
-									goto yy39;
+									goto yy32;
 								}
 							} else {
-								goto yy123;
+								goto yy101;
 							}
 						}
 					} else {
 						if (yyaccept <= 8) {
 							if (yyaccept <= 7) {
 								if (yyaccept == 6) {
-									goto yy127;
+									goto yy104;
 								} else {
-									goto yy140;
+									goto yy115;
 								}
 							} else {
-								goto yy161;
+								goto yy130;
 							}
 						} else {
 							if (yyaccept <= 10) {
 								if (yyaccept == 9) {
-									goto yy171;
+									goto yy140;
 								} else {
-									goto yy180;
+									goto yy149;
 								}
 							} else {
-								goto yy186;
+								goto yy155;
 							}
 						}
 					}
@@ -2666,44 +2654,44 @@
 						if (yyaccept <= 14) {
 							if (yyaccept <= 13) {
 								if (yyaccept == 12) {
-									goto yy195;
+									goto yy164;
 								} else {
-									goto yy211;
+									goto yy179;
 								}
 							} else {
-								goto yy246;
+								goto yy204;
 							}
 						} else {
 							if (yyaccept <= 16) {
 								if (yyaccept == 15) {
-									goto yy252;
+									goto yy208;
 								} else {
-									goto yy255;
+									goto yy210;
 								}
 							} else {
-								goto yy274;
+								goto yy222;
 							}
 						}
 					} else {
 						if (yyaccept <= 20) {
 							if (yyaccept <= 19) {
 								if (yyaccept == 18) {
-									goto yy278;
+									goto yy225;
 								} else {
-									goto yy290;
+									goto yy237;
 								}
 							} else {
-								goto yy301;
+								goto yy248;
 							}
 						} else {
 							if (yyaccept <= 22) {
 								if (yyaccept == 21) {
-									goto yy314;
+									goto yy261;
 								} else {
-									goto yy326;
+									goto yy273;
 								}
 							} else {
-								goto yy329;
+								goto yy276;
 							}
 						}
 					}
@@ -2714,44 +2702,44 @@
 						if (yyaccept <= 26) {
 							if (yyaccept <= 25) {
 								if (yyaccept == 24) {
-									goto yy331;
+									goto yy278;
 								} else {
-									goto yy334;
+									goto yy281;
 								}
 							} else {
-								goto yy88;
+								goto yy75;
 							}
 						} else {
 							if (yyaccept <= 28) {
 								if (yyaccept == 27) {
-									goto yy372;
+									goto yy316;
 								} else {
-									goto yy381;
+									goto yy325;
 								}
 							} else {
-								goto yy383;
+								goto yy327;
 							}
 						}
 					} else {
 						if (yyaccept <= 32) {
 							if (yyaccept <= 31) {
 								if (yyaccept == 30) {
-									goto yy392;
+									goto yy336;
 								} else {
-									goto yy394;
+									goto yy338;
 								}
 							} else {
-								goto yy401;
+								goto yy345;
 							}
 						} else {
 							if (yyaccept <= 34) {
 								if (yyaccept == 33) {
-									goto yy408;
+									goto yy352;
 								} else {
-									goto yy461;
+									goto yy401;
 								}
 							} else {
-								goto yy463;
+								goto yy403;
 							}
 						}
 					}
@@ -2760,44 +2748,44 @@
 						if (yyaccept <= 38) {
 							if (yyaccept <= 37) {
 								if (yyaccept == 36) {
-									goto yy466;
+									goto yy406;
 								} else {
-									goto yy468;
+									goto yy408;
 								}
 							} else {
-								goto yy470;
+								goto yy410;
 							}
 						} else {
 							if (yyaccept <= 40) {
 								if (yyaccept == 39) {
-									goto yy472;
+									goto yy412;
 								} else {
-									goto yy478;
+									goto yy418;
 								}
 							} else {
-								goto yy482;
+								goto yy422;
 							}
 						}
 					} else {
 						if (yyaccept <= 44) {
 							if (yyaccept <= 43) {
 								if (yyaccept == 42) {
-									goto yy491;
+									goto yy430;
 								} else {
-									goto yy501;
+									goto yy440;
 								}
 							} else {
-								goto yy503;
+								goto yy442;
 							}
 						} else {
 							if (yyaccept <= 46) {
 								if (yyaccept == 45) {
-									goto yy506;
+									goto yy445;
 								} else {
-									goto yy516;
+									goto yy455;
 								}
 							} else {
-								goto yy518;
+								goto yy457;
 							}
 						}
 					}
@@ -2810,44 +2798,44 @@
 						if (yyaccept <= 50) {
 							if (yyaccept <= 49) {
 								if (yyaccept == 48) {
-									goto yy520;
+									goto yy459;
 								} else {
-									goto yy522;
+									goto yy461;
 								}
 							} else {
-								goto yy524;
+								goto yy463;
 							}
 						} else {
 							if (yyaccept <= 52) {
 								if (yyaccept == 51) {
-									goto yy563;
+									goto yy494;
 								} else {
-									goto yy566;
+									goto yy497;
 								}
 							} else {
-								goto yy570;
+								goto yy501;
 							}
 						}
 					} else {
 						if (yyaccept <= 56) {
 							if (yyaccept <= 55) {
 								if (yyaccept == 54) {
-									goto yy584;
+									goto yy512;
 								} else {
-									goto yy594;
+									goto yy522;
 								}
 							} else {
-								goto yy598;
+								goto yy526;
 							}
 						} else {
 							if (yyaccept <= 58) {
 								if (yyaccept == 57) {
-									goto yy600;
+									goto yy528;
 								} else {
-									goto yy602;
+									goto yy530;
 								}
 							} else {
-								goto yy636;
+								goto yy558;
 							}
 						}
 					}
@@ -2856,44 +2844,44 @@
 						if (yyaccept <= 62) {
 							if (yyaccept <= 61) {
 								if (yyaccept == 60) {
-									goto yy638;
+									goto yy560;
 								} else {
-									goto yy653;
+									goto yy574;
 								}
 							} else {
-								goto yy655;
+								goto yy576;
 							}
 						} else {
 							if (yyaccept <= 64) {
 								if (yyaccept == 63) {
-									goto yy657;
+									goto yy578;
 								} else {
-									goto yy661;
+									goto yy582;
 								}
 							} else {
-								goto yy667;
+								goto yy588;
 							}
 						}
 					} else {
 						if (yyaccept <= 68) {
 							if (yyaccept <= 67) {
 								if (yyaccept == 66) {
-									goto yy671;
+									goto yy592;
 								} else {
-									goto yy681;
+									goto yy599;
 								}
 							} else {
-								goto yy698;
+								goto yy613;
 							}
 						} else {
 							if (yyaccept <= 70) {
 								if (yyaccept == 69) {
-									goto yy700;
+									goto yy615;
 								} else {
-									goto yy702;
+									goto yy617;
 								}
 							} else {
-								goto yy707;
+								goto yy622;
 							}
 						}
 					}
@@ -2904,44 +2892,44 @@
 						if (yyaccept <= 74) {
 							if (yyaccept <= 73) {
 								if (yyaccept == 72) {
-									goto yy715;
+									goto yy629;
 								} else {
-									goto yy724;
+									goto yy638;
 								}
 							} else {
-								goto yy734;
+								goto yy647;
 							}
 						} else {
 							if (yyaccept <= 76) {
 								if (yyaccept == 75) {
-									goto yy738;
+									goto yy651;
 								} else {
-									goto yy749;
+									goto yy662;
 								}
 							} else {
-								goto yy762;
+								goto yy673;
 							}
 						}
 					} else {
 						if (yyaccept <= 80) {
 							if (yyaccept <= 79) {
 								if (yyaccept == 78) {
-									goto yy764;
+									goto yy675;
 								} else {
-									goto yy766;
+									goto yy677;
 								}
 							} else {
-								goto yy768;
+								goto yy679;
 							}
 						} else {
 							if (yyaccept <= 82) {
 								if (yyaccept == 81) {
-									goto yy775;
+									goto yy685;
 								} else {
-									goto yy781;
+									goto yy691;
 								}
 							} else {
-								goto yy785;
+								goto yy695;
 							}
 						}
 					}
@@ -2950,282 +2938,273 @@
 						if (yyaccept <= 86) {
 							if (yyaccept <= 85) {
 								if (yyaccept == 84) {
-									goto yy787;
+									goto yy697;
 								} else {
-									goto yy798;
+									goto yy708;
 								}
 							} else {
-								goto yy801;
+								goto yy711;
 							}
 						} else {
 							if (yyaccept <= 88) {
 								if (yyaccept == 87) {
-									goto yy813;
+									goto yy721;
 								} else {
-									goto yy827;
+									goto yy733;
 								}
 							} else {
-								goto yy851;
+								goto yy757;
 							}
 						}
 					} else {
 						if (yyaccept <= 92) {
 							if (yyaccept <= 91) {
 								if (yyaccept == 90) {
-									goto yy853;
+									goto yy759;
 								} else {
-									goto yy830;
+									goto yy736;
 								}
 							} else {
-								goto yy861;
+								goto yy766;
 							}
 						} else {
 							if (yyaccept <= 94) {
 								if (yyaccept == 93) {
-									goto yy839;
+									goto yy745;
 								} else {
-									goto yy878;
+									goto yy783;
 								}
 							} else {
-								goto yy896;
+								goto yy801;
 							}
 						}
 					}
 				}
 			}
 		}
-yy86:
-		YYDEBUG(86, *YYCURSOR);
+yy73:
+		YYDEBUG(73, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= '\f') {
-			if (yych <= 0x00) goto yy85;
-			if (yych == '\n') goto yy223;
-			goto yy221;
-		} else {
-			if (yych <= '\r') goto yy223;
-			if (yych == '') goto yy85;
-			goto yy221;
+			if (yych <= 0x00) goto yy72;
+			if (yych == '\n') goto yy186;
+			goto yy185;
+		} else {
+			if (yych <= '\r') goto yy186;
+			if (yych == '') goto yy72;
+			goto yy185;
 		}
-yy87:
-		YYDEBUG(87, *YYCURSOR);
+yy74:
+		YYDEBUG(74, *YYCURSOR);
 		++YYCURSOR;
-yy88:
-		YYDEBUG(88, *YYCURSOR);
+yy75:
+		YYDEBUG(75, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	yyless(1);
 	RETURN_TOKEN(T_AMPERSAND_FOLLOWED_BY_VAR_OR_VARARG);
 }
-yy89:
-		YYDEBUG(89, *YYCURSOR);
+yy76:
+		YYDEBUG(76, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(90, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN(T_BOOLEAN_AND);
 }
-yy91:
-		YYDEBUG(91, *YYCURSOR);
+yy77:
+		YYDEBUG(77, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == '.') goto yy225;
-		goto yy85;
-yy92:
-		YYDEBUG(92, *YYCURSOR);
+		if (yych == '.') goto yy187;
+		goto yy72;
+yy78:
+		YYDEBUG(78, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		if (yych == '*') goto yy226;
-		if (yych == '/') goto yy221;
-		goto yy85;
-yy93:
-		YYDEBUG(93, *YYCURSOR);
+		if (yych == '*') goto yy188;
+		if (yych == '/') goto yy185;
+		goto yy72;
+yy79:
+		YYDEBUG(79, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(94, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN(T_AND_EQUAL);
 }
-yy95:
-		YYDEBUG(95, *YYCURSOR);
+yy80:
+		YYDEBUG(80, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(7);
 		yych = *YYCURSOR;
-yy96:
-		YYDEBUG(96, *YYCURSOR);
+yy81:
+		YYDEBUG(81, *YYCURSOR);
 		if (yybm0+yych & 1) {
-			goto yy95;
+			goto yy80;
 		}
 		switch (yych) {
-		case 'A':
-		case 'a':	goto yy97;
-		case 'B':
-		case 'b':	goto yy98;
-		case 'D':
-		case 'd':	goto yy99;
-		case 'F':
-		case 'f':	goto yy100;
-		case 'I':
-		case 'i':	goto yy101;
-		case 'O':
-		case 'o':	goto yy102;
-		case 'R':
-		case 'r':	goto yy103;
-		case 'S':
-		case 's':	goto yy104;
-		case 'U':
-		case 'u':	goto yy105;
-		default:	goto yy85;
+			case 'A':
+			case 'a': goto yy82;
+			case 'B':
+			case 'b': goto yy83;
+			case 'D':
+			case 'd': goto yy84;
+			case 'F':
+			case 'f': goto yy85;
+			case 'I':
+			case 'i': goto yy86;
+			case 'O':
+			case 'o': goto yy87;
+			case 'R':
+			case 'r': goto yy88;
+			case 'S':
+			case 's': goto yy89;
+			case 'U':
+			case 'u': goto yy90;
+			default: goto yy72;
 		}
-yy97:
-		YYDEBUG(97, *YYCURSOR);
+yy82:
+		YYDEBUG(82, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'R') goto yy228;
-		if (yych == 'r') goto yy228;
-		goto yy85;
-yy98:
-		YYDEBUG(98, *YYCURSOR);
+		if (yych == 'R') goto yy189;
+		if (yych == 'r') goto yy189;
+		goto yy72;
+yy83:
+		YYDEBUG(83, *YYCURSOR);
 		yych = *++YYCURSOR;
 		if (yych <= 'O') {
-			if (yych == 'I') goto yy229;
-			if (yych <= 'N') goto yy85;
-			goto yy230;
+			if (yych == 'I') goto yy190;
+			if (yych <= 'N') goto yy72;
+			goto yy191;
 		} else {
 			if (yych <= 'i') {
-				if (yych <= 'h') goto yy85;
-				goto yy229;
+				if (yych <= 'h') goto yy72;
+				goto yy190;
 			} else {
-				if (yych == 'o') goto yy230;
-				goto yy85;
+				if (yych == 'o') goto yy191;
+				goto yy72;
 			}
 		}
-yy99:
-		YYDEBUG(99, *YYCURSOR);
+yy84:
+		YYDEBUG(84, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'O') goto yy231;
-		if (yych == 'o') goto yy231;
-		goto yy85;
-yy100:
-		YYDEBUG(100, *YYCURSOR);
+		if (yych == 'O') goto yy192;
+		if (yych == 'o') goto yy192;
+		goto yy72;
+yy85:
+		YYDEBUG(85, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'L') goto yy232;
-		if (yych == 'l') goto yy232;
-		goto yy85;
-yy101:
-		YYDEBUG(101, *YYCURSOR);
+		if (yych == 'L') goto yy193;
+		if (yych == 'l') goto yy193;
+		goto yy72;
+yy86:
+		YYDEBUG(86, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'N') goto yy233;
-		if (yych == 'n') goto yy233;
-		goto yy85;
-yy102:
-		YYDEBUG(102, *YYCURSOR);
+		if (yych == 'N') goto yy194;
+		if (yych == 'n') goto yy194;
+		goto yy72;
+yy87:
+		YYDEBUG(87, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'B') goto yy234;
-		if (yych == 'b') goto yy234;
-		goto yy85;
-yy103:
-		YYDEBUG(103, *YYCURSOR);
+		if (yych == 'B') goto yy195;
+		if (yych == 'b') goto yy195;
+		goto yy72;
+yy88:
+		YYDEBUG(88, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'E') goto yy235;
-		if (yych == 'e') goto yy235;
-		goto yy85;
-yy104:
-		YYDEBUG(104, *YYCURSOR);
+		if (yych == 'E') goto yy196;
+		if (yych == 'e') goto yy196;
+		goto yy72;
+yy89:
+		YYDEBUG(89, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'T') goto yy236;
-		if (yych == 't') goto yy236;
-		goto yy85;
-yy105:
-		YYDEBUG(105, *YYCURSOR);
+		if (yych == 'T') goto yy197;
+		if (yych == 't') goto yy197;
+		goto yy72;
+yy90:
+		YYDEBUG(90, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'N') goto yy237;
-		if (yych == 'n') goto yy237;
-		goto yy85;
-yy106:
-		YYDEBUG(106, *YYCURSOR);
+		if (yych == 'N') goto yy198;
+		if (yych == 'n') goto yy198;
+		goto yy72;
+yy91:
+		YYDEBUG(91, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == '=') goto yy238;
-		YYDEBUG(107, *YYCURSOR);
+		if (yych == '=') goto yy199;
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN(T_POW);
 }
-yy108:
-		YYDEBUG(108, *YYCURSOR);
+yy92:
+		YYDEBUG(92, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(109, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN(T_MUL_EQUAL);
 }
-yy110:
-		YYDEBUG(110, *YYCURSOR);
+yy93:
+		YYDEBUG(93, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(111, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN(T_INC);
 }
-yy112:
-		YYDEBUG(112, *YYCURSOR);
+yy94:
+		YYDEBUG(94, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(113, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN(T_PLUS_EQUAL);
 }
-yy114:
-		YYDEBUG(114, *YYCURSOR);
+yy95:
+		YYDEBUG(95, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(115, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN(T_DEC);
 }
-yy116:
-		YYDEBUG(116, *YYCURSOR);
+yy96:
+		YYDEBUG(96, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(117, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN(T_MINUS_EQUAL);
 }
-yy118:
-		YYDEBUG(118, *YYCURSOR);
+yy97:
+		YYDEBUG(97, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(119, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	yy_push_state(ST_LOOKING_FOR_PROPERTY);
 	RETURN_TOKEN(T_OBJECT_OPERATOR);
 }
-yy120:
-		YYDEBUG(120, *YYCURSOR);
+yy98:
+		YYDEBUG(98, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == '.') goto yy240;
-		goto yy85;
-yy121:
-		YYDEBUG(121, *YYCURSOR);
+		if (yych == '.') goto yy200;
+		goto yy72;
+yy99:
+		YYDEBUG(99, *YYCURSOR);
 		yyaccept = 5;
 		YYMARKER = ++YYCURSOR;
 		YYFILL(2);
 		yych = *YYCURSOR;
-yy122:
-		YYDEBUG(122, *YYCURSOR);
+yy100:
+		YYDEBUG(100, *YYCURSOR);
 		if (yych <= 'E') {
-			if (yych <= '/') goto yy123;
-			if (yych <= '9') goto yy121;
-			if (yych >= 'E') goto yy133;
+			if (yych <= '/') goto yy101;
+			if (yych <= '9') goto yy99;
+			if (yych >= 'E') goto yy109;
 		} else {
 			if (yych <= '_') {
-				if (yych >= '_') goto yy242;
+				if (yych >= '_') goto yy201;
 			} else {
-				if (yych == 'e') goto yy133;
+				if (yych == 'e') goto yy109;
 			}
 		}
-yy123:
-		YYDEBUG(123, *YYCURSOR);
+yy101:
+		YYDEBUG(101, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	const char *end;
@@ -3246,21 +3225,20 @@
 	}
 	RETURN_TOKEN_WITH_VAL(T_DNUMBER);
 }
-yy124:
-		YYDEBUG(124, *YYCURSOR);
+yy102:
+		YYDEBUG(102, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(125, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN(T_CONCAT_EQUAL);
 }
-yy126:
-		YYDEBUG(126, *YYCURSOR);
+yy103:
+		YYDEBUG(103, *YYCURSOR);
 		yyaccept = 6;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == '*') goto yy243;
-yy127:
-		YYDEBUG(127, *YYCURSOR);
+		if (yych == '*') goto yy202;
+yy104:
+		YYDEBUG(104, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	int doc_com;
@@ -3297,152 +3275,145 @@
 
 	RETURN_OR_SKIP_TOKEN(T_COMMENT);
 }
-yy128:
-		YYDEBUG(128, *YYCURSOR);
+yy105:
+		YYDEBUG(105, *YYCURSOR);
 		++YYCURSOR;
-		goto yy12;
-yy129:
-		YYDEBUG(129, *YYCURSOR);
+		goto yy7;
+yy106:
+		YYDEBUG(106, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(130, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN(T_DIV_EQUAL);
 }
-yy131:
-		YYDEBUG(131, *YYCURSOR);
+yy107:
+		YYDEBUG(107, *YYCURSOR);
 		yyaccept = 5;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == '_') goto yy123;
-		goto yy122;
-yy132:
-		YYDEBUG(132, *YYCURSOR);
+		if (yych == '_') goto yy101;
+		goto yy100;
+yy108:
+		YYDEBUG(108, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yybm0+yych & 8) {
-			goto yy244;
+			goto yy203;
 		}
-		goto yy85;
-yy133:
-		YYDEBUG(133, *YYCURSOR);
+		goto yy72;
+yy109:
+		YYDEBUG(109, *YYCURSOR);
 		yych = *++YYCURSOR;
 		if (yych <= ',') {
-			if (yych == '+') goto yy247;
-			goto yy85;
+			if (yych == '+') goto yy205;
+			goto yy72;
 		} else {
-			if (yych <= '-') goto yy247;
-			if (yych <= '/') goto yy85;
-			if (yych <= '9') goto yy248;
-			goto yy85;
+			if (yych <= '-') goto yy205;
+			if (yych <= '/') goto yy72;
+			if (yych <= '9') goto yy206;
+			goto yy72;
 		}
-yy134:
-		YYDEBUG(134, *YYCURSOR);
+yy110:
+		YYDEBUG(110, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yybm0+yych & 16) {
-			goto yy250;
+			goto yy207;
 		}
-		goto yy85;
-yy135:
-		YYDEBUG(135, *YYCURSOR);
+		goto yy72;
+yy111:
+		YYDEBUG(111, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yybm0+yych & 32) {
-			goto yy253;
+			goto yy209;
 		}
-		goto yy85;
-yy136:
-		YYDEBUG(136, *YYCURSOR);
+		goto yy72;
+yy112:
+		YYDEBUG(112, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yybm256+yych & 64) {
-			goto yy31;
+			goto yy24;
 		}
-		goto yy85;
-yy137:
-		YYDEBUG(137, *YYCURSOR);
+		goto yy72;
+yy113:
+		YYDEBUG(113, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(138, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN(T_PAAMAYIM_NEKUDOTAYIM);
 }
-yy139:
-		YYDEBUG(139, *YYCURSOR);
+yy114:
+		YYDEBUG(114, *YYCURSOR);
 		yyaccept = 7;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych <= ';') goto yy140;
-		if (yych <= '<') goto yy256;
-		if (yych <= '=') goto yy258;
-yy140:
-		YYDEBUG(140, *YYCURSOR);
+		if (yych <= ';') goto yy115;
+		if (yych <= '<') goto yy211;
+		if (yych <= '=') goto yy212;
+yy115:
+		YYDEBUG(115, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN(T_SL);
 }
-yy141:
-		YYDEBUG(141, *YYCURSOR);
+yy116:
+		YYDEBUG(116, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == '>') goto yy260;
-		YYDEBUG(142, *YYCURSOR);
+		if (yych == '>') goto yy213;
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN(T_IS_SMALLER_OR_EQUAL);
 }
-yy143:
-		YYDEBUG(143, *YYCURSOR);
+yy117:
+		YYDEBUG(117, *YYCURSOR);
 		++YYCURSOR;
-		goto yy75;
-yy144:
-		YYDEBUG(144, *YYCURSOR);
+		goto yy65;
+yy118:
+		YYDEBUG(118, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == '=') goto yy262;
-		YYDEBUG(145, *YYCURSOR);
+		if (yych == '=') goto yy214;
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN(T_IS_EQUAL);
 }
-yy146:
-		YYDEBUG(146, *YYCURSOR);
+yy119:
+		YYDEBUG(119, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(147, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN(T_DOUBLE_ARROW);
 }
-yy148:
-		YYDEBUG(148, *YYCURSOR);
+yy120:
+		YYDEBUG(120, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(149, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN(T_IS_GREATER_OR_EQUAL);
 }
-yy150:
-		YYDEBUG(150, *YYCURSOR);
+yy121:
+		YYDEBUG(121, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == '=') goto yy264;
-		YYDEBUG(151, *YYCURSOR);
+		if (yych == '=') goto yy215;
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN(T_SR);
 }
-yy152:
-		YYDEBUG(152, *YYCURSOR);
+yy122:
+		YYDEBUG(122, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == '>') goto yy266;
-		goto yy85;
-yy153:
-		YYDEBUG(153, *YYCURSOR);
+		if (yych == '>') goto yy216;
+		goto yy72;
+yy123:
+		YYDEBUG(123, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == '\n') goto yy268;
-		if (yych == '\r') goto yy269;
-yy154:
-		YYDEBUG(154, *YYCURSOR);
+		if (yych == '\n') goto yy217;
+		if (yych == '\r') goto yy218;
+yy124:
+		YYDEBUG(124, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	BEGIN(INITIAL);
@@ -3454,743 +3425,731 @@
 	}
 	RETURN_TOKEN(T_CLOSE_TAG);
 }
-yy155:
-		YYDEBUG(155, *YYCURSOR);
+yy125:
+		YYDEBUG(125, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == '=') goto yy270;
-		YYDEBUG(156, *YYCURSOR);
+		if (yych == '=') goto yy219;
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN(T_COALESCE);
 }
-yy157:
-		YYDEBUG(157, *YYCURSOR);
+yy126:
+		YYDEBUG(126, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'S') goto yy272;
-		if (yych == 's') goto yy272;
-		goto yy47;
-yy158:
-		YYDEBUG(158, *YYCURSOR);
+		if (yych == 'S') goto yy220;
+		if (yych == 's') goto yy220;
+		goto yy40;
+yy127:
+		YYDEBUG(127, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'D') goto yy273;
-		if (yych == 'd') goto yy273;
-		goto yy47;
-yy159:
-		YYDEBUG(159, *YYCURSOR);
+		if (yych == 'D') goto yy221;
+		if (yych == 'd') goto yy221;
+		goto yy40;
+yy128:
+		YYDEBUG(128, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'R') goto yy275;
-		if (yych == 'r') goto yy275;
-		goto yy47;
-yy160:
-		YYDEBUG(160, *YYCURSOR);
+		if (yych == 'R') goto yy223;
+		if (yych == 'r') goto yy223;
+		goto yy40;
+yy129:
+		YYDEBUG(129, *YYCURSOR);
 		yyaccept = 8;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm256+yych & 128) {
-			goto yy46;
+			goto yy39;
 		}
-		if (yych == '\\') goto yy162;
-yy161:
-		YYDEBUG(161, *YYCURSOR);
+		if (yych == '\\') goto yy131;
+yy130:
+		YYDEBUG(130, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_IDENT(T_AS);
 }
-yy162:
-		YYDEBUG(162, *YYCURSOR);
+yy131:
+		YYDEBUG(131, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= '_') {
-			if (yych <= '@') goto yy85;
-			if (yych <= 'Z') goto yy276;
-			if (yych <= '^') goto yy85;
-			goto yy276;
-		} else {
-			if (yych <= '`') goto yy85;
-			if (yych <= 'z') goto yy276;
-			if (yych <= 0x7F) goto yy85;
-			goto yy276;
+			if (yych <= '@') goto yy72;
+			if (yych <= 'Z') goto yy224;
+			if (yych <= '^') goto yy72;
+			goto yy224;
+		} else {
+			if (yych <= '`') goto yy72;
+			if (yych <= 'z') goto yy224;
+			if (yych <= 0x7F) goto yy72;
+			goto yy224;
 		}
-yy163:
-		YYDEBUG(163, *YYCURSOR);
+yy132:
+		YYDEBUG(132, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == '<') goto yy279;
-		goto yy85;
-yy164:
-		YYDEBUG(164, *YYCURSOR);
+		if (yych == '<') goto yy226;
+		goto yy72;
+yy133:
+		YYDEBUG(133, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'E') goto yy280;
-		if (yych == 'e') goto yy280;
-		goto yy47;
-yy165:
-		YYDEBUG(165, *YYCURSOR);
+		if (yych == 'E') goto yy227;
+		if (yych == 'e') goto yy227;
+		goto yy40;
+yy134:
+		YYDEBUG(134, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yych <= 'T') {
 			if (yych <= 'L') {
-				if (yych <= 'K') goto yy47;
-				goto yy281;
+				if (yych <= 'K') goto yy40;
+				goto yy228;
 			} else {
-				if (yych <= 'R') goto yy47;
-				if (yych <= 'S') goto yy282;
-				goto yy283;
+				if (yych <= 'R') goto yy40;
+				if (yych <= 'S') goto yy229;
+				goto yy230;
 			}
 		} else {
 			if (yych <= 'r') {
-				if (yych == 'l') goto yy281;
-				goto yy47;
+				if (yych == 'l') goto yy228;
+				goto yy40;
 			} else {
-				if (yych <= 's') goto yy282;
-				if (yych <= 't') goto yy283;
-				goto yy47;
+				if (yych <= 's') goto yy229;
+				if (yych <= 't') goto yy230;
+				goto yy40;
 			}
 		}
-yy166:
-		YYDEBUG(166, *YYCURSOR);
+yy135:
+		YYDEBUG(135, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yych <= 'O') {
-			if (yych == 'A') goto yy284;
-			if (yych <= 'N') goto yy47;
-			goto yy285;
+			if (yych == 'A') goto yy231;
+			if (yych <= 'N') goto yy40;
+			goto yy232;
 		} else {
 			if (yych <= 'a') {
-				if (yych <= '`') goto yy47;
-				goto yy284;
+				if (yych <= '`') goto yy40;
+				goto yy231;
 			} else {
-				if (yych == 'o') goto yy285;
-				goto yy47;
+				if (yych == 'o') goto yy232;
+				goto yy40;
 			}
 		}
-yy167:
-		YYDEBUG(167, *YYCURSOR);
+yy136:
+		YYDEBUG(136, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'N') goto yy286;
-		if (yych == 'n') goto yy286;
-		goto yy47;
-yy168:
-		YYDEBUG(168, *YYCURSOR);
+		if (yych == 'N') goto yy233;
+		if (yych == 'n') goto yy233;
+		goto yy40;
+yy137:
+		YYDEBUG(137, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yych <= 'F') {
-			if (yych == 'C') goto yy287;
-			if (yych <= 'E') goto yy47;
-			goto yy288;
+			if (yych == 'C') goto yy234;
+			if (yych <= 'E') goto yy40;
+			goto yy235;
 		} else {
 			if (yych <= 'c') {
-				if (yych <= 'b') goto yy47;
-				goto yy287;
+				if (yych <= 'b') goto yy40;
+				goto yy234;
 			} else {
-				if (yych == 'f') goto yy288;
-				goto yy47;
+				if (yych == 'f') goto yy235;
+				goto yy40;
 			}
 		}
-yy169:
-		YYDEBUG(169, *YYCURSOR);
+yy138:
+		YYDEBUG(138, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'E') goto yy289;
-		if (yych == 'e') goto yy289;
-		goto yy47;
-yy170:
-		YYDEBUG(170, *YYCURSOR);
+		if (yych == 'E') goto yy236;
+		if (yych == 'e') goto yy236;
+		goto yy40;
+yy139:
+		YYDEBUG(139, *YYCURSOR);
 		yyaccept = 9;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm256+yych & 128) {
-			goto yy46;
+			goto yy39;
 		}
-		if (yych == '\\') goto yy162;
-yy171:
-		YYDEBUG(171, *YYCURSOR);
+		if (yych == '\\') goto yy131;
+yy140:
+		YYDEBUG(140, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_IDENT(T_DO);
 }
-yy172:
-		YYDEBUG(172, *YYCURSOR);
+yy141:
+		YYDEBUG(141, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'H') goto yy291;
-		if (yych == 'h') goto yy291;
-		goto yy47;
-yy173:
-		YYDEBUG(173, *YYCURSOR);
+		if (yych == 'H') goto yy238;
+		if (yych == 'h') goto yy238;
+		goto yy40;
+yy142:
+		YYDEBUG(142, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'S') goto yy292;
-		if (yych == 's') goto yy292;
-		goto yy47;
-yy174:
-		YYDEBUG(174, *YYCURSOR);
+		if (yych == 'S') goto yy239;
+		if (yych == 's') goto yy239;
+		goto yy40;
+yy143:
+		YYDEBUG(143, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'P') goto yy293;
-		if (yych == 'p') goto yy293;
-		goto yy47;
-yy175:
-		YYDEBUG(175, *YYCURSOR);
+		if (yych == 'P') goto yy240;
+		if (yych == 'p') goto yy240;
+		goto yy40;
+yy144:
+		YYDEBUG(144, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yych <= 'U') {
-			if (yych == 'D') goto yy294;
-			if (yych <= 'T') goto yy47;
-			goto yy295;
+			if (yych == 'D') goto yy241;
+			if (yych <= 'T') goto yy40;
+			goto yy242;
 		} else {
 			if (yych <= 'd') {
-				if (yych <= 'c') goto yy47;
-				goto yy294;
+				if (yych <= 'c') goto yy40;
+				goto yy241;
 			} else {
-				if (yych == 'u') goto yy295;
-				goto yy47;
+				if (yych == 'u') goto yy242;
+				goto yy40;
 			}
 		}
-yy176:
-		YYDEBUG(176, *YYCURSOR);
+yy145:
+		YYDEBUG(145, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'A') goto yy296;
-		if (yych == 'a') goto yy296;
-		goto yy47;
-yy177:
-		YYDEBUG(177, *YYCURSOR);
+		if (yych == 'A') goto yy243;
+		if (yych == 'a') goto yy243;
+		goto yy40;
+yy146:
+		YYDEBUG(146, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yych <= 'T') {
-			if (yych == 'I') goto yy297;
-			if (yych <= 'S') goto yy47;
-			goto yy298;
+			if (yych == 'I') goto yy244;
+			if (yych <= 'S') goto yy40;
+			goto yy245;
 		} else {
 			if (yych <= 'i') {
-				if (yych <= 'h') goto yy47;
-				goto yy297;
+				if (yych <= 'h') goto yy40;
+				goto yy244;
 			} else {
-				if (yych == 't') goto yy298;
-				goto yy47;
+				if (yych == 't') goto yy245;
+				goto yy40;
 			}
 		}
-yy178:
-		YYDEBUG(178, *YYCURSOR);
+yy147:
+		YYDEBUG(147, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'N') goto yy299;
-		if (yych == 'n') goto yy299;
-		goto yy47;
-yy179:
-		YYDEBUG(179, *YYCURSOR);
+		if (yych == 'N') goto yy246;
+		if (yych == 'n') goto yy246;
+		goto yy40;
+yy148:
+		YYDEBUG(148, *YYCURSOR);
 		yyaccept = 10;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm256+yych & 128) {
-			goto yy46;
+			goto yy39;
 		}
-		if (yych == '\\') goto yy162;
-yy180:
-		YYDEBUG(180, *YYCURSOR);
+		if (yych == '\\') goto yy131;
+yy149:
+		YYDEBUG(149, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_IDENT(T_FN);
 }
-yy181:
-		YYDEBUG(181, *YYCURSOR);
+yy150:
+		YYDEBUG(150, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'R') goto yy300;
-		if (yych == 'r') goto yy300;
-		goto yy47;
-yy182:
-		YYDEBUG(182, *YYCURSOR);
+		if (yych == 'R') goto yy247;
+		if (yych == 'r') goto yy247;
+		goto yy40;
+yy151:
+		YYDEBUG(151, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'N') goto yy302;
-		if (yych == 'n') goto yy302;
-		goto yy47;
-yy183:
-		YYDEBUG(183, *YYCURSOR);
+		if (yych == 'N') goto yy249;
+		if (yych == 'n') goto yy249;
+		goto yy40;
+yy152:
+		YYDEBUG(152, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'O') goto yy303;
-		if (yych == 'o') goto yy303;
-		goto yy47;
-yy184:
-		YYDEBUG(184, *YYCURSOR);
+		if (yych == 'O') goto yy250;
+		if (yych == 'o') goto yy250;
+		goto yy40;
+yy153:
+		YYDEBUG(153, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'T') goto yy304;
-		if (yych == 't') goto yy304;
-		goto yy47;
-yy185:
-		YYDEBUG(185, *YYCURSOR);
+		if (yych == 'T') goto yy251;
+		if (yych == 't') goto yy251;
+		goto yy40;
+yy154:
+		YYDEBUG(154, *YYCURSOR);
 		yyaccept = 11;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm256+yych & 128) {
-			goto yy46;
+			goto yy39;
 		}
-		if (yych == '\\') goto yy162;
-yy186:
-		YYDEBUG(186, *YYCURSOR);
+		if (yych == '\\') goto yy131;
+yy155:
+		YYDEBUG(155, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_IDENT(T_IF);
 }
-yy187:
-		YYDEBUG(187, *YYCURSOR);
+yy156:
+		YYDEBUG(156, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'P') goto yy305;
-		if (yych == 'p') goto yy305;
-		goto yy47;
-yy188:
-		YYDEBUG(188, *YYCURSOR);
+		if (yych == 'P') goto yy252;
+		if (yych == 'p') goto yy252;
+		goto yy40;
+yy157:
+		YYDEBUG(157, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yych <= 'T') {
 			if (yych <= 'C') {
-				if (yych <= 'B') goto yy47;
-				goto yy306;
+				if (yych <= 'B') goto yy40;
+				goto yy253;
 			} else {
-				if (yych <= 'R') goto yy47;
-				if (yych <= 'S') goto yy307;
-				goto yy308;
+				if (yych <= 'R') goto yy40;
+				if (yych <= 'S') goto yy254;
+				goto yy255;
 			}
 		} else {
 			if (yych <= 'r') {
-				if (yych == 'c') goto yy306;
-				goto yy47;
+				if (yych == 'c') goto yy253;
+				goto yy40;
 			} else {
-				if (yych <= 's') goto yy307;
-				if (yych <= 't') goto yy308;
-				goto yy47;
+				if (yych <= 's') goto yy254;
+				if (yych <= 't') goto yy255;
+				goto yy40;
 			}
 		}
-yy189:
-		YYDEBUG(189, *YYCURSOR);
+yy158:
+		YYDEBUG(158, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'S') goto yy309;
-		if (yych == 's') goto yy309;
-		goto yy47;
-yy190:
-		YYDEBUG(190, *YYCURSOR);
+		if (yych == 'S') goto yy256;
+		if (yych == 's') goto yy256;
+		goto yy40;
+yy159:
+		YYDEBUG(159, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'S') goto yy310;
-		if (yych == 's') goto yy310;
-		goto yy47;
-yy191:
-		YYDEBUG(191, *YYCURSOR);
+		if (yych == 'S') goto yy257;
+		if (yych == 's') goto yy257;
+		goto yy40;
+yy160:
+		YYDEBUG(160, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'T') goto yy311;
-		if (yych == 't') goto yy311;
-		goto yy47;
-yy192:
-		YYDEBUG(192, *YYCURSOR);
+		if (yych == 'T') goto yy258;
+		if (yych == 't') goto yy258;
+		goto yy40;
+yy161:
+		YYDEBUG(161, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'M') goto yy312;
-		if (yych == 'm') goto yy312;
-		goto yy47;
-yy193:
-		YYDEBUG(193, *YYCURSOR);
+		if (yych == 'M') goto yy259;
+		if (yych == 'm') goto yy259;
+		goto yy40;
+yy162:
+		YYDEBUG(162, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'W') goto yy313;
-		if (yych == 'w') goto yy313;
-		goto yy47;
-yy194:
-		YYDEBUG(194, *YYCURSOR);
+		if (yych == 'W') goto yy260;
+		if (yych == 'w') goto yy260;
+		goto yy40;
+yy163:
+		YYDEBUG(163, *YYCURSOR);
 		yyaccept = 12;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm256+yych & 128) {
-			goto yy46;
+			goto yy39;
 		}
-		if (yych == '\\') goto yy162;
-yy195:
-		YYDEBUG(195, *YYCURSOR);
+		if (yych == '\\') goto yy131;
+yy164:
+		YYDEBUG(164, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_IDENT(T_LOGICAL_OR);
 }
-yy196:
-		YYDEBUG(196, *YYCURSOR);
+yy165:
+		YYDEBUG(165, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yych <= 'O') {
-			if (yych == 'I') goto yy315;
-			if (yych <= 'N') goto yy47;
-			goto yy316;
+			if (yych == 'I') goto yy262;
+			if (yych <= 'N') goto yy40;
+			goto yy263;
 		} else {
 			if (yych <= 'i') {
-				if (yych <= 'h') goto yy47;
-				goto yy315;
+				if (yych <= 'h') goto yy40;
+				goto yy262;
 			} else {
-				if (yych == 'o') goto yy316;
-				goto yy47;
+				if (yych == 'o') goto yy263;
+				goto yy40;
 			}
 		}
-yy197:
-		YYDEBUG(197, *YYCURSOR);
+yy166:
+		YYDEBUG(166, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'B') goto yy317;
-		if (yych == 'b') goto yy317;
-		goto yy47;
-yy198:
-		YYDEBUG(198, *YYCURSOR);
+		if (yych == 'B') goto yy264;
+		if (yych == 'b') goto yy264;
+		goto yy40;
+yy167:
+		YYDEBUG(167, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yych <= 'T') {
 			if (yych <= 'P') {
-				if (yych == 'A') goto yy318;
-				goto yy47;
+				if (yych == 'A') goto yy265;
+				goto yy40;
 			} else {
-				if (yych <= 'Q') goto yy319;
-				if (yych <= 'S') goto yy47;
-				goto yy320;
+				if (yych <= 'Q') goto yy266;
+				if (yych <= 'S') goto yy40;
+				goto yy267;
 			}
 		} else {
 			if (yych <= 'p') {
-				if (yych == 'a') goto yy318;
-				goto yy47;
+				if (yych == 'a') goto yy265;
+				goto yy40;
 			} else {
-				if (yych <= 'q') goto yy319;
-				if (yych == 't') goto yy320;
-				goto yy47;
+				if (yych <= 'q') goto yy266;
+				if (yych == 't') goto yy267;
+				goto yy40;
 			}
 		}
-yy199:
-		YYDEBUG(199, *YYCURSOR);
+yy168:
+		YYDEBUG(168, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'A') goto yy321;
-		if (yych == 'a') goto yy321;
-		goto yy47;
-yy200:
-		YYDEBUG(200, *YYCURSOR);
+		if (yych == 'A') goto yy268;
+		if (yych == 'a') goto yy268;
+		goto yy40;
+yy169:
+		YYDEBUG(169, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'I') goto yy322;
-		if (yych == 'i') goto yy322;
-		goto yy47;
-yy201:
-		YYDEBUG(201, *YYCURSOR);
+		if (yych == 'I') goto yy269;
+		if (yych == 'i') goto yy269;
+		goto yy40;
+yy170:
+		YYDEBUG(170, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'R') goto yy323;
-		if (yych == 'r') goto yy323;
-		goto yy47;
-yy202:
-		YYDEBUG(202, *YYCURSOR);
+		if (yych == 'R') goto yy270;
+		if (yych == 'r') goto yy270;
+		goto yy40;
+yy171:
+		YYDEBUG(171, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yych <= 'Y') {
-			if (yych == 'A') goto yy324;
-			if (yych <= 'X') goto yy47;
-			goto yy325;
+			if (yych == 'A') goto yy271;
+			if (yych <= 'X') goto yy40;
+			goto yy272;
 		} else {
 			if (yych <= 'a') {
-				if (yych <= '`') goto yy47;
-				goto yy324;
+				if (yych <= '`') goto yy40;
+				goto yy271;
 			} else {
-				if (yych == 'y') goto yy325;
-				goto yy47;
+				if (yych == 'y') goto yy272;
+				goto yy40;
 			}
 		}
-yy203:
-		YYDEBUG(203, *YYCURSOR);
+yy172:
+		YYDEBUG(172, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'S') goto yy327;
-		if (yych == 's') goto yy327;
-		goto yy47;
-yy204:
-		YYDEBUG(204, *YYCURSOR);
+		if (yych == 'S') goto yy274;
+		if (yych == 's') goto yy274;
+		goto yy40;
+yy173:
+		YYDEBUG(173, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'E') goto yy328;
-		if (yych == 'e') goto yy328;
-		goto yy47;
-yy205:
-		YYDEBUG(205, *YYCURSOR);
+		if (yych == 'E') goto yy275;
+		if (yych == 'e') goto yy275;
+		goto yy40;
+yy174:
+		YYDEBUG(174, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'R') goto yy330;
-		if (yych == 'r') goto yy330;
-		goto yy47;
-yy206:
-		YYDEBUG(206, *YYCURSOR);
+		if (yych == 'R') goto yy277;
+		if (yych == 'r') goto yy277;
+		goto yy40;
+yy175:
+		YYDEBUG(175, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'I') goto yy332;
-		if (yych == 'i') goto yy332;
-		goto yy47;
-yy207:
-		YYDEBUG(207, *YYCURSOR);
+		if (yych == 'I') goto yy279;
+		if (yych == 'i') goto yy279;
+		goto yy40;
+yy176:
+		YYDEBUG(176, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'R') goto yy333;
-		if (yych == 'r') goto yy333;
-		goto yy47;
-yy208:
-		YYDEBUG(208, *YYCURSOR);
+		if (yych == 'R') goto yy280;
+		if (yych == 'r') goto yy280;
+		goto yy40;
+yy177:
+		YYDEBUG(177, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'E') goto yy335;
-		if (yych == 'e') goto yy335;
-		goto yy47;
-yy209:
-		YYDEBUG(209, *YYCURSOR);
+		if (yych == 'E') goto yy282;
+		if (yych == 'e') goto yy282;
+		goto yy40;
+yy178:
+		YYDEBUG(178, *YYCURSOR);
 		yyaccept = 13;
 		YYMARKER = ++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(210, *YYCURSOR);
 		if (yych <= '\\') {
 			if (yych <= '@') {
-				if (yych <= '/') goto yy211;
-				if (yych <= '9') goto yy209;
+				if (yych <= '/') goto yy179;
+				if (yych <= '9') goto yy178;
 			} else {
-				if (yych <= 'Z') goto yy209;
-				if (yych >= '\\') goto yy336;
+				if (yych <= 'Z') goto yy178;
+				if (yych >= '\\') goto yy283;
 			}
 		} else {
 			if (yych <= '`') {
-				if (yych == '_') goto yy209;
+				if (yych == '_') goto yy178;
 			} else {
-				if (yych <= 'z') goto yy209;
-				if (yych >= 0x80) goto yy209;
+				if (yych <= 'z') goto yy178;
+				if (yych >= 0x80) goto yy178;
 			}
 		}
-yy211:
-		YYDEBUG(211, *YYCURSOR);
+yy179:
+		YYDEBUG(179, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_STR(T_NAME_FULLY_QUALIFIED, 1);
 }
-yy212:
-		YYDEBUG(212, *YYCURSOR);
+yy180:
+		YYDEBUG(180, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(213, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN(T_XOR_EQUAL);
 }
-yy214:
-		YYDEBUG(214, *YYCURSOR);
+yy181:
+		YYDEBUG(181, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
 		switch (yych) {
-		case 'C':
-		case 'c':	goto yy337;
-		case 'D':
-		case 'd':	goto yy338;
-		case 'F':
-		case 'f':	goto yy339;
-		case 'H':
-		case 'h':	goto yy340;
-		case 'L':
-		case 'l':	goto yy341;
-		case 'M':
-		case 'm':	goto yy342;
-		case 'N':
-		case 'n':	goto yy343;
-		case 'T':
-		case 't':	goto yy344;
-		default:	goto yy47;
+			case 'C':
+			case 'c': goto yy284;
+			case 'D':
+			case 'd': goto yy285;
+			case 'F':
+			case 'f': goto yy286;
+			case 'H':
+			case 'h': goto yy287;
+			case 'L':
+			case 'l': goto yy288;
+			case 'M':
+			case 'm': goto yy289;
+			case 'N':
+			case 'n': goto yy290;
+			case 'T':
+			case 't': goto yy291;
+			default: goto yy40;
 		}
-yy215:
-		YYDEBUG(215, *YYCURSOR);
+yy182:
+		YYDEBUG(182, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(216, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN(T_OR_EQUAL);
 }
-yy217:
-		YYDEBUG(217, *YYCURSOR);
+yy183:
+		YYDEBUG(183, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(218, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN(T_BOOLEAN_OR);
 }
-yy219:
-		YYDEBUG(219, *YYCURSOR);
+yy184:
+		YYDEBUG(184, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(220, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN(T_IS_NOT_IDENTICAL);
 }
-yy221:
-		YYDEBUG(221, *YYCURSOR);
+yy185:
+		YYDEBUG(185, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(222, *YYCURSOR);
 		if (yybm0+yych & 2) {
-			goto yy221;
+			goto yy185;
 		}
-		if (yych <= 0x00) goto yy85;
-		goto yy83;
-yy223:
-		YYDEBUG(223, *YYCURSOR);
+		if (yych <= 0x00) goto yy72;
+		goto yy70;
+yy186:
+		YYDEBUG(186, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(224, *YYCURSOR);
 		if (yych <= 0x1F) {
 			if (yych <= '\t') {
-				if (yych <= 0x00) goto yy85;
-				if (yych <= 0x08) goto yy221;
-				goto yy223;
-			} else {
-				if (yych <= '\n') goto yy83;
-				if (yych == '\r') goto yy83;
-				goto yy221;
+				if (yych <= 0x00) goto yy72;
+				if (yych <= 0x08) goto yy185;
+				goto yy186;
+			} else {
+				if (yych <= '\n') goto yy70;
+				if (yych == '\r') goto yy70;
+				goto yy185;
 			}
 		} else {
 			if (yych <= '$') {
-				if (yych <= ' ') goto yy223;
-				if (yych <= '"') goto yy221;
-				if (yych <= '#') goto yy345;
-				goto yy346;
-			} else {
-				if (yych <= '-') goto yy221;
-				if (yych <= '.') goto yy347;
-				if (yych <= '/') goto yy348;
-				goto yy221;
+				if (yych <= ' ') goto yy186;
+				if (yych <= '"') goto yy185;
+				if (yych <= '#') goto yy292;
+				goto yy293;
+			} else {
+				if (yych <= '-') goto yy185;
+				if (yych <= '.') goto yy294;
+				if (yych <= '/') goto yy295;
+				goto yy185;
 			}
 		}
-yy225:
-		YYDEBUG(225, *YYCURSOR);
+yy187:
+		YYDEBUG(187, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == '.') goto yy87;
-		goto yy85;
-yy226:
-		YYDEBUG(226, *YYCURSOR);
+		if (yych == '.') goto yy74;
+		goto yy72;
+yy188:
+		YYDEBUG(188, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(227, *YYCURSOR);
 		if (yybm0+yych & 4) {
-			goto yy226;
+			goto yy188;
 		}
-		if (yych <= 0x00) goto yy85;
-		goto yy349;
-yy228:
-		YYDEBUG(228, *YYCURSOR);
+		if (yych <= 0x00) goto yy72;
+		goto yy296;
+yy189:
+		YYDEBUG(189, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'R') goto yy351;
-		if (yych == 'r') goto yy351;
-		goto yy85;
-yy229:
-		YYDEBUG(229, *YYCURSOR);
+		if (yych == 'R') goto yy297;
+		if (yych == 'r') goto yy297;
+		goto yy72;
+yy190:
+		YYDEBUG(190, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'N') goto yy352;
-		if (yych == 'n') goto yy352;
-		goto yy85;
-yy230:
-		YYDEBUG(230, *YYCURSOR);
+		if (yych == 'N') goto yy298;
+		if (yych == 'n') goto yy298;
+		goto yy72;
+yy191:
+		YYDEBUG(191, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'O') goto yy353;
-		if (yych == 'o') goto yy353;
-		goto yy85;
-yy231:
-		YYDEBUG(231, *YYCURSOR);
+		if (yych == 'O') goto yy299;
+		if (yych == 'o') goto yy299;
+		goto yy72;
+yy192:
+		YYDEBUG(192, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'U') goto yy354;
-		if (yych == 'u') goto yy354;
-		goto yy85;
-yy232:
-		YYDEBUG(232, *YYCURSOR);
+		if (yych == 'U') goto yy300;
+		if (yych == 'u') goto yy300;
+		goto yy72;
+yy193:
+		YYDEBUG(193, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'O') goto yy355;
-		if (yych == 'o') goto yy355;
-		goto yy85;
-yy233:
-		YYDEBUG(233, *YYCURSOR);
+		if (yych == 'O') goto yy301;
+		if (yych == 'o') goto yy301;
+		goto yy72;
+yy194:
+		YYDEBUG(194, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'T') goto yy356;
-		if (yych == 't') goto yy356;
-		goto yy85;
-yy234:
-		YYDEBUG(234, *YYCURSOR);
+		if (yych == 'T') goto yy302;
+		if (yych == 't') goto yy302;
+		goto yy72;
+yy195:
+		YYDEBUG(195, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'J') goto yy357;
-		if (yych == 'j') goto yy357;
-		goto yy85;
-yy235:
-		YYDEBUG(235, *YYCURSOR);
+		if (yych == 'J') goto yy303;
+		if (yych == 'j') goto yy303;
+		goto yy72;
+yy196:
+		YYDEBUG(196, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'A') goto yy358;
-		if (yych == 'a') goto yy358;
-		goto yy85;
-yy236:
-		YYDEBUG(236, *YYCURSOR);
+		if (yych == 'A') goto yy304;
+		if (yych == 'a') goto yy304;
+		goto yy72;
+yy197:
+		YYDEBUG(197, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'R') goto yy359;
-		if (yych == 'r') goto yy359;
-		goto yy85;
-yy237:
-		YYDEBUG(237, *YYCURSOR);
+		if (yych == 'R') goto yy305;
+		if (yych == 'r') goto yy305;
+		goto yy72;
+yy198:
+		YYDEBUG(198, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'S') goto yy360;
-		if (yych == 's') goto yy360;
-		goto yy85;
-yy238:
-		YYDEBUG(238, *YYCURSOR);
+		if (yych == 'S') goto yy306;
+		if (yych == 's') goto yy306;
+		goto yy72;
+yy199:
+		YYDEBUG(199, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(239, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN(T_POW_EQUAL);
 }
-yy240:
-		YYDEBUG(240, *YYCURSOR);
+yy200:
+		YYDEBUG(200, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(241, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN(T_ELLIPSIS);
 }
-yy242:
-		YYDEBUG(242, *YYCURSOR);
+yy201:
+		YYDEBUG(201, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		if (yych <= '/') goto yy85;
-		if (yych <= '9') goto yy121;
-		goto yy85;
-yy243:
-		YYDEBUG(243, *YYCURSOR);
+		if (yych <= '/') goto yy72;
+		if (yych <= '9') goto yy99;
+		goto yy72;
+yy202:
+		YYDEBUG(202, *YYCURSOR);
 		yych = *++YYCURSOR;
 		if (yych <= '\f') {
-			if (yych <= 0x08) goto yy85;
-			if (yych <= '\n') goto yy361;
-			goto yy85;
-		} else {
-			if (yych <= '\r') goto yy361;
-			if (yych == ' ') goto yy361;
-			goto yy85;
+			if (yych <= 0x08) goto yy72;
+			if (yych <= '\n') goto yy307;
+			goto yy72;
+		} else {
+			if (yych <= '\r') goto yy307;
+			if (yych == ' ') goto yy307;
+			goto yy72;
 		}
-yy244:
-		YYDEBUG(244, *YYCURSOR);
+yy203:
+		YYDEBUG(203, *YYCURSOR);
 		yyaccept = 14;
 		YYMARKER = ++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(245, *YYCURSOR);
 		if (yybm0+yych & 8) {
-			goto yy244;
+			goto yy203;
 		}
-		if (yych == '_') goto yy132;
-yy246:
-		YYDEBUG(246, *YYCURSOR);
+		if (yych == '_') goto yy108;
+yy204:
+		YYDEBUG(204, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	/* The +/- 2 skips "0b" */
@@ -4233,37 +4192,35 @@
 		RETURN_TOKEN_WITH_VAL(T_DNUMBER);
 	}
 }
-yy247:
-		YYDEBUG(247, *YYCURSOR);
+yy205:
+		YYDEBUG(205, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		if (yych <= '/') goto yy85;
-		if (yych >= ':') goto yy85;
-yy248:
-		YYDEBUG(248, *YYCURSOR);
+		if (yych <= '/') goto yy72;
+		if (yych >= ':') goto yy72;
+yy206:
+		YYDEBUG(206, *YYCURSOR);
 		yyaccept = 5;
 		YYMARKER = ++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(249, *YYCURSOR);
-		if (yych <= '/') goto yy123;
-		if (yych <= '9') goto yy248;
-		if (yych == '_') goto yy247;
-		goto yy123;
-yy250:
-		YYDEBUG(250, *YYCURSOR);
+		if (yych <= '/') goto yy101;
+		if (yych <= '9') goto yy206;
+		if (yych == '_') goto yy205;
+		goto yy101;
+yy207:
+		YYDEBUG(207, *YYCURSOR);
 		yyaccept = 15;
 		YYMARKER = ++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(251, *YYCURSOR);
 		if (yybm0+yych & 16) {
-			goto yy250;
+			goto yy207;
 		}
-		if (yych == '_') goto yy134;
-yy252:
-		YYDEBUG(252, *YYCURSOR);
+		if (yych == '_') goto yy110;
+yy208:
+		YYDEBUG(208, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	/* The +/- 2 skips "0o" */
@@ -4314,19 +4271,18 @@
 	}
 	RETURN_TOKEN_WITH_VAL(T_DNUMBER);
 }
-yy253:
-		YYDEBUG(253, *YYCURSOR);
+yy209:
+		YYDEBUG(209, *YYCURSOR);
 		yyaccept = 16;
 		YYMARKER = ++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(254, *YYCURSOR);
 		if (yybm0+yych & 32) {
-			goto yy253;
+			goto yy209;
 		}
-		if (yych == '_') goto yy135;
-yy255:
-		YYDEBUG(255, *YYCURSOR);
+		if (yych == '_') goto yy111;
+yy210:
+		YYDEBUG(210, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	/* The +/- 2 skips "0x" */
@@ -4369,1532 +4325,1517 @@
 		RETURN_TOKEN_WITH_VAL(T_DNUMBER);
 	}
 }
-yy256:
-		YYDEBUG(256, *YYCURSOR);
+yy211:
+		YYDEBUG(211, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(2);
 		yych = *YYCURSOR;
-		YYDEBUG(257, *YYCURSOR);
 		if (yych <= '\'') {
 			if (yych <= ' ') {
-				if (yych == '\t') goto yy256;
-				if (yych <= 0x1F) goto yy85;
-				goto yy256;
-			} else {
-				if (yych == '"') goto yy363;
-				if (yych <= '&') goto yy85;
-				goto yy364;
+				if (yych == '\t') goto yy211;
+				if (yych <= 0x1F) goto yy72;
+				goto yy211;
+			} else {
+				if (yych == '"') goto yy308;
+				if (yych <= '&') goto yy72;
+				goto yy309;
 			}
 		} else {
 			if (yych <= '_') {
-				if (yych <= '@') goto yy85;
-				if (yych <= 'Z') goto yy365;
-				if (yych <= '^') goto yy85;
-				goto yy365;
-			} else {
-				if (yych <= '`') goto yy85;
-				if (yych <= 'z') goto yy365;
-				if (yych <= 0x7F) goto yy85;
-				goto yy365;
+				if (yych <= '@') goto yy72;
+				if (yych <= 'Z') goto yy310;
+				if (yych <= '^') goto yy72;
+				goto yy310;
+			} else {
+				if (yych <= '`') goto yy72;
+				if (yych <= 'z') goto yy310;
+				if (yych <= 0x7F) goto yy72;
+				goto yy310;
 			}
 		}
-yy258:
-		YYDEBUG(258, *YYCURSOR);
+yy212:
+		YYDEBUG(212, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(259, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN(T_SL_EQUAL);
 }
-yy260:
-		YYDEBUG(260, *YYCURSOR);
+yy213:
+		YYDEBUG(213, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(261, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN(T_SPACESHIP);
 }
-yy262:
-		YYDEBUG(262, *YYCURSOR);
+yy214:
+		YYDEBUG(214, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(263, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN(T_IS_IDENTICAL);
 }
-yy264:
-		YYDEBUG(264, *YYCURSOR);
+yy215:
+		YYDEBUG(215, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(265, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN(T_SR_EQUAL);
 }
-yy266:
-		YYDEBUG(266, *YYCURSOR);
+yy216:
+		YYDEBUG(216, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(267, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	yy_push_state(ST_LOOKING_FOR_PROPERTY);
 	RETURN_TOKEN(T_NULLSAFE_OBJECT_OPERATOR);
 }
-yy268:
-		YYDEBUG(268, *YYCURSOR);
+yy217:
+		YYDEBUG(217, *YYCURSOR);
 		++YYCURSOR;
-		goto yy154;
-yy269:
-		YYDEBUG(269, *YYCURSOR);
+		goto yy124;
+yy218:
+		YYDEBUG(218, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == '\n') goto yy268;
-		goto yy154;
-yy270:
-		YYDEBUG(270, *YYCURSOR);
+		if (yych == '\n') goto yy217;
+		goto yy124;
+yy219:
+		YYDEBUG(219, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(271, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN(T_COALESCE_EQUAL);
 }
-yy272:
-		YYDEBUG(272, *YYCURSOR);
+yy220:
+		YYDEBUG(220, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'T') goto yy367;
-		if (yych == 't') goto yy367;
-		goto yy47;
-yy273:
-		YYDEBUG(273, *YYCURSOR);
+		if (yych == 'T') goto yy311;
+		if (yych == 't') goto yy311;
+		goto yy40;
+yy221:
+		YYDEBUG(221, *YYCURSOR);
 		yyaccept = 17;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm256+yych & 128) {
-			goto yy46;
+			goto yy39;
 		}
-		if (yych == '\\') goto yy162;
-yy274:
-		YYDEBUG(274, *YYCURSOR);
+		if (yych == '\\') goto yy131;
+yy222:
+		YYDEBUG(222, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_IDENT(T_LOGICAL_AND);
 }
-yy275:
-		YYDEBUG(275, *YYCURSOR);
+yy223:
+		YYDEBUG(223, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'A') goto yy368;
-		if (yych == 'a') goto yy368;
-		goto yy47;
-yy276:
-		YYDEBUG(276, *YYCURSOR);
+		if (yych == 'A') goto yy312;
+		if (yych == 'a') goto yy312;
+		goto yy40;
+yy224:
+		YYDEBUG(224, *YYCURSOR);
 		yyaccept = 18;
 		YYMARKER = ++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(277, *YYCURSOR);
 		if (yych <= '\\') {
 			if (yych <= '@') {
-				if (yych <= '/') goto yy278;
-				if (yych <= '9') goto yy276;
+				if (yych <= '/') goto yy225;
+				if (yych <= '9') goto yy224;
 			} else {
-				if (yych <= 'Z') goto yy276;
-				if (yych >= '\\') goto yy162;
+				if (yych <= 'Z') goto yy224;
+				if (yych >= '\\') goto yy131;
 			}
 		} else {
 			if (yych <= '`') {
-				if (yych == '_') goto yy276;
+				if (yych == '_') goto yy224;
 			} else {
-				if (yych <= 'z') goto yy276;
-				if (yych >= 0x80) goto yy276;
+				if (yych <= 'z') goto yy224;
+				if (yych >= 0x80) goto yy224;
 			}
 		}
-yy278:
-		YYDEBUG(278, *YYCURSOR);
+yy225:
+		YYDEBUG(225, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_STR(T_NAME_QUALIFIED, 0);
 }
-yy279:
-		YYDEBUG(279, *YYCURSOR);
+yy226:
+		YYDEBUG(226, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == '<') goto yy256;
-		goto yy85;
-yy280:
-		YYDEBUG(280, *YYCURSOR);
+		if (yych == '<') goto yy211;
+		goto yy72;
+yy227:
+		YYDEBUG(227, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'A') goto yy369;
-		if (yych == 'a') goto yy369;
-		goto yy47;
-yy281:
-		YYDEBUG(281, *YYCURSOR);
+		if (yych == 'A') goto yy313;
+		if (yych == 'a') goto yy313;
+		goto yy40;
+yy228:
+		YYDEBUG(228, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'L') goto yy370;
-		if (yych == 'l') goto yy370;
-		goto yy47;
-yy282:
-		YYDEBUG(282, *YYCURSOR);
+		if (yych == 'L') goto yy314;
+		if (yych == 'l') goto yy314;
+		goto yy40;
+yy229:
+		YYDEBUG(229, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'E') goto yy371;
-		if (yych == 'e') goto yy371;
-		goto yy47;
-yy283:
-		YYDEBUG(283, *YYCURSOR);
+		if (yych == 'E') goto yy315;
+		if (yych == 'e') goto yy315;
+		goto yy40;
+yy230:
+		YYDEBUG(230, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'C') goto yy373;
-		if (yych == 'c') goto yy373;
-		goto yy47;
-yy284:
-		YYDEBUG(284, *YYCURSOR);
+		if (yych == 'C') goto yy317;
+		if (yych == 'c') goto yy317;
+		goto yy40;
+yy231:
+		YYDEBUG(231, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'S') goto yy374;
-		if (yych == 's') goto yy374;
-		goto yy47;
-yy285:
-		YYDEBUG(285, *YYCURSOR);
+		if (yych == 'S') goto yy318;
+		if (yych == 's') goto yy318;
+		goto yy40;
+yy232:
+		YYDEBUG(232, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'N') goto yy375;
-		if (yych == 'n') goto yy375;
-		goto yy47;
-yy286:
-		YYDEBUG(286, *YYCURSOR);
+		if (yych == 'N') goto yy319;
+		if (yych == 'n') goto yy319;
+		goto yy40;
+yy233:
+		YYDEBUG(233, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yych <= 'T') {
-			if (yych <= 'R') goto yy47;
-			if (yych <= 'S') goto yy376;
-			goto yy377;
-		} else {
-			if (yych <= 'r') goto yy47;
-			if (yych <= 's') goto yy376;
-			if (yych <= 't') goto yy377;
-			goto yy47;
+			if (yych <= 'R') goto yy40;
+			if (yych <= 'S') goto yy320;
+			goto yy321;
+		} else {
+			if (yych <= 'r') goto yy40;
+			if (yych <= 's') goto yy320;
+			if (yych <= 't') goto yy321;
+			goto yy40;
 		}
-yy287:
-		YYDEBUG(287, *YYCURSOR);
+yy234:
+		YYDEBUG(234, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'L') goto yy378;
-		if (yych == 'l') goto yy378;
-		goto yy47;
-yy288:
-		YYDEBUG(288, *YYCURSOR);
+		if (yych == 'L') goto yy322;
+		if (yych == 'l') goto yy322;
+		goto yy40;
+yy235:
+		YYDEBUG(235, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'A') goto yy379;
-		if (yych == 'a') goto yy379;
-		goto yy47;
-yy289:
-		YYDEBUG(289, *YYCURSOR);
+		if (yych == 'A') goto yy323;
+		if (yych == 'a') goto yy323;
+		goto yy40;
+yy236:
+		YYDEBUG(236, *YYCURSOR);
 		yyaccept = 19;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm256+yych & 128) {
-			goto yy46;
+			goto yy39;
 		}
-		if (yych == '\\') goto yy162;
-yy290:
-		YYDEBUG(290, *YYCURSOR);
+		if (yych == '\\') goto yy131;
+yy237:
+		YYDEBUG(237, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_IDENT(T_EXIT);
 }
-yy291:
-		YYDEBUG(291, *YYCURSOR);
+yy238:
+		YYDEBUG(238, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'O') goto yy380;
-		if (yych == 'o') goto yy380;
-		goto yy47;
-yy292:
-		YYDEBUG(292, *YYCURSOR);
+		if (yych == 'O') goto yy324;
+		if (yych == 'o') goto yy324;
+		goto yy40;
+yy239:
+		YYDEBUG(239, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'E') goto yy382;
-		if (yych == 'e') goto yy382;
-		goto yy47;
-yy293:
-		YYDEBUG(293, *YYCURSOR);
+		if (yych == 'E') goto yy326;
+		if (yych == 'e') goto yy326;
+		goto yy40;
+yy240:
+		YYDEBUG(240, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'T') goto yy384;
-		if (yych == 't') goto yy384;
-		goto yy47;
-yy294:
-		YYDEBUG(294, *YYCURSOR);
+		if (yych == 'T') goto yy328;
+		if (yych == 't') goto yy328;
+		goto yy40;
+yy241:
+		YYDEBUG(241, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
 		switch (yych) {
-		case 'D':
-		case 'd':	goto yy385;
-		case 'F':
-		case 'f':	goto yy386;
-		case 'I':
-		case 'i':	goto yy387;
-		case 'S':
-		case 's':	goto yy388;
-		case 'W':
-		case 'w':	goto yy389;
-		default:	goto yy47;
+			case 'D':
+			case 'd': goto yy329;
+			case 'F':
+			case 'f': goto yy330;
+			case 'I':
+			case 'i': goto yy331;
+			case 'S':
+			case 's': goto yy332;
+			case 'W':
+			case 'w': goto yy333;
+			default: goto yy40;
 		}
-yy295:
-		YYDEBUG(295, *YYCURSOR);
+yy242:
+		YYDEBUG(242, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'M') goto yy390;
-		if (yych == 'm') goto yy390;
-		goto yy47;
-yy296:
-		YYDEBUG(296, *YYCURSOR);
+		if (yych == 'M') goto yy334;
+		if (yych == 'm') goto yy334;
+		goto yy40;
+yy243:
+		YYDEBUG(243, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'L') goto yy391;
-		if (yych == 'l') goto yy391;
-		goto yy47;
-yy297:
-		YYDEBUG(297, *YYCURSOR);
+		if (yych == 'L') goto yy335;
+		if (yych == 'l') goto yy335;
+		goto yy40;
+yy244:
+		YYDEBUG(244, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'T') goto yy393;
-		if (yych == 't') goto yy393;
-		goto yy47;
-yy298:
-		YYDEBUG(298, *YYCURSOR);
+		if (yych == 'T') goto yy337;
+		if (yych == 't') goto yy337;
+		goto yy40;
+yy245:
+		YYDEBUG(245, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'E') goto yy395;
-		if (yych == 'e') goto yy395;
-		goto yy47;
-yy299:
-		YYDEBUG(299, *YYCURSOR);
+		if (yych == 'E') goto yy339;
+		if (yych == 'e') goto yy339;
+		goto yy40;
+yy246:
+		YYDEBUG(246, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'A') goto yy396;
-		if (yych == 'a') goto yy396;
-		goto yy47;
-yy300:
-		YYDEBUG(300, *YYCURSOR);
+		if (yych == 'A') goto yy340;
+		if (yych == 'a') goto yy340;
+		goto yy40;
+yy247:
+		YYDEBUG(247, *YYCURSOR);
 		yyaccept = 20;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yych <= '\\') {
 			if (yych <= 'D') {
-				if (yych <= '/') goto yy301;
-				if (yych <= '9') goto yy46;
-				if (yych >= 'A') goto yy46;
-			} else {
-				if (yych <= 'E') goto yy397;
-				if (yych <= 'Z') goto yy46;
-				if (yych >= '\\') goto yy162;
+				if (yych <= '/') goto yy248;
+				if (yych <= '9') goto yy39;
+				if (yych >= 'A') goto yy39;
+			} else {
+				if (yych <= 'E') goto yy341;
+				if (yych <= 'Z') goto yy39;
+				if (yych >= '\\') goto yy131;
 			}
 		} else {
 			if (yych <= 'd') {
-				if (yych == '_') goto yy46;
-				if (yych >= 'a') goto yy46;
+				if (yych == '_') goto yy39;
+				if (yych >= 'a') goto yy39;
 			} else {
-				if (yych <= 'e') goto yy397;
-				if (yych <= 'z') goto yy46;
-				if (yych >= 0x80) goto yy46;
+				if (yych <= 'e') goto yy341;
+				if (yych <= 'z') goto yy39;
+				if (yych >= 0x80) goto yy39;
 			}
 		}
-yy301:
-		YYDEBUG(301, *YYCURSOR);
+yy248:
+		YYDEBUG(248, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_IDENT(T_FOR);
 }
-yy302:
-		YYDEBUG(302, *YYCURSOR);
+yy249:
+		YYDEBUG(249, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'C') goto yy398;
-		if (yych == 'c') goto yy398;
-		goto yy47;
-yy303:
-		YYDEBUG(303, *YYCURSOR);
+		if (yych == 'C') goto yy342;
+		if (yych == 'c') goto yy342;
+		goto yy40;
+yy250:
+		YYDEBUG(250, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'B') goto yy399;
-		if (yych == 'b') goto yy399;
-		goto yy47;
-yy304:
-		YYDEBUG(304, *YYCURSOR);
+		if (yych == 'B') goto yy343;
+		if (yych == 'b') goto yy343;
+		goto yy40;
+yy251:
+		YYDEBUG(251, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'O') goto yy400;
-		if (yych == 'o') goto yy400;
-		goto yy47;
-yy305:
-		YYDEBUG(305, *YYCURSOR);
+		if (yych == 'O') goto yy344;
+		if (yych == 'o') goto yy344;
+		goto yy40;
+yy252:
+		YYDEBUG(252, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'L') goto yy402;
-		if (yych == 'l') goto yy402;
-		goto yy47;
-yy306:
-		YYDEBUG(306, *YYCURSOR);
+		if (yych == 'L') goto yy346;
+		if (yych == 'l') goto yy346;
+		goto yy40;
+yy253:
+		YYDEBUG(253, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'L') goto yy403;
-		if (yych == 'l') goto yy403;
-		goto yy47;
-yy307:
-		YYDEBUG(307, *YYCURSOR);
+		if (yych == 'L') goto yy347;
+		if (yych == 'l') goto yy347;
+		goto yy40;
+yy254:
+		YYDEBUG(254, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'T') goto yy404;
-		if (yych == 't') goto yy404;
-		goto yy47;
-yy308:
-		YYDEBUG(308, *YYCURSOR);
+		if (yych == 'T') goto yy348;
+		if (yych == 't') goto yy348;
+		goto yy40;
+yy255:
+		YYDEBUG(255, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'E') goto yy405;
-		if (yych == 'e') goto yy405;
-		goto yy47;
-yy309:
-		YYDEBUG(309, *YYCURSOR);
+		if (yych == 'E') goto yy349;
+		if (yych == 'e') goto yy349;
+		goto yy40;
+yy256:
+		YYDEBUG(256, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'E') goto yy406;
-		if (yych == 'e') goto yy406;
-		goto yy47;
-yy310:
-		YYDEBUG(310, *YYCURSOR);
+		if (yych == 'E') goto yy350;
+		if (yych == 'e') goto yy350;
+		goto yy40;
+yy257:
+		YYDEBUG(257, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'T') goto yy407;
-		if (yych == 't') goto yy407;
-		goto yy47;
-yy311:
-		YYDEBUG(311, *YYCURSOR);
+		if (yych == 'T') goto yy351;
+		if (yych == 't') goto yy351;
+		goto yy40;
+yy258:
+		YYDEBUG(258, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'C') goto yy409;
-		if (yych == 'c') goto yy409;
-		goto yy47;
-yy312:
-		YYDEBUG(312, *YYCURSOR);
+		if (yych == 'C') goto yy353;
+		if (yych == 'c') goto yy353;
+		goto yy40;
+yy259:
+		YYDEBUG(259, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'E') goto yy410;
-		if (yych == 'e') goto yy410;
-		goto yy47;
-yy313:
-		YYDEBUG(313, *YYCURSOR);
+		if (yych == 'E') goto yy354;
+		if (yych == 'e') goto yy354;
+		goto yy40;
+yy260:
+		YYDEBUG(260, *YYCURSOR);
 		yyaccept = 21;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm256+yych & 128) {
-			goto yy46;
+			goto yy39;
 		}
-		if (yych == '\\') goto yy162;
-yy314:
-		YYDEBUG(314, *YYCURSOR);
+		if (yych == '\\') goto yy131;
+yy261:
+		YYDEBUG(261, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_IDENT(T_NEW);
 }
-yy315:
-		YYDEBUG(315, *YYCURSOR);
+yy262:
+		YYDEBUG(262, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yych <= 'V') {
-			if (yych == 'N') goto yy411;
-			if (yych <= 'U') goto yy47;
-			goto yy412;
+			if (yych == 'N') goto yy355;
+			if (yych <= 'U') goto yy40;
+			goto yy356;
 		} else {
 			if (yych <= 'n') {
-				if (yych <= 'm') goto yy47;
-				goto yy411;
+				if (yych <= 'm') goto yy40;
+				goto yy355;
 			} else {
-				if (yych == 'v') goto yy412;
-				goto yy47;
+				if (yych == 'v') goto yy356;
+				goto yy40;
 			}
 		}
-yy316:
-		YYDEBUG(316, *YYCURSOR);
+yy263:
+		YYDEBUG(263, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'T') goto yy413;
-		if (yych == 't') goto yy413;
-		goto yy47;
-yy317:
-		YYDEBUG(317, *YYCURSOR);
+		if (yych == 'T') goto yy357;
+		if (yych == 't') goto yy357;
+		goto yy40;
+yy264:
+		YYDEBUG(264, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'L') goto yy414;
-		if (yych == 'l') goto yy414;
-		goto yy47;
-yy318:
-		YYDEBUG(318, *YYCURSOR);
+		if (yych == 'L') goto yy358;
+		if (yych == 'l') goto yy358;
+		goto yy40;
+yy265:
+		YYDEBUG(265, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'D') goto yy415;
-		if (yych == 'd') goto yy415;
-		goto yy47;
-yy319:
-		YYDEBUG(319, *YYCURSOR);
+		if (yych == 'D') goto yy359;
+		if (yych == 'd') goto yy359;
+		goto yy40;
+yy266:
+		YYDEBUG(266, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'U') goto yy416;
-		if (yych == 'u') goto yy416;
-		goto yy47;
-yy320:
-		YYDEBUG(320, *YYCURSOR);
+		if (yych == 'U') goto yy360;
+		if (yych == 'u') goto yy360;
+		goto yy40;
+yy267:
+		YYDEBUG(267, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'U') goto yy417;
-		if (yych == 'u') goto yy417;
-		goto yy47;
-yy321:
-		YYDEBUG(321, *YYCURSOR);
+		if (yych == 'U') goto yy361;
+		if (yych == 'u') goto yy361;
+		goto yy40;
+yy268:
+		YYDEBUG(268, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'T') goto yy418;
-		if (yych == 't') goto yy418;
-		goto yy47;
-yy322:
-		YYDEBUG(322, *YYCURSOR);
+		if (yych == 'T') goto yy362;
+		if (yych == 't') goto yy362;
+		goto yy40;
+yy269:
+		YYDEBUG(269, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'T') goto yy419;
-		if (yych == 't') goto yy419;
-		goto yy47;
-yy323:
-		YYDEBUG(323, *YYCURSOR);
+		if (yych == 'T') goto yy363;
+		if (yych == 't') goto yy363;
+		goto yy40;
+yy270:
+		YYDEBUG(270, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'O') goto yy420;
-		if (yych == 'o') goto yy420;
-		goto yy47;
-yy324:
-		YYDEBUG(324, *YYCURSOR);
+		if (yych == 'O') goto yy364;
+		if (yych == 'o') goto yy364;
+		goto yy40;
+yy271:
+		YYDEBUG(271, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'I') goto yy421;
-		if (yych == 'i') goto yy421;
-		goto yy47;
-yy325:
-		YYDEBUG(325, *YYCURSOR);
+		if (yych == 'I') goto yy365;
+		if (yych == 'i') goto yy365;
+		goto yy40;
+yy272:
+		YYDEBUG(272, *YYCURSOR);
 		yyaccept = 22;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm256+yych & 128) {
-			goto yy46;
+			goto yy39;
 		}
-		if (yych == '\\') goto yy162;
-yy326:
-		YYDEBUG(326, *YYCURSOR);
+		if (yych == '\\') goto yy131;
+yy273:
+		YYDEBUG(273, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_IDENT(T_TRY);
 }
-yy327:
-		YYDEBUG(327, *YYCURSOR);
+yy274:
+		YYDEBUG(274, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'E') goto yy422;
-		if (yych == 'e') goto yy422;
-		goto yy47;
-yy328:
-		YYDEBUG(328, *YYCURSOR);
+		if (yych == 'E') goto yy366;
+		if (yych == 'e') goto yy366;
+		goto yy40;
+yy275:
+		YYDEBUG(275, *YYCURSOR);
 		yyaccept = 23;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm256+yych & 128) {
-			goto yy46;
+			goto yy39;
 		}
-		if (yych == '\\') goto yy162;
-yy329:
-		YYDEBUG(329, *YYCURSOR);
+		if (yych == '\\') goto yy131;
+yy276:
+		YYDEBUG(276, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_IDENT(T_USE);
 }
-yy330:
-		YYDEBUG(330, *YYCURSOR);
+yy277:
+		YYDEBUG(277, *YYCURSOR);
 		yyaccept = 24;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm256+yych & 128) {
-			goto yy46;
+			goto yy39;
 		}
-		if (yych == '\\') goto yy162;
-yy331:
-		YYDEBUG(331, *YYCURSOR);
+		if (yych == '\\') goto yy131;
+yy278:
+		YYDEBUG(278, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_IDENT(T_VAR);
 }
-yy332:
-		YYDEBUG(332, *YYCURSOR);
+yy279:
+		YYDEBUG(279, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'L') goto yy423;
-		if (yych == 'l') goto yy423;
-		goto yy47;
-yy333:
-		YYDEBUG(333, *YYCURSOR);
+		if (yych == 'L') goto yy367;
+		if (yych == 'l') goto yy367;
+		goto yy40;
+yy280:
+		YYDEBUG(280, *YYCURSOR);
 		yyaccept = 25;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm256+yych & 128) {
-			goto yy46;
+			goto yy39;
 		}
-		if (yych == '\\') goto yy162;
-yy334:
-		YYDEBUG(334, *YYCURSOR);
+		if (yych == '\\') goto yy131;
+yy281:
+		YYDEBUG(281, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_IDENT(T_LOGICAL_XOR);
 }
-yy335:
-		YYDEBUG(335, *YYCURSOR);
+yy282:
+		YYDEBUG(282, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'L') goto yy424;
-		if (yych == 'l') goto yy424;
-		goto yy47;
-yy336:
-		YYDEBUG(336, *YYCURSOR);
+		if (yych == 'L') goto yy368;
+		if (yych == 'l') goto yy368;
+		goto yy40;
+yy283:
+		YYDEBUG(283, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= '_') {
-			if (yych <= '@') goto yy85;
-			if (yych <= 'Z') goto yy209;
-			if (yych <= '^') goto yy85;
-			goto yy209;
-		} else {
-			if (yych <= '`') goto yy85;
-			if (yych <= 'z') goto yy209;
-			if (yych <= 0x7F) goto yy85;
-			goto yy209;
+			if (yych <= '@') goto yy72;
+			if (yych <= 'Z') goto yy178;
+			if (yych <= '^') goto yy72;
+			goto yy178;
+		} else {
+			if (yych <= '`') goto yy72;
+			if (yych <= 'z') goto yy178;
+			if (yych <= 0x7F) goto yy72;
+			goto yy178;
 		}
-yy337:
-		YYDEBUG(337, *YYCURSOR);
+yy284:
+		YYDEBUG(284, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'L') goto yy425;
-		if (yych == 'l') goto yy425;
-		goto yy47;
-yy338:
-		YYDEBUG(338, *YYCURSOR);
+		if (yych == 'L') goto yy369;
+		if (yych == 'l') goto yy369;
+		goto yy40;
+yy285:
+		YYDEBUG(285, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'I') goto yy426;
-		if (yych == 'i') goto yy426;
-		goto yy47;
-yy339:
-		YYDEBUG(339, *YYCURSOR);
+		if (yych == 'I') goto yy370;
+		if (yych == 'i') goto yy370;
+		goto yy40;
+yy286:
+		YYDEBUG(286, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yych <= 'U') {
-			if (yych == 'I') goto yy427;
-			if (yych <= 'T') goto yy47;
-			goto yy428;
+			if (yych == 'I') goto yy371;
+			if (yych <= 'T') goto yy40;
+			goto yy372;
 		} else {
 			if (yych <= 'i') {
-				if (yych <= 'h') goto yy47;
-				goto yy427;
+				if (yych <= 'h') goto yy40;
+				goto yy371;
 			} else {
-				if (yych == 'u') goto yy428;
-				goto yy47;
+				if (yych == 'u') goto yy372;
+				goto yy40;
 			}
 		}
-yy340:
-		YYDEBUG(340, *YYCURSOR);
+yy287:
+		YYDEBUG(287, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'A') goto yy429;
-		if (yych == 'a') goto yy429;
-		goto yy47;
-yy341:
-		YYDEBUG(341, *YYCURSOR);
+		if (yych == 'A') goto yy373;
+		if (yych == 'a') goto yy373;
+		goto yy40;
+yy288:
+		YYDEBUG(288, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'I') goto yy430;
-		if (yych == 'i') goto yy430;
-		goto yy47;
-yy342:
-		YYDEBUG(342, *YYCURSOR);
+		if (yych == 'I') goto yy374;
+		if (yych == 'i') goto yy374;
+		goto yy40;
+yy289:
+		YYDEBUG(289, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'E') goto yy431;
-		if (yych == 'e') goto yy431;
-		goto yy47;
-yy343:
-		YYDEBUG(343, *YYCURSOR);
+		if (yych == 'E') goto yy375;
+		if (yych == 'e') goto yy375;
+		goto yy40;
+yy290:
+		YYDEBUG(290, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'A') goto yy432;
-		if (yych == 'a') goto yy432;
-		goto yy47;
-yy344:
-		YYDEBUG(344, *YYCURSOR);
+		if (yych == 'A') goto yy376;
+		if (yych == 'a') goto yy376;
+		goto yy40;
+yy291:
+		YYDEBUG(291, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'R') goto yy433;
-		if (yych == 'r') goto yy433;
-		goto yy47;
-yy345:
-		YYDEBUG(345, *YYCURSOR);
+		if (yych == 'R') goto yy377;
+		if (yych == 'r') goto yy377;
+		goto yy40;
+yy292:
+		YYDEBUG(292, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yybm0+yych & 2) {
-			goto yy221;
+			goto yy185;
 		}
-		if (yych <= 0x00) goto yy85;
-		goto yy223;
-yy346:
-		YYDEBUG(346, *YYCURSOR);
+		if (yych <= 0x00) goto yy72;
+		goto yy186;
+yy293:
+		YYDEBUG(293, *YYCURSOR);
 		yyaccept = 26;
 		YYMARKER = ++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yybm0+yych & 2) {
-			goto yy221;
+			goto yy185;
 		}
-		if (yych <= 0x00) goto yy88;
-		goto yy83;
-yy347:
-		YYDEBUG(347, *YYCURSOR);
+		if (yych <= 0x00) goto yy75;
+		goto yy70;
+yy294:
+		YYDEBUG(294, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= '\f') {
-			if (yych <= 0x00) goto yy85;
-			if (yych == '\n') goto yy83;
-			goto yy221;
-		} else {
-			if (yych <= '\r') goto yy83;
-			if (yych == '.') goto yy434;
-			goto yy221;
+			if (yych <= 0x00) goto yy72;
+			if (yych == '\n') goto yy70;
+			goto yy185;
+		} else {
+			if (yych <= '\r') goto yy70;
+			if (yych == '.') goto yy378;
+			goto yy185;
 		}
-yy348:
-		YYDEBUG(348, *YYCURSOR);
+yy295:
+		YYDEBUG(295, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= '\f') {
-			if (yych <= 0x00) goto yy85;
-			if (yych == '\n') goto yy83;
-			goto yy221;
-		} else {
-			if (yych <= '\r') goto yy83;
-			if (yych == '*') goto yy435;
-			goto yy221;
+			if (yych <= 0x00) goto yy72;
+			if (yych == '\n') goto yy70;
+			goto yy185;
+		} else {
+			if (yych <= '\r') goto yy70;
+			if (yych == '*') goto yy379;
+			goto yy185;
 		}
-yy349:
-		YYDEBUG(349, *YYCURSOR);
+yy296:
+		YYDEBUG(296, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(350, *YYCURSOR);
 		if (yybm0+yych & 64) {
-			goto yy349;
+			goto yy296;
 		}
-		if (yych <= 0x00) goto yy85;
-		if (yych == '/') goto yy83;
-		goto yy226;
-yy351:
-		YYDEBUG(351, *YYCURSOR);
+		if (yych <= 0x00) goto yy72;
+		if (yych == '/') goto yy70;
+		goto yy188;
+yy297:
+		YYDEBUG(297, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'A') goto yy437;
-		if (yych == 'a') goto yy437;
-		goto yy85;
-yy352:
-		YYDEBUG(352, *YYCURSOR);
+		if (yych == 'A') goto yy380;
+		if (yych == 'a') goto yy380;
+		goto yy72;
+yy298:
+		YYDEBUG(298, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'A') goto yy438;
-		if (yych == 'a') goto yy438;
-		goto yy85;
-yy353:
-		YYDEBUG(353, *YYCURSOR);
+		if (yych == 'A') goto yy381;
+		if (yych == 'a') goto yy381;
+		goto yy72;
+yy299:
+		YYDEBUG(299, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'L') goto yy439;
-		if (yych == 'l') goto yy439;
-		goto yy85;
-yy354:
-		YYDEBUG(354, *YYCURSOR);
+		if (yych == 'L') goto yy382;
+		if (yych == 'l') goto yy382;
+		goto yy72;
+yy300:
+		YYDEBUG(300, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'B') goto yy440;
-		if (yych == 'b') goto yy440;
-		goto yy85;
-yy355:
-		YYDEBUG(355, *YYCURSOR);
+		if (yych == 'B') goto yy383;
+		if (yych == 'b') goto yy383;
+		goto yy72;
+yy301:
+		YYDEBUG(301, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'A') goto yy441;
-		if (yych == 'a') goto yy441;
-		goto yy85;
-yy356:
-		YYDEBUG(356, *YYCURSOR);
+		if (yych == 'A') goto yy384;
+		if (yych == 'a') goto yy384;
+		goto yy72;
+yy302:
+		YYDEBUG(302, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'E') goto yy446;
-		if (yych == 'e') goto yy446;
-		goto yy443;
-yy357:
-		YYDEBUG(357, *YYCURSOR);
+		if (yych == 'E') goto yy387;
+		if (yych == 'e') goto yy387;
+		goto yy386;
+yy303:
+		YYDEBUG(303, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'E') goto yy447;
-		if (yych == 'e') goto yy447;
-		goto yy85;
-yy358:
-		YYDEBUG(358, *YYCURSOR);
+		if (yych == 'E') goto yy388;
+		if (yych == 'e') goto yy388;
+		goto yy72;
+yy304:
+		YYDEBUG(304, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'L') goto yy448;
-		if (yych == 'l') goto yy448;
-		goto yy85;
-yy359:
-		YYDEBUG(359, *YYCURSOR);
+		if (yych == 'L') goto yy389;
+		if (yych == 'l') goto yy389;
+		goto yy72;
+yy305:
+		YYDEBUG(305, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'I') goto yy450;
-		if (yych == 'i') goto yy450;
-		goto yy85;
-yy360:
-		YYDEBUG(360, *YYCURSOR);
+		if (yych == 'I') goto yy390;
+		if (yych == 'i') goto yy390;
+		goto yy72;
+yy306:
+		YYDEBUG(306, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'E') goto yy451;
-		if (yych == 'e') goto yy451;
-		goto yy85;
-yy361:
-		YYDEBUG(361, *YYCURSOR);
+		if (yych == 'E') goto yy391;
+		if (yych == 'e') goto yy391;
+		goto yy72;
+yy307:
+		YYDEBUG(307, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(362, *YYCURSOR);
 		if (yych <= '\f') {
-			if (yych <= 0x08) goto yy127;
-			if (yych <= '\n') goto yy361;
-			goto yy127;
-		} else {
-			if (yych <= '\r') goto yy361;
-			if (yych == ' ') goto yy361;
-			goto yy127;
+			if (yych <= 0x08) goto yy104;
+			if (yych <= '\n') goto yy307;
+			goto yy104;
+		} else {
+			if (yych <= '\r') goto yy307;
+			if (yych == ' ') goto yy307;
+			goto yy104;
 		}
-yy363:
-		YYDEBUG(363, *YYCURSOR);
+yy308:
+		YYDEBUG(308, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == '"') goto yy85;
-		if (yych <= '/') goto yy453;
-		if (yych <= '9') goto yy85;
-		goto yy453;
-yy364:
-		YYDEBUG(364, *YYCURSOR);
+		if (yych == '"') goto yy72;
+		if (yych <= '/') goto yy393;
+		if (yych <= '9') goto yy72;
+		goto yy393;
+yy309:
+		YYDEBUG(309, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == '\'') goto yy85;
-		if (yych <= '/') goto yy455;
-		if (yych <= '9') goto yy85;
-		goto yy455;
-yy365:
-		YYDEBUG(365, *YYCURSOR);
+		if (yych == '\'') goto yy72;
+		if (yych <= '/') goto yy395;
+		if (yych <= '9') goto yy72;
+		goto yy395;
+yy310:
+		YYDEBUG(310, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(2);
 		yych = *YYCURSOR;
-		YYDEBUG(366, *YYCURSOR);
 		if (yych <= '@') {
 			if (yych <= '\f') {
-				if (yych == '\n') goto yy456;
-				goto yy85;
+				if (yych == '\n') goto yy396;
+				goto yy72;
 			} else {
-				if (yych <= '\r') goto yy458;
-				if (yych <= '/') goto yy85;
-				if (yych <= '9') goto yy365;
-				goto yy85;
+				if (yych <= '\r') goto yy398;
+				if (yych <= '/') goto yy72;
+				if (yych <= '9') goto yy310;
+				goto yy72;
 			}
 		} else {
 			if (yych <= '_') {
-				if (yych <= 'Z') goto yy365;
-				if (yych <= '^') goto yy85;
-				goto yy365;
-			} else {
-				if (yych <= '`') goto yy85;
-				if (yych <= 'z') goto yy365;
-				if (yych <= 0x7F) goto yy85;
-				goto yy365;
+				if (yych <= 'Z') goto yy310;
+				if (yych <= '^') goto yy72;
+				goto yy310;
+			} else {
+				if (yych <= '`') goto yy72;
+				if (yych <= 'z') goto yy310;
+				if (yych <= 0x7F) goto yy72;
+				goto yy310;
 			}
 		}
-yy367:
-		YYDEBUG(367, *YYCURSOR);
+yy311:
+		YYDEBUG(311, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'R') goto yy459;
-		if (yych == 'r') goto yy459;
-		goto yy47;
-yy368:
-		YYDEBUG(368, *YYCURSOR);
+		if (yych == 'R') goto yy399;
+		if (yych == 'r') goto yy399;
+		goto yy40;
+yy312:
+		YYDEBUG(312, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'Y') goto yy460;
-		if (yych == 'y') goto yy460;
-		goto yy47;
-yy369:
-		YYDEBUG(369, *YYCURSOR);
+		if (yych == 'Y') goto yy400;
+		if (yych == 'y') goto yy400;
+		goto yy40;
+yy313:
+		YYDEBUG(313, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'K') goto yy462;
-		if (yych == 'k') goto yy462;
-		goto yy47;
-yy370:
-		YYDEBUG(370, *YYCURSOR);
+		if (yych == 'K') goto yy402;
+		if (yych == 'k') goto yy402;
+		goto yy40;
+yy314:
+		YYDEBUG(314, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'A') goto yy464;
-		if (yych == 'a') goto yy464;
-		goto yy47;
-yy371:
-		YYDEBUG(371, *YYCURSOR);
+		if (yych == 'A') goto yy404;
+		if (yych == 'a') goto yy404;
+		goto yy40;
+yy315:
+		YYDEBUG(315, *YYCURSOR);
 		yyaccept = 27;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm256+yych & 128) {
-			goto yy46;
+			goto yy39;
 		}
-		if (yych == '\\') goto yy162;
-yy372:
-		YYDEBUG(372, *YYCURSOR);
+		if (yych == '\\') goto yy131;
+yy316:
+		YYDEBUG(316, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_IDENT(T_CASE);
 }
-yy373:
-		YYDEBUG(373, *YYCURSOR);
+yy317:
+		YYDEBUG(317, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'H') goto yy465;
-		if (yych == 'h') goto yy465;
-		goto yy47;
-yy374:
-		YYDEBUG(374, *YYCURSOR);
+		if (yych == 'H') goto yy405;
+		if (yych == 'h') goto yy405;
+		goto yy40;
+yy318:
+		YYDEBUG(318, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'S') goto yy467;
-		if (yych == 's') goto yy467;
-		goto yy47;
-yy375:
-		YYDEBUG(375, *YYCURSOR);
+		if (yych == 'S') goto yy407;
+		if (yych == 's') goto yy407;
+		goto yy40;
+yy319:
+		YYDEBUG(319, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'E') goto yy469;
-		if (yych == 'e') goto yy469;
-		goto yy47;
-yy376:
-		YYDEBUG(376, *YYCURSOR);
+		if (yych == 'E') goto yy409;
+		if (yych == 'e') goto yy409;
+		goto yy40;
+yy320:
+		YYDEBUG(320, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'T') goto yy471;
-		if (yych == 't') goto yy471;
-		goto yy47;
-yy377:
-		YYDEBUG(377, *YYCURSOR);
+		if (yych == 'T') goto yy411;
+		if (yych == 't') goto yy411;
+		goto yy40;
+yy321:
+		YYDEBUG(321, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'I') goto yy473;
-		if (yych == 'i') goto yy473;
-		goto yy47;
-yy378:
-		YYDEBUG(378, *YYCURSOR);
+		if (yych == 'I') goto yy413;
+		if (yych == 'i') goto yy413;
+		goto yy40;
+yy322:
+		YYDEBUG(322, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'A') goto yy474;
-		if (yych == 'a') goto yy474;
-		goto yy47;
-yy379:
-		YYDEBUG(379, *YYCURSOR);
+		if (yych == 'A') goto yy414;
+		if (yych == 'a') goto yy414;
+		goto yy40;
+yy323:
+		YYDEBUG(323, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'U') goto yy475;
-		if (yych == 'u') goto yy475;
-		goto yy47;
-yy380:
-		YYDEBUG(380, *YYCURSOR);
+		if (yych == 'U') goto yy415;
+		if (yych == 'u') goto yy415;
+		goto yy40;
+yy324:
+		YYDEBUG(324, *YYCURSOR);
 		yyaccept = 28;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm256+yych & 128) {
-			goto yy46;
+			goto yy39;
 		}
-		if (yych == '\\') goto yy162;
-yy381:
-		YYDEBUG(381, *YYCURSOR);
+		if (yych == '\\') goto yy131;
+yy325:
+		YYDEBUG(325, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_IDENT(T_ECHO);
 }
-yy382:
-		YYDEBUG(382, *YYCURSOR);
+yy326:
+		YYDEBUG(326, *YYCURSOR);
 		yyaccept = 29;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yych <= '\\') {
 			if (yych <= 'H') {
-				if (yych <= '/') goto yy383;
-				if (yych <= '9') goto yy46;
-				if (yych >= 'A') goto yy46;
-			} else {
-				if (yych <= 'I') goto yy476;
-				if (yych <= 'Z') goto yy46;
-				if (yych >= '\\') goto yy162;
+				if (yych <= '/') goto yy327;
+				if (yych <= '9') goto yy39;
+				if (yych >= 'A') goto yy39;
+			} else {
+				if (yych <= 'I') goto yy416;
+				if (yych <= 'Z') goto yy39;
+				if (yych >= '\\') goto yy131;
 			}
 		} else {
 			if (yych <= 'h') {
-				if (yych == '_') goto yy46;
-				if (yych >= 'a') goto yy46;
+				if (yych == '_') goto yy39;
+				if (yych >= 'a') goto yy39;
 			} else {
-				if (yych <= 'i') goto yy476;
-				if (yych <= 'z') goto yy46;
-				if (yych >= 0x80) goto yy46;
+				if (yych <= 'i') goto yy416;
+				if (yych <= 'z') goto yy39;
+				if (yych >= 0x80) goto yy39;
 			}
 		}
-yy383:
-		YYDEBUG(383, *YYCURSOR);
+yy327:
+		YYDEBUG(327, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_IDENT(T_ELSE);
 }
-yy384:
-		YYDEBUG(384, *YYCURSOR);
+yy328:
+		YYDEBUG(328, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'Y') goto yy477;
-		if (yych == 'y') goto yy477;
-		goto yy47;
-yy385:
-		YYDEBUG(385, *YYCURSOR);
+		if (yych == 'Y') goto yy417;
+		if (yych == 'y') goto yy417;
+		goto yy40;
+yy329:
+		YYDEBUG(329, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'E') goto yy479;
-		if (yych == 'e') goto yy479;
-		goto yy47;
-yy386:
-		YYDEBUG(386, *YYCURSOR);
+		if (yych == 'E') goto yy419;
+		if (yych == 'e') goto yy419;
+		goto yy40;
+yy330:
+		YYDEBUG(330, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'O') goto yy480;
-		if (yych == 'o') goto yy480;
-		goto yy47;
-yy387:
-		YYDEBUG(387, *YYCURSOR);
+		if (yych == 'O') goto yy420;
+		if (yych == 'o') goto yy420;
+		goto yy40;
+yy331:
+		YYDEBUG(331, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'F') goto yy481;
-		if (yych == 'f') goto yy481;
-		goto yy47;
-yy388:
-		YYDEBUG(388, *YYCURSOR);
+		if (yych == 'F') goto yy421;
+		if (yych == 'f') goto yy421;
+		goto yy40;
+yy332:
+		YYDEBUG(332, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'W') goto yy483;
-		if (yych == 'w') goto yy483;
-		goto yy47;
-yy389:
-		YYDEBUG(389, *YYCURSOR);
+		if (yych == 'W') goto yy423;
+		if (yych == 'w') goto yy423;
+		goto yy40;
+yy333:
+		YYDEBUG(333, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'H') goto yy484;
-		if (yych == 'h') goto yy484;
-		goto yy47;
-yy390:
-		YYDEBUG(390, *YYCURSOR);
+		if (yych == 'H') goto yy424;
+		if (yych == 'h') goto yy424;
+		goto yy40;
+yy334:
+		YYDEBUG(334, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yych <= 0x1F) {
 			if (yych <= '\n') {
-				if (yych <= 0x08) goto yy47;
-				goto yy485;
+				if (yych <= 0x08) goto yy40;
+				goto yy425;
 			} else {
-				if (yych == '\r') goto yy485;
-				goto yy47;
+				if (yych == '\r') goto yy425;
+				goto yy40;
 			}
 		} else {
 			if (yych <= '#') {
-				if (yych <= ' ') goto yy485;
-				if (yych <= '"') goto yy47;
-				goto yy487;
+				if (yych <= ' ') goto yy425;
+				if (yych <= '"') goto yy40;
+				goto yy426;
 			} else {
-				if (yych == '/') goto yy488;
-				goto yy47;
+				if (yych == '/') goto yy427;
+				goto yy40;
 			}
 		}
-yy391:
-		YYDEBUG(391, *YYCURSOR);
+yy335:
+		YYDEBUG(335, *YYCURSOR);
 		yyaccept = 30;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm256+yych & 128) {
-			goto yy46;
+			goto yy39;
 		}
-		if (yych == '\\') goto yy162;
-yy392:
-		YYDEBUG(392, *YYCURSOR);
+		if (yych == '\\') goto yy131;
+yy336:
+		YYDEBUG(336, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_IDENT(T_EVAL);
 }
-yy393:
-		YYDEBUG(393, *YYCURSOR);
+yy337:
+		YYDEBUG(337, *YYCURSOR);
 		yyaccept = 31;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm256+yych & 128) {
-			goto yy46;
+			goto yy39;
 		}
-		if (yych == '\\') goto yy162;
-yy394:
-		YYDEBUG(394, *YYCURSOR);
+		if (yych == '\\') goto yy131;
+yy338:
+		YYDEBUG(338, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_IDENT(T_EXIT);
 }
-yy395:
-		YYDEBUG(395, *YYCURSOR);
+yy339:
+		YYDEBUG(339, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'N') goto yy489;
-		if (yych == 'n') goto yy489;
-		goto yy47;
-yy396:
-		YYDEBUG(396, *YYCURSOR);
+		if (yych == 'N') goto yy428;
+		if (yych == 'n') goto yy428;
+		goto yy40;
+yy340:
+		YYDEBUG(340, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'L') goto yy490;
-		if (yych == 'l') goto yy490;
-		goto yy47;
-yy397:
-		YYDEBUG(397, *YYCURSOR);
+		if (yych == 'L') goto yy429;
+		if (yych == 'l') goto yy429;
+		goto yy40;
+yy341:
+		YYDEBUG(341, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'A') goto yy492;
-		if (yych == 'a') goto yy492;
-		goto yy47;
-yy398:
-		YYDEBUG(398, *YYCURSOR);
+		if (yych == 'A') goto yy431;
+		if (yych == 'a') goto yy431;
+		goto yy40;
+yy342:
+		YYDEBUG(342, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'T') goto yy493;
-		if (yych == 't') goto yy493;
-		goto yy47;
-yy399:
-		YYDEBUG(399, *YYCURSOR);
+		if (yych == 'T') goto yy432;
+		if (yych == 't') goto yy432;
+		goto yy40;
+yy343:
+		YYDEBUG(343, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'A') goto yy494;
-		if (yych == 'a') goto yy494;
-		goto yy47;
-yy400:
-		YYDEBUG(400, *YYCURSOR);
+		if (yych == 'A') goto yy433;
+		if (yych == 'a') goto yy433;
+		goto yy40;
+yy344:
+		YYDEBUG(344, *YYCURSOR);
 		yyaccept = 32;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm256+yych & 128) {
-			goto yy46;
+			goto yy39;
 		}
-		if (yych == '\\') goto yy162;
-yy401:
-		YYDEBUG(401, *YYCURSOR);
+		if (yych == '\\') goto yy131;
+yy345:
+		YYDEBUG(345, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_IDENT(T_GOTO);
 }
-yy402:
-		YYDEBUG(402, *YYCURSOR);
+yy346:
+		YYDEBUG(346, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'E') goto yy495;
-		if (yych == 'e') goto yy495;
-		goto yy47;
-yy403:
-		YYDEBUG(403, *YYCURSOR);
+		if (yych == 'E') goto yy434;
+		if (yych == 'e') goto yy434;
+		goto yy40;
+yy347:
+		YYDEBUG(347, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'U') goto yy496;
-		if (yych == 'u') goto yy496;
-		goto yy47;
-yy404:
-		YYDEBUG(404, *YYCURSOR);
+		if (yych == 'U') goto yy435;
+		if (yych == 'u') goto yy435;
+		goto yy40;
+yy348:
+		YYDEBUG(348, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yych <= 'E') {
-			if (yych == 'A') goto yy497;
-			if (yych <= 'D') goto yy47;
-			goto yy498;
+			if (yych == 'A') goto yy436;
+			if (yych <= 'D') goto yy40;
+			goto yy437;
 		} else {
 			if (yych <= 'a') {
-				if (yych <= '`') goto yy47;
-				goto yy497;
+				if (yych <= '`') goto yy40;
+				goto yy436;
 			} else {
-				if (yych == 'e') goto yy498;
-				goto yy47;
+				if (yych == 'e') goto yy437;
+				goto yy40;
 			}
 		}
-yy405:
-		YYDEBUG(405, *YYCURSOR);
+yy349:
+		YYDEBUG(349, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'R') goto yy499;
-		if (yych == 'r') goto yy499;
-		goto yy47;
-yy406:
-		YYDEBUG(406, *YYCURSOR);
+		if (yych == 'R') goto yy438;
+		if (yych == 'r') goto yy438;
+		goto yy40;
+yy350:
+		YYDEBUG(350, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'T') goto yy500;
-		if (yych == 't') goto yy500;
-		goto yy47;
-yy407:
-		YYDEBUG(407, *YYCURSOR);
+		if (yych == 'T') goto yy439;
+		if (yych == 't') goto yy439;
+		goto yy40;
+yy351:
+		YYDEBUG(351, *YYCURSOR);
 		yyaccept = 33;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm256+yych & 128) {
-			goto yy46;
+			goto yy39;
 		}
-		if (yych == '\\') goto yy162;
-yy408:
-		YYDEBUG(408, *YYCURSOR);
+		if (yych == '\\') goto yy131;
+yy352:
+		YYDEBUG(352, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_IDENT(T_LIST);
 }
-yy409:
-		YYDEBUG(409, *YYCURSOR);
+yy353:
+		YYDEBUG(353, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'H') goto yy502;
-		if (yych == 'h') goto yy502;
-		goto yy47;
-yy410:
-		YYDEBUG(410, *YYCURSOR);
+		if (yych == 'H') goto yy441;
+		if (yych == 'h') goto yy441;
+		goto yy40;
+yy354:
+		YYDEBUG(354, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'S') goto yy504;
-		if (yych == 's') goto yy504;
-		goto yy47;
-yy411:
-		YYDEBUG(411, *YYCURSOR);
+		if (yych == 'S') goto yy443;
+		if (yych == 's') goto yy443;
+		goto yy40;
+yy355:
+		YYDEBUG(355, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'T') goto yy505;
-		if (yych == 't') goto yy505;
-		goto yy47;
-yy412:
-		YYDEBUG(412, *YYCURSOR);
+		if (yych == 'T') goto yy444;
+		if (yych == 't') goto yy444;
+		goto yy40;
+yy356:
+		YYDEBUG(356, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'A') goto yy507;
-		if (yych == 'a') goto yy507;
-		goto yy47;
-yy413:
-		YYDEBUG(413, *YYCURSOR);
+		if (yych == 'A') goto yy446;
+		if (yych == 'a') goto yy446;
+		goto yy40;
+yy357:
+		YYDEBUG(357, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'E') goto yy508;
-		if (yych == 'e') goto yy508;
-		goto yy47;
-yy414:
-		YYDEBUG(414, *YYCURSOR);
+		if (yych == 'E') goto yy447;
+		if (yych == 'e') goto yy447;
+		goto yy40;
+yy358:
+		YYDEBUG(358, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'I') goto yy509;
-		if (yych == 'i') goto yy509;
-		goto yy47;
-yy415:
-		YYDEBUG(415, *YYCURSOR);
+		if (yych == 'I') goto yy448;
+		if (yych == 'i') goto yy448;
+		goto yy40;
+yy359:
+		YYDEBUG(359, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'O') goto yy510;
-		if (yych == 'o') goto yy510;
-		goto yy47;
-yy416:
-		YYDEBUG(416, *YYCURSOR);
+		if (yych == 'O') goto yy449;
+		if (yych == 'o') goto yy449;
+		goto yy40;
+yy360:
+		YYDEBUG(360, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'I') goto yy511;
-		if (yych == 'i') goto yy511;
-		goto yy47;
-yy417:
-		YYDEBUG(417, *YYCURSOR);
+		if (yych == 'I') goto yy450;
+		if (yych == 'i') goto yy450;
+		goto yy40;
+yy361:
+		YYDEBUG(361, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'R') goto yy512;
-		if (yych == 'r') goto yy512;
-		goto yy47;
-yy418:
-		YYDEBUG(418, *YYCURSOR);
+		if (yych == 'R') goto yy451;
+		if (yych == 'r') goto yy451;
+		goto yy40;
+yy362:
+		YYDEBUG(362, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'I') goto yy513;
-		if (yych == 'i') goto yy513;
-		goto yy47;
-yy419:
-		YYDEBUG(419, *YYCURSOR);
+		if (yych == 'I') goto yy452;
+		if (yych == 'i') goto yy452;
+		goto yy40;
+yy363:
+		YYDEBUG(363, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'C') goto yy514;
-		if (yych == 'c') goto yy514;
-		goto yy47;
-yy420:
-		YYDEBUG(420, *YYCURSOR);
+		if (yych == 'C') goto yy453;
+		if (yych == 'c') goto yy453;
+		goto yy40;
+yy364:
+		YYDEBUG(364, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'W') goto yy515;
-		if (yych == 'w') goto yy515;
-		goto yy47;
-yy421:
-		YYDEBUG(421, *YYCURSOR);
+		if (yych == 'W') goto yy454;
+		if (yych == 'w') goto yy454;
+		goto yy40;
+yy365:
+		YYDEBUG(365, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'T') goto yy517;
-		if (yych == 't') goto yy517;
-		goto yy47;
-yy422:
-		YYDEBUG(422, *YYCURSOR);
+		if (yych == 'T') goto yy456;
+		if (yych == 't') goto yy456;
+		goto yy40;
+yy366:
+		YYDEBUG(366, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'T') goto yy519;
-		if (yych == 't') goto yy519;
-		goto yy47;
-yy423:
-		YYDEBUG(423, *YYCURSOR);
+		if (yych == 'T') goto yy458;
+		if (yych == 't') goto yy458;
+		goto yy40;
+yy367:
+		YYDEBUG(367, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'E') goto yy521;
-		if (yych == 'e') goto yy521;
-		goto yy47;
-yy424:
-		YYDEBUG(424, *YYCURSOR);
+		if (yych == 'E') goto yy460;
+		if (yych == 'e') goto yy460;
+		goto yy40;
+yy368:
+		YYDEBUG(368, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'D') goto yy523;
-		if (yych == 'd') goto yy523;
-		goto yy47;
-yy425:
-		YYDEBUG(425, *YYCURSOR);
+		if (yych == 'D') goto yy462;
+		if (yych == 'd') goto yy462;
+		goto yy40;
+yy369:
+		YYDEBUG(369, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'A') goto yy525;
-		if (yych == 'a') goto yy525;
-		goto yy47;
-yy426:
-		YYDEBUG(426, *YYCURSOR);
+		if (yych == 'A') goto yy464;
+		if (yych == 'a') goto yy464;
+		goto yy40;
+yy370:
+		YYDEBUG(370, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'R') goto yy526;
-		if (yych == 'r') goto yy526;
-		goto yy47;
-yy427:
-		YYDEBUG(427, *YYCURSOR);
+		if (yych == 'R') goto yy465;
+		if (yych == 'r') goto yy465;
+		goto yy40;
+yy371:
+		YYDEBUG(371, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'L') goto yy527;
-		if (yych == 'l') goto yy527;
-		goto yy47;
-yy428:
-		YYDEBUG(428, *YYCURSOR);
+		if (yych == 'L') goto yy466;
+		if (yych == 'l') goto yy466;
+		goto yy40;
+yy372:
+		YYDEBUG(372, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'N') goto yy528;
-		if (yych == 'n') goto yy528;
-		goto yy47;
-yy429:
-		YYDEBUG(429, *YYCURSOR);
+		if (yych == 'N') goto yy467;
+		if (yych == 'n') goto yy467;
+		goto yy40;
+yy373:
+		YYDEBUG(373, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'L') goto yy529;
-		if (yych == 'l') goto yy529;
-		goto yy47;
-yy430:
-		YYDEBUG(430, *YYCURSOR);
+		if (yych == 'L') goto yy468;
+		if (yych == 'l') goto yy468;
+		goto yy40;
+yy374:
+		YYDEBUG(374, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'N') goto yy530;
-		if (yych == 'n') goto yy530;
-		goto yy47;
-yy431:
-		YYDEBUG(431, *YYCURSOR);
+		if (yych == 'N') goto yy469;
+		if (yych == 'n') goto yy469;
+		goto yy40;
+yy375:
+		YYDEBUG(375, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'T') goto yy531;
-		if (yych == 't') goto yy531;
-		goto yy47;
-yy432:
-		YYDEBUG(432, *YYCURSOR);
+		if (yych == 'T') goto yy470;
+		if (yych == 't') goto yy470;
+		goto yy40;
+yy376:
+		YYDEBUG(376, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'M') goto yy532;
-		if (yych == 'm') goto yy532;
-		goto yy47;
-yy433:
-		YYDEBUG(433, *YYCURSOR);
+		if (yych == 'M') goto yy471;
+		if (yych == 'm') goto yy471;
+		goto yy40;
+yy377:
+		YYDEBUG(377, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'A') goto yy533;
-		if (yych == 'a') goto yy533;
-		goto yy47;
-yy434:
-		YYDEBUG(434, *YYCURSOR);
+		if (yych == 'A') goto yy472;
+		if (yych == 'a') goto yy472;
+		goto yy40;
+yy378:
+		YYDEBUG(378, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= '\f') {
-			if (yych <= 0x00) goto yy85;
-			if (yych == '\n') goto yy83;
-			goto yy221;
-		} else {
-			if (yych <= '\r') goto yy83;
-			if (yych == '.') goto yy346;
-			goto yy221;
+			if (yych <= 0x00) goto yy72;
+			if (yych == '\n') goto yy70;
+			goto yy185;
+		} else {
+			if (yych <= '\r') goto yy70;
+			if (yych == '.') goto yy293;
+			goto yy185;
 		}
-yy435:
-		YYDEBUG(435, *YYCURSOR);
+yy379:
+		YYDEBUG(379, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(436, *YYCURSOR);
 		if (yybm0+yych & 128) {
-			goto yy435;
+			goto yy379;
 		}
-		if (yych <= 0x00) goto yy85;
-		if (yych <= '\r') goto yy534;
-		goto yy536;
-yy437:
-		YYDEBUG(437, *YYCURSOR);
+		if (yych <= 0x00) goto yy72;
+		if (yych <= '\r') goto yy473;
+		goto yy474;
+yy380:
+		YYDEBUG(380, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'Y') goto yy538;
-		if (yych == 'y') goto yy538;
-		goto yy85;
-yy438:
-		YYDEBUG(438, *YYCURSOR);
+		if (yych == 'Y') goto yy475;
+		if (yych == 'y') goto yy475;
+		goto yy72;
+yy381:
+		YYDEBUG(381, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'R') goto yy540;
-		if (yych == 'r') goto yy540;
-		goto yy85;
-yy439:
-		YYDEBUG(439, *YYCURSOR);
+		if (yych == 'R') goto yy476;
+		if (yych == 'r') goto yy476;
+		goto yy72;
+yy382:
+		YYDEBUG(382, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'E') goto yy545;
-		if (yych == 'e') goto yy545;
-		goto yy542;
-yy440:
-		YYDEBUG(440, *YYCURSOR);
+		if (yych == 'E') goto yy479;
+		if (yych == 'e') goto yy479;
+		goto yy478;
+yy383:
+		YYDEBUG(383, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'L') goto yy546;
-		if (yych == 'l') goto yy546;
-		goto yy85;
-yy441:
-		YYDEBUG(441, *YYCURSOR);
+		if (yych == 'L') goto yy480;
+		if (yych == 'l') goto yy480;
+		goto yy72;
+yy384:
+		YYDEBUG(384, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'T') goto yy547;
-		if (yych == 't') goto yy547;
-		goto yy85;
-yy442:
-		YYDEBUG(442, *YYCURSOR);
+		if (yych == 'T') goto yy481;
+		if (yych == 't') goto yy481;
+		goto yy72;
+yy385:
+		YYDEBUG(385, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-yy443:
-		YYDEBUG(443, *YYCURSOR);
+yy386:
+		YYDEBUG(386, *YYCURSOR);
 		if (yych <= 0x1F) {
-			if (yych == '\t') goto yy442;
-			goto yy85;
+			if (yych == '\t') goto yy385;
+			goto yy72;
 		} else {
-			if (yych <= ' ') goto yy442;
-			if (yych != ')') goto yy85;
+			if (yych <= ' ') goto yy385;
+			if (yych != ')') goto yy72;
 		}
-		YYDEBUG(444, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(445, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN(T_INT_CAST);
 }
-yy446:
-		YYDEBUG(446, *YYCURSOR);
+yy387:
+		YYDEBUG(387, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'G') goto yy549;
-		if (yych == 'g') goto yy549;
-		goto yy85;
-yy447:
-		YYDEBUG(447, *YYCURSOR);
+		if (yych == 'G') goto yy482;
+		if (yych == 'g') goto yy482;
+		goto yy72;
+yy388:
+		YYDEBUG(388, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'C') goto yy550;
-		if (yych == 'c') goto yy550;
-		goto yy85;
-yy448:
-		YYDEBUG(448, *YYCURSOR);
+		if (yych == 'C') goto yy483;
+		if (yych == 'c') goto yy483;
+		goto yy72;
+yy389:
+		YYDEBUG(389, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(449, *YYCURSOR);
 		if (yych <= 0x1F) {
-			if (yych == '\t') goto yy448;
-			goto yy85;
+			if (yych == '\t') goto yy389;
+			goto yy72;
 		} else {
-			if (yych <= ' ') goto yy448;
-			if (yych == ')') goto yy551;
-			goto yy85;
+			if (yych <= ' ') goto yy389;
+			if (yych == ')') goto yy484;
+			goto yy72;
 		}
-yy450:
-		YYDEBUG(450, *YYCURSOR);
+yy390:
+		YYDEBUG(390, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'N') goto yy553;
-		if (yych == 'n') goto yy553;
-		goto yy85;
-yy451:
-		YYDEBUG(451, *YYCURSOR);
+		if (yych == 'N') goto yy485;
+		if (yych == 'n') goto yy485;
+		goto yy72;
+yy391:
+		YYDEBUG(391, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'T') goto yy554;
-		if (yych == 't') goto yy554;
-		goto yy85;
-yy452:
-		YYDEBUG(452, *YYCURSOR);
+		if (yych == 'T') goto yy486;
+		if (yych == 't') goto yy486;
+		goto yy72;
+yy392:
+		YYDEBUG(392, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(3);
 		yych = *YYCURSOR;
-yy453:
-		YYDEBUG(453, *YYCURSOR);
+yy393:
+		YYDEBUG(393, *YYCURSOR);
 		if (yych <= 'Z') {
 			if (yych <= '/') {
-				if (yych == '"') goto yy556;
-				goto yy85;
+				if (yych == '"') goto yy487;
+				goto yy72;
 			} else {
-				if (yych <= '9') goto yy452;
-				if (yych <= '@') goto yy85;
-				goto yy452;
+				if (yych <= '9') goto yy392;
+				if (yych <= '@') goto yy72;
+				goto yy392;
 			}
 		} else {
 			if (yych <= '`') {
-				if (yych == '_') goto yy452;
-				goto yy85;
+				if (yych == '_') goto yy392;
+				goto yy72;
 			} else {
-				if (yych <= 'z') goto yy452;
-				if (yych <= 0x7F) goto yy85;
-				goto yy452;
+				if (yych <= 'z') goto yy392;
+				if (yych <= 0x7F) goto yy72;
+				goto yy392;
 			}
 		}
-yy454:
-		YYDEBUG(454, *YYCURSOR);
+yy394:
+		YYDEBUG(394, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(3);
 		yych = *YYCURSOR;
-yy455:
-		YYDEBUG(455, *YYCURSOR);
+yy395:
+		YYDEBUG(395, *YYCURSOR);
 		if (yych <= 'Z') {
 			if (yych <= '/') {
-				if (yych == '\'') goto yy556;
-				goto yy85;
+				if (yych == '\'') goto yy487;
+				goto yy72;
 			} else {
-				if (yych <= '9') goto yy454;
-				if (yych <= '@') goto yy85;
-				goto yy454;
+				if (yych <= '9') goto yy394;
+				if (yych <= '@') goto yy72;
+				goto yy394;
 			}
 		} else {
 			if (yych <= '`') {
-				if (yych == '_') goto yy454;
-				goto yy85;
+				if (yych == '_') goto yy394;
+				goto yy72;
 			} else {
-				if (yych <= 'z') goto yy454;
-				if (yych <= 0x7F) goto yy85;
-				goto yy454;
+				if (yych <= 'z') goto yy394;
+				if (yych <= 0x7F) goto yy72;
+				goto yy394;
 			}
 		}
-yy456:
-		YYDEBUG(456, *YYCURSOR);
+yy396:
+		YYDEBUG(396, *YYCURSOR);
 		++YYCURSOR;
-yy457:
-		YYDEBUG(457, *YYCURSOR);
+yy397:
+		YYDEBUG(397, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	char *s;
@@ -6040,745 +5981,737 @@
 
 	RETURN_TOKEN(T_START_HEREDOC);
 }
-yy458:
-		YYDEBUG(458, *YYCURSOR);
+yy398:
+		YYDEBUG(398, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == '\n') goto yy456;
-		goto yy457;
-yy459:
-		YYDEBUG(459, *YYCURSOR);
+		if (yych == '\n') goto yy396;
+		goto yy397;
+yy399:
+		YYDEBUG(399, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'A') goto yy557;
-		if (yych == 'a') goto yy557;
-		goto yy47;
-yy460:
-		YYDEBUG(460, *YYCURSOR);
+		if (yych == 'A') goto yy488;
+		if (yych == 'a') goto yy488;
+		goto yy40;
+yy400:
+		YYDEBUG(400, *YYCURSOR);
 		yyaccept = 34;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm256+yych & 128) {
-			goto yy46;
+			goto yy39;
 		}
-		if (yych == '\\') goto yy162;
-yy461:
-		YYDEBUG(461, *YYCURSOR);
+		if (yych == '\\') goto yy131;
+yy401:
+		YYDEBUG(401, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_IDENT(T_ARRAY);
 }
-yy462:
-		YYDEBUG(462, *YYCURSOR);
+yy402:
+		YYDEBUG(402, *YYCURSOR);
 		yyaccept = 35;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm256+yych & 128) {
-			goto yy46;
+			goto yy39;
 		}
-		if (yych == '\\') goto yy162;
-yy463:
-		YYDEBUG(463, *YYCURSOR);
+		if (yych == '\\') goto yy131;
+yy403:
+		YYDEBUG(403, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_IDENT(T_BREAK);
 }
-yy464:
-		YYDEBUG(464, *YYCURSOR);
+yy404:
+		YYDEBUG(404, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'B') goto yy558;
-		if (yych == 'b') goto yy558;
-		goto yy47;
-yy465:
-		YYDEBUG(465, *YYCURSOR);
+		if (yych == 'B') goto yy489;
+		if (yych == 'b') goto yy489;
+		goto yy40;
+yy405:
+		YYDEBUG(405, *YYCURSOR);
 		yyaccept = 36;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm256+yych & 128) {
-			goto yy46;
+			goto yy39;
 		}
-		if (yych == '\\') goto yy162;
-yy466:
-		YYDEBUG(466, *YYCURSOR);
+		if (yych == '\\') goto yy131;
+yy406:
+		YYDEBUG(406, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_IDENT(T_CATCH);
 }
-yy467:
-		YYDEBUG(467, *YYCURSOR);
+yy407:
+		YYDEBUG(407, *YYCURSOR);
 		yyaccept = 37;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm256+yych & 128) {
-			goto yy46;
+			goto yy39;
 		}
-		if (yych == '\\') goto yy162;
-yy468:
-		YYDEBUG(468, *YYCURSOR);
+		if (yych == '\\') goto yy131;
+yy408:
+		YYDEBUG(408, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_IDENT(T_CLASS);
 }
-yy469:
-		YYDEBUG(469, *YYCURSOR);
+yy409:
+		YYDEBUG(409, *YYCURSOR);
 		yyaccept = 38;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm256+yych & 128) {
-			goto yy46;
+			goto yy39;
 		}
-		if (yych == '\\') goto yy162;
-yy470:
-		YYDEBUG(470, *YYCURSOR);
+		if (yych == '\\') goto yy131;
+yy410:
+		YYDEBUG(410, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_IDENT(T_CLONE);
 }
-yy471:
-		YYDEBUG(471, *YYCURSOR);
+yy411:
+		YYDEBUG(411, *YYCURSOR);
 		yyaccept = 39;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm256+yych & 128) {
-			goto yy46;
+			goto yy39;
 		}
-		if (yych == '\\') goto yy162;
-yy472:
-		YYDEBUG(472, *YYCURSOR);
+		if (yych == '\\') goto yy131;
+yy412:
+		YYDEBUG(412, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_IDENT(T_CONST);
 }
-yy473:
-		YYDEBUG(473, *YYCURSOR);
+yy413:
+		YYDEBUG(413, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'N') goto yy559;
-		if (yych == 'n') goto yy559;
-		goto yy47;
-yy474:
-		YYDEBUG(474, *YYCURSOR);
+		if (yych == 'N') goto yy490;
+		if (yych == 'n') goto yy490;
+		goto yy40;
+yy414:
+		YYDEBUG(414, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'R') goto yy560;
-		if (yych == 'r') goto yy560;
-		goto yy47;
-yy475:
-		YYDEBUG(475, *YYCURSOR);
+		if (yych == 'R') goto yy491;
+		if (yych == 'r') goto yy491;
+		goto yy40;
+yy415:
+		YYDEBUG(415, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'L') goto yy561;
-		if (yych == 'l') goto yy561;
-		goto yy47;
-yy476:
-		YYDEBUG(476, *YYCURSOR);
+		if (yych == 'L') goto yy492;
+		if (yych == 'l') goto yy492;
+		goto yy40;
+yy416:
+		YYDEBUG(416, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'F') goto yy562;
-		if (yych == 'f') goto yy562;
-		goto yy47;
-yy477:
-		YYDEBUG(477, *YYCURSOR);
+		if (yych == 'F') goto yy493;
+		if (yych == 'f') goto yy493;
+		goto yy40;
+yy417:
+		YYDEBUG(417, *YYCURSOR);
 		yyaccept = 40;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm256+yych & 128) {
-			goto yy46;
+			goto yy39;
 		}
-		if (yych == '\\') goto yy162;
-yy478:
-		YYDEBUG(478, *YYCURSOR);
+		if (yych == '\\') goto yy131;
+yy418:
+		YYDEBUG(418, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_IDENT(T_EMPTY);
 }
-yy479:
-		YYDEBUG(479, *YYCURSOR);
+yy419:
+		YYDEBUG(419, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'C') goto yy564;
-		if (yych == 'c') goto yy564;
-		goto yy47;
-yy480:
-		YYDEBUG(480, *YYCURSOR);
+		if (yych == 'C') goto yy495;
+		if (yych == 'c') goto yy495;
+		goto yy40;
+yy420:
+		YYDEBUG(420, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'R') goto yy565;
-		if (yych == 'r') goto yy565;
-		goto yy47;
-yy481:
-		YYDEBUG(481, *YYCURSOR);
+		if (yych == 'R') goto yy496;
+		if (yych == 'r') goto yy496;
+		goto yy40;
+yy421:
+		YYDEBUG(421, *YYCURSOR);
 		yyaccept = 41;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm256+yych & 128) {
-			goto yy46;
+			goto yy39;
 		}
-		if (yych == '\\') goto yy162;
-yy482:
-		YYDEBUG(482, *YYCURSOR);
+		if (yych == '\\') goto yy131;
+yy422:
+		YYDEBUG(422, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_IDENT(T_ENDIF);
 }
-yy483:
-		YYDEBUG(483, *YYCURSOR);
+yy423:
+		YYDEBUG(423, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'I') goto yy567;
-		if (yych == 'i') goto yy567;
-		goto yy47;
-yy484:
-		YYDEBUG(484, *YYCURSOR);
+		if (yych == 'I') goto yy498;
+		if (yych == 'i') goto yy498;
+		goto yy40;
+yy424:
+		YYDEBUG(424, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'I') goto yy568;
-		if (yych == 'i') goto yy568;
-		goto yy47;
-yy485:
-		YYDEBUG(485, *YYCURSOR);
+		if (yych == 'I') goto yy499;
+		if (yych == 'i') goto yy499;
+		goto yy40;
+yy425:
+		YYDEBUG(425, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(10);
 		yych = *YYCURSOR;
-		YYDEBUG(486, *YYCURSOR);
 		if (yych <= 'E') {
 			if (yych <= ' ') {
 				if (yych <= '\f') {
-					if (yych <= 0x08) goto yy85;
-					if (yych <= '\n') goto yy485;
-					goto yy85;
-				} else {
-					if (yych <= '\r') goto yy485;
-					if (yych <= 0x1F) goto yy85;
-					goto yy485;
+					if (yych <= 0x08) goto yy72;
+					if (yych <= '\n') goto yy425;
+					goto yy72;
+				} else {
+					if (yych <= '\r') goto yy425;
+					if (yych <= 0x1F) goto yy72;
+					goto yy425;
 				}
 			} else {
 				if (yych <= '.') {
-					if (yych != '#') goto yy85;
+					if (yych != '#') goto yy72;
 				} else {
-					if (yych <= '/') goto yy488;
-					if (yych <= '@') goto yy85;
-					if (yych <= 'D') goto yy569;
-					goto yy571;
+					if (yych <= '/') goto yy427;
+					if (yych <= '@') goto yy72;
+					if (yych <= 'D') goto yy500;
+					goto yy502;
 				}
 			}
 		} else {
 			if (yych <= '`') {
 				if (yych <= 'Z') {
-					if (yych == 'I') goto yy572;
-					goto yy569;
+					if (yych == 'I') goto yy503;
+					goto yy500;
 				} else {
-					if (yych == '_') goto yy569;
-					goto yy85;
+					if (yych == '_') goto yy500;
+					goto yy72;
 				}
 			} else {
 				if (yych <= 'h') {
-					if (yych == 'e') goto yy571;
-					goto yy569;
+					if (yych == 'e') goto yy502;
+					goto yy500;
 				} else {
-					if (yych <= 'i') goto yy572;
-					if (yych <= 'z') goto yy569;
-					if (yych <= 0x7F) goto yy85;
-					goto yy569;
+					if (yych <= 'i') goto yy503;
+					if (yych <= 'z') goto yy500;
+					if (yych <= 0x7F) goto yy72;
+					goto yy500;
 				}
 			}
 		}
-yy487:
-		YYDEBUG(487, *YYCURSOR);
+yy426:
+		YYDEBUG(426, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= '\f') {
-			if (yych <= 0x00) goto yy85;
-			if (yych == '\n') goto yy575;
-			goto yy573;
-		} else {
-			if (yych <= '\r') goto yy575;
-			if (yych == '') goto yy85;
-			goto yy573;
+			if (yych <= 0x00) goto yy72;
+			if (yych == '\n') goto yy505;
+			goto yy504;
+		} else {
+			if (yych <= '\r') goto yy505;
+			if (yych == '') goto yy72;
+			goto yy504;
 		}
-yy488:
-		YYDEBUG(488, *YYCURSOR);
+yy427:
+		YYDEBUG(427, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		if (yych == '*') goto yy577;
-		if (yych == '/') goto yy573;
-		goto yy85;
-yy489:
-		YYDEBUG(489, *YYCURSOR);
+		if (yych == '*') goto yy506;
+		if (yych == '/') goto yy504;
+		goto yy72;
+yy428:
+		YYDEBUG(428, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'D') goto yy579;
-		if (yych == 'd') goto yy579;
-		goto yy47;
-yy490:
-		YYDEBUG(490, *YYCURSOR);
+		if (yych == 'D') goto yy507;
+		if (yych == 'd') goto yy507;
+		goto yy40;
+yy429:
+		YYDEBUG(429, *YYCURSOR);
 		yyaccept = 42;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yych <= '\\') {
 			if (yych <= 'K') {
-				if (yych <= '/') goto yy491;
-				if (yych <= '9') goto yy46;
-				if (yych >= 'A') goto yy46;
-			} else {
-				if (yych <= 'L') goto yy580;
-				if (yych <= 'Z') goto yy46;
-				if (yych >= '\\') goto yy162;
+				if (yych <= '/') goto yy430;
+				if (yych <= '9') goto yy39;
+				if (yych >= 'A') goto yy39;
+			} else {
+				if (yych <= 'L') goto yy508;
+				if (yych <= 'Z') goto yy39;
+				if (yych >= '\\') goto yy131;
 			}
 		} else {
 			if (yych <= 'k') {
-				if (yych == '_') goto yy46;
-				if (yych >= 'a') goto yy46;
+				if (yych == '_') goto yy39;
+				if (yych >= 'a') goto yy39;
 			} else {
-				if (yych <= 'l') goto yy580;
-				if (yych <= 'z') goto yy46;
-				if (yych >= 0x80) goto yy46;
+				if (yych <= 'l') goto yy508;
+				if (yych <= 'z') goto yy39;
+				if (yych >= 0x80) goto yy39;
 			}
 		}
-yy491:
-		YYDEBUG(491, *YYCURSOR);
+yy430:
+		YYDEBUG(430, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_IDENT(T_FINAL);
 }
-yy492:
-		YYDEBUG(492, *YYCURSOR);
+yy431:
+		YYDEBUG(431, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'C') goto yy581;
-		if (yych == 'c') goto yy581;
-		goto yy47;
-yy493:
-		YYDEBUG(493, *YYCURSOR);
+		if (yych == 'C') goto yy509;
+		if (yych == 'c') goto yy509;
+		goto yy40;
+yy432:
+		YYDEBUG(432, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'I') goto yy582;
-		if (yych == 'i') goto yy582;
-		goto yy47;
-yy494:
-		YYDEBUG(494, *YYCURSOR);
+		if (yych == 'I') goto yy510;
+		if (yych == 'i') goto yy510;
+		goto yy40;
+yy433:
+		YYDEBUG(433, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'L') goto yy583;
-		if (yych == 'l') goto yy583;
-		goto yy47;
-yy495:
-		YYDEBUG(495, *YYCURSOR);
+		if (yych == 'L') goto yy511;
+		if (yych == 'l') goto yy511;
+		goto yy40;
+yy434:
+		YYDEBUG(434, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'M') goto yy585;
-		if (yych == 'm') goto yy585;
-		goto yy47;
-yy496:
-		YYDEBUG(496, *YYCURSOR);
+		if (yych == 'M') goto yy513;
+		if (yych == 'm') goto yy513;
+		goto yy40;
+yy435:
+		YYDEBUG(435, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'D') goto yy586;
-		if (yych == 'd') goto yy586;
-		goto yy47;
-yy497:
-		YYDEBUG(497, *YYCURSOR);
+		if (yych == 'D') goto yy514;
+		if (yych == 'd') goto yy514;
+		goto yy40;
+yy436:
+		YYDEBUG(436, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'N') goto yy587;
-		if (yych == 'n') goto yy587;
-		goto yy47;
-yy498:
-		YYDEBUG(498, *YYCURSOR);
+		if (yych == 'N') goto yy515;
+		if (yych == 'n') goto yy515;
+		goto yy40;
+yy437:
+		YYDEBUG(437, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'A') goto yy588;
-		if (yych == 'a') goto yy588;
-		goto yy47;
-yy499:
-		YYDEBUG(499, *YYCURSOR);
+		if (yych == 'A') goto yy516;
+		if (yych == 'a') goto yy516;
+		goto yy40;
+yy438:
+		YYDEBUG(438, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'F') goto yy589;
-		if (yych == 'f') goto yy589;
-		goto yy47;
-yy500:
-		YYDEBUG(500, *YYCURSOR);
+		if (yych == 'F') goto yy517;
+		if (yych == 'f') goto yy517;
+		goto yy40;
+yy439:
+		YYDEBUG(439, *YYCURSOR);
 		yyaccept = 43;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm256+yych & 128) {
-			goto yy46;
+			goto yy39;
 		}
-		if (yych == '\\') goto yy162;
-yy501:
-		YYDEBUG(501, *YYCURSOR);
+		if (yych == '\\') goto yy131;
+yy440:
+		YYDEBUG(440, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_IDENT(T_ISSET);
 }
-yy502:
-		YYDEBUG(502, *YYCURSOR);
+yy441:
+		YYDEBUG(441, *YYCURSOR);
 		yyaccept = 44;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm256+yych & 128) {
-			goto yy46;
+			goto yy39;
 		}
-		if (yych == '\\') goto yy162;
-yy503:
-		YYDEBUG(503, *YYCURSOR);
+		if (yych == '\\') goto yy131;
+yy442:
+		YYDEBUG(442, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_IDENT(T_MATCH);
 }
-yy504:
-		YYDEBUG(504, *YYCURSOR);
+yy443:
+		YYDEBUG(443, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'P') goto yy590;
-		if (yych == 'p') goto yy590;
-		goto yy47;
-yy505:
-		YYDEBUG(505, *YYCURSOR);
+		if (yych == 'P') goto yy518;
+		if (yych == 'p') goto yy518;
+		goto yy40;
+yy444:
+		YYDEBUG(444, *YYCURSOR);
 		yyaccept = 45;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm256+yych & 128) {
-			goto yy46;
+			goto yy39;
 		}
-		if (yych == '\\') goto yy162;
-yy506:
-		YYDEBUG(506, *YYCURSOR);
+		if (yych == '\\') goto yy131;
+yy445:
+		YYDEBUG(445, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_IDENT(T_PRINT);
 }
-yy507:
-		YYDEBUG(507, *YYCURSOR);
+yy446:
+		YYDEBUG(446, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'T') goto yy591;
-		if (yych == 't') goto yy591;
-		goto yy47;
-yy508:
-		YYDEBUG(508, *YYCURSOR);
+		if (yych == 'T') goto yy519;
+		if (yych == 't') goto yy519;
+		goto yy40;
+yy447:
+		YYDEBUG(447, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'C') goto yy592;
-		if (yych == 'c') goto yy592;
-		goto yy47;
-yy509:
-		YYDEBUG(509, *YYCURSOR);
+		if (yych == 'C') goto yy520;
+		if (yych == 'c') goto yy520;
+		goto yy40;
+yy448:
+		YYDEBUG(448, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'C') goto yy593;
-		if (yych == 'c') goto yy593;
-		goto yy47;
-yy510:
-		YYDEBUG(510, *YYCURSOR);
+		if (yych == 'C') goto yy521;
+		if (yych == 'c') goto yy521;
+		goto yy40;
+yy449:
+		YYDEBUG(449, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'N') goto yy595;
-		if (yych == 'n') goto yy595;
-		goto yy47;
-yy511:
-		YYDEBUG(511, *YYCURSOR);
+		if (yych == 'N') goto yy523;
+		if (yych == 'n') goto yy523;
+		goto yy40;
+yy450:
+		YYDEBUG(450, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'R') goto yy596;
-		if (yych == 'r') goto yy596;
-		goto yy47;
-yy512:
-		YYDEBUG(512, *YYCURSOR);
+		if (yych == 'R') goto yy524;
+		if (yych == 'r') goto yy524;
+		goto yy40;
+yy451:
+		YYDEBUG(451, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'N') goto yy597;
-		if (yych == 'n') goto yy597;
-		goto yy47;
-yy513:
-		YYDEBUG(513, *YYCURSOR);
+		if (yych == 'N') goto yy525;
+		if (yych == 'n') goto yy525;
+		goto yy40;
+yy452:
+		YYDEBUG(452, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'C') goto yy599;
-		if (yych == 'c') goto yy599;
-		goto yy47;
-yy514:
-		YYDEBUG(514, *YYCURSOR);
+		if (yych == 'C') goto yy527;
+		if (yych == 'c') goto yy527;
+		goto yy40;
+yy453:
+		YYDEBUG(453, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'H') goto yy601;
-		if (yych == 'h') goto yy601;
-		goto yy47;
-yy515:
-		YYDEBUG(515, *YYCURSOR);
+		if (yych == 'H') goto yy529;
+		if (yych == 'h') goto yy529;
+		goto yy40;
+yy454:
+		YYDEBUG(454, *YYCURSOR);
 		yyaccept = 46;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm256+yych & 128) {
-			goto yy46;
+			goto yy39;
 		}
-		if (yych == '\\') goto yy162;
-yy516:
-		YYDEBUG(516, *YYCURSOR);
+		if (yych == '\\') goto yy131;
+yy455:
+		YYDEBUG(455, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_IDENT(T_THROW);
 }
-yy517:
-		YYDEBUG(517, *YYCURSOR);
+yy456:
+		YYDEBUG(456, *YYCURSOR);
 		yyaccept = 47;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm256+yych & 128) {
-			goto yy46;
+			goto yy39;
 		}
-		if (yych == '\\') goto yy162;
-yy518:
-		YYDEBUG(518, *YYCURSOR);
+		if (yych == '\\') goto yy131;
+yy457:
+		YYDEBUG(457, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_IDENT(T_TRAIT);
 }
-yy519:
-		YYDEBUG(519, *YYCURSOR);
+yy458:
+		YYDEBUG(458, *YYCURSOR);
 		yyaccept = 48;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm256+yych & 128) {
-			goto yy46;
+			goto yy39;
 		}
-		if (yych == '\\') goto yy162;
-yy520:
-		YYDEBUG(520, *YYCURSOR);
+		if (yych == '\\') goto yy131;
+yy459:
+		YYDEBUG(459, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_IDENT(T_UNSET);
 }
-yy521:
-		YYDEBUG(521, *YYCURSOR);
+yy460:
+		YYDEBUG(460, *YYCURSOR);
 		yyaccept = 49;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm256+yych & 128) {
-			goto yy46;
+			goto yy39;
 		}
-		if (yych == '\\') goto yy162;
-yy522:
-		YYDEBUG(522, *YYCURSOR);
+		if (yych == '\\') goto yy131;
+yy461:
+		YYDEBUG(461, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_IDENT(T_WHILE);
 }
-yy523:
-		YYDEBUG(523, *YYCURSOR);
+yy462:
+		YYDEBUG(462, *YYCURSOR);
 		yyaccept = 50;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm256+yych & 128) {
-			goto yy46;
+			goto yy39;
 		}
 		if (yych <= ' ') {
 			if (yych <= '\f') {
-				if (yych <= 0x08) goto yy524;
-				if (yych <= '\n') goto yy603;
+				if (yych <= 0x08) goto yy463;
+				if (yych <= '\n') goto yy531;
 			} else {
-				if (yych <= '\r') goto yy603;
-				if (yych >= ' ') goto yy603;
+				if (yych <= '\r') goto yy531;
+				if (yych >= ' ') goto yy531;
 			}
 		} else {
 			if (yych <= '.') {
-				if (yych == '#') goto yy605;
+				if (yych == '#') goto yy532;
 			} else {
-				if (yych <= '/') goto yy606;
-				if (yych == '\\') goto yy162;
+				if (yych <= '/') goto yy533;
+				if (yych == '\\') goto yy131;
 			}
 		}
-yy524:
-		YYDEBUG(524, *YYCURSOR);
+yy463:
+		YYDEBUG(463, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_IDENT(T_YIELD);
 }
-yy525:
-		YYDEBUG(525, *YYCURSOR);
+yy464:
+		YYDEBUG(464, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'S') goto yy607;
-		if (yych == 's') goto yy607;
-		goto yy47;
-yy526:
-		YYDEBUG(526, *YYCURSOR);
+		if (yych == 'S') goto yy534;
+		if (yych == 's') goto yy534;
+		goto yy40;
+yy465:
+		YYDEBUG(465, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == '_') goto yy608;
-		goto yy47;
-yy527:
-		YYDEBUG(527, *YYCURSOR);
+		if (yych == '_') goto yy535;
+		goto yy40;
+yy466:
+		YYDEBUG(466, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'E') goto yy609;
-		if (yych == 'e') goto yy609;
-		goto yy47;
-yy528:
-		YYDEBUG(528, *YYCURSOR);
+		if (yych == 'E') goto yy536;
+		if (yych == 'e') goto yy536;
+		goto yy40;
+yy467:
+		YYDEBUG(467, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'C') goto yy610;
-		if (yych == 'c') goto yy610;
-		goto yy47;
-yy529:
-		YYDEBUG(529, *YYCURSOR);
+		if (yych == 'C') goto yy537;
+		if (yych == 'c') goto yy537;
+		goto yy40;
+yy468:
+		YYDEBUG(468, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'T') goto yy611;
-		if (yych == 't') goto yy611;
-		goto yy47;
-yy530:
-		YYDEBUG(530, *YYCURSOR);
+		if (yych == 'T') goto yy538;
+		if (yych == 't') goto yy538;
+		goto yy40;
+yy469:
+		YYDEBUG(469, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'E') goto yy612;
-		if (yych == 'e') goto yy612;
-		goto yy47;
-yy531:
-		YYDEBUG(531, *YYCURSOR);
+		if (yych == 'E') goto yy539;
+		if (yych == 'e') goto yy539;
+		goto yy40;
+yy470:
+		YYDEBUG(470, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'H') goto yy613;
-		if (yych == 'h') goto yy613;
-		goto yy47;
-yy532:
-		YYDEBUG(532, *YYCURSOR);
+		if (yych == 'H') goto yy540;
+		if (yych == 'h') goto yy540;
+		goto yy40;
+yy471:
+		YYDEBUG(471, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'E') goto yy614;
-		if (yych == 'e') goto yy614;
-		goto yy47;
-yy533:
-		YYDEBUG(533, *YYCURSOR);
+		if (yych == 'E') goto yy541;
+		if (yych == 'e') goto yy541;
+		goto yy40;
+yy472:
+		YYDEBUG(472, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'I') goto yy615;
-		if (yych == 'i') goto yy615;
-		goto yy47;
-yy534:
-		YYDEBUG(534, *YYCURSOR);
+		if (yych == 'I') goto yy542;
+		if (yych == 'i') goto yy542;
+		goto yy40;
+yy473:
+		YYDEBUG(473, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(535, *YYCURSOR);
 		if (yybm0+yych & 64) {
-			goto yy349;
+			goto yy296;
 		}
 		if (yych <= ' ') {
 			if (yych <= '\n') {
-				if (yych <= 0x00) goto yy85;
-				if (yych <= 0x08) goto yy226;
-				goto yy534;
-			} else {
-				if (yych == '\r') goto yy534;
-				if (yych <= 0x1F) goto yy226;
-				goto yy534;
+				if (yych <= 0x00) goto yy72;
+				if (yych <= 0x08) goto yy188;
+				goto yy473;
+			} else {
+				if (yych == '\r') goto yy473;
+				if (yych <= 0x1F) goto yy188;
+				goto yy473;
 			}
 		} else {
 			if (yych <= '$') {
-				if (yych <= '"') goto yy226;
-				if (yych <= '#') goto yy616;
-				goto yy617;
-			} else {
-				if (yych <= '-') goto yy226;
-				if (yych <= '.') goto yy618;
-				if (yych <= '/') goto yy619;
-				goto yy226;
+				if (yych <= '"') goto yy188;
+				if (yych <= '#') goto yy543;
+				goto yy544;
+			} else {
+				if (yych <= '-') goto yy188;
+				if (yych <= '.') goto yy545;
+				if (yych <= '/') goto yy546;
+				goto yy188;
 			}
 		}
-yy536:
-		YYDEBUG(536, *YYCURSOR);
+yy474:
+		YYDEBUG(474, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(537, *YYCURSOR);
 		if (yych <= '\r') {
 			if (yych <= '\t') {
-				if (yych <= 0x00) goto yy85;
-				goto yy435;
+				if (yych <= 0x00) goto yy72;
+				goto yy379;
 			} else {
-				if (yych <= '\n') goto yy534;
-				if (yych <= '\f') goto yy435;
-				goto yy534;
+				if (yych <= '\n') goto yy473;
+				if (yych <= '\f') goto yy379;
+				goto yy473;
 			}
 		} else {
 			if (yych <= '*') {
-				if (yych <= ')') goto yy435;
-				goto yy536;
+				if (yych <= ')') goto yy379;
+				goto yy474;
 			} else {
-				if (yych == '/') goto yy223;
-				goto yy435;
+				if (yych == '/') goto yy186;
+				goto yy379;
 			}
 		}
-yy538:
-		YYDEBUG(538, *YYCURSOR);
+yy475:
+		YYDEBUG(475, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(539, *YYCURSOR);
 		if (yych <= 0x1F) {
-			if (yych == '\t') goto yy538;
-			goto yy85;
+			if (yych == '\t') goto yy475;
+			goto yy72;
 		} else {
-			if (yych <= ' ') goto yy538;
-			if (yych == ')') goto yy620;
-			goto yy85;
+			if (yych <= ' ') goto yy475;
+			if (yych == ')') goto yy547;
+			goto yy72;
 		}
-yy540:
-		YYDEBUG(540, *YYCURSOR);
+yy476:
+		YYDEBUG(476, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'Y') goto yy622;
-		if (yych == 'y') goto yy622;
-		goto yy85;
-yy541:
-		YYDEBUG(541, *YYCURSOR);
+		if (yych == 'Y') goto yy548;
+		if (yych == 'y') goto yy548;
+		goto yy72;
+yy477:
+		YYDEBUG(477, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-yy542:
-		YYDEBUG(542, *YYCURSOR);
+yy478:
+		YYDEBUG(478, *YYCURSOR);
 		if (yych <= 0x1F) {
-			if (yych == '\t') goto yy541;
-			goto yy85;
+			if (yych == '\t') goto yy477;
+			goto yy72;
 		} else {
-			if (yych <= ' ') goto yy541;
-			if (yych != ')') goto yy85;
+			if (yych <= ' ') goto yy477;
+			if (yych != ')') goto yy72;
 		}
-		YYDEBUG(543, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(544, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN(T_BOOL_CAST);
 }
-yy545:
-		YYDEBUG(545, *YYCURSOR);
+yy479:
+		YYDEBUG(479, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'A') goto yy624;
-		if (yych == 'a') goto yy624;
-		goto yy85;
-yy546:
-		YYDEBUG(546, *YYCURSOR);
+		if (yych == 'A') goto yy549;
+		if (yych == 'a') goto yy549;
+		goto yy72;
+yy480:
+		YYDEBUG(480, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'E') goto yy547;
-		if (yych != 'e') goto yy85;
-yy547:
-		YYDEBUG(547, *YYCURSOR);
+		if (yych == 'E') goto yy481;
+		if (yych != 'e') goto yy72;
+yy481:
+		YYDEBUG(481, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(548, *YYCURSOR);
 		if (yych <= 0x1F) {
-			if (yych == '\t') goto yy547;
-			goto yy85;
+			if (yych == '\t') goto yy481;
+			goto yy72;
 		} else {
-			if (yych <= ' ') goto yy547;
-			if (yych == ')') goto yy625;
-			goto yy85;
+			if (yych <= ' ') goto yy481;
+			if (yych == ')') goto yy550;
+			goto yy72;
 		}
-yy549:
-		YYDEBUG(549, *YYCURSOR);
+yy482:
+		YYDEBUG(482, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'E') goto yy627;
-		if (yych == 'e') goto yy627;
-		goto yy85;
-yy550:
-		YYDEBUG(550, *YYCURSOR);
+		if (yych == 'E') goto yy551;
+		if (yych == 'e') goto yy551;
+		goto yy72;
+yy483:
+		YYDEBUG(483, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'T') goto yy628;
-		if (yych == 't') goto yy628;
-		goto yy85;
-yy551:
-		YYDEBUG(551, *YYCURSOR);
+		if (yych == 'T') goto yy552;
+		if (yych == 't') goto yy552;
+		goto yy72;
+yy484:
+		YYDEBUG(484, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(552, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	if (PARSER_MODE()) {
@@ -6787,3854 +6720,3826 @@
 	}
 	RETURN_TOKEN(T_DOUBLE_CAST);
 }
-yy553:
-		YYDEBUG(553, *YYCURSOR);
+yy485:
+		YYDEBUG(485, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'G') goto yy622;
-		if (yych == 'g') goto yy622;
-		goto yy85;
-yy554:
-		YYDEBUG(554, *YYCURSOR);
+		if (yych == 'G') goto yy548;
+		if (yych == 'g') goto yy548;
+		goto yy72;
+yy486:
+		YYDEBUG(486, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(555, *YYCURSOR);
 		if (yych <= 0x1F) {
-			if (yych == '\t') goto yy554;
-			goto yy85;
+			if (yych == '\t') goto yy486;
+			goto yy72;
 		} else {
-			if (yych <= ' ') goto yy554;
-			if (yych == ')') goto yy630;
-			goto yy85;
+			if (yych <= ' ') goto yy486;
+			if (yych == ')') goto yy553;
+			goto yy72;
 		}
-yy556:
-		YYDEBUG(556, *YYCURSOR);
+yy487:
+		YYDEBUG(487, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == '\n') goto yy456;
-		if (yych == '\r') goto yy458;
-		goto yy85;
-yy557:
-		YYDEBUG(557, *YYCURSOR);
+		if (yych == '\n') goto yy396;
+		if (yych == '\r') goto yy398;
+		goto yy72;
+yy488:
+		YYDEBUG(488, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'C') goto yy632;
-		if (yych == 'c') goto yy632;
-		goto yy47;
-yy558:
-		YYDEBUG(558, *YYCURSOR);
+		if (yych == 'C') goto yy554;
+		if (yych == 'c') goto yy554;
+		goto yy40;
+yy489:
+		YYDEBUG(489, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'L') goto yy633;
-		if (yych == 'l') goto yy633;
-		goto yy47;
-yy559:
-		YYDEBUG(559, *YYCURSOR);
+		if (yych == 'L') goto yy555;
+		if (yych == 'l') goto yy555;
+		goto yy40;
+yy490:
+		YYDEBUG(490, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'U') goto yy634;
-		if (yych == 'u') goto yy634;
-		goto yy47;
-yy560:
-		YYDEBUG(560, *YYCURSOR);
+		if (yych == 'U') goto yy556;
+		if (yych == 'u') goto yy556;
+		goto yy40;
+yy491:
+		YYDEBUG(491, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'E') goto yy635;
-		if (yych == 'e') goto yy635;
-		goto yy47;
-yy561:
-		YYDEBUG(561, *YYCURSOR);
+		if (yych == 'E') goto yy557;
+		if (yych == 'e') goto yy557;
+		goto yy40;
+yy492:
+		YYDEBUG(492, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'T') goto yy637;
-		if (yych == 't') goto yy637;
-		goto yy47;
-yy562:
-		YYDEBUG(562, *YYCURSOR);
+		if (yych == 'T') goto yy559;
+		if (yych == 't') goto yy559;
+		goto yy40;
+yy493:
+		YYDEBUG(493, *YYCURSOR);
 		yyaccept = 51;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm256+yych & 128) {
-			goto yy46;
+			goto yy39;
 		}
-		if (yych == '\\') goto yy162;
-yy563:
-		YYDEBUG(563, *YYCURSOR);
+		if (yych == '\\') goto yy131;
+yy494:
+		YYDEBUG(494, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_IDENT(T_ELSEIF);
 }
-yy564:
-		YYDEBUG(564, *YYCURSOR);
+yy495:
+		YYDEBUG(495, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'L') goto yy639;
-		if (yych == 'l') goto yy639;
-		goto yy47;
-yy565:
-		YYDEBUG(565, *YYCURSOR);
+		if (yych == 'L') goto yy561;
+		if (yych == 'l') goto yy561;
+		goto yy40;
+yy496:
+		YYDEBUG(496, *YYCURSOR);
 		yyaccept = 52;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yych <= '\\') {
 			if (yych <= 'D') {
-				if (yych <= '/') goto yy566;
-				if (yych <= '9') goto yy46;
-				if (yych >= 'A') goto yy46;
-			} else {
-				if (yych <= 'E') goto yy640;
-				if (yych <= 'Z') goto yy46;
-				if (yych >= '\\') goto yy162;
+				if (yych <= '/') goto yy497;
+				if (yych <= '9') goto yy39;
+				if (yych >= 'A') goto yy39;
+			} else {
+				if (yych <= 'E') goto yy562;
+				if (yych <= 'Z') goto yy39;
+				if (yych >= '\\') goto yy131;
 			}
 		} else {
 			if (yych <= 'd') {
-				if (yych == '_') goto yy46;
-				if (yych >= 'a') goto yy46;
+				if (yych == '_') goto yy39;
+				if (yych >= 'a') goto yy39;
 			} else {
-				if (yych <= 'e') goto yy640;
-				if (yych <= 'z') goto yy46;
-				if (yych >= 0x80) goto yy46;
+				if (yych <= 'e') goto yy562;
+				if (yych <= 'z') goto yy39;
+				if (yych >= 0x80) goto yy39;
 			}
 		}
-yy566:
-		YYDEBUG(566, *YYCURSOR);
+yy497:
+		YYDEBUG(497, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_IDENT(T_ENDFOR);
 }
-yy567:
-		YYDEBUG(567, *YYCURSOR);
+yy498:
+		YYDEBUG(498, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'T') goto yy641;
-		if (yych == 't') goto yy641;
-		goto yy47;
-yy568:
-		YYDEBUG(568, *YYCURSOR);
+		if (yych == 'T') goto yy563;
+		if (yych == 't') goto yy563;
+		goto yy40;
+yy499:
+		YYDEBUG(499, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'L') goto yy642;
-		if (yych == 'l') goto yy642;
-		goto yy47;
-yy569:
-		YYDEBUG(569, *YYCURSOR);
+		if (yych == 'L') goto yy564;
+		if (yych == 'l') goto yy564;
+		goto yy40;
+yy500:
+		YYDEBUG(500, *YYCURSOR);
 		++YYCURSOR;
-yy570:
-		YYDEBUG(570, *YYCURSOR);
+yy501:
+		YYDEBUG(501, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	yyless(4);
 	RETURN_TOKEN_WITH_IDENT(T_ENUM);
 }
-yy571:
-		YYDEBUG(571, *YYCURSOR);
+yy502:
+		YYDEBUG(502, *YYCURSOR);
 		yyaccept = 53;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'X') goto yy643;
-		if (yych == 'x') goto yy643;
-		goto yy570;
-yy572:
-		YYDEBUG(572, *YYCURSOR);
+		if (yych == 'X') goto yy565;
+		if (yych == 'x') goto yy565;
+		goto yy501;
+yy503:
+		YYDEBUG(503, *YYCURSOR);
 		yyaccept = 53;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'M') goto yy644;
-		if (yych == 'm') goto yy644;
-		goto yy570;
-yy573:
-		YYDEBUG(573, *YYCURSOR);
+		if (yych == 'M') goto yy566;
+		if (yych == 'm') goto yy566;
+		goto yy501;
+yy504:
+		YYDEBUG(504, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(574, *YYCURSOR);
 		if (yych <= '\n') {
-			if (yych <= 0x00) goto yy85;
-			if (yych <= '\t') goto yy573;
-			goto yy485;
+			if (yych <= 0x00) goto yy72;
+			if (yych <= '\t') goto yy504;
+			goto yy425;
 		} else {
-			if (yych == '\r') goto yy485;
-			goto yy573;
+			if (yych == '\r') goto yy425;
+			goto yy504;
 		}
-yy575:
-		YYDEBUG(575, *YYCURSOR);
+yy505:
+		YYDEBUG(505, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(576, *YYCURSOR);
 		if (yych <= 'D') {
 			if (yych <= 0x1F) {
 				if (yych <= '\t') {
-					if (yych <= 0x00) goto yy85;
-					if (yych <= 0x08) goto yy573;
-					goto yy575;
-				} else {
-					if (yych <= '\n') goto yy485;
-					if (yych == '\r') goto yy485;
-					goto yy573;
+					if (yych <= 0x00) goto yy72;
+					if (yych <= 0x08) goto yy504;
+					goto yy505;
+				} else {
+					if (yych <= '\n') goto yy425;
+					if (yych == '\r') goto yy425;
+					goto yy504;
 				}
 			} else {
 				if (yych <= '#') {
-					if (yych <= ' ') goto yy575;
-					if (yych <= '"') goto yy573;
-					goto yy645;
-				} else {
-					if (yych == '/') goto yy646;
-					if (yych <= '@') goto yy573;
-					goto yy647;
+					if (yych <= ' ') goto yy505;
+					if (yych <= '"') goto yy504;
+					goto yy567;
+				} else {
+					if (yych == '/') goto yy568;
+					if (yych <= '@') goto yy504;
+					goto yy569;
 				}
 			}
 		} else {
 			if (yych <= '`') {
 				if (yych <= 'I') {
-					if (yych <= 'E') goto yy648;
-					if (yych <= 'H') goto yy647;
-					goto yy649;
-				} else {
-					if (yych <= 'Z') goto yy647;
-					if (yych == '_') goto yy647;
-					goto yy573;
+					if (yych <= 'E') goto yy570;
+					if (yych <= 'H') goto yy569;
+					goto yy571;
+				} else {
+					if (yych <= 'Z') goto yy569;
+					if (yych == '_') goto yy569;
+					goto yy504;
 				}
 			} else {
 				if (yych <= 'h') {
-					if (yych == 'e') goto yy648;
-					goto yy647;
+					if (yych == 'e') goto yy570;
+					goto yy569;
 				} else {
-					if (yych <= 'i') goto yy649;
-					if (yych <= 'z') goto yy647;
-					if (yych <= 0x7F) goto yy573;
-					goto yy647;
+					if (yych <= 'i') goto yy571;
+					if (yych <= 'z') goto yy569;
+					if (yych <= 0x7F) goto yy504;
+					goto yy569;
 				}
 			}
 		}
-yy577:
-		YYDEBUG(577, *YYCURSOR);
+yy506:
+		YYDEBUG(506, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(578, *YYCURSOR);
-		if (yych <= 0x00) goto yy85;
-		if (yych == '*') goto yy650;
-		goto yy577;
-yy579:
-		YYDEBUG(579, *YYCURSOR);
+		if (yych <= 0x00) goto yy72;
+		if (yych == '*') goto yy572;
+		goto yy506;
+yy507:
+		YYDEBUG(507, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'S') goto yy652;
-		if (yych == 's') goto yy652;
-		goto yy47;
-yy580:
-		YYDEBUG(580, *YYCURSOR);
+		if (yych == 'S') goto yy573;
+		if (yych == 's') goto yy573;
+		goto yy40;
+yy508:
+		YYDEBUG(508, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'Y') goto yy654;
-		if (yych == 'y') goto yy654;
-		goto yy47;
-yy581:
-		YYDEBUG(581, *YYCURSOR);
+		if (yych == 'Y') goto yy575;
+		if (yych == 'y') goto yy575;
+		goto yy40;
+yy509:
+		YYDEBUG(509, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'H') goto yy656;
-		if (yych == 'h') goto yy656;
-		goto yy47;
-yy582:
-		YYDEBUG(582, *YYCURSOR);
+		if (yych == 'H') goto yy577;
+		if (yych == 'h') goto yy577;
+		goto yy40;
+yy510:
+		YYDEBUG(510, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'O') goto yy658;
-		if (yych == 'o') goto yy658;
-		goto yy47;
-yy583:
-		YYDEBUG(583, *YYCURSOR);
+		if (yych == 'O') goto yy579;
+		if (yych == 'o') goto yy579;
+		goto yy40;
+yy511:
+		YYDEBUG(511, *YYCURSOR);
 		yyaccept = 54;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm256+yych & 128) {
-			goto yy46;
+			goto yy39;
 		}
-		if (yych == '\\') goto yy162;
-yy584:
-		YYDEBUG(584, *YYCURSOR);
+		if (yych == '\\') goto yy131;
+yy512:
+		YYDEBUG(512, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_IDENT(T_GLOBAL);
 }
-yy585:
-		YYDEBUG(585, *YYCURSOR);
+yy513:
+		YYDEBUG(513, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'E') goto yy659;
-		if (yych == 'e') goto yy659;
-		goto yy47;
-yy586:
-		YYDEBUG(586, *YYCURSOR);
+		if (yych == 'E') goto yy580;
+		if (yych == 'e') goto yy580;
+		goto yy40;
+yy514:
+		YYDEBUG(514, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'E') goto yy660;
-		if (yych == 'e') goto yy660;
-		goto yy47;
-yy587:
-		YYDEBUG(587, *YYCURSOR);
+		if (yych == 'E') goto yy581;
+		if (yych == 'e') goto yy581;
+		goto yy40;
+yy515:
+		YYDEBUG(515, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'C') goto yy662;
-		if (yych == 'c') goto yy662;
-		goto yy47;
-yy588:
-		YYDEBUG(588, *YYCURSOR);
+		if (yych == 'C') goto yy583;
+		if (yych == 'c') goto yy583;
+		goto yy40;
+yy516:
+		YYDEBUG(516, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'D') goto yy663;
-		if (yych == 'd') goto yy663;
-		goto yy47;
-yy589:
-		YYDEBUG(589, *YYCURSOR);
+		if (yych == 'D') goto yy584;
+		if (yych == 'd') goto yy584;
+		goto yy40;
+yy517:
+		YYDEBUG(517, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'A') goto yy664;
-		if (yych == 'a') goto yy664;
-		goto yy47;
-yy590:
-		YYDEBUG(590, *YYCURSOR);
+		if (yych == 'A') goto yy585;
+		if (yych == 'a') goto yy585;
+		goto yy40;
+yy518:
+		YYDEBUG(518, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'A') goto yy665;
-		if (yych == 'a') goto yy665;
-		goto yy47;
-yy591:
-		YYDEBUG(591, *YYCURSOR);
+		if (yych == 'A') goto yy586;
+		if (yych == 'a') goto yy586;
+		goto yy40;
+yy519:
+		YYDEBUG(519, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'E') goto yy666;
-		if (yych == 'e') goto yy666;
-		goto yy47;
-yy592:
-		YYDEBUG(592, *YYCURSOR);
+		if (yych == 'E') goto yy587;
+		if (yych == 'e') goto yy587;
+		goto yy40;
+yy520:
+		YYDEBUG(520, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'T') goto yy668;
-		if (yych == 't') goto yy668;
-		goto yy47;
-yy593:
-		YYDEBUG(593, *YYCURSOR);
+		if (yych == 'T') goto yy589;
+		if (yych == 't') goto yy589;
+		goto yy40;
+yy521:
+		YYDEBUG(521, *YYCURSOR);
 		yyaccept = 55;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm256+yych & 128) {
-			goto yy46;
+			goto yy39;
 		}
-		if (yych == '\\') goto yy162;
-yy594:
-		YYDEBUG(594, *YYCURSOR);
+		if (yych == '\\') goto yy131;
+yy522:
+		YYDEBUG(522, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_IDENT(T_PUBLIC);
 }
-yy595:
-		YYDEBUG(595, *YYCURSOR);
+yy523:
+		YYDEBUG(523, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'L') goto yy669;
-		if (yych == 'l') goto yy669;
-		goto yy47;
-yy596:
-		YYDEBUG(596, *YYCURSOR);
+		if (yych == 'L') goto yy590;
+		if (yych == 'l') goto yy590;
+		goto yy40;
+yy524:
+		YYDEBUG(524, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'E') goto yy670;
-		if (yych == 'e') goto yy670;
-		goto yy47;
-yy597:
-		YYDEBUG(597, *YYCURSOR);
+		if (yych == 'E') goto yy591;
+		if (yych == 'e') goto yy591;
+		goto yy40;
+yy525:
+		YYDEBUG(525, *YYCURSOR);
 		yyaccept = 56;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm256+yych & 128) {
-			goto yy46;
+			goto yy39;
 		}
-		if (yych == '\\') goto yy162;
-yy598:
-		YYDEBUG(598, *YYCURSOR);
+		if (yych == '\\') goto yy131;
+yy526:
+		YYDEBUG(526, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_IDENT(T_RETURN);
 }
-yy599:
-		YYDEBUG(599, *YYCURSOR);
+yy527:
+		YYDEBUG(527, *YYCURSOR);
 		yyaccept = 57;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm256+yych & 128) {
-			goto yy46;
+			goto yy39;
 		}
-		if (yych == '\\') goto yy162;
-yy600:
-		YYDEBUG(600, *YYCURSOR);
+		if (yych == '\\') goto yy131;
+yy528:
+		YYDEBUG(528, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_IDENT(T_STATIC);
 }
-yy601:
-		YYDEBUG(601, *YYCURSOR);
+yy529:
+		YYDEBUG(529, *YYCURSOR);
 		yyaccept = 58;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm256+yych & 128) {
-			goto yy46;
+			goto yy39;
 		}
-		if (yych == '\\') goto yy162;
-yy602:
-		YYDEBUG(602, *YYCURSOR);
+		if (yych == '\\') goto yy131;
+yy530:
+		YYDEBUG(530, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_IDENT(T_SWITCH);
 }
-yy603:
-		YYDEBUG(603, *YYCURSOR);
+yy531:
+		YYDEBUG(531, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(5);
 		yych = *YYCURSOR;
-		YYDEBUG(604, *YYCURSOR);
 		if (yych <= '"') {
 			if (yych <= '\f') {
-				if (yych <= 0x08) goto yy85;
-				if (yych <= '\n') goto yy603;
-				goto yy85;
-			} else {
-				if (yych <= '\r') goto yy603;
-				if (yych == ' ') goto yy603;
-				goto yy85;
+				if (yych <= 0x08) goto yy72;
+				if (yych <= '\n') goto yy531;
+				goto yy72;
+			} else {
+				if (yych <= '\r') goto yy531;
+				if (yych == ' ') goto yy531;
+				goto yy72;
 			}
 		} else {
 			if (yych <= 'E') {
-				if (yych <= '#') goto yy605;
-				if (yych == '/') goto yy606;
-				goto yy85;
-			} else {
-				if (yych <= 'F') goto yy672;
-				if (yych == 'f') goto yy672;
-				goto yy85;
+				if (yych <= '#') goto yy532;
+				if (yych == '/') goto yy533;
+				goto yy72;
+			} else {
+				if (yych <= 'F') goto yy593;
+				if (yych == 'f') goto yy593;
+				goto yy72;
 			}
 		}
-yy605:
-		YYDEBUG(605, *YYCURSOR);
+yy532:
+		YYDEBUG(532, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= '\f') {
-			if (yych <= 0x00) goto yy85;
-			if (yych == '\n') goto yy675;
-			goto yy673;
-		} else {
-			if (yych <= '\r') goto yy675;
-			if (yych == '') goto yy85;
-			goto yy673;
+			if (yych <= 0x00) goto yy72;
+			if (yych == '\n') goto yy595;
+			goto yy594;
+		} else {
+			if (yych <= '\r') goto yy595;
+			if (yych == '') goto yy72;
+			goto yy594;
 		}
-yy606:
-		YYDEBUG(606, *YYCURSOR);
+yy533:
+		YYDEBUG(533, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		if (yych == '*') goto yy677;
-		if (yych == '/') goto yy673;
-		goto yy85;
-yy607:
-		YYDEBUG(607, *YYCURSOR);
+		if (yych == '*') goto yy596;
+		if (yych == '/') goto yy594;
+		goto yy72;
+yy534:
+		YYDEBUG(534, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'S') goto yy679;
-		if (yych == 's') goto yy679;
-		goto yy47;
-yy608:
-		YYDEBUG(608, *YYCURSOR);
+		if (yych == 'S') goto yy597;
+		if (yych == 's') goto yy597;
+		goto yy40;
+yy535:
+		YYDEBUG(535, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == '_') goto yy680;
-		goto yy47;
-yy609:
-		YYDEBUG(609, *YYCURSOR);
+		if (yych == '_') goto yy598;
+		goto yy40;
+yy536:
+		YYDEBUG(536, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == '_') goto yy682;
-		goto yy47;
-yy610:
-		YYDEBUG(610, *YYCURSOR);
+		if (yych == '_') goto yy600;
+		goto yy40;
+yy537:
+		YYDEBUG(537, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'T') goto yy683;
-		if (yych == 't') goto yy683;
-		goto yy47;
-yy611:
-		YYDEBUG(611, *YYCURSOR);
+		if (yych == 'T') goto yy601;
+		if (yych == 't') goto yy601;
+		goto yy40;
+yy538:
+		YYDEBUG(538, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == '_') goto yy684;
-		goto yy47;
-yy612:
-		YYDEBUG(612, *YYCURSOR);
+		if (yych == '_') goto yy602;
+		goto yy40;
+yy539:
+		YYDEBUG(539, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == '_') goto yy685;
-		goto yy47;
-yy613:
-		YYDEBUG(613, *YYCURSOR);
+		if (yych == '_') goto yy603;
+		goto yy40;
+yy540:
+		YYDEBUG(540, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'O') goto yy686;
-		if (yych == 'o') goto yy686;
-		goto yy47;
-yy614:
-		YYDEBUG(614, *YYCURSOR);
+		if (yych == 'O') goto yy604;
+		if (yych == 'o') goto yy604;
+		goto yy40;
+yy541:
+		YYDEBUG(541, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'S') goto yy687;
-		if (yych == 's') goto yy687;
-		goto yy47;
-yy615:
-		YYDEBUG(615, *YYCURSOR);
+		if (yych == 'S') goto yy605;
+		if (yych == 's') goto yy605;
+		goto yy40;
+yy542:
+		YYDEBUG(542, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'T') goto yy688;
-		if (yych == 't') goto yy688;
-		goto yy47;
-yy616:
-		YYDEBUG(616, *YYCURSOR);
+		if (yych == 'T') goto yy606;
+		if (yych == 't') goto yy606;
+		goto yy40;
+yy543:
+		YYDEBUG(543, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= '\r') {
 			if (yych <= '\t') {
-				if (yych <= 0x00) goto yy85;
-				goto yy435;
+				if (yych <= 0x00) goto yy72;
+				goto yy379;
 			} else {
-				if (yych <= '\n') goto yy689;
-				if (yych <= '\f') goto yy435;
-				goto yy689;
+				if (yych <= '\n') goto yy607;
+				if (yych <= '\f') goto yy379;
+				goto yy607;
 			}
 		} else {
 			if (yych <= '*') {
-				if (yych <= ')') goto yy435;
-				goto yy536;
+				if (yych <= ')') goto yy379;
+				goto yy474;
 			} else {
-				if (yych == '') goto yy226;
-				goto yy435;
+				if (yych == '') goto yy188;
+				goto yy379;
 			}
 		}
-yy617:
-		YYDEBUG(617, *YYCURSOR);
+yy544:
+		YYDEBUG(544, *YYCURSOR);
 		yyaccept = 26;
 		YYMARKER = ++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yybm0+yych & 4) {
-			goto yy226;
+			goto yy188;
 		}
-		if (yych <= 0x00) goto yy88;
-		goto yy349;
-yy618:
-		YYDEBUG(618, *YYCURSOR);
+		if (yych <= 0x00) goto yy75;
+		goto yy296;
+yy545:
+		YYDEBUG(545, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yybm0+yych & 64) {
-			goto yy349;
+			goto yy296;
 		}
-		if (yych <= 0x00) goto yy85;
-		if (yych == '.') goto yy691;
-		goto yy226;
-yy619:
-		YYDEBUG(619, *YYCURSOR);
+		if (yych <= 0x00) goto yy72;
+		if (yych == '.') goto yy608;
+		goto yy188;
+yy546:
+		YYDEBUG(546, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= '*') {
-			if (yych <= 0x00) goto yy85;
-			if (yych <= ')') goto yy226;
-			goto yy692;
+			if (yych <= 0x00) goto yy72;
+			if (yych <= ')') goto yy188;
+			goto yy609;
 		} else {
-			if (yych == '/') goto yy435;
-			goto yy226;
+			if (yych == '/') goto yy379;
+			goto yy188;
 		}
-yy620:
-		YYDEBUG(620, *YYCURSOR);
+yy547:
+		YYDEBUG(547, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(621, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN(T_ARRAY_CAST);
 }
-yy622:
-		YYDEBUG(622, *YYCURSOR);
+yy548:
+		YYDEBUG(548, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(623, *YYCURSOR);
 		if (yych <= 0x1F) {
-			if (yych == '\t') goto yy622;
-			goto yy85;
+			if (yych == '\t') goto yy548;
+			goto yy72;
 		} else {
-			if (yych <= ' ') goto yy622;
-			if (yych == ')') goto yy693;
-			goto yy85;
+			if (yych <= ' ') goto yy548;
+			if (yych == ')') goto yy610;
+			goto yy72;
 		}
-yy624:
-		YYDEBUG(624, *YYCURSOR);
+yy549:
+		YYDEBUG(549, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'N') goto yy541;
-		if (yych == 'n') goto yy541;
-		goto yy85;
-yy625:
-		YYDEBUG(625, *YYCURSOR);
+		if (yych == 'N') goto yy477;
+		if (yych == 'n') goto yy477;
+		goto yy72;
+yy550:
+		YYDEBUG(550, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(626, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN(T_DOUBLE_CAST);
 }
-yy627:
-		YYDEBUG(627, *YYCURSOR);
+yy551:
+		YYDEBUG(551, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'R') goto yy442;
-		if (yych == 'r') goto yy442;
-		goto yy85;
-yy628:
-		YYDEBUG(628, *YYCURSOR);
+		if (yych == 'R') goto yy385;
+		if (yych == 'r') goto yy385;
+		goto yy72;
+yy552:
+		YYDEBUG(552, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(629, *YYCURSOR);
 		if (yych <= 0x1F) {
-			if (yych == '\t') goto yy628;
-			goto yy85;
+			if (yych == '\t') goto yy552;
+			goto yy72;
 		} else {
-			if (yych <= ' ') goto yy628;
-			if (yych == ')') goto yy695;
-			goto yy85;
+			if (yych <= ' ') goto yy552;
+			if (yych == ')') goto yy611;
+			goto yy72;
 		}
-yy630:
-		YYDEBUG(630, *YYCURSOR);
+yy553:
+		YYDEBUG(553, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(631, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN(T_UNSET_CAST);
 }
-yy632:
-		YYDEBUG(632, *YYCURSOR);
+yy554:
+		YYDEBUG(554, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'T') goto yy697;
-		if (yych == 't') goto yy697;
-		goto yy47;
-yy633:
-		YYDEBUG(633, *YYCURSOR);
+		if (yych == 'T') goto yy612;
+		if (yych == 't') goto yy612;
+		goto yy40;
+yy555:
+		YYDEBUG(555, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'E') goto yy699;
-		if (yych == 'e') goto yy699;
-		goto yy47;
-yy634:
-		YYDEBUG(634, *YYCURSOR);
+		if (yych == 'E') goto yy614;
+		if (yych == 'e') goto yy614;
+		goto yy40;
+yy556:
+		YYDEBUG(556, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'E') goto yy701;
-		if (yych == 'e') goto yy701;
-		goto yy47;
-yy635:
-		YYDEBUG(635, *YYCURSOR);
+		if (yych == 'E') goto yy616;
+		if (yych == 'e') goto yy616;
+		goto yy40;
+yy557:
+		YYDEBUG(557, *YYCURSOR);
 		yyaccept = 59;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm256+yych & 128) {
-			goto yy46;
+			goto yy39;
 		}
-		if (yych == '\\') goto yy162;
-yy636:
-		YYDEBUG(636, *YYCURSOR);
+		if (yych == '\\') goto yy131;
+yy558:
+		YYDEBUG(558, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_IDENT(T_DECLARE);
 }
-yy637:
-		YYDEBUG(637, *YYCURSOR);
+yy559:
+		YYDEBUG(559, *YYCURSOR);
 		yyaccept = 60;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm256+yych & 128) {
-			goto yy46;
+			goto yy39;
 		}
-		if (yych == '\\') goto yy162;
-yy638:
-		YYDEBUG(638, *YYCURSOR);
+		if (yych == '\\') goto yy131;
+yy560:
+		YYDEBUG(560, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_IDENT(T_DEFAULT);
 }
-yy639:
-		YYDEBUG(639, *YYCURSOR);
+yy561:
+		YYDEBUG(561, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'A') goto yy703;
-		if (yych == 'a') goto yy703;
-		goto yy47;
-yy640:
-		YYDEBUG(640, *YYCURSOR);
+		if (yych == 'A') goto yy618;
+		if (yych == 'a') goto yy618;
+		goto yy40;
+yy562:
+		YYDEBUG(562, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'A') goto yy704;
-		if (yych == 'a') goto yy704;
-		goto yy47;
-yy641:
-		YYDEBUG(641, *YYCURSOR);
+		if (yych == 'A') goto yy619;
+		if (yych == 'a') goto yy619;
+		goto yy40;
+yy563:
+		YYDEBUG(563, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'C') goto yy705;
-		if (yych == 'c') goto yy705;
-		goto yy47;
-yy642:
-		YYDEBUG(642, *YYCURSOR);
+		if (yych == 'C') goto yy620;
+		if (yych == 'c') goto yy620;
+		goto yy40;
+yy564:
+		YYDEBUG(564, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'E') goto yy706;
-		if (yych == 'e') goto yy706;
-		goto yy47;
-yy643:
-		YYDEBUG(643, *YYCURSOR);
+		if (yych == 'E') goto yy621;
+		if (yych == 'e') goto yy621;
+		goto yy40;
+yy565:
+		YYDEBUG(565, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'T') goto yy708;
-		if (yych == 't') goto yy708;
-		goto yy85;
-yy644:
-		YYDEBUG(644, *YYCURSOR);
+		if (yych == 'T') goto yy623;
+		if (yych == 't') goto yy623;
+		goto yy72;
+yy566:
+		YYDEBUG(566, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'P') goto yy709;
-		if (yych == 'p') goto yy709;
-		goto yy85;
-yy645:
-		YYDEBUG(645, *YYCURSOR);
+		if (yych == 'P') goto yy624;
+		if (yych == 'p') goto yy624;
+		goto yy72;
+yy567:
+		YYDEBUG(567, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= '\n') {
-			if (yych <= 0x00) goto yy85;
-			if (yych <= '\t') goto yy573;
-			goto yy575;
+			if (yych <= 0x00) goto yy72;
+			if (yych <= '\t') goto yy504;
+			goto yy505;
 		} else {
-			if (yych == '\r') goto yy575;
-			goto yy573;
+			if (yych == '\r') goto yy505;
+			goto yy504;
 		}
-yy646:
-		YYDEBUG(646, *YYCURSOR);
+yy568:
+		YYDEBUG(568, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= '\f') {
-			if (yych <= 0x00) goto yy85;
-			if (yych == '\n') goto yy485;
-			goto yy573;
-		} else {
-			if (yych <= '\r') goto yy485;
-			if (yych == '*') goto yy710;
-			goto yy573;
+			if (yych <= 0x00) goto yy72;
+			if (yych == '\n') goto yy425;
+			goto yy504;
+		} else {
+			if (yych <= '\r') goto yy425;
+			if (yych == '*') goto yy625;
+			goto yy504;
 		}
-yy647:
-		YYDEBUG(647, *YYCURSOR);
+yy569:
+		YYDEBUG(569, *YYCURSOR);
 		yyaccept = 53;
 		YYMARKER = ++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= '\n') {
-			if (yych <= 0x00) goto yy570;
-			if (yych <= '\t') goto yy573;
-			goto yy485;
+			if (yych <= 0x00) goto yy501;
+			if (yych <= '\t') goto yy504;
+			goto yy425;
 		} else {
-			if (yych == '\r') goto yy485;
-			goto yy573;
+			if (yych == '\r') goto yy425;
+			goto yy504;
 		}
-yy648:
-		YYDEBUG(648, *YYCURSOR);
+yy570:
+		YYDEBUG(570, *YYCURSOR);
 		yyaccept = 53;
 		YYMARKER = ++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= '\r') {
 			if (yych <= '\t') {
-				if (yych <= 0x00) goto yy570;
-				goto yy573;
+				if (yych <= 0x00) goto yy501;
+				goto yy504;
 			} else {
-				if (yych <= '\n') goto yy485;
-				if (yych <= '\f') goto yy573;
-				goto yy485;
+				if (yych <= '\n') goto yy425;
+				if (yych <= '\f') goto yy504;
+				goto yy425;
 			}
 		} else {
 			if (yych <= 'X') {
-				if (yych <= 'W') goto yy573;
-				goto yy712;
+				if (yych <= 'W') goto yy504;
+				goto yy626;
 			} else {
-				if (yych == 'x') goto yy712;
-				goto yy573;
+				if (yych == 'x') goto yy626;
+				goto yy504;
 			}
 		}
-yy649:
-		YYDEBUG(649, *YYCURSOR);
+yy571:
+		YYDEBUG(571, *YYCURSOR);
 		yyaccept = 53;
 		YYMARKER = ++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= '\r') {
 			if (yych <= '\t') {
-				if (yych <= 0x00) goto yy570;
-				goto yy573;
+				if (yych <= 0x00) goto yy501;
+				goto yy504;
 			} else {
-				if (yych <= '\n') goto yy485;
-				if (yych <= '\f') goto yy573;
-				goto yy485;
+				if (yych <= '\n') goto yy425;
+				if (yych <= '\f') goto yy504;
+				goto yy425;
 			}
 		} else {
 			if (yych <= 'M') {
-				if (yych <= 'L') goto yy573;
-				goto yy713;
+				if (yych <= 'L') goto yy504;
+				goto yy627;
 			} else {
-				if (yych == 'm') goto yy713;
-				goto yy573;
+				if (yych == 'm') goto yy627;
+				goto yy504;
 			}
 		}
-yy650:
-		YYDEBUG(650, *YYCURSOR);
+yy572:
+		YYDEBUG(572, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(651, *YYCURSOR);
 		if (yych <= '*') {
-			if (yych <= 0x00) goto yy85;
-			if (yych <= ')') goto yy577;
-			goto yy650;
+			if (yych <= 0x00) goto yy72;
+			if (yych <= ')') goto yy506;
+			goto yy572;
 		} else {
-			if (yych == '/') goto yy485;
-			goto yy577;
+			if (yych == '/') goto yy425;
+			goto yy506;
 		}
-yy652:
-		YYDEBUG(652, *YYCURSOR);
+yy573:
+		YYDEBUG(573, *YYCURSOR);
 		yyaccept = 61;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm256+yych & 128) {
-			goto yy46;
+			goto yy39;
 		}
-		if (yych == '\\') goto yy162;
-yy653:
-		YYDEBUG(653, *YYCURSOR);
+		if (yych == '\\') goto yy131;
+yy574:
+		YYDEBUG(574, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_IDENT(T_EXTENDS);
 }
-yy654:
-		YYDEBUG(654, *YYCURSOR);
+yy575:
+		YYDEBUG(575, *YYCURSOR);
 		yyaccept = 62;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm256+yych & 128) {
-			goto yy46;
+			goto yy39;
 		}
-		if (yych == '\\') goto yy162;
-yy655:
-		YYDEBUG(655, *YYCURSOR);
+		if (yych == '\\') goto yy131;
+yy576:
+		YYDEBUG(576, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_IDENT(T_FINALLY);
 }
-yy656:
-		YYDEBUG(656, *YYCURSOR);
+yy577:
+		YYDEBUG(577, *YYCURSOR);
 		yyaccept = 63;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm256+yych & 128) {
-			goto yy46;
+			goto yy39;
 		}
-		if (yych == '\\') goto yy162;
-yy657:
-		YYDEBUG(657, *YYCURSOR);
+		if (yych == '\\') goto yy131;
+yy578:
+		YYDEBUG(578, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_IDENT(T_FOREACH);
 }
-yy658:
-		YYDEBUG(658, *YYCURSOR);
+yy579:
+		YYDEBUG(579, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'N') goto yy714;
-		if (yych == 'n') goto yy714;
-		goto yy47;
-yy659:
-		YYDEBUG(659, *YYCURSOR);
+		if (yych == 'N') goto yy628;
+		if (yych == 'n') goto yy628;
+		goto yy40;
+yy580:
+		YYDEBUG(580, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'N') goto yy716;
-		if (yych == 'n') goto yy716;
-		goto yy47;
-yy660:
-		YYDEBUG(660, *YYCURSOR);
+		if (yych == 'N') goto yy630;
+		if (yych == 'n') goto yy630;
+		goto yy40;
+yy581:
+		YYDEBUG(581, *YYCURSOR);
 		yyaccept = 64;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yych <= '\\') {
 			if (yych <= '@') {
-				if (yych <= '/') goto yy661;
-				if (yych <= '9') goto yy46;
+				if (yych <= '/') goto yy582;
+				if (yych <= '9') goto yy39;
 			} else {
-				if (yych <= 'Z') goto yy46;
-				if (yych >= '\\') goto yy162;
+				if (yych <= 'Z') goto yy39;
+				if (yych >= '\\') goto yy131;
 			}
 		} else {
 			if (yych <= '`') {
-				if (yych == '_') goto yy717;
+				if (yych == '_') goto yy631;
 			} else {
-				if (yych <= 'z') goto yy46;
-				if (yych >= 0x80) goto yy46;
+				if (yych <= 'z') goto yy39;
+				if (yych >= 0x80) goto yy39;
 			}
 		}
-yy661:
-		YYDEBUG(661, *YYCURSOR);
+yy582:
+		YYDEBUG(582, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_IDENT(T_INCLUDE);
 }
-yy662:
-		YYDEBUG(662, *YYCURSOR);
+yy583:
+		YYDEBUG(583, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'E') goto yy718;
-		if (yych == 'e') goto yy718;
-		goto yy47;
-yy663:
-		YYDEBUG(663, *YYCURSOR);
+		if (yych == 'E') goto yy632;
+		if (yych == 'e') goto yy632;
+		goto yy40;
+yy584:
+		YYDEBUG(584, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'O') goto yy719;
-		if (yych == 'o') goto yy719;
-		goto yy47;
-yy664:
-		YYDEBUG(664, *YYCURSOR);
+		if (yych == 'O') goto yy633;
+		if (yych == 'o') goto yy633;
+		goto yy40;
+yy585:
+		YYDEBUG(585, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'C') goto yy720;
-		if (yych == 'c') goto yy720;
-		goto yy47;
-yy665:
-		YYDEBUG(665, *YYCURSOR);
+		if (yych == 'C') goto yy634;
+		if (yych == 'c') goto yy634;
+		goto yy40;
+yy586:
+		YYDEBUG(586, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'C') goto yy721;
-		if (yych == 'c') goto yy721;
-		goto yy47;
-yy666:
-		YYDEBUG(666, *YYCURSOR);
+		if (yych == 'C') goto yy635;
+		if (yych == 'c') goto yy635;
+		goto yy40;
+yy587:
+		YYDEBUG(587, *YYCURSOR);
 		yyaccept = 65;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm256+yych & 128) {
-			goto yy46;
+			goto yy39;
 		}
-		if (yych == '\\') goto yy162;
-yy667:
-		YYDEBUG(667, *YYCURSOR);
+		if (yych == '\\') goto yy131;
+yy588:
+		YYDEBUG(588, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_IDENT(T_PRIVATE);
 }
-yy668:
-		YYDEBUG(668, *YYCURSOR);
+yy589:
+		YYDEBUG(589, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'E') goto yy722;
-		if (yych == 'e') goto yy722;
-		goto yy47;
-yy669:
-		YYDEBUG(669, *YYCURSOR);
+		if (yych == 'E') goto yy636;
+		if (yych == 'e') goto yy636;
+		goto yy40;
+yy590:
+		YYDEBUG(590, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'Y') goto yy723;
-		if (yych == 'y') goto yy723;
-		goto yy47;
-yy670:
-		YYDEBUG(670, *YYCURSOR);
+		if (yych == 'Y') goto yy637;
+		if (yych == 'y') goto yy637;
+		goto yy40;
+yy591:
+		YYDEBUG(591, *YYCURSOR);
 		yyaccept = 66;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yych <= '\\') {
 			if (yych <= '@') {
-				if (yych <= '/') goto yy671;
-				if (yych <= '9') goto yy46;
+				if (yych <= '/') goto yy592;
+				if (yych <= '9') goto yy39;
 			} else {
-				if (yych <= 'Z') goto yy46;
-				if (yych >= '\\') goto yy162;
+				if (yych <= 'Z') goto yy39;
+				if (yych >= '\\') goto yy131;
 			}
 		} else {
 			if (yych <= '`') {
-				if (yych == '_') goto yy725;
+				if (yych == '_') goto yy639;
 			} else {
-				if (yych <= 'z') goto yy46;
-				if (yych >= 0x80) goto yy46;
+				if (yych <= 'z') goto yy39;
+				if (yych >= 0x80) goto yy39;
 			}
 		}
-yy671:
-		YYDEBUG(671, *YYCURSOR);
+yy592:
+		YYDEBUG(592, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_IDENT(T_REQUIRE);
 }
-yy672:
-		YYDEBUG(672, *YYCURSOR);
+yy593:
+		YYDEBUG(593, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'R') goto yy726;
-		if (yych == 'r') goto yy726;
-		goto yy85;
-yy673:
-		YYDEBUG(673, *YYCURSOR);
+		if (yych == 'R') goto yy640;
+		if (yych == 'r') goto yy640;
+		goto yy72;
+yy594:
+		YYDEBUG(594, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(674, *YYCURSOR);
 		if (yych <= '\n') {
-			if (yych <= 0x00) goto yy85;
-			if (yych <= '\t') goto yy673;
-			goto yy603;
+			if (yych <= 0x00) goto yy72;
+			if (yych <= '\t') goto yy594;
+			goto yy531;
 		} else {
-			if (yych == '\r') goto yy603;
-			goto yy673;
+			if (yych == '\r') goto yy531;
+			goto yy594;
 		}
-yy675:
-		YYDEBUG(675, *YYCURSOR);
+yy595:
+		YYDEBUG(595, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(676, *YYCURSOR);
 		if (yych <= ' ') {
 			if (yych <= '\n') {
-				if (yych <= 0x00) goto yy85;
-				if (yych <= 0x08) goto yy673;
-				if (yych <= '\t') goto yy675;
-				goto yy603;
-			} else {
-				if (yych == '\r') goto yy603;
-				if (yych <= 0x1F) goto yy673;
-				goto yy675;
+				if (yych <= 0x00) goto yy72;
+				if (yych <= 0x08) goto yy594;
+				if (yych <= '\t') goto yy595;
+				goto yy531;
+			} else {
+				if (yych == '\r') goto yy531;
+				if (yych <= 0x1F) goto yy594;
+				goto yy595;
 			}
 		} else {
 			if (yych <= '/') {
-				if (yych == '#') goto yy727;
-				if (yych <= '.') goto yy673;
-				goto yy728;
+				if (yych == '#') goto yy641;
+				if (yych <= '.') goto yy594;
+				goto yy642;
 			} else {
 				if (yych <= 'F') {
-					if (yych <= 'E') goto yy673;
-					goto yy729;
+					if (yych <= 'E') goto yy594;
+					goto yy643;
 				} else {
-					if (yych == 'f') goto yy729;
-					goto yy673;
+					if (yych == 'f') goto yy643;
+					goto yy594;
 				}
 			}
 		}
-yy677:
-		YYDEBUG(677, *YYCURSOR);
+yy596:
+		YYDEBUG(596, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(678, *YYCURSOR);
-		if (yych <= 0x00) goto yy85;
-		if (yych == '*') goto yy730;
-		goto yy677;
-yy679:
-		YYDEBUG(679, *YYCURSOR);
+		if (yych <= 0x00) goto yy72;
+		if (yych == '*') goto yy644;
+		goto yy596;
+yy597:
+		YYDEBUG(597, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == '_') goto yy732;
-		goto yy47;
-yy680:
-		YYDEBUG(680, *YYCURSOR);
+		if (yych == '_') goto yy645;
+		goto yy40;
+yy598:
+		YYDEBUG(598, *YYCURSOR);
 		yyaccept = 67;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm256+yych & 128) {
-			goto yy46;
+			goto yy39;
 		}
-		if (yych == '\\') goto yy162;
-yy681:
-		YYDEBUG(681, *YYCURSOR);
+		if (yych == '\\') goto yy131;
+yy599:
+		YYDEBUG(599, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_IDENT(T_DIR);
 }
-yy682:
-		YYDEBUG(682, *YYCURSOR);
+yy600:
+		YYDEBUG(600, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == '_') goto yy733;
-		goto yy47;
-yy683:
-		YYDEBUG(683, *YYCURSOR);
+		if (yych == '_') goto yy646;
+		goto yy40;
+yy601:
+		YYDEBUG(601, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'I') goto yy735;
-		if (yych == 'i') goto yy735;
-		goto yy47;
-yy684:
-		YYDEBUG(684, *YYCURSOR);
+		if (yych == 'I') goto yy648;
+		if (yych == 'i') goto yy648;
+		goto yy40;
+yy602:
+		YYDEBUG(602, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'C') goto yy736;
-		if (yych == 'c') goto yy736;
-		goto yy47;
-yy685:
-		YYDEBUG(685, *YYCURSOR);
+		if (yych == 'C') goto yy649;
+		if (yych == 'c') goto yy649;
+		goto yy40;
+yy603:
+		YYDEBUG(603, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == '_') goto yy737;
-		goto yy47;
-yy686:
-		YYDEBUG(686, *YYCURSOR);
+		if (yych == '_') goto yy650;
+		goto yy40;
+yy604:
+		YYDEBUG(604, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'D') goto yy739;
-		if (yych == 'd') goto yy739;
-		goto yy47;
-yy687:
-		YYDEBUG(687, *YYCURSOR);
+		if (yych == 'D') goto yy652;
+		if (yych == 'd') goto yy652;
+		goto yy40;
+yy605:
+		YYDEBUG(605, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'P') goto yy740;
-		if (yych == 'p') goto yy740;
-		goto yy47;
-yy688:
-		YYDEBUG(688, *YYCURSOR);
+		if (yych == 'P') goto yy653;
+		if (yych == 'p') goto yy653;
+		goto yy40;
+yy606:
+		YYDEBUG(606, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == '_') goto yy741;
-		goto yy47;
-yy689:
-		YYDEBUG(689, *YYCURSOR);
+		if (yych == '_') goto yy654;
+		goto yy40;
+yy607:
+		YYDEBUG(607, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(690, *YYCURSOR);
 		if (yych <= ' ') {
 			if (yych <= '\n') {
-				if (yych <= 0x00) goto yy85;
-				if (yych <= 0x08) goto yy435;
-				if (yych <= '\t') goto yy689;
-				goto yy534;
-			} else {
-				if (yych == '\r') goto yy534;
-				if (yych <= 0x1F) goto yy435;
-				goto yy689;
+				if (yych <= 0x00) goto yy72;
+				if (yych <= 0x08) goto yy379;
+				if (yych <= '\t') goto yy607;
+				goto yy473;
+			} else {
+				if (yych == '\r') goto yy473;
+				if (yych <= 0x1F) goto yy379;
+				goto yy607;
 			}
 		} else {
 			if (yych <= ')') {
-				if (yych <= '"') goto yy435;
-				if (yych <= '#') goto yy742;
-				if (yych <= '$') goto yy743;
-				goto yy435;
+				if (yych <= '"') goto yy379;
+				if (yych <= '#') goto yy655;
+				if (yych <= '$') goto yy656;
+				goto yy379;
 			} else {
 				if (yych <= '-') {
-					if (yych <= '*') goto yy536;
-					goto yy435;
+					if (yych <= '*') goto yy474;
+					goto yy379;
 				} else {
-					if (yych <= '.') goto yy744;
-					if (yych <= '/') goto yy745;
-					goto yy435;
+					if (yych <= '.') goto yy657;
+					if (yych <= '/') goto yy658;
+					goto yy379;
 				}
 			}
 		}
-yy691:
-		YYDEBUG(691, *YYCURSOR);
+yy608:
+		YYDEBUG(608, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yybm0+yych & 64) {
-			goto yy349;
+			goto yy296;
 		}
-		if (yych <= 0x00) goto yy85;
-		if (yych == '.') goto yy617;
-		goto yy226;
-yy692:
-		YYDEBUG(692, *YYCURSOR);
+		if (yych <= 0x00) goto yy72;
+		if (yych == '.') goto yy544;
+		goto yy188;
+yy609:
+		YYDEBUG(609, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yybm0+yych & 64) {
-			goto yy349;
+			goto yy296;
 		}
-		if (yych <= 0x00) goto yy85;
-		if (yych == '/') goto yy534;
-		goto yy226;
-yy693:
-		YYDEBUG(693, *YYCURSOR);
+		if (yych <= 0x00) goto yy72;
+		if (yych == '/') goto yy473;
+		goto yy188;
+yy610:
+		YYDEBUG(610, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(694, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN(T_STRING_CAST);
 }
-yy695:
-		YYDEBUG(695, *YYCURSOR);
+yy611:
+		YYDEBUG(611, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(696, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN(T_OBJECT_CAST);
 }
-yy697:
-		YYDEBUG(697, *YYCURSOR);
+yy612:
+		YYDEBUG(612, *YYCURSOR);
 		yyaccept = 68;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm256+yych & 128) {
-			goto yy46;
+			goto yy39;
 		}
-		if (yych == '\\') goto yy162;
-yy698:
-		YYDEBUG(698, *YYCURSOR);
+		if (yych == '\\') goto yy131;
+yy613:
+		YYDEBUG(613, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_IDENT(T_ABSTRACT);
 }
-yy699:
-		YYDEBUG(699, *YYCURSOR);
+yy614:
+		YYDEBUG(614, *YYCURSOR);
 		yyaccept = 69;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm256+yych & 128) {
-			goto yy46;
+			goto yy39;
 		}
-		if (yych == '\\') goto yy162;
-yy700:
-		YYDEBUG(700, *YYCURSOR);
+		if (yych == '\\') goto yy131;
+yy615:
+		YYDEBUG(615, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_IDENT(T_CALLABLE);
 }
-yy701:
-		YYDEBUG(701, *YYCURSOR);
+yy616:
+		YYDEBUG(616, *YYCURSOR);
 		yyaccept = 70;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm256+yych & 128) {
-			goto yy46;
+			goto yy39;
 		}
-		if (yych == '\\') goto yy162;
-yy702:
-		YYDEBUG(702, *YYCURSOR);
+		if (yych == '\\') goto yy131;
+yy617:
+		YYDEBUG(617, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_IDENT(T_CONTINUE);
 }
-yy703:
-		YYDEBUG(703, *YYCURSOR);
+yy618:
+		YYDEBUG(618, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'R') goto yy746;
-		if (yych == 'r') goto yy746;
-		goto yy47;
-yy704:
-		YYDEBUG(704, *YYCURSOR);
+		if (yych == 'R') goto yy659;
+		if (yych == 'r') goto yy659;
+		goto yy40;
+yy619:
+		YYDEBUG(619, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'C') goto yy747;
-		if (yych == 'c') goto yy747;
-		goto yy47;
-yy705:
-		YYDEBUG(705, *YYCURSOR);
+		if (yych == 'C') goto yy660;
+		if (yych == 'c') goto yy660;
+		goto yy40;
+yy620:
+		YYDEBUG(620, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'H') goto yy748;
-		if (yych == 'h') goto yy748;
-		goto yy47;
-yy706:
-		YYDEBUG(706, *YYCURSOR);
+		if (yych == 'H') goto yy661;
+		if (yych == 'h') goto yy661;
+		goto yy40;
+yy621:
+		YYDEBUG(621, *YYCURSOR);
 		yyaccept = 71;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm256+yych & 128) {
-			goto yy46;
+			goto yy39;
 		}
-		if (yych == '\\') goto yy162;
-yy707:
-		YYDEBUG(707, *YYCURSOR);
+		if (yych == '\\') goto yy131;
+yy622:
+		YYDEBUG(622, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_IDENT(T_ENDWHILE);
 }
-yy708:
-		YYDEBUG(708, *YYCURSOR);
+yy623:
+		YYDEBUG(623, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'E') goto yy750;
-		if (yych == 'e') goto yy750;
-		goto yy85;
-yy709:
-		YYDEBUG(709, *YYCURSOR);
+		if (yych == 'E') goto yy663;
+		if (yych == 'e') goto yy663;
+		goto yy72;
+yy624:
+		YYDEBUG(624, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'L') goto yy751;
-		if (yych == 'l') goto yy751;
-		goto yy85;
-yy710:
-		YYDEBUG(710, *YYCURSOR);
+		if (yych == 'L') goto yy664;
+		if (yych == 'l') goto yy664;
+		goto yy72;
+yy625:
+		YYDEBUG(625, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(711, *YYCURSOR);
 		if (yych <= '\f') {
-			if (yych <= 0x00) goto yy85;
-			if (yych == '\n') goto yy752;
-			goto yy710;
-		} else {
-			if (yych <= '\r') goto yy752;
-			if (yych == '*') goto yy754;
-			goto yy710;
+			if (yych <= 0x00) goto yy72;
+			if (yych == '\n') goto yy665;
+			goto yy625;
+		} else {
+			if (yych <= '\r') goto yy665;
+			if (yych == '*') goto yy666;
+			goto yy625;
 		}
-yy712:
-		YYDEBUG(712, *YYCURSOR);
+yy626:
+		YYDEBUG(626, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= '\r') {
 			if (yych <= '\t') {
-				if (yych <= 0x00) goto yy85;
-				goto yy573;
+				if (yych <= 0x00) goto yy72;
+				goto yy504;
 			} else {
-				if (yych <= '\n') goto yy485;
-				if (yych <= '\f') goto yy573;
-				goto yy485;
+				if (yych <= '\n') goto yy425;
+				if (yych <= '\f') goto yy504;
+				goto yy425;
 			}
 		} else {
 			if (yych <= 'T') {
-				if (yych <= 'S') goto yy573;
-				goto yy756;
+				if (yych <= 'S') goto yy504;
+				goto yy667;
 			} else {
-				if (yych == 't') goto yy756;
-				goto yy573;
+				if (yych == 't') goto yy667;
+				goto yy504;
 			}
 		}
-yy713:
-		YYDEBUG(713, *YYCURSOR);
+yy627:
+		YYDEBUG(627, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= '\r') {
 			if (yych <= '\t') {
-				if (yych <= 0x00) goto yy85;
-				goto yy573;
+				if (yych <= 0x00) goto yy72;
+				goto yy504;
 			} else {
-				if (yych <= '\n') goto yy485;
-				if (yych <= '\f') goto yy573;
-				goto yy485;
+				if (yych <= '\n') goto yy425;
+				if (yych <= '\f') goto yy504;
+				goto yy425;
 			}
 		} else {
 			if (yych <= 'P') {
-				if (yych <= 'O') goto yy573;
-				goto yy757;
+				if (yych <= 'O') goto yy504;
+				goto yy668;
 			} else {
-				if (yych == 'p') goto yy757;
-				goto yy573;
+				if (yych == 'p') goto yy668;
+				goto yy504;
 			}
 		}
-yy714:
-		YYDEBUG(714, *YYCURSOR);
+yy628:
+		YYDEBUG(628, *YYCURSOR);
 		yyaccept = 72;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm256+yych & 128) {
-			goto yy46;
+			goto yy39;
 		}
-		if (yych == '\\') goto yy162;
-yy715:
-		YYDEBUG(715, *YYCURSOR);
+		if (yych == '\\') goto yy131;
+yy629:
+		YYDEBUG(629, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_IDENT(T_FUNCTION);
 }
-yy716:
-		YYDEBUG(716, *YYCURSOR);
+yy630:
+		YYDEBUG(630, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'T') goto yy758;
-		if (yych == 't') goto yy758;
-		goto yy47;
-yy717:
-		YYDEBUG(717, *YYCURSOR);
+		if (yych == 'T') goto yy669;
+		if (yych == 't') goto yy669;
+		goto yy40;
+yy631:
+		YYDEBUG(631, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'O') goto yy759;
-		if (yych == 'o') goto yy759;
-		goto yy47;
-yy718:
-		YYDEBUG(718, *YYCURSOR);
+		if (yych == 'O') goto yy670;
+		if (yych == 'o') goto yy670;
+		goto yy40;
+yy632:
+		YYDEBUG(632, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'O') goto yy760;
-		if (yych == 'o') goto yy760;
-		goto yy47;
-yy719:
-		YYDEBUG(719, *YYCURSOR);
+		if (yych == 'O') goto yy671;
+		if (yych == 'o') goto yy671;
+		goto yy40;
+yy633:
+		YYDEBUG(633, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'F') goto yy761;
-		if (yych == 'f') goto yy761;
-		goto yy47;
-yy720:
-		YYDEBUG(720, *YYCURSOR);
+		if (yych == 'F') goto yy672;
+		if (yych == 'f') goto yy672;
+		goto yy40;
+yy634:
+		YYDEBUG(634, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'E') goto yy763;
-		if (yych == 'e') goto yy763;
-		goto yy47;
-yy721:
-		YYDEBUG(721, *YYCURSOR);
+		if (yych == 'E') goto yy674;
+		if (yych == 'e') goto yy674;
+		goto yy40;
+yy635:
+		YYDEBUG(635, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'E') goto yy765;
-		if (yych == 'e') goto yy765;
-		goto yy47;
-yy722:
-		YYDEBUG(722, *YYCURSOR);
+		if (yych == 'E') goto yy676;
+		if (yych == 'e') goto yy676;
+		goto yy40;
+yy636:
+		YYDEBUG(636, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'D') goto yy767;
-		if (yych == 'd') goto yy767;
-		goto yy47;
-yy723:
-		YYDEBUG(723, *YYCURSOR);
+		if (yych == 'D') goto yy678;
+		if (yych == 'd') goto yy678;
+		goto yy40;
+yy637:
+		YYDEBUG(637, *YYCURSOR);
 		yyaccept = 73;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm256+yych & 128) {
-			goto yy46;
+			goto yy39;
 		}
-		if (yych == '\\') goto yy162;
-yy724:
-		YYDEBUG(724, *YYCURSOR);
+		if (yych == '\\') goto yy131;
+yy638:
+		YYDEBUG(638, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_IDENT(T_READONLY);
 }
-yy725:
-		YYDEBUG(725, *YYCURSOR);
+yy639:
+		YYDEBUG(639, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'O') goto yy769;
-		if (yych == 'o') goto yy769;
-		goto yy47;
-yy726:
-		YYDEBUG(726, *YYCURSOR);
+		if (yych == 'O') goto yy680;
+		if (yych == 'o') goto yy680;
+		goto yy40;
+yy640:
+		YYDEBUG(640, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'O') goto yy770;
-		if (yych == 'o') goto yy770;
-		goto yy85;
-yy727:
-		YYDEBUG(727, *YYCURSOR);
+		if (yych == 'O') goto yy681;
+		if (yych == 'o') goto yy681;
+		goto yy72;
+yy641:
+		YYDEBUG(641, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= '\n') {
-			if (yych <= 0x00) goto yy85;
-			if (yych <= '\t') goto yy673;
-			goto yy675;
+			if (yych <= 0x00) goto yy72;
+			if (yych <= '\t') goto yy594;
+			goto yy595;
 		} else {
-			if (yych == '\r') goto yy675;
-			goto yy673;
+			if (yych == '\r') goto yy595;
+			goto yy594;
 		}
-yy728:
-		YYDEBUG(728, *YYCURSOR);
+yy642:
+		YYDEBUG(642, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= '\f') {
-			if (yych <= 0x00) goto yy85;
-			if (yych == '\n') goto yy603;
-			goto yy673;
-		} else {
-			if (yych <= '\r') goto yy603;
-			if (yych == '*') goto yy771;
-			goto yy673;
+			if (yych <= 0x00) goto yy72;
+			if (yych == '\n') goto yy531;
+			goto yy594;
+		} else {
+			if (yych <= '\r') goto yy531;
+			if (yych == '*') goto yy682;
+			goto yy594;
 		}
-yy729:
-		YYDEBUG(729, *YYCURSOR);
+yy643:
+		YYDEBUG(643, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= '\r') {
 			if (yych <= '\t') {
-				if (yych <= 0x00) goto yy85;
-				goto yy673;
+				if (yych <= 0x00) goto yy72;
+				goto yy594;
 			} else {
-				if (yych <= '\n') goto yy603;
-				if (yych <= '\f') goto yy673;
-				goto yy603;
+				if (yych <= '\n') goto yy531;
+				if (yych <= '\f') goto yy594;
+				goto yy531;
 			}
 		} else {
 			if (yych <= 'R') {
-				if (yych <= 'Q') goto yy673;
-				goto yy773;
+				if (yych <= 'Q') goto yy594;
+				goto yy683;
 			} else {
-				if (yych == 'r') goto yy773;
-				goto yy673;
+				if (yych == 'r') goto yy683;
+				goto yy594;
 			}
 		}
-yy730:
-		YYDEBUG(730, *YYCURSOR);
+yy644:
+		YYDEBUG(644, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(731, *YYCURSOR);
 		if (yych <= '*') {
-			if (yych <= 0x00) goto yy85;
-			if (yych <= ')') goto yy677;
-			goto yy730;
+			if (yych <= 0x00) goto yy72;
+			if (yych <= ')') goto yy596;
+			goto yy644;
 		} else {
-			if (yych == '/') goto yy603;
-			goto yy677;
+			if (yych == '/') goto yy531;
+			goto yy596;
 		}
-yy732:
-		YYDEBUG(732, *YYCURSOR);
+yy645:
+		YYDEBUG(645, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == '_') goto yy774;
-		goto yy47;
-yy733:
-		YYDEBUG(733, *YYCURSOR);
+		if (yych == '_') goto yy684;
+		goto yy40;
+yy646:
+		YYDEBUG(646, *YYCURSOR);
 		yyaccept = 74;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm256+yych & 128) {
-			goto yy46;
+			goto yy39;
 		}
-		if (yych == '\\') goto yy162;
-yy734:
-		YYDEBUG(734, *YYCURSOR);
+		if (yych == '\\') goto yy131;
+yy647:
+		YYDEBUG(647, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_IDENT(T_FILE);
 }
-yy735:
-		YYDEBUG(735, *YYCURSOR);
+yy648:
+		YYDEBUG(648, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'O') goto yy776;
-		if (yych == 'o') goto yy776;
-		goto yy47;
-yy736:
-		YYDEBUG(736, *YYCURSOR);
+		if (yych == 'O') goto yy686;
+		if (yych == 'o') goto yy686;
+		goto yy40;
+yy649:
+		YYDEBUG(649, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'O') goto yy777;
-		if (yych == 'o') goto yy777;
-		goto yy47;
-yy737:
-		YYDEBUG(737, *YYCURSOR);
+		if (yych == 'O') goto yy687;
+		if (yych == 'o') goto yy687;
+		goto yy40;
+yy650:
+		YYDEBUG(650, *YYCURSOR);
 		yyaccept = 75;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm256+yych & 128) {
-			goto yy46;
+			goto yy39;
 		}
-		if (yych == '\\') goto yy162;
-yy738:
-		YYDEBUG(738, *YYCURSOR);
+		if (yych == '\\') goto yy131;
+yy651:
+		YYDEBUG(651, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_IDENT(T_LINE);
 }
-yy739:
-		YYDEBUG(739, *YYCURSOR);
+yy652:
+		YYDEBUG(652, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == '_') goto yy778;
-		goto yy47;
-yy740:
-		YYDEBUG(740, *YYCURSOR);
+		if (yych == '_') goto yy688;
+		goto yy40;
+yy653:
+		YYDEBUG(653, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'A') goto yy779;
-		if (yych == 'a') goto yy779;
-		goto yy47;
-yy741:
-		YYDEBUG(741, *YYCURSOR);
+		if (yych == 'A') goto yy689;
+		if (yych == 'a') goto yy689;
+		goto yy40;
+yy654:
+		YYDEBUG(654, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == '_') goto yy780;
-		goto yy47;
-yy742:
-		YYDEBUG(742, *YYCURSOR);
+		if (yych == '_') goto yy690;
+		goto yy40;
+yy655:
+		YYDEBUG(655, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yybm0+yych & 128) {
-			goto yy435;
+			goto yy379;
 		}
-		if (yych <= 0x00) goto yy85;
-		if (yych <= '\r') goto yy689;
-		goto yy536;
-yy743:
-		YYDEBUG(743, *YYCURSOR);
+		if (yych <= 0x00) goto yy72;
+		if (yych <= '\r') goto yy607;
+		goto yy474;
+yy656:
+		YYDEBUG(656, *YYCURSOR);
 		yyaccept = 26;
 		YYMARKER = ++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yybm0+yych & 128) {
-			goto yy435;
+			goto yy379;
 		}
-		if (yych <= 0x00) goto yy88;
-		if (yych <= '\r') goto yy534;
-		goto yy536;
-yy744:
-		YYDEBUG(744, *YYCURSOR);
+		if (yych <= 0x00) goto yy75;
+		if (yych <= '\r') goto yy473;
+		goto yy474;
+yy657:
+		YYDEBUG(657, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= '\r') {
 			if (yych <= '\t') {
-				if (yych <= 0x00) goto yy85;
-				goto yy435;
+				if (yych <= 0x00) goto yy72;
+				goto yy379;
 			} else {
-				if (yych <= '\n') goto yy534;
-				if (yych <= '\f') goto yy435;
-				goto yy534;
+				if (yych <= '\n') goto yy473;
+				if (yych <= '\f') goto yy379;
+				goto yy473;
 			}
 		} else {
 			if (yych <= '*') {
-				if (yych <= ')') goto yy435;
-				goto yy536;
+				if (yych <= ')') goto yy379;
+				goto yy474;
 			} else {
-				if (yych == '.') goto yy782;
-				goto yy435;
+				if (yych == '.') goto yy692;
+				goto yy379;
 			}
 		}
-yy745:
-		YYDEBUG(745, *YYCURSOR);
+yy658:
+		YYDEBUG(658, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yybm0+yych & 128) {
-			goto yy435;
+			goto yy379;
 		}
-		if (yych <= 0x00) goto yy85;
-		if (yych <= '\r') goto yy534;
-		goto yy783;
-yy746:
-		YYDEBUG(746, *YYCURSOR);
+		if (yych <= 0x00) goto yy72;
+		if (yych <= '\r') goto yy473;
+		goto yy693;
+yy659:
+		YYDEBUG(659, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'E') goto yy784;
-		if (yych == 'e') goto yy784;
-		goto yy47;
-yy747:
-		YYDEBUG(747, *YYCURSOR);
+		if (yych == 'E') goto yy694;
+		if (yych == 'e') goto yy694;
+		goto yy40;
+yy660:
+		YYDEBUG(660, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'H') goto yy786;
-		if (yych == 'h') goto yy786;
-		goto yy47;
-yy748:
-		YYDEBUG(748, *YYCURSOR);
+		if (yych == 'H') goto yy696;
+		if (yych == 'h') goto yy696;
+		goto yy40;
+yy661:
+		YYDEBUG(661, *YYCURSOR);
 		yyaccept = 76;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm256+yych & 128) {
-			goto yy46;
+			goto yy39;
 		}
-		if (yych == '\\') goto yy162;
-yy749:
-		YYDEBUG(749, *YYCURSOR);
+		if (yych == '\\') goto yy131;
+yy662:
+		YYDEBUG(662, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_IDENT(T_ENDSWITCH);
 }
-yy750:
-		YYDEBUG(750, *YYCURSOR);
+yy663:
+		YYDEBUG(663, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'N') goto yy788;
-		if (yych == 'n') goto yy788;
-		goto yy85;
-yy751:
-		YYDEBUG(751, *YYCURSOR);
+		if (yych == 'N') goto yy698;
+		if (yych == 'n') goto yy698;
+		goto yy72;
+yy664:
+		YYDEBUG(664, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'E') goto yy789;
-		if (yych == 'e') goto yy789;
-		goto yy85;
-yy752:
-		YYDEBUG(752, *YYCURSOR);
+		if (yych == 'E') goto yy699;
+		if (yych == 'e') goto yy699;
+		goto yy72;
+yy665:
+		YYDEBUG(665, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(753, *YYCURSOR);
 		if (yych <= '@') {
 			if (yych <= ' ') {
 				if (yych <= '\n') {
-					if (yych <= 0x00) goto yy85;
-					if (yych <= 0x08) goto yy577;
-					goto yy752;
-				} else {
-					if (yych == '\r') goto yy752;
-					if (yych <= 0x1F) goto yy577;
-					goto yy752;
+					if (yych <= 0x00) goto yy72;
+					if (yych <= 0x08) goto yy506;
+					goto yy665;
+				} else {
+					if (yych == '\r') goto yy665;
+					if (yych <= 0x1F) goto yy506;
+					goto yy665;
 				}
 			} else {
 				if (yych <= ')') {
-					if (yych == '#') goto yy790;
-					goto yy577;
+					if (yych == '#') goto yy700;
+					goto yy506;
 				} else {
-					if (yych <= '*') goto yy650;
-					if (yych == '/') goto yy791;
-					goto yy577;
+					if (yych <= '*') goto yy572;
+					if (yych == '/') goto yy701;
+					goto yy506;
 				}
 			}
 		} else {
 			if (yych <= '_') {
 				if (yych <= 'H') {
-					if (yych == 'E') goto yy793;
-					goto yy792;
+					if (yych == 'E') goto yy703;
+					goto yy702;
 				} else {
-					if (yych <= 'I') goto yy794;
-					if (yych <= 'Z') goto yy792;
-					if (yych <= '^') goto yy577;
-					goto yy792;
+					if (yych <= 'I') goto yy704;
+					if (yych <= 'Z') goto yy702;
+					if (yych <= '^') goto yy506;
+					goto yy702;
 				}
 			} else {
 				if (yych <= 'h') {
-					if (yych <= '`') goto yy577;
-					if (yych == 'e') goto yy793;
-					goto yy792;
-				} else {
-					if (yych <= 'i') goto yy794;
-					if (yych <= 'z') goto yy792;
-					if (yych <= 0x7F) goto yy577;
-					goto yy792;
+					if (yych <= '`') goto yy506;
+					if (yych == 'e') goto yy703;
+					goto yy702;
+				} else {
+					if (yych <= 'i') goto yy704;
+					if (yych <= 'z') goto yy702;
+					if (yych <= 0x7F) goto yy506;
+					goto yy702;
 				}
 			}
 		}
-yy754:
-		YYDEBUG(754, *YYCURSOR);
+yy666:
+		YYDEBUG(666, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(755, *YYCURSOR);
 		if (yych <= '\r') {
 			if (yych <= '\t') {
-				if (yych <= 0x00) goto yy85;
-				goto yy710;
+				if (yych <= 0x00) goto yy72;
+				goto yy625;
 			} else {
-				if (yych <= '\n') goto yy752;
-				if (yych <= '\f') goto yy710;
-				goto yy752;
+				if (yych <= '\n') goto yy665;
+				if (yych <= '\f') goto yy625;
+				goto yy665;
 			}
 		} else {
 			if (yych <= '*') {
-				if (yych <= ')') goto yy710;
-				goto yy754;
+				if (yych <= ')') goto yy625;
+				goto yy666;
 			} else {
-				if (yych == '/') goto yy575;
-				goto yy710;
+				if (yych == '/') goto yy505;
+				goto yy625;
 			}
 		}
-yy756:
-		YYDEBUG(756, *YYCURSOR);
+yy667:
+		YYDEBUG(667, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= '\r') {
 			if (yych <= '\t') {
-				if (yych <= 0x00) goto yy85;
-				goto yy573;
+				if (yych <= 0x00) goto yy72;
+				goto yy504;
 			} else {
-				if (yych <= '\n') goto yy485;
-				if (yych <= '\f') goto yy573;
-				goto yy485;
+				if (yych <= '\n') goto yy425;
+				if (yych <= '\f') goto yy504;
+				goto yy425;
 			}
 		} else {
 			if (yych <= 'E') {
-				if (yych <= 'D') goto yy573;
-				goto yy795;
+				if (yych <= 'D') goto yy504;
+				goto yy705;
 			} else {
-				if (yych == 'e') goto yy795;
-				goto yy573;
+				if (yych == 'e') goto yy705;
+				goto yy504;
 			}
 		}
-yy757:
-		YYDEBUG(757, *YYCURSOR);
+yy668:
+		YYDEBUG(668, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= '\r') {
 			if (yych <= '\t') {
-				if (yych <= 0x00) goto yy85;
-				goto yy573;
+				if (yych <= 0x00) goto yy72;
+				goto yy504;
 			} else {
-				if (yych <= '\n') goto yy485;
-				if (yych <= '\f') goto yy573;
-				goto yy485;
+				if (yych <= '\n') goto yy425;
+				if (yych <= '\f') goto yy504;
+				goto yy425;
 			}
 		} else {
 			if (yych <= 'L') {
-				if (yych <= 'K') goto yy573;
-				goto yy796;
+				if (yych <= 'K') goto yy504;
+				goto yy706;
 			} else {
-				if (yych == 'l') goto yy796;
-				goto yy573;
+				if (yych == 'l') goto yy706;
+				goto yy504;
 			}
 		}
-yy758:
-		YYDEBUG(758, *YYCURSOR);
+yy669:
+		YYDEBUG(669, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'S') goto yy797;
-		if (yych == 's') goto yy797;
-		goto yy47;
-yy759:
-		YYDEBUG(759, *YYCURSOR);
+		if (yych == 'S') goto yy707;
+		if (yych == 's') goto yy707;
+		goto yy40;
+yy670:
+		YYDEBUG(670, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'N') goto yy799;
-		if (yych == 'n') goto yy799;
-		goto yy47;
-yy760:
-		YYDEBUG(760, *YYCURSOR);
+		if (yych == 'N') goto yy709;
+		if (yych == 'n') goto yy709;
+		goto yy40;
+yy671:
+		YYDEBUG(671, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'F') goto yy800;
-		if (yych == 'f') goto yy800;
-		goto yy47;
-yy761:
-		YYDEBUG(761, *YYCURSOR);
+		if (yych == 'F') goto yy710;
+		if (yych == 'f') goto yy710;
+		goto yy40;
+yy672:
+		YYDEBUG(672, *YYCURSOR);
 		yyaccept = 77;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm256+yych & 128) {
-			goto yy46;
+			goto yy39;
 		}
-		if (yych == '\\') goto yy162;
-yy762:
-		YYDEBUG(762, *YYCURSOR);
+		if (yych == '\\') goto yy131;
+yy673:
+		YYDEBUG(673, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
     RETURN_TOKEN_WITH_IDENT(T_INSTEADOF);
 }
-yy763:
-		YYDEBUG(763, *YYCURSOR);
+yy674:
+		YYDEBUG(674, *YYCURSOR);
 		yyaccept = 78;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm256+yych & 128) {
-			goto yy46;
+			goto yy39;
 		}
-		if (yych == '\\') goto yy162;
-yy764:
-		YYDEBUG(764, *YYCURSOR);
+		if (yych == '\\') goto yy131;
+yy675:
+		YYDEBUG(675, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_IDENT(T_INTERFACE);
 }
-yy765:
-		YYDEBUG(765, *YYCURSOR);
+yy676:
+		YYDEBUG(676, *YYCURSOR);
 		yyaccept = 79;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm256+yych & 128) {
-			goto yy46;
+			goto yy39;
 		}
-		if (yych == '\\') goto yy802;
-yy766:
-		YYDEBUG(766, *YYCURSOR);
+		if (yych == '\\') goto yy712;
+yy677:
+		YYDEBUG(677, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_IDENT(T_NAMESPACE);
 }
-yy767:
-		YYDEBUG(767, *YYCURSOR);
+yy678:
+		YYDEBUG(678, *YYCURSOR);
 		yyaccept = 80;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm256+yych & 128) {
-			goto yy46;
+			goto yy39;
 		}
-		if (yych == '\\') goto yy162;
-yy768:
-		YYDEBUG(768, *YYCURSOR);
+		if (yych == '\\') goto yy131;
+yy679:
+		YYDEBUG(679, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_IDENT(T_PROTECTED);
 }
-yy769:
-		YYDEBUG(769, *YYCURSOR);
+yy680:
+		YYDEBUG(680, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'N') goto yy803;
-		if (yych == 'n') goto yy803;
-		goto yy47;
-yy770:
-		YYDEBUG(770, *YYCURSOR);
+		if (yych == 'N') goto yy713;
+		if (yych == 'n') goto yy713;
+		goto yy40;
+yy681:
+		YYDEBUG(681, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'M') goto yy804;
-		if (yych == 'm') goto yy804;
-		goto yy85;
-yy771:
-		YYDEBUG(771, *YYCURSOR);
+		if (yych == 'M') goto yy714;
+		if (yych == 'm') goto yy714;
+		goto yy72;
+yy682:
+		YYDEBUG(682, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(772, *YYCURSOR);
 		if (yych <= '\f') {
-			if (yych <= 0x00) goto yy85;
-			if (yych == '\n') goto yy805;
-			goto yy771;
-		} else {
-			if (yych <= '\r') goto yy805;
-			if (yych == '*') goto yy807;
-			goto yy771;
+			if (yych <= 0x00) goto yy72;
+			if (yych == '\n') goto yy715;
+			goto yy682;
+		} else {
+			if (yych <= '\r') goto yy715;
+			if (yych == '*') goto yy716;
+			goto yy682;
 		}
-yy773:
-		YYDEBUG(773, *YYCURSOR);
+yy683:
+		YYDEBUG(683, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= '\r') {
 			if (yych <= '\t') {
-				if (yych <= 0x00) goto yy85;
-				goto yy673;
+				if (yych <= 0x00) goto yy72;
+				goto yy594;
 			} else {
-				if (yych <= '\n') goto yy603;
-				if (yych <= '\f') goto yy673;
-				goto yy603;
+				if (yych <= '\n') goto yy531;
+				if (yych <= '\f') goto yy594;
+				goto yy531;
 			}
 		} else {
 			if (yych <= 'O') {
-				if (yych <= 'N') goto yy673;
-				goto yy809;
+				if (yych <= 'N') goto yy594;
+				goto yy717;
 			} else {
-				if (yych == 'o') goto yy809;
-				goto yy673;
+				if (yych == 'o') goto yy717;
+				goto yy594;
 			}
 		}
-yy774:
-		YYDEBUG(774, *YYCURSOR);
+yy684:
+		YYDEBUG(684, *YYCURSOR);
 		yyaccept = 81;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm256+yych & 128) {
-			goto yy46;
+			goto yy39;
 		}
-		if (yych == '\\') goto yy162;
-yy775:
-		YYDEBUG(775, *YYCURSOR);
+		if (yych == '\\') goto yy131;
+yy685:
+		YYDEBUG(685, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_IDENT(T_CLASS_C);
 }
-yy776:
-		YYDEBUG(776, *YYCURSOR);
+yy686:
+		YYDEBUG(686, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'N') goto yy810;
-		if (yych == 'n') goto yy810;
-		goto yy47;
-yy777:
-		YYDEBUG(777, *YYCURSOR);
+		if (yych == 'N') goto yy718;
+		if (yych == 'n') goto yy718;
+		goto yy40;
+yy687:
+		YYDEBUG(687, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'M') goto yy811;
-		if (yych == 'm') goto yy811;
-		goto yy47;
-yy778:
-		YYDEBUG(778, *YYCURSOR);
+		if (yych == 'M') goto yy719;
+		if (yych == 'm') goto yy719;
+		goto yy40;
+yy688:
+		YYDEBUG(688, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == '_') goto yy812;
-		goto yy47;
-yy779:
-		YYDEBUG(779, *YYCURSOR);
+		if (yych == '_') goto yy720;
+		goto yy40;
+yy689:
+		YYDEBUG(689, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'C') goto yy814;
-		if (yych == 'c') goto yy814;
-		goto yy47;
-yy780:
-		YYDEBUG(780, *YYCURSOR);
+		if (yych == 'C') goto yy722;
+		if (yych == 'c') goto yy722;
+		goto yy40;
+yy690:
+		YYDEBUG(690, *YYCURSOR);
 		yyaccept = 82;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm256+yych & 128) {
-			goto yy46;
+			goto yy39;
 		}
-		if (yych == '\\') goto yy162;
-yy781:
-		YYDEBUG(781, *YYCURSOR);
+		if (yych == '\\') goto yy131;
+yy691:
+		YYDEBUG(691, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_IDENT(T_TRAIT_C);
 }
-yy782:
-		YYDEBUG(782, *YYCURSOR);
+yy692:
+		YYDEBUG(692, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= '\r') {
 			if (yych <= '\t') {
-				if (yych <= 0x00) goto yy85;
-				goto yy435;
+				if (yych <= 0x00) goto yy72;
+				goto yy379;
 			} else {
-				if (yych <= '\n') goto yy534;
-				if (yych <= '\f') goto yy435;
-				goto yy534;
+				if (yych <= '\n') goto yy473;
+				if (yych <= '\f') goto yy379;
+				goto yy473;
 			}
 		} else {
 			if (yych <= '*') {
-				if (yych <= ')') goto yy435;
-				goto yy536;
+				if (yych <= ')') goto yy379;
+				goto yy474;
 			} else {
-				if (yych == '.') goto yy743;
-				goto yy435;
+				if (yych == '.') goto yy656;
+				goto yy379;
 			}
 		}
-yy783:
-		YYDEBUG(783, *YYCURSOR);
+yy693:
+		YYDEBUG(693, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= '\r') {
 			if (yych <= '\t') {
-				if (yych <= 0x00) goto yy85;
-				goto yy435;
+				if (yych <= 0x00) goto yy72;
+				goto yy379;
 			} else {
-				if (yych <= '\n') goto yy534;
-				if (yych <= '\f') goto yy435;
-				goto yy534;
+				if (yych <= '\n') goto yy473;
+				if (yych <= '\f') goto yy379;
+				goto yy473;
 			}
 		} else {
 			if (yych <= '*') {
-				if (yych <= ')') goto yy435;
-				goto yy536;
+				if (yych <= ')') goto yy379;
+				goto yy474;
 			} else {
-				if (yych == '/') goto yy689;
-				goto yy435;
+				if (yych == '/') goto yy607;
+				goto yy379;
 			}
 		}
-yy784:
-		YYDEBUG(784, *YYCURSOR);
+yy694:
+		YYDEBUG(694, *YYCURSOR);
 		yyaccept = 83;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm256+yych & 128) {
-			goto yy46;
+			goto yy39;
 		}
-		if (yych == '\\') goto yy162;
-yy785:
-		YYDEBUG(785, *YYCURSOR);
+		if (yych == '\\') goto yy131;
+yy695:
+		YYDEBUG(695, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_IDENT(T_ENDDECLARE);
 }
-yy786:
-		YYDEBUG(786, *YYCURSOR);
+yy696:
+		YYDEBUG(696, *YYCURSOR);
 		yyaccept = 84;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm256+yych & 128) {
-			goto yy46;
+			goto yy39;
 		}
-		if (yych == '\\') goto yy162;
-yy787:
-		YYDEBUG(787, *YYCURSOR);
+		if (yych == '\\') goto yy131;
+yy697:
+		YYDEBUG(697, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_IDENT(T_ENDFOREACH);
 }
-yy788:
-		YYDEBUG(788, *YYCURSOR);
+yy698:
+		YYDEBUG(698, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'D') goto yy815;
-		if (yych == 'd') goto yy815;
-		goto yy85;
-yy789:
-		YYDEBUG(789, *YYCURSOR);
+		if (yych == 'D') goto yy723;
+		if (yych == 'd') goto yy723;
+		goto yy72;
+yy699:
+		YYDEBUG(699, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'M') goto yy816;
-		if (yych == 'm') goto yy816;
-		goto yy85;
-yy790:
-		YYDEBUG(790, *YYCURSOR);
+		if (yych == 'M') goto yy724;
+		if (yych == 'm') goto yy724;
+		goto yy72;
+yy700:
+		YYDEBUG(700, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= '\r') {
 			if (yych <= '\t') {
-				if (yych <= 0x00) goto yy85;
-				goto yy710;
+				if (yych <= 0x00) goto yy72;
+				goto yy625;
 			} else {
-				if (yych <= '\n') goto yy817;
-				if (yych <= '\f') goto yy710;
-				goto yy817;
+				if (yych <= '\n') goto yy725;
+				if (yych <= '\f') goto yy625;
+				goto yy725;
 			}
 		} else {
 			if (yych <= '*') {
-				if (yych <= ')') goto yy710;
-				goto yy754;
+				if (yych <= ')') goto yy625;
+				goto yy666;
 			} else {
-				if (yych == '') goto yy577;
-				goto yy710;
+				if (yych == '') goto yy506;
+				goto yy625;
 			}
 		}
-yy791:
-		YYDEBUG(791, *YYCURSOR);
+yy701:
+		YYDEBUG(701, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= '*') {
-			if (yych <= 0x00) goto yy85;
-			if (yych <= ')') goto yy577;
-			goto yy819;
+			if (yych <= 0x00) goto yy72;
+			if (yych <= ')') goto yy506;
+			goto yy726;
 		} else {
-			if (yych == '/') goto yy710;
-			goto yy577;
+			if (yych == '/') goto yy625;
+			goto yy506;
 		}
-yy792:
-		YYDEBUG(792, *YYCURSOR);
+yy702:
+		YYDEBUG(702, *YYCURSOR);
 		yyaccept = 53;
 		YYMARKER = ++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		if (yych <= 0x00) goto yy570;
-		if (yych == '*') goto yy650;
-		goto yy577;
-yy793:
-		YYDEBUG(793, *YYCURSOR);
+		if (yych <= 0x00) goto yy501;
+		if (yych == '*') goto yy572;
+		goto yy506;
+yy703:
+		YYDEBUG(703, *YYCURSOR);
 		yyaccept = 53;
 		YYMARKER = ++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= 'W') {
-			if (yych <= 0x00) goto yy570;
-			if (yych == '*') goto yy650;
-			goto yy577;
-		} else {
-			if (yych <= 'X') goto yy820;
-			if (yych == 'x') goto yy820;
-			goto yy577;
+			if (yych <= 0x00) goto yy501;
+			if (yych == '*') goto yy572;
+			goto yy506;
+		} else {
+			if (yych <= 'X') goto yy727;
+			if (yych == 'x') goto yy727;
+			goto yy506;
 		}
-yy794:
-		YYDEBUG(794, *YYCURSOR);
+yy704:
+		YYDEBUG(704, *YYCURSOR);
 		yyaccept = 53;
 		YYMARKER = ++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= 'L') {
-			if (yych <= 0x00) goto yy570;
-			if (yych == '*') goto yy650;
-			goto yy577;
-		} else {
-			if (yych <= 'M') goto yy821;
-			if (yych == 'm') goto yy821;
-			goto yy577;
+			if (yych <= 0x00) goto yy501;
+			if (yych == '*') goto yy572;
+			goto yy506;
+		} else {
+			if (yych <= 'M') goto yy728;
+			if (yych == 'm') goto yy728;
+			goto yy506;
 		}
-yy795:
-		YYDEBUG(795, *YYCURSOR);
+yy705:
+		YYDEBUG(705, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= '\r') {
 			if (yych <= '\t') {
-				if (yych <= 0x00) goto yy85;
-				goto yy573;
+				if (yych <= 0x00) goto yy72;
+				goto yy504;
 			} else {
-				if (yych <= '\n') goto yy485;
-				if (yych <= '\f') goto yy573;
-				goto yy485;
+				if (yych <= '\n') goto yy425;
+				if (yych <= '\f') goto yy504;
+				goto yy425;
 			}
 		} else {
 			if (yych <= 'N') {
-				if (yych <= 'M') goto yy573;
-				goto yy822;
+				if (yych <= 'M') goto yy504;
+				goto yy729;
 			} else {
-				if (yych == 'n') goto yy822;
-				goto yy573;
+				if (yych == 'n') goto yy729;
+				goto yy504;
 			}
 		}
-yy796:
-		YYDEBUG(796, *YYCURSOR);
+yy706:
+		YYDEBUG(706, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= '\r') {
 			if (yych <= '\t') {
-				if (yych <= 0x00) goto yy85;
-				goto yy573;
+				if (yych <= 0x00) goto yy72;
+				goto yy504;
 			} else {
-				if (yych <= '\n') goto yy485;
-				if (yych <= '\f') goto yy573;
-				goto yy485;
+				if (yych <= '\n') goto yy425;
+				if (yych <= '\f') goto yy504;
+				goto yy425;
 			}
 		} else {
 			if (yych <= 'E') {
-				if (yych <= 'D') goto yy573;
-				goto yy823;
+				if (yych <= 'D') goto yy504;
+				goto yy730;
 			} else {
-				if (yych == 'e') goto yy823;
-				goto yy573;
+				if (yych == 'e') goto yy730;
+				goto yy504;
 			}
 		}
-yy797:
-		YYDEBUG(797, *YYCURSOR);
+yy707:
+		YYDEBUG(707, *YYCURSOR);
 		yyaccept = 85;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm256+yych & 128) {
-			goto yy46;
+			goto yy39;
 		}
-		if (yych == '\\') goto yy162;
-yy798:
-		YYDEBUG(798, *YYCURSOR);
+		if (yych == '\\') goto yy131;
+yy708:
+		YYDEBUG(708, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_IDENT(T_IMPLEMENTS);
 }
-yy799:
-		YYDEBUG(799, *YYCURSOR);
+yy709:
+		YYDEBUG(709, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'C') goto yy824;
-		if (yych == 'c') goto yy824;
-		goto yy47;
-yy800:
-		YYDEBUG(800, *YYCURSOR);
+		if (yych == 'C') goto yy731;
+		if (yych == 'c') goto yy731;
+		goto yy40;
+yy710:
+		YYDEBUG(710, *YYCURSOR);
 		yyaccept = 86;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm256+yych & 128) {
-			goto yy46;
+			goto yy39;
 		}
-		if (yych == '\\') goto yy162;
-yy801:
-		YYDEBUG(801, *YYCURSOR);
+		if (yych == '\\') goto yy131;
+yy711:
+		YYDEBUG(711, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_IDENT(T_INSTANCEOF);
 }
-yy802:
-		YYDEBUG(802, *YYCURSOR);
+yy712:
+		YYDEBUG(712, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= '_') {
-			if (yych <= '@') goto yy85;
-			if (yych <= 'Z') goto yy825;
-			if (yych <= '^') goto yy85;
-			goto yy825;
-		} else {
-			if (yych <= '`') goto yy85;
-			if (yych <= 'z') goto yy825;
-			if (yych <= 0x7F) goto yy85;
-			goto yy825;
+			if (yych <= '@') goto yy72;
+			if (yych <= 'Z') goto yy732;
+			if (yych <= '^') goto yy72;
+			goto yy732;
+		} else {
+			if (yych <= '`') goto yy72;
+			if (yych <= 'z') goto yy732;
+			if (yych <= 0x7F) goto yy72;
+			goto yy732;
 		}
-yy803:
-		YYDEBUG(803, *YYCURSOR);
+yy713:
+		YYDEBUG(713, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'C') goto yy828;
-		if (yych == 'c') goto yy828;
-		goto yy47;
-yy804:
-		YYDEBUG(804, *YYCURSOR);
+		if (yych == 'C') goto yy734;
+		if (yych == 'c') goto yy734;
+		goto yy40;
+yy714:
+		YYDEBUG(714, *YYCURSOR);
 		yych = *++YYCURSOR;
 		if (yych <= '^') {
 			if (yych <= '9') {
-				if (yych <= '/') goto yy829;
-				goto yy85;
+				if (yych <= '/') goto yy735;
+				goto yy72;
 			} else {
-				if (yych <= '@') goto yy829;
-				if (yych <= 'Z') goto yy85;
-				goto yy829;
+				if (yych <= '@') goto yy735;
+				if (yych <= 'Z') goto yy72;
+				goto yy735;
 			}
 		} else {
 			if (yych <= '`') {
-				if (yych <= '_') goto yy85;
-				goto yy829;
+				if (yych <= '_') goto yy72;
+				goto yy735;
 			} else {
-				if (yych <= 'z') goto yy85;
-				if (yych <= 0x7F) goto yy829;
-				goto yy85;
+				if (yych <= 'z') goto yy72;
+				if (yych <= 0x7F) goto yy735;
+				goto yy72;
 			}
 		}
-yy805:
-		YYDEBUG(805, *YYCURSOR);
+yy715:
+		YYDEBUG(715, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(806, *YYCURSOR);
 		if (yych <= '#') {
 			if (yych <= '\f') {
-				if (yych <= 0x00) goto yy85;
-				if (yych <= 0x08) goto yy677;
-				if (yych <= '\n') goto yy805;
-				goto yy677;
+				if (yych <= 0x00) goto yy72;
+				if (yych <= 0x08) goto yy596;
+				if (yych <= '\n') goto yy715;
+				goto yy596;
 			} else {
 				if (yych <= 0x1F) {
-					if (yych <= '\r') goto yy805;
-					goto yy677;
+					if (yych <= '\r') goto yy715;
+					goto yy596;
 				} else {
-					if (yych <= ' ') goto yy805;
-					if (yych <= '"') goto yy677;
-					goto yy831;
+					if (yych <= ' ') goto yy715;
+					if (yych <= '"') goto yy596;
+					goto yy737;
 				}
 			}
 		} else {
 			if (yych <= '/') {
-				if (yych == '*') goto yy730;
-				if (yych <= '.') goto yy677;
-				goto yy832;
+				if (yych == '*') goto yy644;
+				if (yych <= '.') goto yy596;
+				goto yy738;
 			} else {
 				if (yych <= 'F') {
-					if (yych <= 'E') goto yy677;
-					goto yy833;
+					if (yych <= 'E') goto yy596;
+					goto yy739;
 				} else {
-					if (yych == 'f') goto yy833;
-					goto yy677;
+					if (yych == 'f') goto yy739;
+					goto yy596;
 				}
 			}
 		}
-yy807:
-		YYDEBUG(807, *YYCURSOR);
+yy716:
+		YYDEBUG(716, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(808, *YYCURSOR);
 		if (yych <= '\r') {
 			if (yych <= '\t') {
-				if (yych <= 0x00) goto yy85;
-				goto yy771;
+				if (yych <= 0x00) goto yy72;
+				goto yy682;
 			} else {
-				if (yych <= '\n') goto yy805;
-				if (yych <= '\f') goto yy771;
-				goto yy805;
+				if (yych <= '\n') goto yy715;
+				if (yych <= '\f') goto yy682;
+				goto yy715;
 			}
 		} else {
 			if (yych <= '*') {
-				if (yych <= ')') goto yy771;
-				goto yy807;
+				if (yych <= ')') goto yy682;
+				goto yy716;
 			} else {
-				if (yych == '/') goto yy675;
-				goto yy771;
+				if (yych == '/') goto yy595;
+				goto yy682;
 			}
 		}
-yy809:
-		YYDEBUG(809, *YYCURSOR);
+yy717:
+		YYDEBUG(717, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= '\r') {
 			if (yych <= '\t') {
-				if (yych <= 0x00) goto yy85;
-				goto yy673;
+				if (yych <= 0x00) goto yy72;
+				goto yy594;
 			} else {
-				if (yych <= '\n') goto yy603;
-				if (yych <= '\f') goto yy673;
-				goto yy603;
+				if (yych <= '\n') goto yy531;
+				if (yych <= '\f') goto yy594;
+				goto yy531;
 			}
 		} else {
 			if (yych <= 'M') {
-				if (yych <= 'L') goto yy673;
-				goto yy834;
+				if (yych <= 'L') goto yy594;
+				goto yy740;
 			} else {
-				if (yych == 'm') goto yy834;
-				goto yy673;
+				if (yych == 'm') goto yy740;
+				goto yy594;
 			}
 		}
-yy810:
-		YYDEBUG(810, *YYCURSOR);
+yy718:
+		YYDEBUG(718, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == '_') goto yy835;
-		goto yy47;
-yy811:
-		YYDEBUG(811, *YYCURSOR);
+		if (yych == '_') goto yy741;
+		goto yy40;
+yy719:
+		YYDEBUG(719, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'P') goto yy836;
-		if (yych == 'p') goto yy836;
-		goto yy47;
-yy812:
-		YYDEBUG(812, *YYCURSOR);
+		if (yych == 'P') goto yy742;
+		if (yych == 'p') goto yy742;
+		goto yy40;
+yy720:
+		YYDEBUG(720, *YYCURSOR);
 		yyaccept = 87;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm256+yych & 128) {
-			goto yy46;
+			goto yy39;
 		}
-		if (yych == '\\') goto yy162;
-yy813:
-		YYDEBUG(813, *YYCURSOR);
+		if (yych == '\\') goto yy131;
+yy721:
+		YYDEBUG(721, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_IDENT(T_METHOD_C);
 }
-yy814:
-		YYDEBUG(814, *YYCURSOR);
+yy722:
+		YYDEBUG(722, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'E') goto yy837;
-		if (yych == 'e') goto yy837;
-		goto yy47;
-yy815:
-		YYDEBUG(815, *YYCURSOR);
+		if (yych == 'E') goto yy743;
+		if (yych == 'e') goto yy743;
+		goto yy40;
+yy723:
+		YYDEBUG(723, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'S') goto yy838;
-		if (yych == 's') goto yy838;
-		goto yy85;
-yy816:
-		YYDEBUG(816, *YYCURSOR);
+		if (yych == 'S') goto yy744;
+		if (yych == 's') goto yy744;
+		goto yy72;
+yy724:
+		YYDEBUG(724, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'E') goto yy840;
-		if (yych == 'e') goto yy840;
-		goto yy85;
-yy817:
-		YYDEBUG(817, *YYCURSOR);
+		if (yych == 'E') goto yy746;
+		if (yych == 'e') goto yy746;
+		goto yy72;
+yy725:
+		YYDEBUG(725, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(818, *YYCURSOR);
 		if (yych <= '@') {
 			if (yych <= 0x1F) {
 				if (yych <= '\t') {
-					if (yych <= 0x00) goto yy85;
-					if (yych <= 0x08) goto yy710;
-					goto yy817;
-				} else {
-					if (yych <= '\n') goto yy752;
-					if (yych == '\r') goto yy752;
-					goto yy710;
+					if (yych <= 0x00) goto yy72;
+					if (yych <= 0x08) goto yy625;
+					goto yy725;
+				} else {
+					if (yych <= '\n') goto yy665;
+					if (yych == '\r') goto yy665;
+					goto yy625;
 				}
 			} else {
 				if (yych <= ')') {
-					if (yych <= ' ') goto yy817;
-					if (yych == '#') goto yy841;
-					goto yy710;
-				} else {
-					if (yych <= '*') goto yy754;
-					if (yych == '/') goto yy842;
-					goto yy710;
+					if (yych <= ' ') goto yy725;
+					if (yych == '#') goto yy747;
+					goto yy625;
+				} else {
+					if (yych <= '*') goto yy666;
+					if (yych == '/') goto yy748;
+					goto yy625;
 				}
 			}
 		} else {
 			if (yych <= '_') {
 				if (yych <= 'H') {
-					if (yych == 'E') goto yy844;
-					goto yy843;
+					if (yych == 'E') goto yy750;
+					goto yy749;
 				} else {
-					if (yych <= 'I') goto yy845;
-					if (yych <= 'Z') goto yy843;
-					if (yych <= '^') goto yy710;
-					goto yy843;
+					if (yych <= 'I') goto yy751;
+					if (yych <= 'Z') goto yy749;
+					if (yych <= '^') goto yy625;
+					goto yy749;
 				}
 			} else {
 				if (yych <= 'h') {
-					if (yych <= '`') goto yy710;
-					if (yych == 'e') goto yy844;
-					goto yy843;
-				} else {
-					if (yych <= 'i') goto yy845;
-					if (yych <= 'z') goto yy843;
-					if (yych <= 0x7F) goto yy710;
-					goto yy843;
+					if (yych <= '`') goto yy625;
+					if (yych == 'e') goto yy750;
+					goto yy749;
+				} else {
+					if (yych <= 'i') goto yy751;
+					if (yych <= 'z') goto yy749;
+					if (yych <= 0x7F) goto yy625;
+					goto yy749;
 				}
 			}
 		}
-yy819:
-		YYDEBUG(819, *YYCURSOR);
+yy726:
+		YYDEBUG(726, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= '*') {
-			if (yych <= 0x00) goto yy85;
-			if (yych <= ')') goto yy577;
-			goto yy650;
+			if (yych <= 0x00) goto yy72;
+			if (yych <= ')') goto yy506;
+			goto yy572;
 		} else {
-			if (yych == '/') goto yy752;
-			goto yy577;
+			if (yych == '/') goto yy665;
+			goto yy506;
 		}
-yy820:
-		YYDEBUG(820, *YYCURSOR);
+yy727:
+		YYDEBUG(727, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= 'S') {
-			if (yych <= 0x00) goto yy85;
-			if (yych == '*') goto yy650;
-			goto yy577;
-		} else {
-			if (yych <= 'T') goto yy846;
-			if (yych == 't') goto yy846;
-			goto yy577;
+			if (yych <= 0x00) goto yy72;
+			if (yych == '*') goto yy572;
+			goto yy506;
+		} else {
+			if (yych <= 'T') goto yy752;
+			if (yych == 't') goto yy752;
+			goto yy506;
 		}
-yy821:
-		YYDEBUG(821, *YYCURSOR);
+yy728:
+		YYDEBUG(728, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= 'O') {
-			if (yych <= 0x00) goto yy85;
-			if (yych == '*') goto yy650;
-			goto yy577;
-		} else {
-			if (yych <= 'P') goto yy847;
-			if (yych == 'p') goto yy847;
-			goto yy577;
+			if (yych <= 0x00) goto yy72;
+			if (yych == '*') goto yy572;
+			goto yy506;
+		} else {
+			if (yych <= 'P') goto yy753;
+			if (yych == 'p') goto yy753;
+			goto yy506;
 		}
-yy822:
-		YYDEBUG(822, *YYCURSOR);
+yy729:
+		YYDEBUG(729, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= '\r') {
 			if (yych <= '\t') {
-				if (yych <= 0x00) goto yy85;
-				goto yy573;
+				if (yych <= 0x00) goto yy72;
+				goto yy504;
 			} else {
-				if (yych <= '\n') goto yy485;
-				if (yych <= '\f') goto yy573;
-				goto yy485;
+				if (yych <= '\n') goto yy425;
+				if (yych <= '\f') goto yy504;
+				goto yy425;
 			}
 		} else {
 			if (yych <= 'D') {
-				if (yych <= 'C') goto yy573;
-				goto yy848;
+				if (yych <= 'C') goto yy504;
+				goto yy754;
 			} else {
-				if (yych == 'd') goto yy848;
-				goto yy573;
+				if (yych == 'd') goto yy754;
+				goto yy504;
 			}
 		}
-yy823:
-		YYDEBUG(823, *YYCURSOR);
+yy730:
+		YYDEBUG(730, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= '\r') {
 			if (yych <= '\t') {
-				if (yych <= 0x00) goto yy85;
-				goto yy573;
+				if (yych <= 0x00) goto yy72;
+				goto yy504;
 			} else {
-				if (yych <= '\n') goto yy485;
-				if (yych <= '\f') goto yy573;
-				goto yy485;
+				if (yych <= '\n') goto yy425;
+				if (yych <= '\f') goto yy504;
+				goto yy425;
 			}
 		} else {
 			if (yych <= 'M') {
-				if (yych <= 'L') goto yy573;
-				goto yy849;
+				if (yych <= 'L') goto yy504;
+				goto yy755;
 			} else {
-				if (yych == 'm') goto yy849;
-				goto yy573;
+				if (yych == 'm') goto yy755;
+				goto yy504;
 			}
 		}
-yy824:
-		YYDEBUG(824, *YYCURSOR);
+yy731:
+		YYDEBUG(731, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'E') goto yy850;
-		if (yych == 'e') goto yy850;
-		goto yy47;
-yy825:
-		YYDEBUG(825, *YYCURSOR);
+		if (yych == 'E') goto yy756;
+		if (yych == 'e') goto yy756;
+		goto yy40;
+yy732:
+		YYDEBUG(732, *YYCURSOR);
 		yyaccept = 88;
 		YYMARKER = ++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(826, *YYCURSOR);
 		if (yych <= '\\') {
 			if (yych <= '@') {
-				if (yych <= '/') goto yy827;
-				if (yych <= '9') goto yy825;
+				if (yych <= '/') goto yy733;
+				if (yych <= '9') goto yy732;
 			} else {
-				if (yych <= 'Z') goto yy825;
-				if (yych >= '\\') goto yy802;
+				if (yych <= 'Z') goto yy732;
+				if (yych >= '\\') goto yy712;
 			}
 		} else {
 			if (yych <= '`') {
-				if (yych == '_') goto yy825;
+				if (yych == '_') goto yy732;
 			} else {
-				if (yych <= 'z') goto yy825;
-				if (yych >= 0x80) goto yy825;
+				if (yych <= 'z') goto yy732;
+				if (yych >= 0x80) goto yy732;
 			}
 		}
-yy827:
-		YYDEBUG(827, *YYCURSOR);
+yy733:
+		YYDEBUG(733, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_STR(T_NAME_RELATIVE, sizeof("namespace\\") - 1);
 }
-yy828:
-		YYDEBUG(828, *YYCURSOR);
+yy734:
+		YYDEBUG(734, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'E') goto yy852;
-		if (yych == 'e') goto yy852;
-		goto yy47;
-yy829:
-		YYDEBUG(829, *YYCURSOR);
+		if (yych == 'E') goto yy758;
+		if (yych == 'e') goto yy758;
+		goto yy40;
+yy735:
+		YYDEBUG(735, *YYCURSOR);
 		++YYCURSOR;
-yy830:
-		YYDEBUG(830, *YYCURSOR);
+yy736:
+		YYDEBUG(736, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	yyless(yyleng - 1);
 	HANDLE_NEWLINES(yytext, yyleng);
 	RETURN_TOKEN_WITH_IDENT(T_YIELD_FROM);
 }
-yy831:
-		YYDEBUG(831, *YYCURSOR);
+yy737:
+		YYDEBUG(737, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= '\r') {
 			if (yych <= '\t') {
-				if (yych <= 0x00) goto yy85;
-				goto yy771;
+				if (yych <= 0x00) goto yy72;
+				goto yy682;
 			} else {
-				if (yych <= '\n') goto yy854;
-				if (yych <= '\f') goto yy771;
-				goto yy854;
+				if (yych <= '\n') goto yy760;
+				if (yych <= '\f') goto yy682;
+				goto yy760;
 			}
 		} else {
 			if (yych <= '*') {
-				if (yych <= ')') goto yy771;
-				goto yy807;
+				if (yych <= ')') goto yy682;
+				goto yy716;
 			} else {
-				if (yych == '') goto yy677;
-				goto yy771;
+				if (yych == '') goto yy596;
+				goto yy682;
 			}
 		}
-yy832:
-		YYDEBUG(832, *YYCURSOR);
+yy738:
+		YYDEBUG(738, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= '*') {
-			if (yych <= 0x00) goto yy85;
-			if (yych <= ')') goto yy677;
-			goto yy856;
+			if (yych <= 0x00) goto yy72;
+			if (yych <= ')') goto yy596;
+			goto yy761;
 		} else {
-			if (yych == '/') goto yy771;
-			goto yy677;
+			if (yych == '/') goto yy682;
+			goto yy596;
 		}
-yy833:
-		YYDEBUG(833, *YYCURSOR);
+yy739:
+		YYDEBUG(739, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= 'Q') {
-			if (yych <= 0x00) goto yy85;
-			if (yych == '*') goto yy730;
-			goto yy677;
-		} else {
-			if (yych <= 'R') goto yy857;
-			if (yych == 'r') goto yy857;
-			goto yy677;
+			if (yych <= 0x00) goto yy72;
+			if (yych == '*') goto yy644;
+			goto yy596;
+		} else {
+			if (yych <= 'R') goto yy762;
+			if (yych == 'r') goto yy762;
+			goto yy596;
 		}
-yy834:
-		YYDEBUG(834, *YYCURSOR);
+yy740:
+		YYDEBUG(740, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= '9') {
 			if (yych <= '\n') {
-				if (yych <= 0x00) goto yy829;
-				if (yych <= '\t') goto yy858;
-				goto yy859;
-			} else {
-				if (yych == '\r') goto yy859;
-				if (yych <= '/') goto yy858;
-				goto yy673;
+				if (yych <= 0x00) goto yy735;
+				if (yych <= '\t') goto yy763;
+				goto yy764;
+			} else {
+				if (yych == '\r') goto yy764;
+				if (yych <= '/') goto yy763;
+				goto yy594;
 			}
 		} else {
 			if (yych <= '_') {
-				if (yych <= '@') goto yy858;
-				if (yych <= 'Z') goto yy673;
-				if (yych <= '^') goto yy858;
-				goto yy673;
-			} else {
-				if (yych <= '`') goto yy858;
-				if (yych <= 'z') goto yy673;
-				if (yych <= 0x7F) goto yy858;
-				goto yy673;
+				if (yych <= '@') goto yy763;
+				if (yych <= 'Z') goto yy594;
+				if (yych <= '^') goto yy763;
+				goto yy594;
+			} else {
+				if (yych <= '`') goto yy763;
+				if (yych <= 'z') goto yy594;
+				if (yych <= 0x7F) goto yy763;
+				goto yy594;
 			}
 		}
-yy835:
-		YYDEBUG(835, *YYCURSOR);
+yy741:
+		YYDEBUG(741, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == '_') goto yy860;
-		goto yy47;
-yy836:
-		YYDEBUG(836, *YYCURSOR);
+		if (yych == '_') goto yy765;
+		goto yy40;
+yy742:
+		YYDEBUG(742, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'I') goto yy862;
-		if (yych == 'i') goto yy862;
-		goto yy47;
-yy837:
-		YYDEBUG(837, *YYCURSOR);
+		if (yych == 'I') goto yy767;
+		if (yych == 'i') goto yy767;
+		goto yy40;
+yy743:
+		YYDEBUG(743, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == '_') goto yy863;
-		goto yy47;
-yy838:
-		YYDEBUG(838, *YYCURSOR);
+		if (yych == '_') goto yy768;
+		goto yy40;
+yy744:
+		YYDEBUG(744, *YYCURSOR);
 		++YYCURSOR;
-yy839:
-		YYDEBUG(839, *YYCURSOR);
+yy745:
+		YYDEBUG(745, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	yyless(4);
 	RETURN_TOKEN_WITH_STR(T_STRING, 0);
 }
-yy840:
-		YYDEBUG(840, *YYCURSOR);
+yy746:
+		YYDEBUG(746, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'N') goto yy864;
-		if (yych == 'n') goto yy864;
-		goto yy85;
-yy841:
-		YYDEBUG(841, *YYCURSOR);
+		if (yych == 'N') goto yy769;
+		if (yych == 'n') goto yy769;
+		goto yy72;
+yy747:
+		YYDEBUG(747, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= '\f') {
-			if (yych <= 0x00) goto yy85;
-			if (yych == '\n') goto yy817;
-			goto yy710;
-		} else {
-			if (yych <= '\r') goto yy817;
-			if (yych == '*') goto yy754;
-			goto yy710;
+			if (yych <= 0x00) goto yy72;
+			if (yych == '\n') goto yy725;
+			goto yy625;
+		} else {
+			if (yych <= '\r') goto yy725;
+			if (yych == '*') goto yy666;
+			goto yy625;
 		}
-yy842:
-		YYDEBUG(842, *YYCURSOR);
+yy748:
+		YYDEBUG(748, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= '\f') {
-			if (yych <= 0x00) goto yy85;
-			if (yych == '\n') goto yy752;
-			goto yy710;
-		} else {
-			if (yych <= '\r') goto yy752;
-			if (yych == '*') goto yy865;
-			goto yy710;
+			if (yych <= 0x00) goto yy72;
+			if (yych == '\n') goto yy665;
+			goto yy625;
+		} else {
+			if (yych <= '\r') goto yy665;
+			if (yych == '*') goto yy770;
+			goto yy625;
 		}
-yy843:
-		YYDEBUG(843, *YYCURSOR);
+yy749:
+		YYDEBUG(749, *YYCURSOR);
 		yyaccept = 53;
 		YYMARKER = ++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= '\f') {
-			if (yych <= 0x00) goto yy570;
-			if (yych == '\n') goto yy752;
-			goto yy710;
-		} else {
-			if (yych <= '\r') goto yy752;
-			if (yych == '*') goto yy754;
-			goto yy710;
+			if (yych <= 0x00) goto yy501;
+			if (yych == '\n') goto yy665;
+			goto yy625;
+		} else {
+			if (yych <= '\r') goto yy665;
+			if (yych == '*') goto yy666;
+			goto yy625;
 		}
-yy844:
-		YYDEBUG(844, *YYCURSOR);
+yy750:
+		YYDEBUG(750, *YYCURSOR);
 		yyaccept = 53;
 		YYMARKER = ++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= ')') {
 			if (yych <= '\n') {
-				if (yych <= 0x00) goto yy570;
-				if (yych <= '\t') goto yy710;
-				goto yy752;
+				if (yych <= 0x00) goto yy501;
+				if (yych <= '\t') goto yy625;
+				goto yy665;
 			} else {
-				if (yych == '\r') goto yy752;
-				goto yy710;
+				if (yych == '\r') goto yy665;
+				goto yy625;
 			}
 		} else {
 			if (yych <= 'X') {
-				if (yych <= '*') goto yy754;
-				if (yych <= 'W') goto yy710;
-				goto yy866;
+				if (yych <= '*') goto yy666;
+				if (yych <= 'W') goto yy625;
+				goto yy771;
 			} else {
-				if (yych == 'x') goto yy866;
-				goto yy710;
+				if (yych == 'x') goto yy771;
+				goto yy625;
 			}
 		}
-yy845:
-		YYDEBUG(845, *YYCURSOR);
+yy751:
+		YYDEBUG(751, *YYCURSOR);
 		yyaccept = 53;
 		YYMARKER = ++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= ')') {
 			if (yych <= '\n') {
-				if (yych <= 0x00) goto yy570;
-				if (yych <= '\t') goto yy710;
-				goto yy752;
+				if (yych <= 0x00) goto yy501;
+				if (yych <= '\t') goto yy625;
+				goto yy665;
 			} else {
-				if (yych == '\r') goto yy752;
-				goto yy710;
+				if (yych == '\r') goto yy665;
+				goto yy625;
 			}
 		} else {
 			if (yych <= 'M') {
-				if (yych <= '*') goto yy754;
-				if (yych <= 'L') goto yy710;
-				goto yy867;
+				if (yych <= '*') goto yy666;
+				if (yych <= 'L') goto yy625;
+				goto yy772;
 			} else {
-				if (yych == 'm') goto yy867;
-				goto yy710;
+				if (yych == 'm') goto yy772;
+				goto yy625;
 			}
 		}
-yy846:
-		YYDEBUG(846, *YYCURSOR);
+yy752:
+		YYDEBUG(752, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= 'D') {
-			if (yych <= 0x00) goto yy85;
-			if (yych == '*') goto yy650;
-			goto yy577;
-		} else {
-			if (yych <= 'E') goto yy868;
-			if (yych == 'e') goto yy868;
-			goto yy577;
+			if (yych <= 0x00) goto yy72;
+			if (yych == '*') goto yy572;
+			goto yy506;
+		} else {
+			if (yych <= 'E') goto yy773;
+			if (yych == 'e') goto yy773;
+			goto yy506;
 		}
-yy847:
-		YYDEBUG(847, *YYCURSOR);
+yy753:
+		YYDEBUG(753, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= 'K') {
-			if (yych <= 0x00) goto yy85;
-			if (yych == '*') goto yy650;
-			goto yy577;
-		} else {
-			if (yych <= 'L') goto yy869;
-			if (yych == 'l') goto yy869;
-			goto yy577;
+			if (yych <= 0x00) goto yy72;
+			if (yych == '*') goto yy572;
+			goto yy506;
+		} else {
+			if (yych <= 'L') goto yy774;
+			if (yych == 'l') goto yy774;
+			goto yy506;
 		}
-yy848:
-		YYDEBUG(848, *YYCURSOR);
+yy754:
+		YYDEBUG(754, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= '\r') {
 			if (yych <= '\t') {
-				if (yych <= 0x00) goto yy85;
-				goto yy573;
+				if (yych <= 0x00) goto yy72;
+				goto yy504;
 			} else {
-				if (yych <= '\n') goto yy485;
-				if (yych <= '\f') goto yy573;
-				goto yy485;
+				if (yych <= '\n') goto yy425;
+				if (yych <= '\f') goto yy504;
+				goto yy425;
 			}
 		} else {
 			if (yych <= 'S') {
-				if (yych <= 'R') goto yy573;
-				goto yy870;
+				if (yych <= 'R') goto yy504;
+				goto yy775;
 			} else {
-				if (yych == 's') goto yy870;
-				goto yy573;
+				if (yych == 's') goto yy775;
+				goto yy504;
 			}
 		}
-yy849:
-		YYDEBUG(849, *YYCURSOR);
+yy755:
+		YYDEBUG(755, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= '\r') {
 			if (yych <= '\t') {
-				if (yych <= 0x00) goto yy85;
-				goto yy573;
+				if (yych <= 0x00) goto yy72;
+				goto yy504;
 			} else {
-				if (yych <= '\n') goto yy485;
-				if (yych <= '\f') goto yy573;
-				goto yy485;
+				if (yych <= '\n') goto yy425;
+				if (yych <= '\f') goto yy504;
+				goto yy425;
 			}
 		} else {
 			if (yych <= 'E') {
-				if (yych <= 'D') goto yy573;
-				goto yy871;
+				if (yych <= 'D') goto yy504;
+				goto yy776;
 			} else {
-				if (yych == 'e') goto yy871;
-				goto yy573;
+				if (yych == 'e') goto yy776;
+				goto yy504;
 			}
 		}
-yy850:
-		YYDEBUG(850, *YYCURSOR);
+yy756:
+		YYDEBUG(756, *YYCURSOR);
 		yyaccept = 89;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm256+yych & 128) {
-			goto yy46;
+			goto yy39;
 		}
-		if (yych == '\\') goto yy162;
-yy851:
-		YYDEBUG(851, *YYCURSOR);
+		if (yych == '\\') goto yy131;
+yy757:
+		YYDEBUG(757, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_IDENT(T_INCLUDE_ONCE);
 }
-yy852:
-		YYDEBUG(852, *YYCURSOR);
+yy758:
+		YYDEBUG(758, *YYCURSOR);
 		yyaccept = 90;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm256+yych & 128) {
-			goto yy46;
+			goto yy39;
 		}
-		if (yych == '\\') goto yy162;
-yy853:
-		YYDEBUG(853, *YYCURSOR);
+		if (yych == '\\') goto yy131;
+yy759:
+		YYDEBUG(759, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_IDENT(T_REQUIRE_ONCE);
 }
-yy854:
-		YYDEBUG(854, *YYCURSOR);
+yy760:
+		YYDEBUG(760, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(855, *YYCURSOR);
 		if (yych <= '"') {
 			if (yych <= '\n') {
-				if (yych <= 0x00) goto yy85;
-				if (yych <= 0x08) goto yy771;
-				if (yych <= '\t') goto yy854;
-				goto yy805;
+				if (yych <= 0x00) goto yy72;
+				if (yych <= 0x08) goto yy682;
+				if (yych <= '\t') goto yy760;
+				goto yy715;
 			} else {
 				if (yych <= '\r') {
-					if (yych <= '\f') goto yy771;
-					goto yy805;
+					if (yych <= '\f') goto yy682;
+					goto yy715;
 				} else {
-					if (yych == ' ') goto yy854;
-					goto yy771;
+					if (yych == ' ') goto yy760;
+					goto yy682;
 				}
 			}
 		} else {
 			if (yych <= '/') {
 				if (yych <= ')') {
-					if (yych <= '#') goto yy872;
-					goto yy771;
+					if (yych <= '#') goto yy777;
+					goto yy682;
 				} else {
-					if (yych <= '*') goto yy807;
-					if (yych <= '.') goto yy771;
-					goto yy873;
+					if (yych <= '*') goto yy716;
+					if (yych <= '.') goto yy682;
+					goto yy778;
 				}
 			} else {
 				if (yych <= 'F') {
-					if (yych <= 'E') goto yy771;
-					goto yy874;
+					if (yych <= 'E') goto yy682;
+					goto yy779;
 				} else {
-					if (yych == 'f') goto yy874;
-					goto yy771;
+					if (yych == 'f') goto yy779;
+					goto yy682;
 				}
 			}
 		}
-yy856:
-		YYDEBUG(856, *YYCURSOR);
+yy761:
+		YYDEBUG(761, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= '*') {
-			if (yych <= 0x00) goto yy85;
-			if (yych <= ')') goto yy677;
-			goto yy730;
+			if (yych <= 0x00) goto yy72;
+			if (yych <= ')') goto yy596;
+			goto yy644;
 		} else {
-			if (yych == '/') goto yy805;
-			goto yy677;
+			if (yych == '/') goto yy715;
+			goto yy596;
 		}
-yy857:
-		YYDEBUG(857, *YYCURSOR);
+yy762:
+		YYDEBUG(762, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= 'N') {
-			if (yych <= 0x00) goto yy85;
-			if (yych == '*') goto yy730;
-			goto yy677;
-		} else {
-			if (yych <= 'O') goto yy875;
-			if (yych == 'o') goto yy875;
-			goto yy677;
+			if (yych <= 0x00) goto yy72;
+			if (yych == '*') goto yy644;
+			goto yy596;
+		} else {
+			if (yych <= 'O') goto yy780;
+			if (yych == 'o') goto yy780;
+			goto yy596;
 		}
-yy858:
-		YYDEBUG(858, *YYCURSOR);
+yy763:
+		YYDEBUG(763, *YYCURSOR);
 		yyaccept = 91;
 		YYMARKER = ++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= '\n') {
-			if (yych <= 0x00) goto yy830;
-			if (yych <= '\t') goto yy673;
-			goto yy603;
+			if (yych <= 0x00) goto yy736;
+			if (yych <= '\t') goto yy594;
+			goto yy531;
 		} else {
-			if (yych == '\r') goto yy603;
-			goto yy673;
+			if (yych == '\r') goto yy531;
+			goto yy594;
 		}
-yy859:
-		YYDEBUG(859, *YYCURSOR);
+yy764:
+		YYDEBUG(764, *YYCURSOR);
 		yyaccept = 91;
 		YYMARKER = ++YYCURSOR;
 		YYFILL(5);
 		yych = *YYCURSOR;
 		if (yych <= '"') {
 			if (yych <= '\f') {
-				if (yych <= 0x08) goto yy830;
-				if (yych <= '\n') goto yy603;
-				goto yy830;
-			} else {
-				if (yych <= '\r') goto yy603;
-				if (yych == ' ') goto yy603;
-				goto yy830;
+				if (yych <= 0x08) goto yy736;
+				if (yych <= '\n') goto yy531;
+				goto yy736;
+			} else {
+				if (yych <= '\r') goto yy531;
+				if (yych == ' ') goto yy531;
+				goto yy736;
 			}
 		} else {
 			if (yych <= 'E') {
-				if (yych <= '#') goto yy605;
-				if (yych == '/') goto yy606;
-				goto yy830;
-			} else {
-				if (yych <= 'F') goto yy672;
-				if (yych == 'f') goto yy672;
-				goto yy830;
+				if (yych <= '#') goto yy532;
+				if (yych == '/') goto yy533;
+				goto yy736;
+			} else {
+				if (yych <= 'F') goto yy593;
+				if (yych == 'f') goto yy593;
+				goto yy736;
 			}
 		}
-yy860:
-		YYDEBUG(860, *YYCURSOR);
+yy765:
+		YYDEBUG(765, *YYCURSOR);
 		yyaccept = 92;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm256+yych & 128) {
-			goto yy46;
+			goto yy39;
 		}
-		if (yych == '\\') goto yy162;
-yy861:
-		YYDEBUG(861, *YYCURSOR);
+		if (yych == '\\') goto yy131;
+yy766:
+		YYDEBUG(766, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_IDENT(T_FUNC_C);
 }
-yy862:
-		YYDEBUG(862, *YYCURSOR);
+yy767:
+		YYDEBUG(767, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'L') goto yy876;
-		if (yych == 'l') goto yy876;
-		goto yy47;
-yy863:
-		YYDEBUG(863, *YYCURSOR);
+		if (yych == 'L') goto yy781;
+		if (yych == 'l') goto yy781;
+		goto yy40;
+yy768:
+		YYDEBUG(768, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == '_') goto yy877;
-		goto yy47;
-yy864:
-		YYDEBUG(864, *YYCURSOR);
+		if (yych == '_') goto yy782;
+		goto yy40;
+yy769:
+		YYDEBUG(769, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'T') goto yy815;
-		if (yych == 't') goto yy815;
-		goto yy85;
-yy865:
-		YYDEBUG(865, *YYCURSOR);
+		if (yych == 'T') goto yy723;
+		if (yych == 't') goto yy723;
+		goto yy72;
+yy770:
+		YYDEBUG(770, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= '\r') {
 			if (yych <= '\t') {
-				if (yych <= 0x00) goto yy85;
-				goto yy710;
+				if (yych <= 0x00) goto yy72;
+				goto yy625;
 			} else {
-				if (yych <= '\n') goto yy752;
-				if (yych <= '\f') goto yy710;
-				goto yy752;
+				if (yych <= '\n') goto yy665;
+				if (yych <= '\f') goto yy625;
+				goto yy665;
 			}
 		} else {
 			if (yych <= '*') {
-				if (yych <= ')') goto yy710;
-				goto yy754;
+				if (yych <= ')') goto yy625;
+				goto yy666;
 			} else {
-				if (yych == '/') goto yy817;
-				goto yy710;
+				if (yych == '/') goto yy725;
+				goto yy625;
 			}
 		}
-yy866:
-		YYDEBUG(866, *YYCURSOR);
+yy771:
+		YYDEBUG(771, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= ')') {
 			if (yych <= '\n') {
-				if (yych <= 0x00) goto yy85;
-				if (yych <= '\t') goto yy710;
-				goto yy752;
+				if (yych <= 0x00) goto yy72;
+				if (yych <= '\t') goto yy625;
+				goto yy665;
 			} else {
-				if (yych == '\r') goto yy752;
-				goto yy710;
+				if (yych == '\r') goto yy665;
+				goto yy625;
 			}
 		} else {
 			if (yych <= 'T') {
-				if (yych <= '*') goto yy754;
-				if (yych <= 'S') goto yy710;
-				goto yy879;
+				if (yych <= '*') goto yy666;
+				if (yych <= 'S') goto yy625;
+				goto yy784;
 			} else {
-				if (yych == 't') goto yy879;
-				goto yy710;
+				if (yych == 't') goto yy784;
+				goto yy625;
 			}
 		}
-yy867:
-		YYDEBUG(867, *YYCURSOR);
+yy772:
+		YYDEBUG(772, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= ')') {
 			if (yych <= '\n') {
-				if (yych <= 0x00) goto yy85;
-				if (yych <= '\t') goto yy710;
-				goto yy752;
+				if (yych <= 0x00) goto yy72;
+				if (yych <= '\t') goto yy625;
+				goto yy665;
 			} else {
-				if (yych == '\r') goto yy752;
-				goto yy710;
+				if (yych == '\r') goto yy665;
+				goto yy625;
 			}
 		} else {
 			if (yych <= 'P') {
-				if (yych <= '*') goto yy754;
-				if (yych <= 'O') goto yy710;
-				goto yy880;
+				if (yych <= '*') goto yy666;
+				if (yych <= 'O') goto yy625;
+				goto yy785;
 			} else {
-				if (yych == 'p') goto yy880;
-				goto yy710;
+				if (yych == 'p') goto yy785;
+				goto yy625;
 			}
 		}
-yy868:
-		YYDEBUG(868, *YYCURSOR);
+yy773:
+		YYDEBUG(773, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= 'M') {
-			if (yych <= 0x00) goto yy85;
-			if (yych == '*') goto yy650;
-			goto yy577;
-		} else {
-			if (yych <= 'N') goto yy881;
-			if (yych == 'n') goto yy881;
-			goto yy577;
+			if (yych <= 0x00) goto yy72;
+			if (yych == '*') goto yy572;
+			goto yy506;
+		} else {
+			if (yych <= 'N') goto yy786;
+			if (yych == 'n') goto yy786;
+			goto yy506;
 		}
-yy869:
-		YYDEBUG(869, *YYCURSOR);
+yy774:
+		YYDEBUG(774, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= 'D') {
-			if (yych <= 0x00) goto yy85;
-			if (yych == '*') goto yy650;
-			goto yy577;
-		} else {
-			if (yych <= 'E') goto yy882;
-			if (yych == 'e') goto yy882;
-			goto yy577;
+			if (yych <= 0x00) goto yy72;
+			if (yych == '*') goto yy572;
+			goto yy506;
+		} else {
+			if (yych <= 'E') goto yy787;
+			if (yych == 'e') goto yy787;
+			goto yy506;
 		}
-yy870:
-		YYDEBUG(870, *YYCURSOR);
+yy775:
+		YYDEBUG(775, *YYCURSOR);
 		yyaccept = 93;
 		YYMARKER = ++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= '\n') {
-			if (yych <= 0x00) goto yy839;
-			if (yych <= '\t') goto yy573;
-			goto yy485;
+			if (yych <= 0x00) goto yy745;
+			if (yych <= '\t') goto yy504;
+			goto yy425;
 		} else {
-			if (yych == '\r') goto yy485;
-			goto yy573;
+			if (yych == '\r') goto yy425;
+			goto yy504;
 		}
-yy871:
-		YYDEBUG(871, *YYCURSOR);
+yy776:
+		YYDEBUG(776, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= '\r') {
 			if (yych <= '\t') {
-				if (yych <= 0x00) goto yy85;
-				goto yy573;
+				if (yych <= 0x00) goto yy72;
+				goto yy504;
 			} else {
-				if (yych <= '\n') goto yy485;
-				if (yych <= '\f') goto yy573;
-				goto yy485;
+				if (yych <= '\n') goto yy425;
+				if (yych <= '\f') goto yy504;
+				goto yy425;
 			}
 		} else {
 			if (yych <= 'N') {
-				if (yych <= 'M') goto yy573;
-				goto yy883;
+				if (yych <= 'M') goto yy504;
+				goto yy788;
 			} else {
-				if (yych == 'n') goto yy883;
-				goto yy573;
+				if (yych == 'n') goto yy788;
+				goto yy504;
 			}
 		}
-yy872:
-		YYDEBUG(872, *YYCURSOR);
+yy777:
+		YYDEBUG(777, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= '\f') {
-			if (yych <= 0x00) goto yy85;
-			if (yych == '\n') goto yy854;
-			goto yy771;
-		} else {
-			if (yych <= '\r') goto yy854;
-			if (yych == '*') goto yy807;
-			goto yy771;
+			if (yych <= 0x00) goto yy72;
+			if (yych == '\n') goto yy760;
+			goto yy682;
+		} else {
+			if (yych <= '\r') goto yy760;
+			if (yych == '*') goto yy716;
+			goto yy682;
 		}
-yy873:
-		YYDEBUG(873, *YYCURSOR);
+yy778:
+		YYDEBUG(778, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= '\f') {
-			if (yych <= 0x00) goto yy85;
-			if (yych == '\n') goto yy805;
-			goto yy771;
-		} else {
-			if (yych <= '\r') goto yy805;
-			if (yych == '*') goto yy884;
-			goto yy771;
+			if (yych <= 0x00) goto yy72;
+			if (yych == '\n') goto yy715;
+			goto yy682;
+		} else {
+			if (yych <= '\r') goto yy715;
+			if (yych == '*') goto yy789;
+			goto yy682;
 		}
-yy874:
-		YYDEBUG(874, *YYCURSOR);
+yy779:
+		YYDEBUG(779, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= ')') {
 			if (yych <= '\n') {
-				if (yych <= 0x00) goto yy85;
-				if (yych <= '\t') goto yy771;
-				goto yy805;
+				if (yych <= 0x00) goto yy72;
+				if (yych <= '\t') goto yy682;
+				goto yy715;
 			} else {
-				if (yych == '\r') goto yy805;
-				goto yy771;
+				if (yych == '\r') goto yy715;
+				goto yy682;
 			}
 		} else {
 			if (yych <= 'R') {
-				if (yych <= '*') goto yy807;
-				if (yych <= 'Q') goto yy771;
-				goto yy885;
+				if (yych <= '*') goto yy716;
+				if (yych <= 'Q') goto yy682;
+				goto yy790;
 			} else {
-				if (yych == 'r') goto yy885;
-				goto yy771;
+				if (yych == 'r') goto yy790;
+				goto yy682;
 			}
 		}
-yy875:
-		YYDEBUG(875, *YYCURSOR);
+yy780:
+		YYDEBUG(780, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= 'L') {
-			if (yych <= 0x00) goto yy85;
-			if (yych == '*') goto yy730;
-			goto yy677;
-		} else {
-			if (yych <= 'M') goto yy886;
-			if (yych == 'm') goto yy886;
-			goto yy677;
+			if (yych <= 0x00) goto yy72;
+			if (yych == '*') goto yy644;
+			goto yy596;
+		} else {
+			if (yych <= 'M') goto yy791;
+			if (yych == 'm') goto yy791;
+			goto yy596;
 		}
-yy876:
-		YYDEBUG(876, *YYCURSOR);
+yy781:
+		YYDEBUG(781, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'E') goto yy887;
-		if (yych == 'e') goto yy887;
-		goto yy47;
-yy877:
-		YYDEBUG(877, *YYCURSOR);
+		if (yych == 'E') goto yy792;
+		if (yych == 'e') goto yy792;
+		goto yy40;
+yy782:
+		YYDEBUG(782, *YYCURSOR);
 		yyaccept = 94;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm256+yych & 128) {
-			goto yy46;
+			goto yy39;
 		}
-		if (yych == '\\') goto yy162;
-yy878:
-		YYDEBUG(878, *YYCURSOR);
+		if (yych == '\\') goto yy131;
+yy783:
+		YYDEBUG(783, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_IDENT(T_NS_C);
 }
-yy879:
-		YYDEBUG(879, *YYCURSOR);
+yy784:
+		YYDEBUG(784, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= ')') {
 			if (yych <= '\n') {
-				if (yych <= 0x00) goto yy85;
-				if (yych <= '\t') goto yy710;
-				goto yy752;
+				if (yych <= 0x00) goto yy72;
+				if (yych <= '\t') goto yy625;
+				goto yy665;
 			} else {
-				if (yych == '\r') goto yy752;
-				goto yy710;
+				if (yych == '\r') goto yy665;
+				goto yy625;
 			}
 		} else {
 			if (yych <= 'E') {
-				if (yych <= '*') goto yy754;
-				if (yych <= 'D') goto yy710;
-				goto yy888;
+				if (yych <= '*') goto yy666;
+				if (yych <= 'D') goto yy625;
+				goto yy793;
 			} else {
-				if (yych == 'e') goto yy888;
-				goto yy710;
+				if (yych == 'e') goto yy793;
+				goto yy625;
 			}
 		}
-yy880:
-		YYDEBUG(880, *YYCURSOR);
+yy785:
+		YYDEBUG(785, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= ')') {
 			if (yych <= '\n') {
-				if (yych <= 0x00) goto yy85;
-				if (yych <= '\t') goto yy710;
-				goto yy752;
+				if (yych <= 0x00) goto yy72;
+				if (yych <= '\t') goto yy625;
+				goto yy665;
 			} else {
-				if (yych == '\r') goto yy752;
-				goto yy710;
+				if (yych == '\r') goto yy665;
+				goto yy625;
 			}
 		} else {
 			if (yych <= 'L') {
-				if (yych <= '*') goto yy754;
-				if (yych <= 'K') goto yy710;
-				goto yy889;
+				if (yych <= '*') goto yy666;
+				if (yych <= 'K') goto yy625;
+				goto yy794;
 			} else {
-				if (yych == 'l') goto yy889;
-				goto yy710;
+				if (yych == 'l') goto yy794;
+				goto yy625;
 			}
 		}
-yy881:
-		YYDEBUG(881, *YYCURSOR);
+yy786:
+		YYDEBUG(786, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= 'C') {
-			if (yych <= 0x00) goto yy85;
-			if (yych == '*') goto yy650;
-			goto yy577;
-		} else {
-			if (yych <= 'D') goto yy890;
-			if (yych == 'd') goto yy890;
-			goto yy577;
+			if (yych <= 0x00) goto yy72;
+			if (yych == '*') goto yy572;
+			goto yy506;
+		} else {
+			if (yych <= 'D') goto yy795;
+			if (yych == 'd') goto yy795;
+			goto yy506;
 		}
-yy882:
-		YYDEBUG(882, *YYCURSOR);
+yy787:
+		YYDEBUG(787, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= 'L') {
-			if (yych <= 0x00) goto yy85;
-			if (yych == '*') goto yy650;
-			goto yy577;
-		} else {
-			if (yych <= 'M') goto yy891;
-			if (yych == 'm') goto yy891;
-			goto yy577;
+			if (yych <= 0x00) goto yy72;
+			if (yych == '*') goto yy572;
+			goto yy506;
+		} else {
+			if (yych <= 'M') goto yy796;
+			if (yych == 'm') goto yy796;
+			goto yy506;
 		}
-yy883:
-		YYDEBUG(883, *YYCURSOR);
+yy788:
+		YYDEBUG(788, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= '\r') {
 			if (yych <= '\t') {
-				if (yych <= 0x00) goto yy85;
-				goto yy573;
+				if (yych <= 0x00) goto yy72;
+				goto yy504;
 			} else {
-				if (yych <= '\n') goto yy485;
-				if (yych <= '\f') goto yy573;
-				goto yy485;
+				if (yych <= '\n') goto yy425;
+				if (yych <= '\f') goto yy504;
+				goto yy425;
 			}
 		} else {
 			if (yych <= 'T') {
-				if (yych <= 'S') goto yy573;
-				goto yy848;
+				if (yych <= 'S') goto yy504;
+				goto yy754;
 			} else {
-				if (yych == 't') goto yy848;
-				goto yy573;
+				if (yych == 't') goto yy754;
+				goto yy504;
 			}
 		}
-yy884:
-		YYDEBUG(884, *YYCURSOR);
+yy789:
+		YYDEBUG(789, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= '\r') {
 			if (yych <= '\t') {
-				if (yych <= 0x00) goto yy85;
-				goto yy771;
+				if (yych <= 0x00) goto yy72;
+				goto yy682;
 			} else {
-				if (yych <= '\n') goto yy805;
-				if (yych <= '\f') goto yy771;
-				goto yy805;
+				if (yych <= '\n') goto yy715;
+				if (yych <= '\f') goto yy682;
+				goto yy715;
 			}
 		} else {
 			if (yych <= '*') {
-				if (yych <= ')') goto yy771;
-				goto yy807;
+				if (yych <= ')') goto yy682;
+				goto yy716;
 			} else {
-				if (yych == '/') goto yy854;
-				goto yy771;
+				if (yych == '/') goto yy760;
+				goto yy682;
 			}
 		}
-yy885:
-		YYDEBUG(885, *YYCURSOR);
+yy790:
+		YYDEBUG(790, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= ')') {
 			if (yych <= '\n') {
-				if (yych <= 0x00) goto yy85;
-				if (yych <= '\t') goto yy771;
-				goto yy805;
+				if (yych <= 0x00) goto yy72;
+				if (yych <= '\t') goto yy682;
+				goto yy715;
 			} else {
-				if (yych == '\r') goto yy805;
-				goto yy771;
+				if (yych == '\r') goto yy715;
+				goto yy682;
 			}
 		} else {
 			if (yych <= 'O') {
-				if (yych <= '*') goto yy807;
-				if (yych <= 'N') goto yy771;
-				goto yy892;
+				if (yych <= '*') goto yy716;
+				if (yych <= 'N') goto yy682;
+				goto yy797;
 			} else {
-				if (yych == 'o') goto yy892;
-				goto yy771;
+				if (yych == 'o') goto yy797;
+				goto yy682;
 			}
 		}
-yy886:
-		YYDEBUG(886, *YYCURSOR);
+yy791:
+		YYDEBUG(791, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= '@') {
 			if (yych <= '*') {
-				if (yych <= 0x00) goto yy829;
-				if (yych <= ')') goto yy893;
-				goto yy894;
-			} else {
-				if (yych <= '/') goto yy893;
-				if (yych <= '9') goto yy677;
-				goto yy893;
+				if (yych <= 0x00) goto yy735;
+				if (yych <= ')') goto yy798;
+				goto yy799;
+			} else {
+				if (yych <= '/') goto yy798;
+				if (yych <= '9') goto yy596;
+				goto yy798;
 			}
 		} else {
 			if (yych <= '_') {
-				if (yych <= 'Z') goto yy677;
-				if (yych <= '^') goto yy893;
-				goto yy677;
-			} else {
-				if (yych <= '`') goto yy893;
-				if (yych <= 'z') goto yy677;
-				if (yych <= 0x7F) goto yy893;
-				goto yy677;
+				if (yych <= 'Z') goto yy596;
+				if (yych <= '^') goto yy798;
+				goto yy596;
+			} else {
+				if (yych <= '`') goto yy798;
+				if (yych <= 'z') goto yy596;
+				if (yych <= 0x7F) goto yy798;
+				goto yy596;
 			}
 		}
-yy887:
-		YYDEBUG(887, *YYCURSOR);
+yy792:
+		YYDEBUG(792, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'R') goto yy895;
-		if (yych == 'r') goto yy895;
-		goto yy47;
-yy888:
-		YYDEBUG(888, *YYCURSOR);
+		if (yych == 'R') goto yy800;
+		if (yych == 'r') goto yy800;
+		goto yy40;
+yy793:
+		YYDEBUG(793, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= ')') {
 			if (yych <= '\n') {
-				if (yych <= 0x00) goto yy85;
-				if (yych <= '\t') goto yy710;
-				goto yy752;
+				if (yych <= 0x00) goto yy72;
+				if (yych <= '\t') goto yy625;
+				goto yy665;
 			} else {
-				if (yych == '\r') goto yy752;
-				goto yy710;
+				if (yych == '\r') goto yy665;
+				goto yy625;
 			}
 		} else {
 			if (yych <= 'N') {
-				if (yych <= '*') goto yy754;
-				if (yych <= 'M') goto yy710;
-				goto yy897;
+				if (yych <= '*') goto yy666;
+				if (yych <= 'M') goto yy625;
+				goto yy802;
 			} else {
-				if (yych == 'n') goto yy897;
-				goto yy710;
+				if (yych == 'n') goto yy802;
+				goto yy625;
 			}
 		}
-yy889:
-		YYDEBUG(889, *YYCURSOR);
+yy794:
+		YYDEBUG(794, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= ')') {
 			if (yych <= '\n') {
-				if (yych <= 0x00) goto yy85;
-				if (yych <= '\t') goto yy710;
-				goto yy752;
+				if (yych <= 0x00) goto yy72;
+				if (yych <= '\t') goto yy625;
+				goto yy665;
 			} else {
-				if (yych == '\r') goto yy752;
-				goto yy710;
+				if (yych == '\r') goto yy665;
+				goto yy625;
 			}
 		} else {
 			if (yych <= 'E') {
-				if (yych <= '*') goto yy754;
-				if (yych <= 'D') goto yy710;
-				goto yy898;
+				if (yych <= '*') goto yy666;
+				if (yych <= 'D') goto yy625;
+				goto yy803;
 			} else {
-				if (yych == 'e') goto yy898;
-				goto yy710;
+				if (yych == 'e') goto yy803;
+				goto yy625;
 			}
 		}
-yy890:
-		YYDEBUG(890, *YYCURSOR);
+yy795:
+		YYDEBUG(795, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= 'R') {
-			if (yych <= 0x00) goto yy85;
-			if (yych == '*') goto yy650;
-			goto yy577;
-		} else {
-			if (yych <= 'S') goto yy899;
-			if (yych == 's') goto yy899;
-			goto yy577;
+			if (yych <= 0x00) goto yy72;
+			if (yych == '*') goto yy572;
+			goto yy506;
+		} else {
+			if (yych <= 'S') goto yy804;
+			if (yych == 's') goto yy804;
+			goto yy506;
 		}
-yy891:
-		YYDEBUG(891, *YYCURSOR);
+yy796:
+		YYDEBUG(796, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= 'D') {
-			if (yych <= 0x00) goto yy85;
-			if (yych == '*') goto yy650;
-			goto yy577;
-		} else {
-			if (yych <= 'E') goto yy900;
-			if (yych == 'e') goto yy900;
-			goto yy577;
+			if (yych <= 0x00) goto yy72;
+			if (yych == '*') goto yy572;
+			goto yy506;
+		} else {
+			if (yych <= 'E') goto yy805;
+			if (yych == 'e') goto yy805;
+			goto yy506;
 		}
-yy892:
-		YYDEBUG(892, *YYCURSOR);
+yy797:
+		YYDEBUG(797, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= ')') {
 			if (yych <= '\n') {
-				if (yych <= 0x00) goto yy85;
-				if (yych <= '\t') goto yy771;
-				goto yy805;
+				if (yych <= 0x00) goto yy72;
+				if (yych <= '\t') goto yy682;
+				goto yy715;
 			} else {
-				if (yych == '\r') goto yy805;
-				goto yy771;
+				if (yych == '\r') goto yy715;
+				goto yy682;
 			}
 		} else {
 			if (yych <= 'M') {
-				if (yych <= '*') goto yy807;
-				if (yych <= 'L') goto yy771;
-				goto yy901;
+				if (yych <= '*') goto yy716;
+				if (yych <= 'L') goto yy682;
+				goto yy806;
 			} else {
-				if (yych == 'm') goto yy901;
-				goto yy771;
+				if (yych == 'm') goto yy806;
+				goto yy682;
 			}
 		}
-yy893:
-		YYDEBUG(893, *YYCURSOR);
+yy798:
+		YYDEBUG(798, *YYCURSOR);
 		yyaccept = 91;
 		YYMARKER = ++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		if (yych <= 0x00) goto yy830;
-		if (yych == '*') goto yy730;
-		goto yy677;
-yy894:
-		YYDEBUG(894, *YYCURSOR);
+		if (yych <= 0x00) goto yy736;
+		if (yych == '*') goto yy644;
+		goto yy596;
+yy799:
+		YYDEBUG(799, *YYCURSOR);
 		yyaccept = 91;
 		YYMARKER = ++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= '*') {
-			if (yych <= 0x00) goto yy830;
-			if (yych <= ')') goto yy677;
-			goto yy730;
+			if (yych <= 0x00) goto yy736;
+			if (yych <= ')') goto yy596;
+			goto yy644;
 		} else {
-			if (yych == '/') goto yy603;
-			goto yy677;
+			if (yych == '/') goto yy531;
+			goto yy596;
 		}
-yy895:
-		YYDEBUG(895, *YYCURSOR);
+yy800:
+		YYDEBUG(800, *YYCURSOR);
 		yyaccept = 95;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm256+yych & 128) {
-			goto yy46;
+			goto yy39;
 		}
-		if (yych == '\\') goto yy162;
-yy896:
-		YYDEBUG(896, *YYCURSOR);
+		if (yych == '\\') goto yy131;
+yy801:
+		YYDEBUG(801, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_IDENT(T_HALT_COMPILER);
 }
-yy897:
-		YYDEBUG(897, *YYCURSOR);
+yy802:
+		YYDEBUG(802, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= ')') {
 			if (yych <= '\n') {
-				if (yych <= 0x00) goto yy85;
-				if (yych <= '\t') goto yy710;
-				goto yy752;
+				if (yych <= 0x00) goto yy72;
+				if (yych <= '\t') goto yy625;
+				goto yy665;
 			} else {
-				if (yych == '\r') goto yy752;
-				goto yy710;
+				if (yych == '\r') goto yy665;
+				goto yy625;
 			}
 		} else {
 			if (yych <= 'D') {
-				if (yych <= '*') goto yy754;
-				if (yych <= 'C') goto yy710;
-				goto yy902;
+				if (yych <= '*') goto yy666;
+				if (yych <= 'C') goto yy625;
+				goto yy807;
 			} else {
-				if (yych == 'd') goto yy902;
-				goto yy710;
+				if (yych == 'd') goto yy807;
+				goto yy625;
 			}
 		}
-yy898:
-		YYDEBUG(898, *YYCURSOR);
+yy803:
+		YYDEBUG(803, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= ')') {
 			if (yych <= '\n') {
-				if (yych <= 0x00) goto yy85;
-				if (yych <= '\t') goto yy710;
-				goto yy752;
+				if (yych <= 0x00) goto yy72;
+				if (yych <= '\t') goto yy625;
+				goto yy665;
 			} else {
-				if (yych == '\r') goto yy752;
-				goto yy710;
+				if (yych == '\r') goto yy665;
+				goto yy625;
 			}
 		} else {
 			if (yych <= 'M') {
-				if (yych <= '*') goto yy754;
-				if (yych <= 'L') goto yy710;
-				goto yy903;
+				if (yych <= '*') goto yy666;
+				if (yych <= 'L') goto yy625;
+				goto yy808;
 			} else {
-				if (yych == 'm') goto yy903;
-				goto yy710;
+				if (yych == 'm') goto yy808;
+				goto yy625;
 			}
 		}
-yy899:
-		YYDEBUG(899, *YYCURSOR);
+yy804:
+		YYDEBUG(804, *YYCURSOR);
 		yyaccept = 93;
 		YYMARKER = ++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		if (yych <= 0x00) goto yy839;
-		if (yych == '*') goto yy650;
-		goto yy577;
-yy900:
-		YYDEBUG(900, *YYCURSOR);
+		if (yych <= 0x00) goto yy745;
+		if (yych == '*') goto yy572;
+		goto yy506;
+yy805:
+		YYDEBUG(805, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= 'M') {
-			if (yych <= 0x00) goto yy85;
-			if (yych == '*') goto yy650;
-			goto yy577;
-		} else {
-			if (yych <= 'N') goto yy904;
-			if (yych == 'n') goto yy904;
-			goto yy577;
+			if (yych <= 0x00) goto yy72;
+			if (yych == '*') goto yy572;
+			goto yy506;
+		} else {
+			if (yych <= 'N') goto yy809;
+			if (yych == 'n') goto yy809;
+			goto yy506;
 		}
-yy901:
-		YYDEBUG(901, *YYCURSOR);
+yy806:
+		YYDEBUG(806, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= '/') {
 			if (yych <= '\f') {
-				if (yych <= 0x00) goto yy829;
-				if (yych == '\n') goto yy906;
-				goto yy905;
-			} else {
-				if (yych <= '\r') goto yy906;
-				if (yych == '*') goto yy907;
-				goto yy905;
+				if (yych <= 0x00) goto yy735;
+				if (yych == '\n') goto yy811;
+				goto yy810;
+			} else {
+				if (yych <= '\r') goto yy811;
+				if (yych == '*') goto yy812;
+				goto yy810;
 			}
 		} else {
 			if (yych <= '^') {
-				if (yych <= '9') goto yy771;
-				if (yych <= '@') goto yy905;
-				if (yych <= 'Z') goto yy771;
-				goto yy905;
+				if (yych <= '9') goto yy682;
+				if (yych <= '@') goto yy810;
+				if (yych <= 'Z') goto yy682;
+				goto yy810;
 			} else {
 				if (yych <= '`') {
-					if (yych <= '_') goto yy771;
-					goto yy905;
+					if (yych <= '_') goto yy682;
+					goto yy810;
 				} else {
-					if (yych <= 'z') goto yy771;
-					if (yych <= 0x7F) goto yy905;
-					goto yy771;
+					if (yych <= 'z') goto yy682;
+					if (yych <= 0x7F) goto yy810;
+					goto yy682;
 				}
 			}
 		}
-yy902:
-		YYDEBUG(902, *YYCURSOR);
+yy807:
+		YYDEBUG(807, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= ')') {
 			if (yych <= '\n') {
-				if (yych <= 0x00) goto yy85;
-				if (yych <= '\t') goto yy710;
-				goto yy752;
+				if (yych <= 0x00) goto yy72;
+				if (yych <= '\t') goto yy625;
+				goto yy665;
 			} else {
-				if (yych == '\r') goto yy752;
-				goto yy710;
+				if (yych == '\r') goto yy665;
+				goto yy625;
 			}
 		} else {
 			if (yych <= 'S') {
-				if (yych <= '*') goto yy754;
-				if (yych <= 'R') goto yy710;
-				goto yy908;
+				if (yych <= '*') goto yy666;
+				if (yych <= 'R') goto yy625;
+				goto yy813;
 			} else {
-				if (yych == 's') goto yy908;
-				goto yy710;
+				if (yych == 's') goto yy813;
+				goto yy625;
 			}
 		}
-yy903:
-		YYDEBUG(903, *YYCURSOR);
+yy808:
+		YYDEBUG(808, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= ')') {
 			if (yych <= '\n') {
-				if (yych <= 0x00) goto yy85;
-				if (yych <= '\t') goto yy710;
-				goto yy752;
+				if (yych <= 0x00) goto yy72;
+				if (yych <= '\t') goto yy625;
+				goto yy665;
 			} else {
-				if (yych == '\r') goto yy752;
-				goto yy710;
+				if (yych == '\r') goto yy665;
+				goto yy625;
 			}
 		} else {
 			if (yych <= 'E') {
-				if (yych <= '*') goto yy754;
-				if (yych <= 'D') goto yy710;
-				goto yy909;
+				if (yych <= '*') goto yy666;
+				if (yych <= 'D') goto yy625;
+				goto yy814;
 			} else {
-				if (yych == 'e') goto yy909;
-				goto yy710;
+				if (yych == 'e') goto yy814;
+				goto yy625;
 			}
 		}
-yy904:
-		YYDEBUG(904, *YYCURSOR);
+yy809:
+		YYDEBUG(809, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= 'S') {
-			if (yych <= 0x00) goto yy85;
-			if (yych == '*') goto yy650;
-			goto yy577;
-		} else {
-			if (yych <= 'T') goto yy890;
-			if (yych == 't') goto yy890;
-			goto yy577;
+			if (yych <= 0x00) goto yy72;
+			if (yych == '*') goto yy572;
+			goto yy506;
+		} else {
+			if (yych <= 'T') goto yy795;
+			if (yych == 't') goto yy795;
+			goto yy506;
 		}
-yy905:
-		YYDEBUG(905, *YYCURSOR);
+yy810:
+		YYDEBUG(810, *YYCURSOR);
 		yyaccept = 91;
 		YYMARKER = ++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= '\f') {
-			if (yych <= 0x00) goto yy830;
-			if (yych == '\n') goto yy805;
-			goto yy771;
-		} else {
-			if (yych <= '\r') goto yy805;
-			if (yych == '*') goto yy807;
-			goto yy771;
+			if (yych <= 0x00) goto yy736;
+			if (yych == '\n') goto yy715;
+			goto yy682;
+		} else {
+			if (yych <= '\r') goto yy715;
+			if (yych == '*') goto yy716;
+			goto yy682;
 		}
-yy906:
-		YYDEBUG(906, *YYCURSOR);
+yy811:
+		YYDEBUG(811, *YYCURSOR);
 		yyaccept = 91;
 		YYMARKER = ++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= '#') {
 			if (yych <= '\f') {
-				if (yych <= 0x00) goto yy830;
-				if (yych <= 0x08) goto yy677;
-				if (yych <= '\n') goto yy805;
-				goto yy677;
+				if (yych <= 0x00) goto yy736;
+				if (yych <= 0x08) goto yy596;
+				if (yych <= '\n') goto yy715;
+				goto yy596;
 			} else {
 				if (yych <= 0x1F) {
-					if (yych <= '\r') goto yy805;
-					goto yy677;
+					if (yych <= '\r') goto yy715;
+					goto yy596;
 				} else {
-					if (yych <= ' ') goto yy805;
-					if (yych <= '"') goto yy677;
-					goto yy831;
+					if (yych <= ' ') goto yy715;
+					if (yych <= '"') goto yy596;
+					goto yy737;
 				}
 			}
 		} else {
 			if (yych <= '/') {
-				if (yych == '*') goto yy730;
-				if (yych <= '.') goto yy677;
-				goto yy832;
+				if (yych == '*') goto yy644;
+				if (yych <= '.') goto yy596;
+				goto yy738;
 			} else {
 				if (yych <= 'F') {
-					if (yych <= 'E') goto yy677;
-					goto yy833;
+					if (yych <= 'E') goto yy596;
+					goto yy739;
 				} else {
-					if (yych == 'f') goto yy833;
-					goto yy677;
+					if (yych == 'f') goto yy739;
+					goto yy596;
 				}
 			}
 		}
-yy907:
-		YYDEBUG(907, *YYCURSOR);
+yy812:
+		YYDEBUG(812, *YYCURSOR);
 		yyaccept = 91;
 		YYMARKER = ++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= '\r') {
 			if (yych <= '\t') {
-				if (yych <= 0x00) goto yy830;
-				goto yy771;
+				if (yych <= 0x00) goto yy736;
+				goto yy682;
 			} else {
-				if (yych <= '\n') goto yy805;
-				if (yych <= '\f') goto yy771;
-				goto yy805;
+				if (yych <= '\n') goto yy715;
+				if (yych <= '\f') goto yy682;
+				goto yy715;
 			}
 		} else {
 			if (yych <= '*') {
-				if (yych <= ')') goto yy771;
-				goto yy807;
+				if (yych <= ')') goto yy682;
+				goto yy716;
 			} else {
-				if (yych == '/') goto yy675;
-				goto yy771;
+				if (yych == '/') goto yy595;
+				goto yy682;
 			}
 		}
-yy908:
-		YYDEBUG(908, *YYCURSOR);
+yy813:
+		YYDEBUG(813, *YYCURSOR);
 		yyaccept = 93;
 		YYMARKER = ++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= '\f') {
-			if (yych <= 0x00) goto yy839;
-			if (yych == '\n') goto yy752;
-			goto yy710;
-		} else {
-			if (yych <= '\r') goto yy752;
-			if (yych == '*') goto yy754;
-			goto yy710;
+			if (yych <= 0x00) goto yy745;
+			if (yych == '\n') goto yy665;
+			goto yy625;
+		} else {
+			if (yych <= '\r') goto yy665;
+			if (yych == '*') goto yy666;
+			goto yy625;
 		}
-yy909:
-		YYDEBUG(909, *YYCURSOR);
+yy814:
+		YYDEBUG(814, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= ')') {
 			if (yych <= '\n') {
-				if (yych <= 0x00) goto yy85;
-				if (yych <= '\t') goto yy710;
-				goto yy752;
+				if (yych <= 0x00) goto yy72;
+				if (yych <= '\t') goto yy625;
+				goto yy665;
 			} else {
-				if (yych == '\r') goto yy752;
-				goto yy710;
+				if (yych == '\r') goto yy665;
+				goto yy625;
 			}
 		} else {
 			if (yych <= 'N') {
-				if (yych <= '*') goto yy754;
-				if (yych <= 'M') goto yy710;
+				if (yych <= '*') goto yy666;
+				if (yych <= 'M') goto yy625;
 			} else {
-				if (yych != 'n') goto yy710;
+				if (yych != 'n') goto yy625;
 			}
 		}
-		YYDEBUG(910, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= ')') {
 			if (yych <= '\n') {
-				if (yych <= 0x00) goto yy85;
-				if (yych <= '\t') goto yy710;
-				goto yy752;
+				if (yych <= 0x00) goto yy72;
+				if (yych <= '\t') goto yy625;
+				goto yy665;
 			} else {
-				if (yych == '\r') goto yy752;
-				goto yy710;
+				if (yych == '\r') goto yy665;
+				goto yy625;
 			}
 		} else {
 			if (yych <= 'T') {
-				if (yych <= '*') goto yy754;
-				if (yych <= 'S') goto yy710;
-				goto yy902;
+				if (yych <= '*') goto yy666;
+				if (yych <= 'S') goto yy625;
+				goto yy807;
 			} else {
-				if (yych == 't') goto yy902;
-				goto yy710;
+				if (yych == 't') goto yy807;
+				goto yy625;
 			}
 		}
 	}
@@ -10675,99 +10580,206 @@
 			128, 128, 128, 128, 128, 128, 128, 128, 
 			128, 128, 128, 128, 128, 128, 128, 128, 
 		};
-		YYDEBUG(911, *YYCURSOR);
-		YYFILL(3);
+		YYDEBUG(815, *YYCURSOR);
+		YYFILL(4);
 		yych = *YYCURSOR;
 		if (yybm0+yych & 64) {
-			goto yy915;
+			goto yy818;
 		}
-		if (yych <= 'Z') {
-			if (yych <= '>') {
-				if (yych == '-') goto yy918;
+		if (yych <= '?') {
+			if (yych <= '-') {
+				if (yych == '#') goto yy819;
+				if (yych >= '-') goto yy820;
 			} else {
-				if (yych <= '?') goto yy919;
-				if (yych >= 'A') goto yy920;
+				if (yych == '/') goto yy821;
+				if (yych >= '?') goto yy822;
 			}
 		} else {
-			if (yych <= '`') {
-				if (yych == '_') goto yy920;
-			} else {
-				if (yych <= 'z') goto yy920;
-				if (yych >= 0x80) goto yy920;
+			if (yych <= '_') {
+				if (yych <= '@') goto yy816;
+				if (yych <= 'Z') goto yy823;
+				if (yych >= '_') goto yy823;
+			} else {
+				if (yych <= '`') goto yy816;
+				if (yych <= 'z') goto yy823;
+				if (yych >= 0x80) goto yy823;
 			}
 		}
-		YYDEBUG(913, *YYCURSOR);
+yy816:
+		YYDEBUG(816, *YYCURSOR);
 		++YYCURSOR;
-yy914:
-		YYDEBUG(914, *YYCURSOR);
+yy817:
+		YYDEBUG(817, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	yyless(0);
 	yy_pop_state();
 	goto restart;
 }
-yy915:
-		YYDEBUG(915, *YYCURSOR);
+yy818:
+		YYDEBUG(818, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(916, *YYCURSOR);
 		if (yybm0+yych & 64) {
-			goto yy915;
+			goto yy818;
 		}
-		YYDEBUG(917, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	goto return_whitespace;
 }
-yy918:
-		YYDEBUG(918, *YYCURSOR);
+yy819:
+		YYDEBUG(819, *YYCURSOR);
+		++YYCURSOR;
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	while (YYCURSOR < YYLIMIT) {
+		switch (*YYCURSOR++) {
+			case '\r':
+			case '\n':
+				YYCURSOR--;
+				break;
+			case '?':
+				if (*YYCURSOR == '>') {
+					YYCURSOR--;
+					break;
+				}
+				ZEND_FALLTHROUGH;
+			default:
+				continue;
+		}
+
+		break;
+	}
+
+	yyleng = YYCURSOR - SCNG(yy_text);
+	RETURN_OR_SKIP_TOKEN(T_COMMENT);
+}
+yy820:
+		YYDEBUG(820, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == '>') goto yy923;
-		goto yy914;
-yy919:
-		YYDEBUG(919, *YYCURSOR);
+		if (yych == '>') goto yy824;
+		goto yy817;
+yy821:
+		YYDEBUG(821, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '*') goto yy825;
+		if (yych == '/') goto yy819;
+		goto yy817;
+yy822:
+		YYDEBUG(822, *YYCURSOR);
+		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == '-') goto yy925;
-		goto yy914;
-yy920:
-		YYDEBUG(920, *YYCURSOR);
+		if (yych == '-') goto yy827;
+		goto yy817;
+yy823:
+		YYDEBUG(823, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(921, *YYCURSOR);
 		if (yybm0+yych & 128) {
-			goto yy920;
+			goto yy823;
 		}
-		YYDEBUG(922, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	yy_pop_state();
 	RETURN_TOKEN_WITH_STR(T_STRING, 0);
 }
-yy923:
-		YYDEBUG(923, *YYCURSOR);
+yy824:
+		YYDEBUG(824, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(924, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN(T_OBJECT_OPERATOR);
 }
-yy925:
-		YYDEBUG(925, *YYCURSOR);
+yy825:
+		YYDEBUG(825, *YYCURSOR);
+		yyaccept = 1;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == '*') goto yy829;
+yy826:
+		YYDEBUG(826, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	int doc_com;
+
+	if (yyleng > 2) {
+		doc_com = 1;
+		RESET_DOC_COMMENT();
+	} else {
+		doc_com = 0;
+	}
+
+	while (YYCURSOR < YYLIMIT) {
+		if (*YYCURSOR++ == '*' && *YYCURSOR == '/') {
+			break;
+		}
+	}
+
+	if (YYCURSOR < YYLIMIT) {
+		YYCURSOR++;
+	} else {
+		zend_throw_exception_ex(zend_ce_parse_error, 0, "Unterminated comment starting line %d", CG(zend_lineno));
+		if (PARSER_MODE()) {
+			RETURN_TOKEN(T_ERROR);
+		}
+	}
+
+	yyleng = YYCURSOR - SCNG(yy_text);
+	HANDLE_NEWLINES(yytext, yyleng);
+
+	if (doc_com) {
+		CG(doc_comment) = zend_string_init(yytext, yyleng, 0);
+		RETURN_OR_SKIP_TOKEN(T_DOC_COMMENT);
+	}
+
+	RETURN_OR_SKIP_TOKEN(T_COMMENT);
+}
+yy827:
+		YYDEBUG(827, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == '>') goto yy927;
-		YYDEBUG(926, *YYCURSOR);
+		if (yych == '>') goto yy830;
+yy828:
+		YYDEBUG(828, *YYCURSOR);
 		YYCURSOR = YYMARKER;
-		goto yy914;
-yy927:
-		YYDEBUG(927, *YYCURSOR);
+		if (yyaccept == 0) {
+			goto yy817;
+		} else {
+			goto yy826;
+		}
+yy829:
+		YYDEBUG(829, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych <= '\f') {
+			if (yych <= 0x08) goto yy828;
+			if (yych <= '\n') goto yy831;
+			goto yy828;
+		} else {
+			if (yych <= '\r') goto yy831;
+			if (yych == ' ') goto yy831;
+			goto yy828;
+		}
+yy830:
+		YYDEBUG(830, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(928, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN(T_NULLSAFE_OBJECT_OPERATOR);
 }
+yy831:
+		YYDEBUG(831, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		if (yych <= '\f') {
+			if (yych <= 0x08) goto yy826;
+			if (yych <= '\n') goto yy831;
+			goto yy826;
+		} else {
+			if (yych <= '\r') goto yy831;
+			if (yych == ' ') goto yy831;
+			goto yy826;
+		}
 	}
 /* *********************************** */
 yyc_ST_BACKQUOTE:
@@ -10806,19 +10818,18 @@
 			128, 128, 128, 128, 128, 128, 128, 128, 
 			128, 128, 128, 128, 128, 128, 128, 128, 
 		};
-		YYDEBUG(929, *YYCURSOR);
+		YYDEBUG(832, *YYCURSOR);
 		YYFILL(2);
 		yych = *YYCURSOR;
 		if (yych <= '_') {
-			if (yych == '$') goto yy933;
+			if (yych == '$') goto yy834;
 		} else {
-			if (yych <= '`') goto yy934;
-			if (yych == '{') goto yy936;
+			if (yych <= '`') goto yy835;
+			if (yych == '{') goto yy836;
 		}
-		YYDEBUG(931, *YYCURSOR);
 		++YYCURSOR;
-yy932:
-		YYDEBUG(932, *YYCURSOR);
+yy833:
+		YYDEBUG(833, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	if (YYCURSOR > YYLIMIT) {
@@ -10864,74 +10875,70 @@
 		RETURN_TOKEN(T_ERROR);
 	}
 }
-yy933:
-		YYDEBUG(933, *YYCURSOR);
+yy834:
+		YYDEBUG(834, *YYCURSOR);
 		yych = *++YYCURSOR;
 		if (yych <= '_') {
-			if (yych <= '@') goto yy932;
-			if (yych <= 'Z') goto yy937;
-			if (yych <= '^') goto yy932;
-			goto yy937;
+			if (yych <= '@') goto yy833;
+			if (yych <= 'Z') goto yy837;
+			if (yych <= '^') goto yy833;
+			goto yy837;
 		} else {
 			if (yych <= 'z') {
-				if (yych <= '`') goto yy932;
-				goto yy937;
+				if (yych <= '`') goto yy833;
+				goto yy837;
 			} else {
-				if (yych <= '{') goto yy940;
-				if (yych <= 0x7F) goto yy932;
-				goto yy937;
+				if (yych <= '{') goto yy839;
+				if (yych <= 0x7F) goto yy833;
+				goto yy837;
 			}
 		}
-yy934:
-		YYDEBUG(934, *YYCURSOR);
+yy835:
+		YYDEBUG(835, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(935, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	BEGIN(ST_IN_SCRIPTING);
 	RETURN_TOKEN('`');
 }
-yy936:
-		YYDEBUG(936, *YYCURSOR);
+yy836:
+		YYDEBUG(836, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == '$') goto yy942;
-		goto yy932;
-yy937:
-		YYDEBUG(937, *YYCURSOR);
+		if (yych == '$') goto yy840;
+		goto yy833;
+yy837:
+		YYDEBUG(837, *YYCURSOR);
 		YYMARKER = ++YYCURSOR;
 		YYFILL(4);
 		yych = *YYCURSOR;
-		YYDEBUG(938, *YYCURSOR);
 		if (yybm0+yych & 128) {
-			goto yy937;
+			goto yy837;
 		}
 		if (yych <= '>') {
-			if (yych == '-') goto yy944;
+			if (yych == '-') goto yy841;
 		} else {
-			if (yych <= '?') goto yy946;
-			if (yych <= '@') goto yy939;
-			if (yych <= '') goto yy947;
+			if (yych <= '?') goto yy843;
+			if (yych <= '@') goto yy838;
+			if (yych <= '') goto yy844;
 		}
-yy939:
-		YYDEBUG(939, *YYCURSOR);
+yy838:
+		YYDEBUG(838, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_STR(T_VARIABLE, 1);
 }
-yy940:
-		YYDEBUG(940, *YYCURSOR);
+yy839:
+		YYDEBUG(839, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(941, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	yy_push_state(ST_LOOKING_FOR_VARNAME);
 	enter_nesting('{');
 	RETURN_TOKEN(T_DOLLAR_OPEN_CURLY_BRACES);
 }
-yy942:
-		YYDEBUG(942, *YYCURSOR);
+yy840:
+		YYDEBUG(840, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(943, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	yy_push_state(ST_IN_SCRIPTING);
@@ -10939,74 +10946,71 @@
 	enter_nesting('{');
 	RETURN_TOKEN(T_CURLY_OPEN);
 }
-yy944:
-		YYDEBUG(944, *YYCURSOR);
+yy841:
+		YYDEBUG(841, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == '>') goto yy949;
-yy945:
-		YYDEBUG(945, *YYCURSOR);
+		if (yych == '>') goto yy845;
+yy842:
+		YYDEBUG(842, *YYCURSOR);
 		YYCURSOR = YYMARKER;
-		goto yy939;
-yy946:
-		YYDEBUG(946, *YYCURSOR);
-		yych = *++YYCURSOR;
-		if (yych == '-') goto yy950;
-		goto yy945;
-yy947:
-		YYDEBUG(947, *YYCURSOR);
+		goto yy838;
+yy843:
+		YYDEBUG(843, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '-') goto yy846;
+		goto yy842;
+yy844:
+		YYDEBUG(844, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(948, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	yyless(yyleng - 1);
 	yy_push_state(ST_VAR_OFFSET);
 	RETURN_TOKEN_WITH_STR(T_VARIABLE, 1);
 }
-yy949:
-		YYDEBUG(949, *YYCURSOR);
+yy845:
+		YYDEBUG(845, *YYCURSOR);
 		yych = *++YYCURSOR;
 		if (yych <= '_') {
-			if (yych <= '@') goto yy945;
-			if (yych <= 'Z') goto yy951;
-			if (yych <= '^') goto yy945;
-			goto yy951;
-		} else {
-			if (yych <= '`') goto yy945;
-			if (yych <= 'z') goto yy951;
-			if (yych <= 0x7F) goto yy945;
-			goto yy951;
-		}
-yy950:
-		YYDEBUG(950, *YYCURSOR);
-		yych = *++YYCURSOR;
-		if (yych == '>') goto yy953;
-		goto yy945;
-yy951:
-		YYDEBUG(951, *YYCURSOR);
+			if (yych <= '@') goto yy842;
+			if (yych <= 'Z') goto yy847;
+			if (yych <= '^') goto yy842;
+			goto yy847;
+		} else {
+			if (yych <= '`') goto yy842;
+			if (yych <= 'z') goto yy847;
+			if (yych <= 0x7F) goto yy842;
+			goto yy847;
+		}
+yy846:
+		YYDEBUG(846, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '>') goto yy848;
+		goto yy842;
+yy847:
+		YYDEBUG(847, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(952, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	yyless(yyleng - 3);
 	yy_push_state(ST_LOOKING_FOR_PROPERTY);
 	RETURN_TOKEN_WITH_STR(T_VARIABLE, 1);
 }
-yy953:
-		YYDEBUG(953, *YYCURSOR);
+yy848:
+		YYDEBUG(848, *YYCURSOR);
 		yych = *++YYCURSOR;
 		if (yych <= '_') {
-			if (yych <= '@') goto yy945;
-			if (yych <= 'Z') goto yy954;
-			if (yych <= '^') goto yy945;
-		} else {
-			if (yych <= '`') goto yy945;
-			if (yych <= 'z') goto yy954;
-			if (yych <= 0x7F) goto yy945;
+			if (yych <= '@') goto yy842;
+			if (yych <= 'Z') goto yy849;
+			if (yych <= '^') goto yy842;
+		} else {
+			if (yych <= '`') goto yy842;
+			if (yych <= 'z') goto yy849;
+			if (yych <= 0x7F) goto yy842;
 		}
-yy954:
-		YYDEBUG(954, *YYCURSOR);
+yy849:
+		YYDEBUG(849, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(955, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	yyless(yyleng - 4);
@@ -11051,19 +11055,18 @@
 			128, 128, 128, 128, 128, 128, 128, 128, 
 			128, 128, 128, 128, 128, 128, 128, 128, 
 		};
-		YYDEBUG(956, *YYCURSOR);
+		YYDEBUG(850, *YYCURSOR);
 		YYFILL(2);
 		yych = *YYCURSOR;
 		if (yych <= '#') {
-			if (yych == '"') goto yy960;
+			if (yych == '"') goto yy852;
 		} else {
-			if (yych <= '$') goto yy962;
-			if (yych == '{') goto yy963;
+			if (yych <= '$') goto yy853;
+			if (yych == '{') goto yy854;
 		}
-		YYDEBUG(958, *YYCURSOR);
 		++YYCURSOR;
-yy959:
-		YYDEBUG(959, *YYCURSOR);
+yy851:
+		YYDEBUG(851, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	if (GET_DOUBLE_QUOTES_SCANNED_LENGTH()) {
@@ -11117,74 +11120,70 @@
 		RETURN_TOKEN(T_ERROR);
 	}
 }
-yy960:
-		YYDEBUG(960, *YYCURSOR);
+yy852:
+		YYDEBUG(852, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(961, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	BEGIN(ST_IN_SCRIPTING);
 	RETURN_TOKEN('"');
 }
-yy962:
-		YYDEBUG(962, *YYCURSOR);
+yy853:
+		YYDEBUG(853, *YYCURSOR);
 		yych = *++YYCURSOR;
 		if (yych <= '_') {
-			if (yych <= '@') goto yy959;
-			if (yych <= 'Z') goto yy964;
-			if (yych <= '^') goto yy959;
-			goto yy964;
+			if (yych <= '@') goto yy851;
+			if (yych <= 'Z') goto yy855;
+			if (yych <= '^') goto yy851;
+			goto yy855;
 		} else {
 			if (yych <= 'z') {
-				if (yych <= '`') goto yy959;
-				goto yy964;
+				if (yych <= '`') goto yy851;
+				goto yy855;
 			} else {
-				if (yych <= '{') goto yy967;
-				if (yych <= 0x7F) goto yy959;
-				goto yy964;
+				if (yych <= '{') goto yy857;
+				if (yych <= 0x7F) goto yy851;
+				goto yy855;
 			}
 		}
-yy963:
-		YYDEBUG(963, *YYCURSOR);
+yy854:
+		YYDEBUG(854, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == '$') goto yy969;
-		goto yy959;
-yy964:
-		YYDEBUG(964, *YYCURSOR);
+		if (yych == '$') goto yy858;
+		goto yy851;
+yy855:
+		YYDEBUG(855, *YYCURSOR);
 		YYMARKER = ++YYCURSOR;
 		YYFILL(4);
 		yych = *YYCURSOR;
-		YYDEBUG(965, *YYCURSOR);
 		if (yybm0+yych & 128) {
-			goto yy964;
+			goto yy855;
 		}
 		if (yych <= '>') {
-			if (yych == '-') goto yy971;
+			if (yych == '-') goto yy859;
 		} else {
-			if (yych <= '?') goto yy973;
-			if (yych <= '@') goto yy966;
-			if (yych <= '') goto yy974;
+			if (yych <= '?') goto yy861;
+			if (yych <= '@') goto yy856;
+			if (yych <= '') goto yy862;
 		}
-yy966:
-		YYDEBUG(966, *YYCURSOR);
+yy856:
+		YYDEBUG(856, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_STR(T_VARIABLE, 1);
 }
-yy967:
-		YYDEBUG(967, *YYCURSOR);
+yy857:
+		YYDEBUG(857, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(968, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	yy_push_state(ST_LOOKING_FOR_VARNAME);
 	enter_nesting('{');
 	RETURN_TOKEN(T_DOLLAR_OPEN_CURLY_BRACES);
 }
-yy969:
-		YYDEBUG(969, *YYCURSOR);
+yy858:
+		YYDEBUG(858, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(970, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	yy_push_state(ST_IN_SCRIPTING);
@@ -11192,74 +11191,71 @@
 	enter_nesting('{');
 	RETURN_TOKEN(T_CURLY_OPEN);
 }
-yy971:
-		YYDEBUG(971, *YYCURSOR);
+yy859:
+		YYDEBUG(859, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == '>') goto yy976;
-yy972:
-		YYDEBUG(972, *YYCURSOR);
+		if (yych == '>') goto yy863;
+yy860:
+		YYDEBUG(860, *YYCURSOR);
 		YYCURSOR = YYMARKER;
-		goto yy966;
-yy973:
-		YYDEBUG(973, *YYCURSOR);
-		yych = *++YYCURSOR;
-		if (yych == '-') goto yy977;
-		goto yy972;
-yy974:
-		YYDEBUG(974, *YYCURSOR);
+		goto yy856;
+yy861:
+		YYDEBUG(861, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '-') goto yy864;
+		goto yy860;
+yy862:
+		YYDEBUG(862, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(975, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	yyless(yyleng - 1);
 	yy_push_state(ST_VAR_OFFSET);
 	RETURN_TOKEN_WITH_STR(T_VARIABLE, 1);
 }
-yy976:
-		YYDEBUG(976, *YYCURSOR);
+yy863:
+		YYDEBUG(863, *YYCURSOR);
 		yych = *++YYCURSOR;
 		if (yych <= '_') {
-			if (yych <= '@') goto yy972;
-			if (yych <= 'Z') goto yy978;
-			if (yych <= '^') goto yy972;
-			goto yy978;
-		} else {
-			if (yych <= '`') goto yy972;
-			if (yych <= 'z') goto yy978;
-			if (yych <= 0x7F) goto yy972;
-			goto yy978;
-		}
-yy977:
-		YYDEBUG(977, *YYCURSOR);
-		yych = *++YYCURSOR;
-		if (yych == '>') goto yy980;
-		goto yy972;
-yy978:
-		YYDEBUG(978, *YYCURSOR);
+			if (yych <= '@') goto yy860;
+			if (yych <= 'Z') goto yy865;
+			if (yych <= '^') goto yy860;
+			goto yy865;
+		} else {
+			if (yych <= '`') goto yy860;
+			if (yych <= 'z') goto yy865;
+			if (yych <= 0x7F) goto yy860;
+			goto yy865;
+		}
+yy864:
+		YYDEBUG(864, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '>') goto yy866;
+		goto yy860;
+yy865:
+		YYDEBUG(865, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(979, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	yyless(yyleng - 3);
 	yy_push_state(ST_LOOKING_FOR_PROPERTY);
 	RETURN_TOKEN_WITH_STR(T_VARIABLE, 1);
 }
-yy980:
-		YYDEBUG(980, *YYCURSOR);
+yy866:
+		YYDEBUG(866, *YYCURSOR);
 		yych = *++YYCURSOR;
 		if (yych <= '_') {
-			if (yych <= '@') goto yy972;
-			if (yych <= 'Z') goto yy981;
-			if (yych <= '^') goto yy972;
-		} else {
-			if (yych <= '`') goto yy972;
-			if (yych <= 'z') goto yy981;
-			if (yych <= 0x7F) goto yy972;
+			if (yych <= '@') goto yy860;
+			if (yych <= 'Z') goto yy867;
+			if (yych <= '^') goto yy860;
+		} else {
+			if (yych <= '`') goto yy860;
+			if (yych <= 'z') goto yy867;
+			if (yych <= 0x7F) goto yy860;
 		}
-yy981:
-		YYDEBUG(981, *YYCURSOR);
+yy867:
+		YYDEBUG(867, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(982, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	yyless(yyleng - 4);
@@ -11304,15 +11300,14 @@
 			128, 128, 128, 128, 128, 128, 128, 128, 
 			128, 128, 128, 128, 128, 128, 128, 128, 
 		};
-		YYDEBUG(983, *YYCURSOR);
+		YYDEBUG(868, *YYCURSOR);
 		YYFILL(2);
 		yych = *YYCURSOR;
-		if (yych == '$') goto yy987;
-		if (yych == '{') goto yy988;
-		YYDEBUG(985, *YYCURSOR);
+		if (yych == '$') goto yy870;
+		if (yych == '{') goto yy871;
 		++YYCURSOR;
-yy986:
-		YYDEBUG(986, *YYCURSOR);
+yy869:
+		YYDEBUG(869, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	zend_heredoc_label *heredoc_label = zend_ptr_stack_top(&SCNG(heredoc_label_stack));
@@ -11436,65 +11431,62 @@
 
 	RETURN_TOKEN_WITH_VAL(T_ENCAPSED_AND_WHITESPACE);
 }
-yy987:
-		YYDEBUG(987, *YYCURSOR);
+yy870:
+		YYDEBUG(870, *YYCURSOR);
 		yych = *++YYCURSOR;
 		if (yych <= '_') {
-			if (yych <= '@') goto yy986;
-			if (yych <= 'Z') goto yy989;
-			if (yych <= '^') goto yy986;
-			goto yy989;
+			if (yych <= '@') goto yy869;
+			if (yych <= 'Z') goto yy872;
+			if (yych <= '^') goto yy869;
+			goto yy872;
 		} else {
 			if (yych <= 'z') {
-				if (yych <= '`') goto yy986;
-				goto yy989;
+				if (yych <= '`') goto yy869;
+				goto yy872;
 			} else {
-				if (yych <= '{') goto yy992;
-				if (yych <= 0x7F) goto yy986;
-				goto yy989;
+				if (yych <= '{') goto yy874;
+				if (yych <= 0x7F) goto yy869;
+				goto yy872;
 			}
 		}
-yy988:
-		YYDEBUG(988, *YYCURSOR);
+yy871:
+		YYDEBUG(871, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == '$') goto yy994;
-		goto yy986;
-yy989:
-		YYDEBUG(989, *YYCURSOR);
+		if (yych == '$') goto yy875;
+		goto yy869;
+yy872:
+		YYDEBUG(872, *YYCURSOR);
 		YYMARKER = ++YYCURSOR;
 		YYFILL(4);
 		yych = *YYCURSOR;
-		YYDEBUG(990, *YYCURSOR);
 		if (yybm0+yych & 128) {
-			goto yy989;
+			goto yy872;
 		}
 		if (yych <= '>') {
-			if (yych == '-') goto yy996;
+			if (yych == '-') goto yy876;
 		} else {
-			if (yych <= '?') goto yy998;
-			if (yych <= '@') goto yy991;
-			if (yych <= '') goto yy999;
+			if (yych <= '?') goto yy878;
+			if (yych <= '@') goto yy873;
+			if (yych <= '') goto yy879;
 		}
-yy991:
-		YYDEBUG(991, *YYCURSOR);
+yy873:
+		YYDEBUG(873, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_STR(T_VARIABLE, 1);
 }
-yy992:
-		YYDEBUG(992, *YYCURSOR);
+yy874:
+		YYDEBUG(874, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(993, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	yy_push_state(ST_LOOKING_FOR_VARNAME);
 	enter_nesting('{');
 	RETURN_TOKEN(T_DOLLAR_OPEN_CURLY_BRACES);
 }
-yy994:
-		YYDEBUG(994, *YYCURSOR);
+yy875:
+		YYDEBUG(875, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(995, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	yy_push_state(ST_IN_SCRIPTING);
@@ -11502,74 +11494,71 @@
 	enter_nesting('{');
 	RETURN_TOKEN(T_CURLY_OPEN);
 }
-yy996:
-		YYDEBUG(996, *YYCURSOR);
+yy876:
+		YYDEBUG(876, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == '>') goto yy1001;
-yy997:
-		YYDEBUG(997, *YYCURSOR);
+		if (yych == '>') goto yy880;
+yy877:
+		YYDEBUG(877, *YYCURSOR);
 		YYCURSOR = YYMARKER;
-		goto yy991;
-yy998:
-		YYDEBUG(998, *YYCURSOR);
-		yych = *++YYCURSOR;
-		if (yych == '-') goto yy1002;
-		goto yy997;
-yy999:
-		YYDEBUG(999, *YYCURSOR);
+		goto yy873;
+yy878:
+		YYDEBUG(878, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '-') goto yy881;
+		goto yy877;
+yy879:
+		YYDEBUG(879, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(1000, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	yyless(yyleng - 1);
 	yy_push_state(ST_VAR_OFFSET);
 	RETURN_TOKEN_WITH_STR(T_VARIABLE, 1);
 }
-yy1001:
-		YYDEBUG(1001, *YYCURSOR);
+yy880:
+		YYDEBUG(880, *YYCURSOR);
 		yych = *++YYCURSOR;
 		if (yych <= '_') {
-			if (yych <= '@') goto yy997;
-			if (yych <= 'Z') goto yy1003;
-			if (yych <= '^') goto yy997;
-			goto yy1003;
-		} else {
-			if (yych <= '`') goto yy997;
-			if (yych <= 'z') goto yy1003;
-			if (yych <= 0x7F) goto yy997;
-			goto yy1003;
-		}
-yy1002:
-		YYDEBUG(1002, *YYCURSOR);
-		yych = *++YYCURSOR;
-		if (yych == '>') goto yy1005;
-		goto yy997;
-yy1003:
-		YYDEBUG(1003, *YYCURSOR);
+			if (yych <= '@') goto yy877;
+			if (yych <= 'Z') goto yy882;
+			if (yych <= '^') goto yy877;
+			goto yy882;
+		} else {
+			if (yych <= '`') goto yy877;
+			if (yych <= 'z') goto yy882;
+			if (yych <= 0x7F) goto yy877;
+			goto yy882;
+		}
+yy881:
+		YYDEBUG(881, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '>') goto yy883;
+		goto yy877;
+yy882:
+		YYDEBUG(882, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(1004, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	yyless(yyleng - 3);
 	yy_push_state(ST_LOOKING_FOR_PROPERTY);
 	RETURN_TOKEN_WITH_STR(T_VARIABLE, 1);
 }
-yy1005:
-		YYDEBUG(1005, *YYCURSOR);
+yy883:
+		YYDEBUG(883, *YYCURSOR);
 		yych = *++YYCURSOR;
 		if (yych <= '_') {
-			if (yych <= '@') goto yy997;
-			if (yych <= 'Z') goto yy1006;
-			if (yych <= '^') goto yy997;
-		} else {
-			if (yych <= '`') goto yy997;
-			if (yych <= 'z') goto yy1006;
-			if (yych <= 0x7F) goto yy997;
+			if (yych <= '@') goto yy877;
+			if (yych <= 'Z') goto yy884;
+			if (yych <= '^') goto yy877;
+		} else {
+			if (yych <= '`') goto yy877;
+			if (yych <= 'z') goto yy884;
+			if (yych <= 0x7F) goto yy877;
 		}
-yy1006:
-		YYDEBUG(1006, *YYCURSOR);
+yy884:
+		YYDEBUG(884, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(1007, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	yyless(yyleng - 4);
@@ -11614,23 +11603,23 @@
 			128, 128, 128, 128, 128, 128, 128, 128, 
 			128, 128, 128, 128, 128, 128, 128, 128, 
 		};
-		YYDEBUG(1008, *YYCURSOR);
+		YYDEBUG(885, *YYCURSOR);
 		YYFILL(2);
 		yych = *YYCURSOR;
 		if (yych <= '_') {
-			if (yych <= '@') goto yy1010;
-			if (yych <= 'Z') goto yy1012;
-			if (yych >= '_') goto yy1012;
-		} else {
-			if (yych <= '`') goto yy1010;
-			if (yych <= 'z') goto yy1012;
-			if (yych >= 0x80) goto yy1012;
+			if (yych <= '@') goto yy886;
+			if (yych <= 'Z') goto yy888;
+			if (yych >= '_') goto yy888;
+		} else {
+			if (yych <= '`') goto yy886;
+			if (yych <= 'z') goto yy888;
+			if (yych >= 0x80) goto yy888;
 		}
-yy1010:
-		YYDEBUG(1010, *YYCURSOR);
+yy886:
+		YYDEBUG(886, *YYCURSOR);
 		++YYCURSOR;
-yy1011:
-		YYDEBUG(1011, *YYCURSOR);
+yy887:
+		YYDEBUG(887, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	yyless(0);
@@ -11638,51 +11627,50 @@
 	yy_push_state(ST_IN_SCRIPTING);
 	goto restart;
 }
-yy1012:
-		YYDEBUG(1012, *YYCURSOR);
+yy888:
+		YYDEBUG(888, *YYCURSOR);
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yych <= '_') {
 			if (yych <= '@') {
-				if (yych <= '/') goto yy1011;
-				if (yych <= '9') goto yy1014;
-				goto yy1011;
-			} else {
-				if (yych <= '') goto yy1014;
-				if (yych <= '^') goto yy1011;
-				goto yy1014;
+				if (yych <= '/') goto yy887;
+				if (yych <= '9') goto yy890;
+				goto yy887;
+			} else {
+				if (yych <= '') goto yy890;
+				if (yych <= '^') goto yy887;
+				goto yy890;
 			}
 		} else {
 			if (yych <= '|') {
-				if (yych <= '`') goto yy1011;
-				if (yych <= 'z') goto yy1014;
-				goto yy1011;
-			} else {
-				if (yych <= '}') goto yy1014;
-				if (yych <= 0x7F) goto yy1011;
-				goto yy1014;
+				if (yych <= '`') goto yy887;
+				if (yych <= 'z') goto yy890;
+				goto yy887;
+			} else {
+				if (yych <= '}') goto yy890;
+				if (yych <= 0x7F) goto yy887;
+				goto yy890;
 			}
 		}
-yy1013:
-		YYDEBUG(1013, *YYCURSOR);
+yy889:
+		YYDEBUG(889, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-yy1014:
-		YYDEBUG(1014, *YYCURSOR);
+yy890:
+		YYDEBUG(890, *YYCURSOR);
 		if (yybm0+yych & 128) {
-			goto yy1013;
+			goto yy889;
 		}
-		if (yych <= '@') goto yy1015;
-		if (yych <= '') goto yy1016;
-		if (yych == '}') goto yy1016;
-yy1015:
-		YYDEBUG(1015, *YYCURSOR);
+		if (yych <= '@') goto yy891;
+		if (yych <= '') goto yy892;
+		if (yych == '}') goto yy892;
+yy891:
+		YYDEBUG(891, *YYCURSOR);
 		YYCURSOR = YYMARKER;
-		goto yy1011;
-yy1016:
-		YYDEBUG(1016, *YYCURSOR);
+		goto yy887;
+yy892:
+		YYDEBUG(892, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(1017, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	yyless(yyleng - 1);
@@ -11728,55 +11716,54 @@
 			 16,  16,  16,  16,  16,  16,  16,  16, 
 			 16,  16,  16,  16,  16,  16,  16,  16, 
 		};
-		YYDEBUG(1018, *YYCURSOR);
+		YYDEBUG(893, *YYCURSOR);
 		YYFILL(2);
 		yych = *YYCURSOR;
 		if (yych <= '0') {
 			if (yych <= ' ') {
 				if (yych <= '\f') {
-					if (yych <= 0x08) goto yy1020;
-					if (yych <= '\n') goto yy1022;
+					if (yych <= 0x08) goto yy894;
+					if (yych <= '\n') goto yy895;
 				} else {
-					if (yych <= '\r') goto yy1022;
-					if (yych >= ' ') goto yy1022;
+					if (yych <= '\r') goto yy895;
+					if (yych >= ' ') goto yy895;
 				}
 			} else {
 				if (yych <= '$') {
-					if (yych <= '"') goto yy1024;
-					if (yych <= '#') goto yy1022;
-					goto yy1026;
-				} else {
-					if (yych == '\'') goto yy1022;
-					if (yych <= '/') goto yy1024;
-					goto yy1027;
+					if (yych <= '"') goto yy896;
+					if (yych <= '#') goto yy895;
+					goto yy898;
+				} else {
+					if (yych == '\'') goto yy895;
+					if (yych <= '/') goto yy896;
+					goto yy899;
 				}
 			}
 		} else {
 			if (yych <= '') {
 				if (yych <= 'Z') {
-					if (yych <= '9') goto yy1029;
-					if (yych <= '@') goto yy1024;
-					goto yy1031;
-				} else {
-					if (yych <= '') goto yy1024;
-					if (yych <= '\\') goto yy1022;
-					goto yy1034;
+					if (yych <= '9') goto yy901;
+					if (yych <= '@') goto yy896;
+					goto yy902;
+				} else {
+					if (yych <= '') goto yy896;
+					if (yych <= '\\') goto yy895;
+					goto yy903;
 				}
 			} else {
 				if (yych <= '`') {
-					if (yych == '_') goto yy1031;
-					goto yy1024;
+					if (yych == '_') goto yy902;
+					goto yy896;
 				} else {
-					if (yych <= 'z') goto yy1031;
-					if (yych <= '~') goto yy1024;
-					if (yych >= 0x80) goto yy1031;
+					if (yych <= 'z') goto yy902;
+					if (yych <= '~') goto yy896;
+					if (yych >= 0x80) goto yy902;
 				}
 			}
 		}
-yy1020:
-		YYDEBUG(1020, *YYCURSOR);
+yy894:
+		YYDEBUG(894, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(1021, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	if (YYCURSOR > YYLIMIT) {
@@ -11785,10 +11772,9 @@
 
 	RETURN_TOKEN(T_BAD_CHARACTER);
 }
-yy1022:
-		YYDEBUG(1022, *YYCURSOR);
+yy895:
+		YYDEBUG(895, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(1023, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	/* Invalid rule to return a more explicit parse error with proper line number */
@@ -11797,57 +11783,57 @@
 	ZVAL_NULL(zendlval);
 	RETURN_TOKEN_WITH_VAL(T_ENCAPSED_AND_WHITESPACE);
 }
-yy1024:
-		YYDEBUG(1024, *YYCURSOR);
+yy896:
+		YYDEBUG(896, *YYCURSOR);
 		++YYCURSOR;
-yy1025:
-		YYDEBUG(1025, *YYCURSOR);
+yy897:
+		YYDEBUG(897, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	/* Only '' or '-' can be valid, but returning other tokens will allow a more explicit parse error */
 	RETURN_TOKEN(yytext0);
 }
-yy1026:
-		YYDEBUG(1026, *YYCURSOR);
+yy898:
+		YYDEBUG(898, *YYCURSOR);
 		yych = *++YYCURSOR;
 		if (yych <= '_') {
-			if (yych <= '@') goto yy1025;
-			if (yych <= 'Z') goto yy1036;
-			if (yych <= '^') goto yy1025;
-			goto yy1036;
-		} else {
-			if (yych <= '`') goto yy1025;
-			if (yych <= 'z') goto yy1036;
-			if (yych <= 0x7F) goto yy1025;
-			goto yy1036;
+			if (yych <= '@') goto yy897;
+			if (yych <= 'Z') goto yy904;
+			if (yych <= '^') goto yy897;
+			goto yy904;
+		} else {
+			if (yych <= '`') goto yy897;
+			if (yych <= 'z') goto yy904;
+			if (yych <= 0x7F) goto yy897;
+			goto yy904;
 		}
-yy1027:
-		YYDEBUG(1027, *YYCURSOR);
+yy899:
+		YYDEBUG(899, *YYCURSOR);
 		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yych <= 'X') {
 			if (yych <= 'B') {
-				if (yych <= '/') goto yy1028;
-				if (yych <= '9') goto yy1039;
-				if (yych >= 'B') goto yy1042;
+				if (yych <= '/') goto yy900;
+				if (yych <= '9') goto yy906;
+				if (yych >= 'B') goto yy908;
 			} else {
-				if (yych == 'O') goto yy1044;
-				if (yych >= 'X') goto yy1045;
+				if (yych == 'O') goto yy910;
+				if (yych >= 'X') goto yy911;
 			}
 		} else {
 			if (yych <= 'b') {
-				if (yych == '_') goto yy1046;
-				if (yych >= 'b') goto yy1042;
+				if (yych == '_') goto yy912;
+				if (yych >= 'b') goto yy908;
 			} else {
 				if (yych <= 'o') {
-					if (yych >= 'o') goto yy1044;
+					if (yych >= 'o') goto yy910;
 				} else {
-					if (yych == 'x') goto yy1045;
+					if (yych == 'x') goto yy911;
 				}
 			}
 		}
-yy1028:
-		YYDEBUG(1028, *YYCURSOR);
+yy900:
+		YYDEBUG(900, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{ /* Offset could be treated as a long */
 	if (yyleng < MAX_LENGTH_OF_LONG - 1 || (yyleng == MAX_LENGTH_OF_LONG - 1 && strcmp(yytext, long_min_digits) < 0)) {
@@ -11864,80 +11850,74 @@
 	}
 	RETURN_TOKEN_WITH_VAL(T_NUM_STRING);
 }
-yy1029:
-		YYDEBUG(1029, *YYCURSOR);
+yy901:
+		YYDEBUG(901, *YYCURSOR);
 		yyaccept = 0;
 		YYMARKER = ++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(1030, *YYCURSOR);
 		if (yybm0+yych & 8) {
-			goto yy1029;
+			goto yy901;
 		}
-		if (yych == '_') goto yy1046;
-		goto yy1028;
-yy1031:
-		YYDEBUG(1031, *YYCURSOR);
+		if (yych == '_') goto yy912;
+		goto yy900;
+yy902:
+		YYDEBUG(902, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(1032, *YYCURSOR);
 		if (yybm0+yych & 16) {
-			goto yy1031;
+			goto yy902;
 		}
-		YYDEBUG(1033, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_STR(T_STRING, 0);
 }
-yy1034:
-		YYDEBUG(1034, *YYCURSOR);
+yy903:
+		YYDEBUG(903, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(1035, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	yy_pop_state();
 	RETURN_TOKEN('');
 }
-yy1036:
-		YYDEBUG(1036, *YYCURSOR);
+yy904:
+		YYDEBUG(904, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(1037, *YYCURSOR);
 		if (yych <= '^') {
 			if (yych <= '9') {
-				if (yych >= '0') goto yy1036;
+				if (yych >= '0') goto yy904;
 			} else {
-				if (yych <= '@') goto yy1038;
-				if (yych <= 'Z') goto yy1036;
+				if (yych <= '@') goto yy905;
+				if (yych <= 'Z') goto yy904;
 			}
 		} else {
 			if (yych <= '`') {
-				if (yych <= '_') goto yy1036;
+				if (yych <= '_') goto yy904;
 			} else {
-				if (yych <= 'z') goto yy1036;
-				if (yych >= 0x80) goto yy1036;
+				if (yych <= 'z') goto yy904;
+				if (yych >= 0x80) goto yy904;
 			}
 		}
-yy1038:
-		YYDEBUG(1038, *YYCURSOR);
+yy905:
+		YYDEBUG(905, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	RETURN_TOKEN_WITH_STR(T_VARIABLE, 1);
 }
-yy1039:
-		YYDEBUG(1039, *YYCURSOR);
+yy906:
+		YYDEBUG(906, *YYCURSOR);
 		yyaccept = 1;
 		YYMARKER = ++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(1040, *YYCURSOR);
-		if (yych <= '/') goto yy1041;
-		if (yych <= '9') goto yy1039;
-		if (yych == '_') goto yy1046;
-yy1041:
-		YYDEBUG(1041, *YYCURSOR);
+		if (yych <= '/') goto yy907;
+		if (yych <= '9') goto yy906;
+		if (yych == '_') goto yy912;
+yy907:
+		YYDEBUG(907, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{ /* Offset must be treated as a string */
 	if (yyleng == 1) {
@@ -11947,84 +11927,81 @@
 	}
 	RETURN_TOKEN_WITH_VAL(T_NUM_STRING);
 }
-yy1042:
-		YYDEBUG(1042, *YYCURSOR);
+yy908:
+		YYDEBUG(908, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yybm0+yych & 32) {
-			goto yy1047;
+			goto yy913;
 		}
-yy1043:
-		YYDEBUG(1043, *YYCURSOR);
+yy909:
+		YYDEBUG(909, *YYCURSOR);
 		YYCURSOR = YYMARKER;
 		if (yyaccept == 0) {
-			goto yy1028;
+			goto yy900;
 		} else {
-			goto yy1041;
+			goto yy907;
 		}
-yy1044:
-		YYDEBUG(1044, *YYCURSOR);
+yy910:
+		YYDEBUG(910, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yybm0+yych & 64) {
-			goto yy1049;
+			goto yy914;
 		}
-		goto yy1043;
-yy1045:
-		YYDEBUG(1045, *YYCURSOR);
+		goto yy909;
+yy911:
+		YYDEBUG(911, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yybm0+yych & 128) {
-			goto yy1051;
+			goto yy915;
 		}
-		goto yy1043;
-yy1046:
-		YYDEBUG(1046, *YYCURSOR);
+		goto yy909;
+yy912:
+		YYDEBUG(912, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		if (yych <= '/') goto yy1043;
-		if (yych <= '9') goto yy1039;
-		goto yy1043;
-yy1047:
-		YYDEBUG(1047, *YYCURSOR);
+		if (yych <= '/') goto yy909;
+		if (yych <= '9') goto yy906;
+		goto yy909;
+yy913:
+		YYDEBUG(913, *YYCURSOR);
 		yyaccept = 1;
 		YYMARKER = ++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(1048, *YYCURSOR);
 		if (yybm0+yych & 32) {
-			goto yy1047;
+			goto yy913;
 		}
-		if (yych == '_') goto yy1042;
-		goto yy1041;
-yy1049:
-		YYDEBUG(1049, *YYCURSOR);
+		if (yych == '_') goto yy908;
+		goto yy907;
+yy914:
+		YYDEBUG(914, *YYCURSOR);
 		yyaccept = 1;
 		YYMARKER = ++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(1050, *YYCURSOR);
 		if (yybm0+yych & 64) {
-			goto yy1049;
+			goto yy914;
 		}
-		if (yych == '_') goto yy1044;
-		goto yy1041;
-yy1051:
-		YYDEBUG(1051, *YYCURSOR);
+		if (yych == '_') goto yy910;
+		goto yy907;
+yy915:
+		YYDEBUG(915, *YYCURSOR);
 		yyaccept = 1;
 		YYMARKER = ++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(1052, *YYCURSOR);
 		if (yybm0+yych & 128) {
-			goto yy1051;
+			goto yy915;
 		}
-		if (yych == '_') goto yy1045;
-		goto yy1041;
+		if (yych == '_') goto yy911;
+		goto yy907;
 	}
 /* *********************************** */
 yyc_SHEBANG:
@@ -12063,36 +12040,32 @@
 			128, 128, 128, 128, 128, 128, 128, 128, 
 			128, 128, 128, 128, 128, 128, 128, 128, 
 		};
-		YYDEBUG(1053, *YYCURSOR);
+		YYDEBUG(916, *YYCURSOR);
 		YYFILL(2);
 		yych = *YYCURSOR;
-		if (yych == '#') goto yy1057;
-		YYDEBUG(1055, *YYCURSOR);
+		if (yych == '#') goto yy918;
 		++YYCURSOR;
-yy1056:
-		YYDEBUG(1056, *YYCURSOR);
+yy917:
+		YYDEBUG(917, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	yyless(0);
 	BEGIN(INITIAL);
 	goto restart;
 }
-yy1057:
-		YYDEBUG(1057, *YYCURSOR);
+yy918:
+		YYDEBUG(918, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych != '!') goto yy1056;
-yy1058:
-		YYDEBUG(1058, *YYCURSOR);
+		if (yych != '!') goto yy917;
+yy919:
+		YYDEBUG(919, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(1059, *YYCURSOR);
 		if (yybm0+yych & 128) {
-			goto yy1058;
+			goto yy919;
 		}
-		YYDEBUG(1060, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(1061, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 		{
 	CG(zend_lineno)++;
@@ -12102,14 +12075,13 @@
 	}
 /* *********************************** */
 yyc_INITIAL:
-	YYDEBUG(1062, *YYCURSOR);
+	YYDEBUG(920, *YYCURSOR);
 	YYFILL(7);
 	yych = *YYCURSOR;
-	if (yych == '<') goto yy1066;
-	YYDEBUG(1064, *YYCURSOR);
+	if (yych == '<') goto yy922;
 	++YYCURSOR;
-yy1065:
-	YYDEBUG(1065, *YYCURSOR);
+yy921:
+	YYDEBUG(921, *YYCURSOR);
 	yyleng = YYCURSOR - SCNG(yy_text);
 	{
 	if (YYCURSOR > YYLIMIT) {
@@ -12162,20 +12134,19 @@
 	HANDLE_NEWLINES(yytext, yyleng);
 	RETURN_TOKEN_WITH_VAL(T_INLINE_HTML);
 }
-yy1066:
-	YYDEBUG(1066, *YYCURSOR);
+yy922:
+	YYDEBUG(922, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych != '?') goto yy1065;
-	YYDEBUG(1067, *YYCURSOR);
+	if (yych != '?') goto yy921;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'O') {
-		if (yych == '=') goto yy1069;
+		if (yych == '=') goto yy924;
 	} else {
-		if (yych <= 'P') goto yy1071;
-		if (yych == 'p') goto yy1071;
+		if (yych <= 'P') goto yy925;
+		if (yych == 'p') goto yy925;
 	}
-yy1068:
-	YYDEBUG(1068, *YYCURSOR);
+yy923:
+	YYDEBUG(923, *YYCURSOR);
 	yyleng = YYCURSOR - SCNG(yy_text);
 	{
 	if (CG(short_tags)) {
@@ -12185,10 +12156,9 @@
 		goto inline_char_handler;
 	}
 }
-yy1069:
-	YYDEBUG(1069, *YYCURSOR);
+yy924:
+	YYDEBUG(924, *YYCURSOR);
 	++YYCURSOR;
-	YYDEBUG(1070, *YYCURSOR);
 	yyleng = YYCURSOR - SCNG(yy_text);
 	{
 	BEGIN(ST_IN_SCRIPTING);
@@ -12198,32 +12168,32 @@
 	}
 	RETURN_TOKEN(T_OPEN_TAG_WITH_ECHO);
 }
-yy1071:
-	YYDEBUG(1071, *YYCURSOR);
+yy925:
+	YYDEBUG(925, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'H') goto yy1073;
-	if (yych == 'h') goto yy1073;
-yy1072:
-	YYDEBUG(1072, *YYCURSOR);
+	if (yych == 'H') goto yy927;
+	if (yych == 'h') goto yy927;
+yy926:
+	YYDEBUG(926, *YYCURSOR);
 	YYCURSOR = YYMARKER;
-	goto yy1068;
-yy1073:
-	YYDEBUG(1073, *YYCURSOR);
+	goto yy923;
+yy927:
+	YYDEBUG(927, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'P') goto yy1074;
-	if (yych != 'p') goto yy1072;
-yy1074:
-	YYDEBUG(1074, *YYCURSOR);
+	if (yych == 'P') goto yy928;
+	if (yych != 'p') goto yy926;
+yy928:
+	YYDEBUG(928, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '\f') {
-		if (yych <= 0x08) goto yy1075;
-		if (yych <= '\n') goto yy1076;
+		if (yych <= 0x08) goto yy929;
+		if (yych <= '\n') goto yy930;
 	} else {
-		if (yych <= '\r') goto yy1078;
-		if (yych == ' ') goto yy1076;
+		if (yych <= '\r') goto yy932;
+		if (yych == ' ') goto yy930;
 	}
-yy1075:
-	YYDEBUG(1075, *YYCURSOR);
+yy929:
+	YYDEBUG(929, *YYCURSOR);
 	yyleng = YYCURSOR - SCNG(yy_text);
 	{
 	/* Allow <?php followed by end of file. */
@@ -12239,30 +12209,27 @@
 	}
 	goto inline_char_handler;
 }
-yy1076:
-	YYDEBUG(1076, *YYCURSOR);
+yy930:
+	YYDEBUG(930, *YYCURSOR);
 	++YYCURSOR;
-yy1077:
-	YYDEBUG(1077, *YYCURSOR);
+yy931:
+	YYDEBUG(931, *YYCURSOR);
 	yyleng = YYCURSOR - SCNG(yy_text);
 	{
 	HANDLE_NEWLINE(yytextyyleng-1);
 	BEGIN(ST_IN_SCRIPTING);
 	RETURN_OR_SKIP_TOKEN(T_OPEN_TAG);
 }
-yy1078:
-	YYDEBUG(1078, *YYCURSOR);
+yy932:
+	YYDEBUG(932, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == '\n') goto yy1076;
-	goto yy1077;
+	if (yych == '\n') goto yy930;
+	goto yy931;
 /* *********************************** */
 yyc_ST_END_HEREDOC:
-	YYDEBUG(1079, *YYCURSOR);
+	YYDEBUG(933, *YYCURSOR);
 	YYFILL(1);
-	yych = *YYCURSOR;
-	YYDEBUG(1081, *YYCURSOR);
 	++YYCURSOR;
-	YYDEBUG(1082, *YYCURSOR);
 	yyleng = YYCURSOR - SCNG(yy_text);
 	{
 	zend_heredoc_label *heredoc_label = zend_ptr_stack_pop(&SCNG(heredoc_label_stack));
@@ -12278,12 +12245,9 @@
 }
 /* *********************************** */
 yyc_ST_NOWDOC:
-	YYDEBUG(1083, *YYCURSOR);
+	YYDEBUG(934, *YYCURSOR);
 	YYFILL(1);
-	yych = *YYCURSOR;
-	YYDEBUG(1085, *YYCURSOR);
 	++YYCURSOR;
-	YYDEBUG(1086, *YYCURSOR);
 	yyleng = YYCURSOR - SCNG(yy_text);
 	{
 	zend_heredoc_label *heredoc_label = zend_ptr_stack_top(&SCNG(heredoc_label_stack));

php-8.3.7.tar.xz/Zend/zend_language_scanner.l -> php-8.3.21.tar.xz/Zend/zend_language_scanner.l Changed

@@ -275,7 +275,7 @@
 	CG(zend_lineno) = lex_state->lineno;
 	zend_restore_compiled_filename(lex_state->filename);
 
-	if (SCNG(script_filtered)) {
+	if (SCNG(script_filtered) && SCNG(script_filtered) != lex_state->script_filtered) {
 		efree(SCNG(script_filtered));
 		SCNG(script_filtered) = NULL;
 	}
@@ -1597,12 +1597,6 @@
 	RETURN_TOKEN_WITH_STR(T_STRING, 0);
 }
 
-<ST_LOOKING_FOR_PROPERTY>{ANY_CHAR} {
-	yyless(0);
-	yy_pop_state();
-	goto restart;
-}
-
 <ST_IN_SCRIPTING>"::" {
 	RETURN_TOKEN(T_PAAMAYIM_NEKUDOTAYIM);
 }
@@ -2385,7 +2379,7 @@
 }
 
 
-<ST_IN_SCRIPTING>"#"|"//" {
+<ST_IN_SCRIPTING,ST_LOOKING_FOR_PROPERTY>"#"|"//" {
 	while (YYCURSOR < YYLIMIT) {
 		switch (*YYCURSOR++) {
 			case '\r':
@@ -2409,7 +2403,7 @@
 	RETURN_OR_SKIP_TOKEN(T_COMMENT);
 }
 
-<ST_IN_SCRIPTING>"/*"|"/**"{WHITESPACE} {
+<ST_IN_SCRIPTING,ST_LOOKING_FOR_PROPERTY>"/*"|"/**"{WHITESPACE} {
 	int doc_com;
 
 	if (yyleng > 2) {
@@ -2445,6 +2439,12 @@
 	RETURN_OR_SKIP_TOKEN(T_COMMENT);
 }
 
+<ST_LOOKING_FOR_PROPERTY>{ANY_CHAR} {
+	yyless(0);
+	yy_pop_state();
+	goto restart;
+}
+
 <ST_IN_SCRIPTING>"?>"{NEWLINE}? {
 	BEGIN(INITIAL);
 	if (yytextyyleng-1 != '>') {

php-8.3.7.tar.xz/Zend/zend_language_scanner_defs.h -> php-8.3.21.tar.xz/Zend/zend_language_scanner_defs.h Changed

php-8.3.7.tar.xz/Zend/zend_max_execution_timer.c -> php-8.3.21.tar.xz/Zend/zend_max_execution_timer.c Changed

php-8.3.7.tar.xz/Zend/zend_object_handlers.c -> php-8.3.21.tar.xz/Zend/zend_object_handlers.c Changed

@@ -30,6 +30,7 @@
 #include "zend_closures.h"
 #include "zend_compile.h"
 #include "zend_hash.h"
+#include "zend_observer.h"
 
 #define DEBUG_OBJECT_HANDLERS 0
 
@@ -846,7 +847,7 @@
 					goto exit;
 				}
 				if (UNEXPECTED(!type_matched)) {
-					Z_TRY_DELREF_P(value);
+					zval_ptr_dtor(&tmp);
 					variable_ptr = &EG(error_zval);
 					goto exit;
 				}
@@ -949,7 +950,7 @@
 					goto exit;
 				}
 				if (UNEXPECTED(!type_matched)) {
-					zval_ptr_dtor(value);
+					zval_ptr_dtor(&tmp);
 					goto exit;
 				}
 				value = &tmp;
@@ -1344,7 +1345,10 @@
 	func->arg_flags0 = 0;
 	func->arg_flags1 = 0;
 	func->arg_flags2 = 0;
-	func->fn_flags = ZEND_ACC_CALL_VIA_TRAMPOLINE | ZEND_ACC_PUBLIC | ZEND_ACC_VARIADIC;
+	func->fn_flags = ZEND_ACC_CALL_VIA_TRAMPOLINE
+		| ZEND_ACC_PUBLIC
+		| ZEND_ACC_VARIADIC
+		| (fbc->common.fn_flags & (ZEND_ACC_RETURN_REFERENCE|ZEND_ACC_ABSTRACT));
 	if (is_static) {
 		func->fn_flags |= ZEND_ACC_STATIC;
 	}
@@ -1358,7 +1362,8 @@
 	 * value so that it doesn't contain garbage when the engine allocates space for the next stack
 	 * frame. This didn't cause any issues until now due to "lucky" structure layout. */
 	func->last_var = 0;
-	func->T = (fbc->type == ZEND_USER_FUNCTION)? MAX(fbc->op_array.last_var + fbc->op_array.T, 2) : 2;
+	uint32_t min_T = 2 + ZEND_OBSERVER_ENABLED;
+	func->T = (fbc->type == ZEND_USER_FUNCTION)? MAX(fbc->op_array.last_var + fbc->op_array.T, min_T) : min_T;
 	func->filename = (fbc->type == ZEND_USER_FUNCTION)? fbc->op_array.filename : ZSTR_EMPTY_ALLOC();
 	func->line_start = (fbc->type == ZEND_USER_FUNCTION)? fbc->op_array.line_start : 0;
 	func->line_end = (fbc->type == ZEND_USER_FUNCTION)? fbc->op_array.line_end : 0;
@@ -1536,19 +1541,27 @@
 	if (EXPECTED(fbc)) {
 		if (UNEXPECTED(fbc->common.fn_flags & ZEND_ACC_ABSTRACT)) {
 			zend_abstract_method_call(fbc);
-			fbc = NULL;
+			goto fail;
 		} else if (UNEXPECTED(fbc->common.scope->ce_flags & ZEND_ACC_TRAIT)) {
 			zend_error(E_DEPRECATED,
 				"Calling static trait method %s::%s is deprecated, "
 				"it should only be called on a class using the trait",
 				ZSTR_VAL(fbc->common.scope->name), ZSTR_VAL(fbc->common.function_name));
 			if (EG(exception)) {
-				return NULL;
+				goto fail;
 			}
 		}
 	}
 
 	return fbc;
+
+ fail:
+	if (UNEXPECTED(fbc->common.fn_flags & ZEND_ACC_CALL_VIA_TRAMPOLINE)) {
+		zend_string_release_ex(fbc->common.function_name, 0);
+		zend_free_trampoline(fbc);
+	}
+
+	return NULL;
 }
 /* }}} */
 
@@ -1686,6 +1699,7 @@
 				if (UNEXPECTED(constructor->op_array.fn_flags & ZEND_ACC_PRIVATE)
 				 || UNEXPECTED(!zend_check_protected(zend_get_function_root_class(constructor), scope))) {
 					zend_bad_constructor_call(constructor, scope);
+					zend_object_store_ctor_failed(zobj);
 					constructor = NULL;
 				}
 			}

php-8.3.7.tar.xz/Zend/zend_opcode.c -> php-8.3.21.tar.xz/Zend/zend_opcode.c Changed

php-8.3.7.tar.xz/Zend/zend_operators.c -> php-8.3.21.tar.xz/Zend/zend_operators.c Changed

php-8.3.7.tar.xz/Zend/zend_operators.h -> php-8.3.21.tar.xz/Zend/zend_operators.h Changed

@@ -28,7 +28,20 @@
 #include <stdint.h>
 
 #ifdef HAVE_IEEEFP_H
-#include <ieeefp.h>
+/**
+ * On FreeBSD with ubsan/clang we get the following:
+ * `/usr/include/machine/ieeefp.h:161:17: runtime error: left shift of negative value -1`
+ * `SUMMARY: UndefinedBehaviorSanitizer: undefined-behavior /usr/include/machine/ieeefp.h:161:17`
+ * ...
+ * `_newcw |= (~_m << FP_MSKS_OFF) & FP_MSKS_FLD;`
+**/
+# if __has_feature(undefined_behavior_sanitizer) && defined(__FreeBSD__) && defined(__clang__)
+#  pragma clang attribute push (__attribute__((no_sanitize("undefined"))), apply_to=function)
+# endif
+# include <ieeefp.h>
+# if __has_feature(undefined_behavior_sanitizer) && defined(__FreeBSD__) && defined(__clang__)
+#  pragma clang attribute pop
+# endif
 #endif
 
 #include "zend_portability.h"
@@ -709,11 +722,13 @@
 	 * have read the values of op1 and op2.
 	 */
 
+	zend_long sum = (zend_long) ((zend_ulong) Z_LVAL_P(op1) + (zend_ulong) Z_LVAL_P(op2));
+
 	if (UNEXPECTED((Z_LVAL_P(op1) & LONG_SIGN_MASK) == (Z_LVAL_P(op2) & LONG_SIGN_MASK)
-		&& (Z_LVAL_P(op1) & LONG_SIGN_MASK) != ((Z_LVAL_P(op1) + Z_LVAL_P(op2)) & LONG_SIGN_MASK))) {
+		&& (Z_LVAL_P(op1) & LONG_SIGN_MASK) != (sum & LONG_SIGN_MASK))) {
 		ZVAL_DOUBLE(result, (double) Z_LVAL_P(op1) + (double) Z_LVAL_P(op2));
 	} else {
-		ZVAL_LONG(result, Z_LVAL_P(op1) + Z_LVAL_P(op2));
+		ZVAL_LONG(result, sum);
 	}
 #endif
 }
@@ -791,11 +806,19 @@
 		ZVAL_LONG(result, llresult);
 	}
 #else
-	ZVAL_LONG(result, Z_LVAL_P(op1) - Z_LVAL_P(op2));
+	/*
+	 * 'result' may alias with op1 or op2, so we need to
+	 * ensure that 'result' is not updated until after we
+	 * have read the values of op1 and op2.
+	 */
+
+	zend_long sub = (zend_long) ((zend_ulong) Z_LVAL_P(op1) - (zend_ulong) Z_LVAL_P(op2));
 
 	if (UNEXPECTED((Z_LVAL_P(op1) & LONG_SIGN_MASK) != (Z_LVAL_P(op2) & LONG_SIGN_MASK)
-		&& (Z_LVAL_P(op1) & LONG_SIGN_MASK) != (Z_LVAL_P(result) & LONG_SIGN_MASK))) {
+		&& (Z_LVAL_P(op1) & LONG_SIGN_MASK) != (sub & LONG_SIGN_MASK))) {
 		ZVAL_DOUBLE(result, (double) Z_LVAL_P(op1) - (double) Z_LVAL_P(op2));
+	} else {
+		ZVAL_LONG(result, sub);
 	}
 #endif
 }

php-8.3.7.tar.xz/Zend/zend_portability.h -> php-8.3.21.tar.xz/Zend/zend_portability.h Changed

php-8.3.7.tar.xz/Zend/zend_string.c -> php-8.3.21.tar.xz/Zend/zend_string.c Changed

@@ -23,6 +23,10 @@
 # include "valgrind/callgrind.h"
 #endif
 
+#if __has_feature(memory_sanitizer)
+# include <sanitizer/msan_interface.h>
+#endif
+
 ZEND_API zend_new_interned_string_func_t zend_new_interned_string;
 ZEND_API zend_string_init_interned_func_t zend_string_init_interned;
 ZEND_API zend_string_init_existing_interned_func_t zend_string_init_existing_interned;
@@ -398,32 +402,32 @@
 ZEND_API zend_never_inline NOIPA bool ZEND_FASTCALL zend_string_equal_val(const zend_string *s1, const zend_string *s2)
 {
 	const char *ptr = ZSTR_VAL(s1);
-	size_t delta = (const char*)s2 - (const char*)s1;
+	uintptr_t delta = (uintptr_t) s2 - (uintptr_t) s1;
 	size_t len = ZSTR_LEN(s1);
 	zend_ulong ret;
 
 	__asm__ (
-		".LL0%=:\n\t"
+		"0:\n\t"
 		"movl (%2,%3), %0\n\t"
 		"xorl (%2), %0\n\t"
-		"jne .LL1%=\n\t"
+		"jne 1f\n\t"
 		"addl $0x4, %2\n\t"
 		"subl $0x4, %1\n\t"
-		"ja .LL0%=\n\t"
+		"ja 0b\n\t"
 		"movl $0x1, %0\n\t"
-		"jmp .LL3%=\n\t"
-		".LL1%=:\n\t"
+		"jmp 3f\n\t"
+		"1:\n\t"
 		"cmpl $0x4,%1\n\t"
-		"jb .LL2%=\n\t"
+		"jb 2f\n\t"
 		"xorl %0, %0\n\t"
-		"jmp .LL3%=\n\t"
-		".LL2%=:\n\t"
+		"jmp 3f\n\t"
+		"2:\n\t"
 		"negl %1\n\t"
 		"lea 0x20(,%1,8), %1\n\t"
 		"shll %b1, %0\n\t"
 		"sete %b0\n\t"
 		"movzbl %b0, %0\n\t"
-		".LL3%=:\n"
+		"3:\n"
 		: "=&a"(ret),
 		  "+c"(len),
 		  "+r"(ptr)
@@ -436,32 +440,32 @@
 ZEND_API zend_never_inline NOIPA bool ZEND_FASTCALL zend_string_equal_val(const zend_string *s1, const zend_string *s2)
 {
 	const char *ptr = ZSTR_VAL(s1);
-	size_t delta = (const char*)s2 - (const char*)s1;
+	uintptr_t delta = (uintptr_t) s2 - (uintptr_t) s1;
 	size_t len = ZSTR_LEN(s1);
 	zend_ulong ret;
 
 	__asm__ (
-		".LL0%=:\n\t"
+		"0:\n\t"
 		"movq (%2,%3), %0\n\t"
 		"xorq (%2), %0\n\t"
-		"jne .LL1%=\n\t"
+		"jne 1f\n\t"
 		"addq $0x8, %2\n\t"
 		"subq $0x8, %1\n\t"
-		"ja .LL0%=\n\t"
+		"ja 0b\n\t"
 		"movq $0x1, %0\n\t"
-		"jmp .LL3%=\n\t"
-		".LL1%=:\n\t"
+		"jmp 3f\n\t"
+		"1:\n\t"
 		"cmpq $0x8,%1\n\t"
-		"jb .LL2%=\n\t"
+		"jb 2f\n\t"
 		"xorq %0, %0\n\t"
-		"jmp .LL3%=\n\t"
-		".LL2%=:\n\t"
+		"jmp 3f\n\t"
+		"2:\n\t"
 		"negq %1\n\t"
 		"lea 0x40(,%1,8), %1\n\t"
 		"shlq %b1, %0\n\t"
 		"sete %b0\n\t"
 		"movzbq %b0, %0\n\t"
-		".LL3%=:\n"
+		"3:\n"
 		: "=&a"(ret),
 		  "+c"(len),
 		  "+r"(ptr)
@@ -500,3 +504,27 @@
 
 	return res;
 }
+
+/* strlcpy and strlcat are not intercepted by msan, so we need to do it ourselves. */
+#if __has_feature(memory_sanitizer)
+static size_t (*libc_strlcpy)(char *__restrict, const char *__restrict, size_t);
+size_t strlcpy(char *__restrict dest, const char *__restrict src, size_t n)
+{
+	if (!libc_strlcpy) {
+		libc_strlcpy = dlsym(RTLD_NEXT, "strlcpy");
+	}
+	size_t result = libc_strlcpy(dest, src, n);
+	__msan_unpoison_string(dest);
+	return result;
+}
+static size_t (*libc_strlcat)(char *__restrict, const char *__restrict, size_t);
+size_t strlcat (char *__restrict dest, const char *restrict src, size_t n)
+{
+	if (!libc_strlcat) {
+		libc_strlcat = dlsym(RTLD_NEXT, "strlcat");
+	}
+	size_t result = libc_strlcat(dest, src, n);
+	__msan_unpoison_string(dest);
+	return result;
+}
+#endif

php-8.3.7.tar.xz/Zend/zend_string.h -> php-8.3.21.tar.xz/Zend/zend_string.h Changed

php-8.3.7.tar.xz/Zend/zend_strtod.c -> php-8.3.21.tar.xz/Zend/zend_strtod.c Changed

php-8.3.7.tar.xz/Zend/zend_virtual_cwd.h -> php-8.3.21.tar.xz/Zend/zend_virtual_cwd.h Changed

php-8.3.7.tar.xz/Zend/zend_vm_def.h -> php-8.3.21.tar.xz/Zend/zend_vm_def.h Changed

@@ -3850,6 +3850,16 @@
 	function_name = GET_OP2_ZVAL_PTR(BP_VAR_R);
 	if (zend_is_callable_ex(function_name, NULL, 0, NULL, &fcc, &error)) {
 		ZEND_ASSERT(!error);
+
+		/* Deprecation can be emitted from zend_is_callable_ex(), which can
+		 * invoke a user error handler and throw an exception.
+		 * For the CONST and CV case we reuse the same exception block below
+		 * to make sure we don't increase VM size too much. */
+		if (!(OP2_TYPE & (IS_TMP_VAR|IS_VAR)) && UNEXPECTED(EG(exception))) {
+			FREE_OP2();
+			HANDLE_EXCEPTION();
+		}
+
 		func = fcc.function_handler;
 		object_or_called_scope = fcc.called_scope;
 		if (func->common.fn_flags & ZEND_ACC_CLOSURE) {
@@ -8024,7 +8034,7 @@
 
 	/* Exception was thrown before executing any op */
 	if (UNEXPECTED(!throw_op)) {
-		ZEND_VM_DISPATCH_TO_HELPER(zend_dispatch_try_catch_finally_helper, try_catch_offset, -1, 0, 0);
+		ZEND_VM_DISPATCH_TO_HELPER(zend_dispatch_try_catch_finally_helper, try_catch_offset, -1, op_num, 0);
 	}
 
 	uint32_t throw_op_num = throw_op - EX(func)->op_array.opcodes;

php-8.3.7.tar.xz/Zend/zend_vm_execute.h -> php-8.3.21.tar.xz/Zend/zend_vm_execute.h Changed

@@ -7076,6 +7076,16 @@
 	function_name = RT_CONSTANT(opline, opline->op2);
 	if (zend_is_callable_ex(function_name, NULL, 0, NULL, &fcc, &error)) {
 		ZEND_ASSERT(!error);
+
+		/* Deprecation can be emitted from zend_is_callable_ex(), which can
+		 * invoke a user error handler and throw an exception.
+		 * For the CONST and CV case we reuse the same exception block below
+		 * to make sure we don't increase VM size too much. */
+		if (!(IS_CONST & (IS_TMP_VAR|IS_VAR)) && UNEXPECTED(EG(exception))) {
+
+			HANDLE_EXCEPTION();
+		}
+
 		func = fcc.function_handler;
 		object_or_called_scope = fcc.called_scope;
 		if (func->common.fn_flags & ZEND_ACC_CLOSURE) {
@@ -9596,6 +9606,16 @@
 	function_name = _get_zval_ptr_var(opline->op2.var EXECUTE_DATA_CC);
 	if (zend_is_callable_ex(function_name, NULL, 0, NULL, &fcc, &error)) {
 		ZEND_ASSERT(!error);
+
+		/* Deprecation can be emitted from zend_is_callable_ex(), which can
+		 * invoke a user error handler and throw an exception.
+		 * For the CONST and CV case we reuse the same exception block below
+		 * to make sure we don't increase VM size too much. */
+		if (!((IS_TMP_VAR|IS_VAR) & (IS_TMP_VAR|IS_VAR)) && UNEXPECTED(EG(exception))) {
+			zval_ptr_dtor_nogc(EX_VAR(opline->op2.var));
+			HANDLE_EXCEPTION();
+		}
+
 		func = fcc.function_handler;
 		object_or_called_scope = fcc.called_scope;
 		if (func->common.fn_flags & ZEND_ACC_CLOSURE) {
@@ -11983,6 +12003,16 @@
 	function_name = _get_zval_ptr_cv_BP_VAR_R(opline->op2.var EXECUTE_DATA_CC);
 	if (zend_is_callable_ex(function_name, NULL, 0, NULL, &fcc, &error)) {
 		ZEND_ASSERT(!error);
+
+		/* Deprecation can be emitted from zend_is_callable_ex(), which can
+		 * invoke a user error handler and throw an exception.
+		 * For the CONST and CV case we reuse the same exception block below
+		 * to make sure we don't increase VM size too much. */
+		if (!(IS_CV & (IS_TMP_VAR|IS_VAR)) && UNEXPECTED(EG(exception))) {
+
+			HANDLE_EXCEPTION();
+		}
+
 		func = fcc.function_handler;
 		object_or_called_scope = fcc.called_scope;
 		if (func->common.fn_flags & ZEND_ACC_CLOSURE) {

php-8.3.7.tar.xz/Zend/zend_vm_gen.php -> php-8.3.21.tar.xz/Zend/zend_vm_gen.php Changed

php-8.3.7.tar.xz/Zend/zend_weakrefs.c -> php-8.3.21.tar.xz/Zend/zend_weakrefs.c Changed

php-8.3.7.tar.xz/benchmark/generate_diff.php -> php-8.3.21.tar.xz/benchmark/generate_diff.php Changed

@@ -10,6 +10,7 @@
 
     $repo = __DIR__ . '/repos/data';
     cloneRepo($repo, 'git@github.com:php/benchmarking-data.git');
+    $baseCommitHash = find_benchmarked_commit_hash($repo, $baseCommitHash);
     $headSummaryFile = $repo . '/' . substr($headCommitHash, 0, 2) . '/' . $headCommitHash . '/summary.json';
     $baseSummaryFile = $repo . '/' . substr($baseCommitHash, 0, 2) . '/' . $baseCommitHash . '/summary.json';
     if (!file_exists($headSummaryFile)) {
@@ -60,6 +61,28 @@
     return sprintf('%.2f%%', $instructionDiff / $baseInstructions * 100);
 }
 
+function find_benchmarked_commit_hash(string $repo, string $commitHash): ?string {
+    $repeat = 10;
+
+    while (true) {
+        if ($repeat-- <= 0) {
+            fwrite(STDERR, "Count not find benchmarked commit hash\n");
+            exit(1);
+        }
+        $summaryFile = $repo . '/' . substr($commitHash, 0, 2) . '/' . $commitHash . '/summary.json';
+        if (file_exists($summaryFile)) {
+            break;
+        }
+        $commitHash = trim(runCommand(
+            'git', 'rev-parse', $commitHash . '^',
+            dirname(__DIR__),
+            printCommand: false,
+        )->stdout);
+    }
+
+    return $commitHash;
+}
+
 $headCommitHash = $argv1 ?? null;
 $baseCommitHash = $argv2 ?? null;
 $output = main($headCommitHash, $baseCommitHash);

php-8.3.7.tar.xz/benchmark/shared.php -> php-8.3.21.tar.xz/benchmark/shared.php Changed

php-8.3.7.tar.xz/build/Makefile.global -> php-8.3.21.tar.xz/build/Makefile.global Changed

php-8.3.7.tar.xz/build/gen_stub.php -> php-8.3.21.tar.xz/build/gen_stub.php Changed

php-8.3.7.tar.xz/build/genif.sh -> php-8.3.21.tar.xz/build/genif.sh Changed

php-8.3.7.tar.xz/build/php.m4 -> php-8.3.21.tar.xz/build/php.m4 Changed

@@ -765,6 +765,14 @@
 )
 
 dnl
+dnl PHP_BUILD_SHARED_DYLIB
+dnl
+AC_DEFUN(PHP_BUILD_SHARED_DYLIB,
+  PHP_BUILD_SHARED
+  OVERALL_TARGET=libphp.dylib
+)
+
+dnl
 dnl PHP_BUILD_STATIC
 dnl
 AC_DEFUN(PHP_BUILD_STATIC,
@@ -876,6 +884,7 @@
     case "$2" in
     static) PHP_BUILD_STATIC;;
     shared) PHP_BUILD_SHARED;;
+    shared-dylib) PHP_BUILD_SHARED_DYLIB;;
     bundle) PHP_BUILD_BUNDLE;;
     esac
     install_sapi="install-sapi"
@@ -1260,33 +1269,21 @@
 dnl PHP_MISSING_TIME_R_DECL
 dnl
 AC_DEFUN(PHP_MISSING_TIME_R_DECL,
-  AC_MSG_CHECKING(for missing declarations of reentrant functions)
-  AC_COMPILE_IFELSE(AC_LANG_PROGRAM(#include <time.h>, struct tm *(*func)(void) = localtime_r),
-    :
-  ,
-    AC_DEFINE(MISSING_LOCALTIME_R_DECL,1,Whether localtime_r is declared)
-  )
-  AC_COMPILE_IFELSE(AC_LANG_PROGRAM(#include <time.h>, struct tm *(*func)(void) = gmtime_r),
-    :
-  ,
-    AC_DEFINE(MISSING_GMTIME_R_DECL,1,Whether gmtime_r is declared)
-  )
-  AC_COMPILE_IFELSE(AC_LANG_PROGRAM(#include <time.h>, char *(*func)(void) = asctime_r),
-    :
-  ,
-    AC_DEFINE(MISSING_ASCTIME_R_DECL,1,Whether asctime_r is declared)
-  )
-  AC_COMPILE_IFELSE(AC_LANG_PROGRAM(#include <time.h>, char *(*func)(void) = ctime_r),
-    :
-  ,
-    AC_DEFINE(MISSING_CTIME_R_DECL,1,Whether ctime_r is declared)
-  )
-  AC_COMPILE_IFELSE(AC_LANG_PROGRAM(#include <string.h>, char *(*func)(void) = strtok_r),
-    :
-  ,
-    AC_DEFINE(MISSING_STRTOK_R_DECL,1,Whether strtok_r is declared)
-  )
-  AC_MSG_RESULT(done)
+AC_CHECK_DECL(localtime_r,,
+  AC_DEFINE(MISSING_LOCALTIME_R_DECL, 1, Whether localtime_r is declared),
+  #include <time.h>)
+AC_CHECK_DECL(gmtime_r,,
+  AC_DEFINE(MISSING_GMTIME_R_DECL, 1, Whether gmtime_r is declared),
+  #include <time.h>)
+AC_CHECK_DECL(asctime_r,,
+  AC_DEFINE(MISSING_ASCTIME_R_DECL, 1, Whether asctime_r is declared),
+  #include <time.h>)
+AC_CHECK_DECL(ctime_r,,
+  AC_DEFINE(MISSING_CTIME_R_DECL, 1, Whether ctime_r is declared),
+  #include <time.h>)
+AC_CHECK_DECL(strtok_r,,
+  AC_DEFINE(MISSING_STRTOK_R_DECL, 1, Whether strtok_r is declared),
+  #include <string.h>)
 )
 
 dnl
@@ -1315,7 +1312,7 @@
 dnl
 AC_DEFUN(PHP_MISSING_FCLOSE_DECL,
   AC_MSG_CHECKING(for fclose declaration)
-  AC_COMPILE_IFELSE(AC_LANG_PROGRAM(#include <stdio.h>, int (*func)(void) = fclose),
+  AC_COMPILE_IFELSE(AC_LANG_PROGRAM(#include <stdio.h>, int (*func)(FILE *) = fclose),
     AC_DEFINE(MISSING_FCLOSE_DECL,0, )
     AC_MSG_RESULT(ok)
   ,
@@ -1929,9 +1926,8 @@
   ICU_CFLAGS="$ICU_CFLAGS -DU_NO_DEFAULT_INCLUDE_UTF_HEADERS=1"
   ICU_CXXFLAGS="$ICU_CXXFLAGS -DUNISTR_FROM_CHAR_EXPLICIT=explicit -DUNISTR_FROM_STRING_EXPLICIT=explicit"
 
-  if test "$PKG_CONFIG icu-io --atleast-version=60"; then
-    ICU_CFLAGS="$ICU_CFLAGS -DU_HIDE_OBSOLETE_UTF_OLD_H=1"
-  fi
+  AS_IF($PKG_CONFIG icu-io --atleast-version=60,
+    ICU_CFLAGS="$ICU_CFLAGS -DU_HIDE_OBSOLETE_UTF_OLD_H=1")
 )
 
 dnl
@@ -2862,3 +2858,15 @@
   AC_DEFINE_UNQUOTED(PHP_HAVE_AVX512_VBMI_SUPPORTS,
    $have_avx512_vbmi_supports, Whether the compiler supports AVX512 VBMI)
 )
+
+dnl
+dnl PHP_REMOVE_OPTIMIZATION_FLAGS
+dnl
+dnl Removes known compiler optimization flags like -O, -O0, -O1, ..., -Ofast
+dnl from CFLAGS and CXXFLAGS.
+dnl
+AC_DEFUN(PHP_REMOVE_OPTIMIZATION_FLAGS, 
+  sed_script='s/$\t \|^$-O$0-9gsz\|fast\|$$\t \|$$/\1/g'
+  CFLAGS=$(echo "$CFLAGS" | $SED -e "$sed_script")
+  CXXFLAGS=$(echo "$CXXFLAGS" | $SED -e "$sed_script")
+)

php-8.3.7.tar.xz/buildconf -> php-8.3.21.tar.xz/buildconf Changed

php-8.3.7.tar.xz/configure -> php-8.3.21.tar.xz/configure Changed

@@ -1,11 +1,12 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for PHP 8.3.7.
+# Generated by GNU Autoconf 2.71 for PHP 8.3.21.
 #
 # Report bugs to <https://github.com/php/php-src/issues>.
 #
 #
-# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation,
+# Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -16,14 +17,16 @@
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+as_nop=:
+if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
+then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
-else
+else $as_nop
   case `(set -o) 2>/dev/null` in #(
   *posix*) :
     set -o posix ;; #(
@@ -33,46 +36,46 @@
 fi
 
 
+
+# Reset variables that may have inherited troublesome values from
+# the environment.
+
+# IFS needs to be set, to space, tab, and newline, in precisely that order.
+# (If _AS_PATH_WALK were called with IFS unset, it would have the
+# side effect of setting IFS to empty, thus disabling word splitting.)
+# Quoting is to prevent editors from complaining about space-tab.
 as_nl='
 '
 export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\$.*\$"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in #(
-      *"$as_nl"*)
-	expr "X$arg" : "X\$.*\$$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\$.*\$"`;;
-      esac;
-      expr "X$arg" : "X\$.*\$" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
+IFS=" ""	$as_nl"
+
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# Ensure predictable behavior from utilities with locale-dependent output.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# We cannot yet rely on "unset" to work, but we need these variables
+# to be unset--not just set to an empty or harmless value--now, to
+# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh).  This construct
+# also avoids known problems related to "unset" and subshell syntax
+# in other old shells (e.g. bash 2.01 and pdksh 5.2.14).
+for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH
+do eval test \${$as_var+y} \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+
+# Ensure that fds 0, 1, and 2 are open.
+if (exec 3>&0) 2>/dev/null; then :; else exec 0</dev/null; fi
+if (exec 3>&1) 2>/dev/null; then :; else exec 1>/dev/null; fi
+if (exec 3>&2)            ; then :; else exec 2>/dev/null; fi
 
 # The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
+if ${PATH_SEPARATOR+false} :; then
   PATH_SEPARATOR=:
   (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
     (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
@@ -81,13 +84,6 @@
 fi
 
 
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
 # Find who we are.  Look in the path if we contain no directory separator.
 as_myself=
 case $0 in #((
@@ -96,8 +92,12 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    test -r "$as_dir$0" && as_myself=$as_dir$0 && break
   done
 IFS=$as_save_IFS
 
@@ -109,30 +109,10 @@
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   exit 1
 fi
 
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 # Use a proper internal environment variable to ensure we don't fall
   # into an infinite loop, continuously re-executing ourselves.
@@ -154,20 +134,22 @@
 exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
 # Admittedly, this is quite paranoid, since all the known shells bail
 # out after a failed `exec'.
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
-as_fn_exit 255
+printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
   fi
   # We don't want this to propagate to other subprocesses.
           { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
-  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+  as_bourne_compatible="as_nop=:
+if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
+then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '\${1+\"\$@\"}'='\"\$@\"'
   setopt NO_GLOB_SUBST
-else
+else \$as_nop
   case \`(set -o) 2>/dev/null\` in #(
   *posix*) :
     set -o posix ;; #(
@@ -187,42 +169,53 @@
 as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
 as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
 as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
-if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
+if ( set x; as_fn_ret_success y && test x = \"\$1\" )
+then :
 
-else
+else \$as_nop
   exitcode=1; echo positional parameters were not saved.
 fi
 test x\$exitcode = x0 || exit 1
+blah=\$(echo \$(echo blah))
+test x\"\$blah\" = xblah || exit 1
 test -x / || exit 1"
   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
   test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
 test \$(( 1 + 1 )) = 2 || exit 1"
-  if (eval "$as_required") 2>/dev/null; then :
+  if (eval "$as_required") 2>/dev/null
+then :
   as_have_required=yes
-else
+else $as_nop
   as_have_required=no
 fi
-  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
+  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null
+then :
 
-else
+else $as_nop
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 as_found=false
 for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
   as_found=:
   case $as_dir in #(
 	 /*)
 	   for as_base in sh bash ksh sh5; do
 	     # Try only shells that exist, to save several forks.
-	     as_shell=$as_dir/$as_base
+	     as_shell=$as_dir$as_base
 	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
+		    as_run=a "$as_shell" -c "$as_bourne_compatible""$as_required" 2>/dev/null
+then :
   CONFIG_SHELL=$as_shell as_have_required=yes
-		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
+		   if as_run=a "$as_shell" -c "$as_bourne_compatible""$as_suggested" 2>/dev/null
+then :
   break 2
 fi
 fi
@@ -230,14 +223,21 @@
        esac
   as_found=false
 done
-$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
-	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
-  CONFIG_SHELL=$SHELL as_have_required=yes
-fi; }
 IFS=$as_save_IFS
+if $as_found
+then :
+
+else $as_nop
+  if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+	      as_run=a "$SHELL" -c "$as_bourne_compatible""$as_required" 2>/dev/null
+then :
+  CONFIG_SHELL=$SHELL as_have_required=yes
+fi
+fi
 
 
-      if test "x$CONFIG_SHELL" != x; then :
+      if test "x$CONFIG_SHELL" != x
+then :
   export CONFIG_SHELL
              # We cannot yet assume a decent shell, so we have to provide a
 # neutralization value for shells without unset; and this also
@@ -255,18 +255,19 @@
 exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
 # Admittedly, this is quite paranoid, since all the known shells bail
 # out after a failed `exec'.
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
 exit 255
 fi
 
-    if test x$as_have_required = xno; then :
-  $as_echo "$0: This script requires a shell more modern than all"
-  $as_echo "$0: the shells that I found on your system."
-  if test x${ZSH_VERSION+set} = xset ; then
-    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
-    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
+    if test x$as_have_required = xno
+then :
+  printf "%s\n" "$0: This script requires a shell more modern than all"
+  printf "%s\n" "$0: the shells that I found on your system."
+  if test ${ZSH_VERSION+y} ; then
+    printf "%s\n" "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+    printf "%s\n" "$0: be upgraded to zsh 4.3.4 or later."
   else
-    $as_echo "$0: Please tell bug-autoconf@gnu.org and
+    printf "%s\n" "$0: Please tell bug-autoconf@gnu.org and
 $0: https://github.com/php/php-src/issues about your
 $0: system, including any error possibly output before this
 $0: message. Then install a modern shell, or manually run
@@ -294,6 +295,7 @@
 }
 as_unset=as_fn_unset
 
+
 # as_fn_set_status STATUS
 # -----------------------
 # Set $? to STATUS, without forking.
@@ -311,6 +313,14 @@
   as_fn_set_status $1
   exit $1
 } # as_fn_exit
+# as_fn_nop
+# ---------
+# Do nothing but, unlike ":", preserve the value of $?.
+as_fn_nop ()
+{
+  return $?
+}
+as_nop=as_fn_nop
 
 # as_fn_mkdir_p
 # -------------
@@ -325,7 +335,7 @@
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -334,7 +344,7 @@
 	 X"$as_dir" : 'X$//$^/' \| \
 	 X"$as_dir" : 'X$//$$' \| \
 	 X"$as_dir" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
+printf "%s\n" X"$as_dir" |
     sed '/^X$.*^/$\/\/*^/^/*\/*$/{
 	    s//\1/
 	    q
@@ -373,12 +383,13 @@
 # advantage of any shell optimizations that allow amortized linear growth over
 # repeated appends, instead of the typical quadratic growth present in naive
 # implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null
+then :
   eval 'as_fn_append ()
   {
     eval $1+=\$2
   }'
-else
+else $as_nop
   as_fn_append ()
   {
     eval $1=\$$1\$2
@@ -390,18 +401,27 @@
 # Perform arithmetic evaluation on the ARGs, and store the result in the
 # global $as_val. Take advantage of shells that can avoid forks. The arguments
 # must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null
+then :
   eval 'as_fn_arith ()
   {
     as_val=$(( $* ))
   }'
-else
+else $as_nop
   as_fn_arith ()
   {
     as_val=`expr "$@" || test $? -eq 1`
   }
 fi # as_fn_arith
 
+# as_fn_nop
+# ---------
+# Do nothing but, unlike ":", preserve the value of $?.
+as_fn_nop ()
+{
+  return $?
+}
+as_nop=as_fn_nop
 
 # as_fn_error STATUS ERROR LINENO LOG_FD
 # ----------------------------------------
@@ -413,9 +433,9 @@
   as_status=$1; test $as_status -eq 0 && as_status=1
   if test "$4"; then
     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  $as_echo "$as_me: error: $2" >&2
+  printf "%s\n" "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -442,7 +462,7 @@
 $as_expr X/"$0" : '.*/$^/^/*$/*$' \| \
 	 X"$0" : 'X$//$$' \| \
 	 X"$0" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X/"$0" |
+printf "%s\n" X/"$0" |
     sed '/^.*\/$^/^/*$\/*$/{
 	    s//\1/
 	    q
@@ -486,7 +506,7 @@
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+    { printf "%s\n" "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
   # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
   # already done that, so ensure we don't try to do so again and fall
@@ -500,6 +520,10 @@
   exit
 }
 
+
+# Determine whether it's possible to make 'echo' print without a newline.
+# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
+# for compatibility with existing Makefiles.
 ECHO_C= ECHO_N= ECHO_T=
 case `echo -n x` in #(((((
 -n*)
@@ -513,6 +537,13 @@
   ECHO_N='-n';;
 esac
 
+# For backward compatibility with old third-party macros, we provide
+# the shell variables $as_echo and $as_echo_n.  New code should use
+# AS_ECHO("message") and AS_ECHO_N("message"), respectively.
+as_echo='printf %s\n'
+as_echo_n='printf %s'
+
+
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
@@ -732,48 +763,44 @@
 # Identity of this package.
 PACKAGE_NAME='PHP'
 PACKAGE_TARNAME='php'
-PACKAGE_VERSION='8.3.7'
-PACKAGE_STRING='PHP 8.3.7'
+PACKAGE_VERSION='8.3.21'
+PACKAGE_STRING='PHP 8.3.21'
 PACKAGE_BUGREPORT='https://github.com/php/php-src/issues'
 PACKAGE_URL='https://www.php.net'
 
 ac_unique_file="main/php_version.h"
 # Factoring default headers for most tests.
 ac_includes_default="\
-#include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
+#include <stddef.h>
+#ifdef HAVE_STDIO_H
+# include <stdio.h>
 #endif
-#ifdef STDC_HEADERS
+#ifdef HAVE_STDLIB_H
 # include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
 #endif
 #ifdef HAVE_STRING_H
-# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
-#  include <memory.h>
-# endif
 # include <string.h>
 #endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
 #ifdef HAVE_INTTYPES_H
 # include <inttypes.h>
 #endif
 #ifdef HAVE_STDINT_H
 # include <stdint.h>
 #endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif"
 
+ac_header_c_list=
 ac_subst_vars='LTLIBOBJS
 LIBTOOL
 NMEDIT
@@ -1300,8 +1327,6 @@
   *)    ac_optarg=yes ;;
   esac
 
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
   case $ac_dashdash$ac_option in
   --)
     ac_dashdash=yes ;;
@@ -1342,9 +1367,9 @@
     ac_useropt=`expr "x$ac_option" : 'x-*disable-$.*$'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*^-+._$as_cr_alnum" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
+      as_fn_error $? "invalid feature name: \`$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/-+./_/g'`
+    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/-+./_/g'`
     case $ac_user_opts in
       *"
 "enable_$ac_useropt"
@@ -1368,9 +1393,9 @@
     ac_useropt=`expr "x$ac_option" : 'x-*enable-$^=*$'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*^-+._$as_cr_alnum" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
+      as_fn_error $? "invalid feature name: \`$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/-+./_/g'`
+    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/-+./_/g'`
     case $ac_user_opts in
       *"
 "enable_$ac_useropt"
@@ -1581,9 +1606,9 @@
     ac_useropt=`expr "x$ac_option" : 'x-*with-$^=*$'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*^-+._$as_cr_alnum" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
+      as_fn_error $? "invalid package name: \`$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/-+./_/g'`
+    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/-+./_/g'`
     case $ac_user_opts in
       *"
 "with_$ac_useropt"
@@ -1597,9 +1622,9 @@
     ac_useropt=`expr "x$ac_option" : 'x-*without-$.*$'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*^-+._$as_cr_alnum" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
+      as_fn_error $? "invalid package name: \`$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/-+./_/g'`
+    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/-+./_/g'`
     case $ac_user_opts in
       *"
 "with_$ac_useropt"
@@ -1643,9 +1668,9 @@
 
   *)
     # FIXME: should be removed in autoconf 3.0.
-    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    printf "%s\n" "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*^-._$as_cr_alnum" >/dev/null &&
-      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+      printf "%s\n" "$as_me: WARNING: invalid host type: $ac_option" >&2
     : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
     ;;
 
@@ -1661,7 +1686,7 @@
   case $enable_option_checking in
     no) ;;
     fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
-    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+    *)     printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
 fi
 
@@ -1725,7 +1750,7 @@
 	 X"$as_myself" : 'X$//$^/' \| \
 	 X"$as_myself" : 'X$//$$' \| \
 	 X"$as_myself" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X"$as_myself" |
+printf "%s\n" X"$as_myself" |
     sed '/^X$.*^/$\/\/*^/^/*\/*$/{
 	    s//\1/
 	    q
@@ -1782,7 +1807,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures PHP 8.3.7 to adapt to many kinds of systems.
+\`configure' configures PHP 8.3.21 to adapt to many kinds of systems.
 
 Usage: $0 OPTION... VAR=VALUE...
 
@@ -1854,7 +1879,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of PHP 8.3.7:";;
+     short | recursive ) echo "Configuration of PHP 8.3.21:";;
    esac
   cat <<\_ACEOF
 
@@ -2270,9 +2295,9 @@
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.\\/||'`
+  ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.\\/||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/^\\/*|/..|g;s|/||'`
+  ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/^\\/*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -2300,7 +2325,8 @@
 ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
 
     cd "$ac_dir" || { ac_status=$?; continue; }
-    # Check for guested configure.
+    # Check for configure.gnu first; this name is used for a wrapper for
+    # Metaconfig's "Configure" on case-insensitive file systems.
     if test -f "$ac_srcdir/configure.gnu"; then
       echo &&
       $SHELL "$ac_srcdir/configure.gnu" --help=recursive
@@ -2308,7 +2334,7 @@
       echo &&
       $SHELL "$ac_srcdir/configure" --help=recursive
     else
-      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+      printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi || ac_status=$?
     cd "$ac_pwd" || { ac_status=$?; break; }
   done
@@ -2317,10 +2343,10 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-PHP configure 8.3.7
-generated by GNU Autoconf 2.69
+PHP configure 8.3.21
+generated by GNU Autoconf 2.71
 
-Copyright (C) 2012 Free Software Foundation, Inc.
+Copyright (C) 2021 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -2337,14 +2363,14 @@
 ac_fn_c_try_compile ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext
+  rm -f conftest.$ac_objext conftest.beam
   if { { ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -2352,14 +2378,15 @@
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then :
+       } && test -s conftest.$ac_objext
+then :
   ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
+else $as_nop
+  printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1
@@ -2381,7 +2408,7 @@
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -2389,14 +2416,15 @@
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } > conftest.i && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       }; then :
+       }
+then :
   ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
+else $as_nop
+  printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
     ac_retval=1
@@ -2406,139 +2434,6 @@
 
 } # ac_fn_c_try_cpp
 
-# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
-# Tests whether HEADER exists, giving a warning if it cannot be compiled using
-# the include files in INCLUDES and setting the cache variable VAR
-# accordingly.
-ac_fn_c_check_header_mongrel ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if eval \${$3+:} false; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
-$as_echo_n "checking $2 usability... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_header_compiler=yes
-else
-  ac_header_compiler=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
-$as_echo_n "checking $2 presence... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <$2>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  ac_header_preproc=yes
-else
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
-  yes:no: )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-( $as_echo "## ---------------------------------------------------- ##
-## Report this to https://github.com/php/php-src/issues ##
-## ---------------------------------------------------- ##"
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  eval "$3=\$ac_header_compiler"
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_header_mongrel
-
-# ac_fn_c_try_run LINENO
-# ----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
-# that executables *can* be run.
-ac_fn_c_try_run ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-       $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_retval=$ac_status
-fi
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_run
-
 # ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
 # -------------------------------------------------------
 # Tests whether HEADER exists and can be compiled using the include files in
@@ -2546,26 +2441,28 @@
 ac_fn_c_check_header_compile ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+printf %s "checking for $2... " >&6; }
+if eval test \${$3+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 #include <$2>
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   eval "$3=yes"
-else
+else $as_nop
   eval "$3=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_header_compile
@@ -2576,14 +2473,14 @@
 ac_fn_c_try_link ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest$ac_exeext
+  rm -f conftest.$ac_objext conftest.beam conftest$ac_exeext
   if { { ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -2591,17 +2488,18 @@
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext && {
 	 test "$cross_compiling" = yes ||
 	 test -x conftest$ac_exeext
-       }; then :
+       }
+then :
   ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
+else $as_nop
+  printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1
@@ -2622,11 +2520,12 @@
 ac_fn_c_check_func ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+printf %s "checking for $2... " >&6; }
+if eval test \${$3+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 /* Define $2 to an innocuous variant, in case <limits.h> declares $2.
@@ -2634,16 +2533,9 @@
 #define $2 innocuous_$2
 
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $2 (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
+   which can conflict with char $2 (); below.  */
 
+#include <limits.h>
 #undef $2
 
 /* Override any GCC internal prototype to avoid an error.
@@ -2661,42 +2553,86 @@
 #endif
 
 int
-main ()
+main (void)
 {
 return $2 ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   eval "$3=yes"
-else
+else $as_nop
   eval "$3=no"
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 fi
 eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_func
 
+# ac_fn_c_try_run LINENO
+# ----------------------
+# Try to run conftest.$ac_ext, and return whether this succeeded. Assumes that
+# executables *can* be run.
+ac_fn_c_try_run ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+printf "%s\n" "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+printf "%s\n" "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }
+then :
+  ac_retval=0
+else $as_nop
+  printf "%s\n" "$as_me: program exited with status $ac_status" >&5
+       printf "%s\n" "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       ac_retval=$ac_status
+fi
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_run
+
 # ac_fn_cxx_try_compile LINENO
 # ----------------------------
 # Try to compile conftest.$ac_ext, and return whether this succeeded.
 ac_fn_cxx_try_compile ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext
+  rm -f conftest.$ac_objext conftest.beam
   if { { ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -2704,14 +2640,15 @@
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then :
+       } && test -s conftest.$ac_objext
+then :
   ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
+else $as_nop
+  printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1
@@ -2733,7 +2670,7 @@
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -2741,14 +2678,15 @@
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } > conftest.i && {
 	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
-       }; then :
+       }
+then :
   ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
+else $as_nop
+  printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
     ac_retval=1
@@ -2765,16 +2703,17 @@
 ac_fn_c_check_member ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
-$as_echo_n "checking for $2.$3... " >&6; }
-if eval \${$4+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
+printf %s "checking for $2.$3... " >&6; }
+if eval test \${$4+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $5
 int
-main ()
+main (void)
 {
 static $2 ac_aggr;
 if (ac_aggr.$3)
@@ -2783,14 +2722,15 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   eval "$4=yes"
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $5
 int
-main ()
+main (void)
 {
 static $2 ac_aggr;
 if (sizeof ac_aggr.$3)
@@ -2799,41 +2739,45 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   eval "$4=yes"
-else
+else $as_nop
   eval "$4=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 eval ac_res=\$$4
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_member
 
-# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
-# ---------------------------------------------
+# ac_fn_check_decl LINENO SYMBOL VAR INCLUDES EXTRA-OPTIONS FLAG-VAR
+# ------------------------------------------------------------------
 # Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
-# accordingly.
-ac_fn_c_check_decl ()
+# accordingly. Pass EXTRA-OPTIONS to the compiler, using FLAG-VAR.
+ac_fn_check_decl ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   as_decl_name=`echo $2|sed 's/ *(.*//'`
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
+printf %s "checking whether $as_decl_name is declared... " >&6; }
+if eval test \${$3+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
-$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  eval ac_save_FLAGS=\$$6
+  as_fn_append $6 " $5"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 int
-main ()
+main (void)
 {
 #ifndef $as_decl_name
 #ifdef __cplusplus
@@ -2847,19 +2791,22 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   eval "$3=yes"
-else
+else $as_nop
   eval "$3=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+  eval $6=\$ac_save_FLAGS
+
 fi
 eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
-} # ac_fn_c_check_decl
+} # ac_fn_check_decl
 
 # ac_fn_c_check_type LINENO TYPE VAR INCLUDES
 # -------------------------------------------
@@ -2868,17 +2815,18 @@
 ac_fn_c_check_type ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+printf %s "checking for $2... " >&6; }
+if eval test \${$3+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   eval "$3=no"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 int
-main ()
+main (void)
 {
 if (sizeof ($2))
 	 return 0;
@@ -2886,12 +2834,13 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 int
-main ()
+main (void)
 {
 if (sizeof (($2)))
 	    return 0;
@@ -2899,18 +2848,19 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
-else
+else $as_nop
   eval "$3=yes"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_type
@@ -2929,7 +2879,7 @@
 /* end confdefs.h.  */
 $4
 int
-main ()
+main (void)
 {
 static int test_array 1 - 2 * !(($2) >= 0);
 test_array 0 = 0;
@@ -2939,14 +2889,15 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_lo=0 ac_mid=0
   while :; do
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 int
-main ()
+main (void)
 {
 static int test_array 1 - 2 * !(($2) <= $ac_mid);
 test_array 0 = 0;
@@ -2956,9 +2907,10 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_hi=$ac_mid; break
-else
+else $as_nop
   as_fn_arith $ac_mid + 1 && ac_lo=$as_val
 			if test $ac_lo -le $ac_mid; then
 			  ac_lo= ac_hi=
@@ -2966,14 +2918,14 @@
 			fi
 			as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
   done
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 int
-main ()
+main (void)
 {
 static int test_array 1 - 2 * !(($2) < 0);
 test_array 0 = 0;
@@ -2983,14 +2935,15 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_hi=-1 ac_mid=-1
   while :; do
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 int
-main ()
+main (void)
 {
 static int test_array 1 - 2 * !(($2) >= $ac_mid);
 test_array 0 = 0;
@@ -3000,9 +2953,10 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_lo=$ac_mid; break
-else
+else $as_nop
   as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val
 			if test $ac_mid -le $ac_hi; then
 			  ac_lo= ac_hi=
@@ -3010,14 +2964,14 @@
 			fi
 			as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
   done
-else
+else $as_nop
   ac_lo= ac_hi=
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 # Binary search between lo and hi bounds.
 while test "x$ac_lo" != "x$ac_hi"; do
   as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val
@@ -3025,7 +2979,7 @@
 /* end confdefs.h.  */
 $4
 int
-main ()
+main (void)
 {
 static int test_array 1 - 2 * !(($2) <= $ac_mid);
 test_array 0 = 0;
@@ -3035,12 +2989,13 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_hi=$ac_mid
-else
+else $as_nop
   as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 done
 case $ac_lo in #((
 ?*) eval "$3=\$ac_lo"; ac_retval=0 ;;
@@ -3050,12 +3005,12 @@
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
-static long int longval () { return $2; }
-static unsigned long int ulongval () { return $2; }
+static long int longval (void) { return $2; }
+static unsigned long int ulongval (void) { return $2; }
 #include <stdio.h>
 #include <stdlib.h>
 int
-main ()
+main (void)
 {
 
   FILE *f = fopen ("conftest.val", "w");
@@ -3083,9 +3038,10 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   echo >>conftest.val; read $3 <conftest.val; ac_retval=0
-else
+else $as_nop
   ac_retval=1
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -3097,14 +3053,34 @@
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_compute_int
+ac_configure_args_raw=
+for ac_arg
+do
+  case $ac_arg in
+  *\'*)
+    ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+  esac
+  as_fn_append ac_configure_args_raw " '$ac_arg'"
+done
+
+case $ac_configure_args_raw in
+  *$as_nl*)
+    ac_safe_unquote= ;;
+  *)
+    ac_unsafe_z='|&;<>()$`\\"*? ''	' # This string ends in space, tab.
+    ac_unsafe_a="$ac_unsafe_z#~"
+    ac_safe_unquote="s/ '\$^$ac_unsafe_a^$ac_unsafe_z*\$'/ \\1/g"
+    ac_configure_args_raw=`      printf "%s\n" "$ac_configure_args_raw" | sed "$ac_safe_unquote"`;;
+esac
+
 cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by PHP $as_me 8.3.7, which was
-generated by GNU Autoconf 2.69.  Invocation command line was
+It was created by PHP $as_me 8.3.21, which was
+generated by GNU Autoconf 2.71.  Invocation command line was
 
-  $ $0 $@
+  $ $0$ac_configure_args_raw
 
 _ACEOF
 exec 5>>config.log
@@ -3137,8 +3113,12 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    $as_echo "PATH: $as_dir"
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    printf "%s\n" "PATH: $as_dir"
   done
 IFS=$as_save_IFS
 
@@ -3173,7 +3153,7 @@
     | -silent | --silent | --silen | --sile | --sil)
       continue ;;
     *\'*)
-      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+      ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
     1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
@@ -3208,11 +3188,13 @@
 # WARNING: Use '\'' to represent an apostrophe within the trap.
 # WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
 trap 'exit_status=$?
+  # Sanitize IFS.
+  IFS=" ""	$as_nl"
   # Save into config.log some information that might help in debugging.
   {
     echo
 
-    $as_echo "## ---------------- ##
+    printf "%s\n" "## ---------------- ##
 ## Cache variables. ##
 ## ---------------- ##"
     echo
@@ -3223,8 +3205,8 @@
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
@@ -3248,7 +3230,7 @@
 )
     echo
 
-    $as_echo "## ----------------- ##
+    printf "%s\n" "## ----------------- ##
 ## Output variables. ##
 ## ----------------- ##"
     echo
@@ -3256,14 +3238,14 @@
     do
       eval ac_val=\$$ac_var
       case $ac_val in
-      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
       esac
-      $as_echo "$ac_var='\''$ac_val'\''"
+      printf "%s\n" "$ac_var='\''$ac_val'\''"
     done | sort
     echo
 
     if test -n "$ac_subst_files"; then
-      $as_echo "## ------------------- ##
+      printf "%s\n" "## ------------------- ##
 ## File substitutions. ##
 ## ------------------- ##"
       echo
@@ -3271,15 +3253,15 @@
       do
 	eval ac_val=\$$ac_var
 	case $ac_val in
-	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	*\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
 	esac
-	$as_echo "$ac_var='\''$ac_val'\''"
+	printf "%s\n" "$ac_var='\''$ac_val'\''"
       done | sort
       echo
     fi
 
     if test -s confdefs.h; then
-      $as_echo "## ----------- ##
+      printf "%s\n" "## ----------- ##
 ## confdefs.h. ##
 ## ----------- ##"
       echo
@@ -3287,8 +3269,8 @@
       echo
     fi
     test "$ac_signal" != 0 &&
-      $as_echo "$as_me: caught signal $ac_signal"
-    $as_echo "$as_me: exit $exit_status"
+      printf "%s\n" "$as_me: caught signal $ac_signal"
+    printf "%s\n" "$as_me: exit $exit_status"
   } >&5
   rm -f core *.core core.conftest.* &&
     rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
@@ -3302,63 +3284,48 @@
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
 rm -f -r conftest* confdefs.h
 
-$as_echo "/* confdefs.h */" > confdefs.h
+printf "%s\n" "/* confdefs.h */" > confdefs.h
 
 # Predefined preprocessor variables.
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
+printf "%s\n" "#define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
+printf "%s\n" "#define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
+printf "%s\n" "#define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
+printf "%s\n" "#define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
+printf "%s\n" "#define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_URL "$PACKAGE_URL"
-_ACEOF
+printf "%s\n" "#define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h
 
 
 # Let the site file select an alternate cache file if it wants to.
 # Prefer an explicitly selected file to automatically selected ones.
-ac_site_file1=NONE
-ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  # We do not want a PATH search for config.site.
-  case $CONFIG_SITE in #((
-    -*)  ac_site_file1=./$CONFIG_SITE;;
-    */*) ac_site_file1=$CONFIG_SITE;;
-    *)   ac_site_file1=./$CONFIG_SITE;;
-  esac
+  ac_site_files="$CONFIG_SITE"
 elif test "x$prefix" != xNONE; then
-  ac_site_file1=$prefix/share/config.site
-  ac_site_file2=$prefix/etc/config.site
+  ac_site_files="$prefix/share/config.site $prefix/etc/config.site"
 else
-  ac_site_file1=$ac_default_prefix/share/config.site
-  ac_site_file2=$ac_default_prefix/etc/config.site
+  ac_site_files="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
 fi
-for ac_site_file in "$ac_site_file1" "$ac_site_file2"
+
+for ac_site_file in $ac_site_files
 do
-  test "x$ac_site_file" = xNONE && continue
-  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
-$as_echo "$as_me: loading site script $ac_site_file" >&6;}
+  case $ac_site_file in #(
+  */*) :
+     ;; #(
+  *) :
+    ac_site_file=./$ac_site_file ;;
+esac
+  if test -f "$ac_site_file" && test -r "$ac_site_file"; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
     . "$ac_site_file" \
-      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+      || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "failed to load site script $ac_site_file
 See \`config.log' for more details" "$LINENO" 5; }
   fi
@@ -3368,19 +3335,652 @@
   # Some versions of bash will fail to source /dev/null (special files
   # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
   if test /dev/null != "$cache_file" && test -f "$cache_file"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
-$as_echo "$as_me: loading cache $cache_file" >&6;}
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+printf "%s\n" "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       \\/* | ?:\\/* ) . "$cache_file";;
       *)                      . "./$cache_file";;
     esac
   fi
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
-$as_echo "$as_me: creating cache $cache_file" >&6;}
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+printf "%s\n" "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
+# Test code for whether the C compiler supports C89 (global declarations)
+ac_c_conftest_c89_globals='
+/* Does the compiler advertise C89 conformance?
+   Do not test the value of __STDC__, because some compilers set it to 0
+   while being otherwise adequately conformant. */
+#if !defined __STDC__
+# error "Compiler does not advertise C89 conformance"
+#endif
+
+#include <stddef.h>
+#include <stdarg.h>
+struct stat;
+/* Most of the following tests are stolen from RCS 5.7 src/conf.sh.  */
+struct buf { int x; };
+struct buf * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+     char **p;
+     int i;
+{
+  return pi;
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+  char *s;
+  va_list v;
+  va_start (v,p);
+  s = g (p, va_arg (v,int));
+  va_end (v);
+  return s;
+}
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
+   function prototypes and stuff, but not \xHH hex character constants.
+   These do not provoke an error unfortunately, instead are silently treated
+   as an "x".  The following induces an error, until -std is added to get
+   proper ANSI mode.  Curiously \x00 != x always comes out true, for an
+   array size at least.  It is necessary to write \x00 == 0 to get something
+   that is true only with -std.  */
+int osf4_cc_array '\''\x00'\'' == 0 ? 1 : -1;
+
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+   inside strings and character constants.  */
+#define FOO(x) '\''x'\''
+int xlc6_cc_arrayFOO(a) == '\''x'\'' ? 1 : -1;
+
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, int *(*)(struct buf *, struct stat *, int),
+               int, int);'
+
+# Test code for whether the C compiler supports C89 (body of main).
+ac_c_conftest_c89_main='
+ok |= (argc == 0 || f (e, argv, 0) != argv0 || f (e, argv, 1) != argv1);
+'
+
+# Test code for whether the C compiler supports C99 (global declarations)
+ac_c_conftest_c99_globals='
+// Does the compiler advertise C99 conformance?
+#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L
+# error "Compiler does not advertise C99 conformance"
+#endif
+
+#include <stdbool.h>
+extern int puts (const char *);
+extern int printf (const char *, ...);
+extern int dprintf (int, const char *, ...);
+extern void *malloc (size_t);
+
+// Check varargs macros.  These examples are taken from C99 6.10.3.5.
+// dprintf is used instead of fprintf to avoid needing to declare
+// FILE and stderr.
+#define debug(...) dprintf (2, __VA_ARGS__)
+#define showlist(...) puts (#__VA_ARGS__)
+#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__))
+static void
+test_varargs_macros (void)
+{
+  int x = 1234;
+  int y = 5678;
+  debug ("Flag");
+  debug ("X = %d\n", x);
+  showlist (The first, second, and third items.);
+  report (x>y, "x is %d but y is %d", x, y);
+}
+
+// Check long long types.
+#define BIG64 18446744073709551615ull
+#define BIG32 4294967295ul
+#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0)
+#if !BIG_OK
+  #error "your preprocessor is broken"
+#endif
+#if BIG_OK
+#else
+  #error "your preprocessor is broken"
+#endif
+static long long int bignum = -9223372036854775807LL;
+static unsigned long long int ubignum = BIG64;
+
+struct incomplete_array
+{
+  int datasize;
+  double data;
+};
+
+struct named_init {
+  int number;
+  const wchar_t *name;
+  double average;
+};
+
+typedef const char *ccp;
+
+static inline int
+test_restrict (ccp restrict text)
+{
+  // See if C++-style comments work.
+  // Iterate through items via the restricted pointer.
+  // Also check for declarations in for loops.
+  for (unsigned int i = 0; *(text+i) != '\''\0'\''; ++i)
+    continue;
+  return 0;
+}
+
+// Check varargs and va_copy.
+static bool
+test_varargs (const char *format, ...)
+{
+  va_list args;
+  va_start (args, format);
+  va_list args_copy;
+  va_copy (args_copy, args);
+
+  const char *str = "";
+  int number = 0;
+  float fnumber = 0;
+
+  while (*format)
+    {
+      switch (*format++)
+	{
+	case '\''s'\'': // string
+	  str = va_arg (args_copy, const char *);
+	  break;
+	case '\''d'\'': // int
+	  number = va_arg (args_copy, int);
+	  break;
+	case '\''f'\'': // float
+	  fnumber = va_arg (args_copy, double);
+	  break;
+	default:
+	  break;
+	}
+    }
+  va_end (args_copy);
+  va_end (args);
+
+  return *str && number && fnumber;
+}
+'
+
+# Test code for whether the C compiler supports C99 (body of main).
+ac_c_conftest_c99_main='
+  // Check bool.
+  _Bool success = false;
+  success |= (argc != 0);
+
+  // Check restrict.
+  if (test_restrict ("String literal") == 0)
+    success = true;
+  char *restrict newvar = "Another string";
+
+  // Check varargs.
+  success &= test_varargs ("s, d'\'' f .", "string", 65, 34.234);
+  test_varargs_macros ();
+
+  // Check flexible array members.
+  struct incomplete_array *ia =
+    malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10));
+  ia->datasize = 10;
+  for (int i = 0; i < ia->datasize; ++i)
+    ia->datai = i * 1.234;
+
+  // Check named initializers.
+  struct named_init ni = {
+    .number = 34,
+    .name = L"Test wide string",
+    .average = 543.34343,
+  };
+
+  ni.number = 58;
+
+  int dynamic_arrayni.number;
+  dynamic_array0 = argv00;
+  dynamic_arrayni.number - 1 = 543;
+
+  // work around unused variable warnings
+  ok |= (!success || bignum == 0LL || ubignum == 0uLL || newvar0 == '\''x'\''
+	 || dynamic_arrayni.number - 1 != 543);
+'
+
+# Test code for whether the C compiler supports C11 (global declarations)
+ac_c_conftest_c11_globals='
+// Does the compiler advertise C11 conformance?
+#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112L
+# error "Compiler does not advertise C11 conformance"
+#endif
+
+// Check _Alignas.
+char _Alignas (double) aligned_as_double;
+char _Alignas (0) no_special_alignment;
+extern char aligned_as_int;
+char _Alignas (0) _Alignas (int) aligned_as_int;
+
+// Check _Alignof.
+enum
+{
+  int_alignment = _Alignof (int),
+  int_array_alignment = _Alignof (int100),
+  char_alignment = _Alignof (char)
+};
+_Static_assert (0 < -_Alignof (int), "_Alignof is signed");
+
+// Check _Noreturn.
+int _Noreturn does_not_return (void) { for (;;) continue; }
+
+// Check _Static_assert.
+struct test_static_assert
+{
+  int x;
+  _Static_assert (sizeof (int) <= sizeof (long int),
+                  "_Static_assert does not work in struct");
+  long int y;
+};
+
+// Check UTF-8 literals.
+#define u8 syntax error!
+char const utf8_literal = u8"happens to be ASCII" "another string";
+
+// Check duplicate typedefs.
+typedef long *long_ptr;
+typedef long int *long_ptr;
+typedef long_ptr long_ptr;
+
+// Anonymous structures and unions -- taken from C11 6.7.2.1 Example 1.
+struct anonymous
+{
+  union {
+    struct { int i; int j; };
+    struct { int k; long int l; } w;
+  };
+  int m;
+} v1;
+'
+
+# Test code for whether the C compiler supports C11 (body of main).
+ac_c_conftest_c11_main='
+  _Static_assert ((offsetof (struct anonymous, i)
+		   == offsetof (struct anonymous, w.k)),
+		  "Anonymous union alignment botch");
+  v1.i = 2;
+  v1.w.k = 5;
+  ok |= v1.i != 5;
+'
+
+# Test code for whether the C compiler supports C11 (complete).
+ac_c_conftest_c11_program="${ac_c_conftest_c89_globals}
+${ac_c_conftest_c99_globals}
+${ac_c_conftest_c11_globals}
+
+int
+main (int argc, char **argv)
+{
+  int ok = 0;
+  ${ac_c_conftest_c89_main}
+  ${ac_c_conftest_c99_main}
+  ${ac_c_conftest_c11_main}
+  return ok;
+}
+"
+
+# Test code for whether the C compiler supports C99 (complete).
+ac_c_conftest_c99_program="${ac_c_conftest_c89_globals}
+${ac_c_conftest_c99_globals}
+
+int
+main (int argc, char **argv)
+{
+  int ok = 0;
+  ${ac_c_conftest_c89_main}
+  ${ac_c_conftest_c99_main}
+  return ok;
+}
+"
+
+# Test code for whether the C compiler supports C89 (complete).
+ac_c_conftest_c89_program="${ac_c_conftest_c89_globals}
+
+int
+main (int argc, char **argv)
+{
+  int ok = 0;
+  ${ac_c_conftest_c89_main}
+  return ok;
+}
+"
+
+as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H"
+as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H"
+as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H"
+as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H"
+as_fn_append ac_header_c_list " stdint.h stdint_h HAVE_STDINT_H"
+as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H"
+as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H"
+as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H"
+as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H"
+as_fn_append ac_header_c_list " wchar.h wchar_h HAVE_WCHAR_H"
+as_fn_append ac_header_c_list " minix/config.h minix_config_h HAVE_MINIX_CONFIG_H"
+# Test code for whether the C++ compiler supports C++98 (global declarations)
+ac_cxx_conftest_cxx98_globals='
+// Does the compiler advertise C++98 conformance?
+#if !defined __cplusplus || __cplusplus < 199711L
+# error "Compiler does not advertise C++98 conformance"
+#endif
+
+// These inclusions are to reject old compilers that
+// lack the unsuffixed header files.
+#include <cstdlib>
+#include <exception>
+
+// <cassert> and <cstring> are *not* freestanding headers in C++98.
+extern void assert (int);
+namespace std {
+  extern int strcmp (const char *, const char *);
+}
+
+// Namespaces, exceptions, and templates were all added after "C++ 2.0".
+using std::exception;
+using std::strcmp;
+
+namespace {
+
+void test_exception_syntax()
+{
+  try {
+    throw "test";
+  } catch (const char *s) {
+    // Extra parentheses suppress a warning when building autoconf itself,
+    // due to lint rules shared with more typical C programs.
+    assert (!(strcmp) (s, "test"));
+  }
+}
+
+template <typename T> struct test_template
+{
+  T const val;
+  explicit test_template(T t) : val(t) {}
+  template <typename U> T add(U u) { return static_cast<T>(u) + val; }
+};
+
+} // anonymous namespace
+'
+
+# Test code for whether the C++ compiler supports C++98 (body of main)
+ac_cxx_conftest_cxx98_main='
+  assert (argc);
+  assert (! argv0);
+{
+  test_exception_syntax ();
+  test_template<double> tt (2.0);
+  assert (tt.add (4) == 6.0);
+  assert (true && !false);
+}
+'
+
+# Test code for whether the C++ compiler supports C++11 (global declarations)
+ac_cxx_conftest_cxx11_globals='
+// Does the compiler advertise C++ 2011 conformance?
+#if !defined __cplusplus || __cplusplus < 201103L
+# error "Compiler does not advertise C++11 conformance"
+#endif
+
+namespace cxx11test
+{
+  constexpr int get_val() { return 20; }
+
+  struct testinit
+  {
+    int i;
+    double d;
+  };
+
+  class delegate
+  {
+  public:
+    delegate(int n) : n(n) {}
+    delegate(): delegate(2354) {}
+
+    virtual int getval() { return this->n; };
+  protected:
+    int n;
+  };
+
+  class overridden : public delegate
+  {
+  public:
+    overridden(int n): delegate(n) {}
+    virtual int getval() override final { return this->n * 2; }
+  };
+
+  class nocopy
+  {
+  public:
+    nocopy(int i): i(i) {}
+    nocopy() = default;
+    nocopy(const nocopy&) = delete;
+    nocopy & operator=(const nocopy&) = delete;
+  private:
+    int i;
+  };
+
+  // for testing lambda expressions
+  template <typename Ret, typename Fn> Ret eval(Fn f, Ret v)
+  {
+    return f(v);
+  }
+
+  // for testing variadic templates and trailing return types
+  template <typename V> auto sum(V first) -> V
+  {
+    return first;
+  }
+  template <typename V, typename... Args> auto sum(V first, Args... rest) -> V
+  {
+    return first + sum(rest...);
+  }
+}
+'
+
+# Test code for whether the C++ compiler supports C++11 (body of main)
+ac_cxx_conftest_cxx11_main='
+{
+  // Test auto and decltype
+  auto a1 = 6538;
+  auto a2 = 48573953.4;
+  auto a3 = "String literal";
+
+  int total = 0;
+  for (auto i = a3; *i; ++i) { total += *i; }
+
+  decltype(a2) a4 = 34895.034;
+}
+{
+  // Test constexpr
+  short sacxx11test::get_val() = { 0 };
+}
+{
+  // Test initializer lists
+  cxx11test::testinit il = { 4323, 435234.23544 };
+}
+{
+  // Test range-based for
+  int array = {9, 7, 13, 15, 4, 18, 12, 10, 5, 3,
+                 14, 19, 17, 8, 6, 20, 16, 2, 11, 1};
+  for (auto &x : array) { x += 23; }
+}
+{
+  // Test lambda expressions
+  using cxx11test::eval;
+  assert (eval ((int x) { return x*2; }, 21) == 42);
+  double d = 2.0;
+  assert (eval (&(double x) { return d += x; }, 3.0) == 5.0);
+  assert (d == 5.0);
+  assert (eval (=(double x) mutable { return d += x; }, 4.0) == 9.0);
+  assert (d == 5.0);
+}
+{
+  // Test use of variadic templates
+  using cxx11test::sum;
+  auto a = sum(1);
+  auto b = sum(1, 2);
+  auto c = sum(1.0, 2.0, 3.0);
+}
+{
+  // Test constructor delegation
+  cxx11test::delegate d1;
+  cxx11test::delegate d2();
+  cxx11test::delegate d3(45);
+}
+{
+  // Test override and final
+  cxx11test::overridden o1(55464);
+}
+{
+  // Test nullptr
+  char *c = nullptr;
+}
+{
+  // Test template brackets
+  test_template<::test_template<int>> v(test_template<int>(12));
+}
+{
+  // Unicode literals
+  char const *utf8 = u8"UTF-8 string \u2500";
+  char16_t const *utf16 = u"UTF-8 string \u2500";
+  char32_t const *utf32 = U"UTF-32 string \u2500";
+}
+'
+
+# Test code for whether the C compiler supports C++11 (complete).
+ac_cxx_conftest_cxx11_program="${ac_cxx_conftest_cxx98_globals}
+${ac_cxx_conftest_cxx11_globals}
+
+int
+main (int argc, char **argv)
+{
+  int ok = 0;
+  ${ac_cxx_conftest_cxx98_main}
+  ${ac_cxx_conftest_cxx11_main}
+  return ok;
+}
+"
+
+# Test code for whether the C compiler supports C++98 (complete).
+ac_cxx_conftest_cxx98_program="${ac_cxx_conftest_cxx98_globals}
+int
+main (int argc, char **argv)
+{
+  int ok = 0;
+  ${ac_cxx_conftest_cxx98_main}
+  return ok;
+}
+"
+
+
+# Auxiliary files required by this configure script.
+ac_aux_files="config.guess config.sub"
+
+# Locations in which to look for auxiliary files.
+ac_aux_dir_candidates="${srcdir}/build"
+
+# Search for a directory containing all of the required auxiliary files,
+# $ac_aux_files, from the $PATH-style list $ac_aux_dir_candidates.
+# If we don't find one directory that contains all the files we need,
+# we report the set of missing files from the *first* directory in
+# $ac_aux_dir_candidates and give up.
+ac_missing_aux_files=""
+ac_first_candidate=:
+printf "%s\n" "$as_me:${as_lineno-$LINENO}: looking for aux files: $ac_aux_files" >&5
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_found=false
+for as_dir in $ac_aux_dir_candidates
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+  as_found=:
+
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}:  trying $as_dir" >&5
+  ac_aux_dir_found=yes
+  ac_install_sh=
+  for ac_aux in $ac_aux_files
+  do
+    # As a special case, if "install-sh" is required, that requirement
+    # can be satisfied by any of "install-sh", "install.sh", or "shtool",
+    # and $ac_install_sh is set appropriately for whichever one is found.
+    if test x"$ac_aux" = x"install-sh"
+    then
+      if test -f "${as_dir}install-sh"; then
+        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}install-sh found" >&5
+        ac_install_sh="${as_dir}install-sh -c"
+      elif test -f "${as_dir}install.sh"; then
+        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}install.sh found" >&5
+        ac_install_sh="${as_dir}install.sh -c"
+      elif test -f "${as_dir}shtool"; then
+        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}shtool found" >&5
+        ac_install_sh="${as_dir}shtool install -c"
+      else
+        ac_aux_dir_found=no
+        if $ac_first_candidate; then
+          ac_missing_aux_files="${ac_missing_aux_files} install-sh"
+        else
+          break
+        fi
+      fi
+    else
+      if test -f "${as_dir}${ac_aux}"; then
+        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}${ac_aux} found" >&5
+      else
+        ac_aux_dir_found=no
+        if $ac_first_candidate; then
+          ac_missing_aux_files="${ac_missing_aux_files} ${ac_aux}"
+        else
+          break
+        fi
+      fi
+    fi
+  done
+  if test "$ac_aux_dir_found" = yes; then
+    ac_aux_dir="$as_dir"
+    break
+  fi
+  ac_first_candidate=false
+
+  as_found=false
+done
+IFS=$as_save_IFS
+if $as_found
+then :
+
+else $as_nop
+  as_fn_error $? "cannot find required auxiliary files:$ac_missing_aux_files" "$LINENO" 5
+fi
+
+
+# These three variables are undocumented and unsupported,
+# and are intended to be withdrawn in a future Autoconf release.
+# They can cause serious problems if a builder's source tree is in a directory
+# whose full name contains unusual characters.
+if test -f "${ac_aux_dir}config.guess"; then
+  ac_config_guess="$SHELL ${ac_aux_dir}config.guess"
+fi
+if test -f "${ac_aux_dir}config.sub"; then
+  ac_config_sub="$SHELL ${ac_aux_dir}config.sub"
+fi
+if test -f "$ac_aux_dir/configure"; then
+  ac_configure="$SHELL ${ac_aux_dir}configure"
+fi
+
 # Check that the precious variables saved in the cache have kept the same
 # value.
 ac_cache_corrupted=false
@@ -3391,12 +3991,12 @@
   eval ac_new_val=\$ac_env_${ac_var}_value
   case $ac_old_set,$ac_new_set in
     set,)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+printf "%s\n" "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
+printf "%s\n" "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
     *)
@@ -3405,24 +4005,24 @@
 	ac_old_val_w=`echo x $ac_old_val`
 	ac_new_val_w=`echo x $ac_new_val`
 	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
-$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
+printf "%s\n" "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
 	  ac_cache_corrupted=:
 	else
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
-$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+printf "%s\n" "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
 	  eval $ac_var=\$ac_old_val
 	fi
-	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
-$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
-	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
-$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
+printf "%s\n" "$as_me:   former value:  \`$ac_old_val'" >&2;}
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
+printf "%s\n" "$as_me:   current value: \`$ac_new_val'" >&2;}
       fi;;
   esac
   # Pass precious variables to config.status.
   if test "$ac_new_set" = set; then
     case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_arg=$ac_var=`printf "%s\n" "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
     *) ac_arg=$ac_var=$ac_new_val ;;
     esac
     case " $ac_configure_args " in
@@ -3432,11 +4032,12 @@
   fi
 done
 if $ac_cache_corrupted; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
-$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;}
+  as_fn_error $? "run \`${MAKE-make} distclean' and/or \`rm $cache_file'
+	    and start over" "$LINENO" 5
 fi
 ## -------------------- ##
 ## Main body of script. ##
@@ -3450,44 +4051,17 @@
 
 
 
-ac_aux_dir=
-for ac_dir in build "$srcdir"/build; do
-  if test -f "$ac_dir/install-sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f "$ac_dir/install.sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f "$ac_dir/shtool"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in build \"$srcdir\"/build" "$LINENO" 5
-fi
-
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
-
 
 
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
-$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if ${ac_cv_path_GREP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+printf %s "checking for grep that handles long lines and -e... " >&6; }
+if test ${ac_cv_path_GREP+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -z "$GREP"; then
   ac_path_GREP_found=false
   # Loop through the user's path and test for each of PROGNAME-LIST
@@ -3495,10 +4069,15 @@
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in grep ggrep; do
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_prog in grep ggrep
+   do
     for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+      ac_path_GREP="$as_dir$ac_prog$ac_exec_ext"
       as_fn_executable_p "$ac_path_GREP" || continue
 # Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
@@ -3507,13 +4086,13 @@
   ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
 *)
   ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
+  printf %s 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    $as_echo 'GREP' >> "conftest.nl"
+    printf "%s\n" 'GREP' >> "conftest.nl"
     "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -3541,16 +4120,17 @@
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
-$as_echo "$ac_cv_path_GREP" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
+printf "%s\n" "$ac_cv_path_GREP" >&6; }
  GREP="$ac_cv_path_GREP"
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
-$as_echo_n "checking for egrep... " >&6; }
-if ${ac_cv_path_EGREP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+printf %s "checking for egrep... " >&6; }
+if test ${ac_cv_path_EGREP+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
    then ac_cv_path_EGREP="$GREP -E"
    else
@@ -3561,10 +4141,15 @@
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in egrep; do
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_prog in egrep
+   do
     for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+      ac_path_EGREP="$as_dir$ac_prog$ac_exec_ext"
       as_fn_executable_p "$ac_path_EGREP" || continue
 # Check for GNU ac_path_EGREP and select it if it is found.
   # Check for GNU $ac_path_EGREP
@@ -3573,13 +4158,13 @@
   ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
 *)
   ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
+  printf %s 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    $as_echo 'EGREP' >> "conftest.nl"
+    printf "%s\n" 'EGREP' >> "conftest.nl"
     "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -3608,16 +4193,17 @@
 
    fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
-$as_echo "$ac_cv_path_EGREP" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+printf "%s\n" "$ac_cv_path_EGREP" >&6; }
  EGREP="$ac_cv_path_EGREP"
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
-$as_echo_n "checking for a sed that does not truncate output... " >&6; }
-if ${ac_cv_path_SED+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+printf %s "checking for a sed that does not truncate output... " >&6; }
+if test ${ac_cv_path_SED+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
             ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
      for ac_i in 1 2 3 4 5 6 7; do
        ac_script="$ac_script$as_nl$ac_script"
@@ -3631,10 +4217,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in sed gsed; do
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_prog in sed gsed
+   do
     for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
+      ac_path_SED="$as_dir$ac_prog$ac_exec_ext"
       as_fn_executable_p "$ac_path_SED" || continue
 # Check for GNU ac_path_SED and select it if it is found.
   # Check for GNU $ac_path_SED
@@ -3643,13 +4234,13 @@
   ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
 *)
   ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
+  printf %s 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    $as_echo '' >> "conftest.nl"
+    printf "%s\n" '' >> "conftest.nl"
     "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -3677,8 +4268,8 @@
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
-$as_echo "$ac_cv_path_SED" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
+printf "%s\n" "$ac_cv_path_SED" >&6; }
  SED="$ac_cv_path_SED"
   rm -f conftest.sed
 
@@ -3736,7 +4327,7 @@
    else
     break
    fi
-   $as_echo "$CURRENT_ARG \\" >>config.nice
+   printf "%s\n" "$CURRENT_ARG \\" >>config.nice
    CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS $CURRENT_ARG"
   done
   echo '"$@"' >> config.nice
@@ -3756,26 +4347,30 @@
 
 
 
-# Make sure we can run config.sub.
-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
-$as_echo_n "checking build system type... " >&6; }
-if ${ac_cv_build+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+
+
+
+  # Make sure we can run config.sub.
+$SHELL "${ac_aux_dir}config.sub" sun4 >/dev/null 2>&1 ||
+  as_fn_error $? "cannot run $SHELL ${ac_aux_dir}config.sub" "$LINENO" 5
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+printf %s "checking build system type... " >&6; }
+if test ${ac_cv_build+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_build_alias=$build_alias
 test "x$ac_build_alias" = x &&
-  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+  ac_build_alias=`$SHELL "${ac_aux_dir}config.guess"`
 test "x$ac_build_alias" = x &&
   as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+ac_cv_build=`$SHELL "${ac_aux_dir}config.sub" $ac_build_alias` ||
+  as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $ac_build_alias failed" "$LINENO" 5
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
-$as_echo "$ac_cv_build" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+printf "%s\n" "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
 *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
@@ -3794,21 +4389,22 @@
 case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
-$as_echo_n "checking host system type... " >&6; }
-if ${ac_cv_host+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+printf %s "checking host system type... " >&6; }
+if test ${ac_cv_host+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test "x$host_alias" = x; then
   ac_cv_host=$ac_cv_build
 else
-  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+  ac_cv_host=`$SHELL "${ac_aux_dir}config.sub" $host_alias` ||
+    as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $host_alias failed" "$LINENO" 5
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
-$as_echo "$ac_cv_host" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+printf "%s\n" "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
 *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
@@ -3827,21 +4423,22 @@
 case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
-$as_echo_n "checking target system type... " >&6; }
-if ${ac_cv_target+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
+printf %s "checking target system type... " >&6; }
+if test ${ac_cv_target+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test "x$target_alias" = x; then
   ac_cv_target=$ac_cv_host
 else
-  ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
-    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
+  ac_cv_target=`$SHELL "${ac_aux_dir}config.sub" $target_alias` ||
+    as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $target_alias failed" "$LINENO" 5
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5
-$as_echo "$ac_cv_target" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5
+printf "%s\n" "$ac_cv_target" >&6; }
 case $ac_cv_target in
 *-*-*) ;;
 *) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;;
@@ -3882,12 +4479,13 @@
 
 
 ac_IFS=$IFS; IFS="."
-set $(echo 8.3.7 | "${SED}" 's/$0-9\.*$$.*$/\1\.\2/')
+set $(echo 8.3.21 | "${SED}" 's/$0-9\.*$$.*$/\1\.\2/')
 IFS=$ac_IFS
 PHP_MAJOR_VERSION=$1
 PHP_MINOR_VERSION=$2
 PHP_RELEASE_VERSION=$3
-if test -z "$PHP_EXTRA_VERSION"; then :
+if test -z "$PHP_EXTRA_VERSION"
+then :
   PHP_EXTRA_VERSION=$4
 fi
 PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION"
@@ -3958,11 +4556,12 @@
 	if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PKG_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_PKG_CONFIG+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $PKG_CONFIG in
   \\/* | ?:\\/*)
   ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
@@ -3972,11 +4571,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3988,11 +4591,11 @@
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+printf "%s\n" "$PKG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -4001,11 +4604,12 @@
   ac_pt_PKG_CONFIG=$PKG_CONFIG
   # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_ac_pt_PKG_CONFIG+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $ac_pt_PKG_CONFIG in
   \\/* | ?:\\/*)
   ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
@@ -4015,11 +4619,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4031,11 +4639,11 @@
 fi
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 if test -n "$ac_pt_PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
-$as_echo "$ac_pt_PKG_CONFIG" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+printf "%s\n" "$ac_pt_PKG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
   if test "x$ac_pt_PKG_CONFIG" = x; then
@@ -4043,8 +4651,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     PKG_CONFIG=$ac_pt_PKG_CONFIG
@@ -4056,17 +4664,26 @@
 fi
 if test -n "$PKG_CONFIG"; then
 	_pkg_min_version=0.9.0
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
-$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+printf %s "checking pkg-config is at least version $_pkg_min_version... " >&6; }
 	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 	else
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 		PKG_CONFIG=""
 	fi
 fi
+
+
+
+
+
+
+
+
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -4077,11 +4694,12 @@
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
@@ -4089,11 +4707,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4104,11 +4726,11 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf "%s\n" "$CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -4121,11 +4743,12 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 else
@@ -4133,11 +4756,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4148,11 +4775,11 @@
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+printf "%s\n" "$ac_ct_CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -4164,8 +4791,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -4173,23 +4800,23 @@
 fi
 
 
-test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "no acceptable C compiler found in \$PATH
 See \`config.log' for more details" "$LINENO" 5; }
 
 # Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
 set X $ac_compile
 ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
+for ac_option in --version -v -V -qversion -version; do
   { { ac_try="$ac_compiler $ac_option >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_compiler $ac_option >&5") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -4199,7 +4826,7 @@
     cat conftest.er1 >&5
   fi
   rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 done
 
@@ -4207,7 +4834,7 @@
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
@@ -4219,9 +4846,9 @@
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-$as_echo_n "checking whether the C compiler works... " >&6; }
-ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest^ *//'`
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+printf %s "checking whether the C compiler works... " >&6; }
+ac_link_default=`printf "%s\n" "$ac_link" | sed 's/ -o *conftest^ *//'`
 
 # The possible output files:
 ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
@@ -4242,11 +4869,12 @@
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_link_default") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+then :
   # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
 # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
 # in a Makefile.  We should not override ac_cv_exeext if it was cached,
@@ -4263,7 +4891,7 @@
 	# certainly right.
 	break;;
     *.* )
-	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+	if test ${ac_cv_exeext+y} && test "$ac_cv_exeext" != no;
 	then :; else
 	   ac_cv_exeext=`expr "$ac_file" : '^.*$\..*$'`
 	fi
@@ -4279,44 +4907,46 @@
 done
 test "$ac_cv_exeext" = no && ac_cv_exeext=
 
-else
+else $as_nop
   ac_file=''
 fi
-if test -z "$ac_file"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-$as_echo "$as_me: failed program was:" >&5
+if test -z "$ac_file"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "C compiler cannot create executables
 See \`config.log' for more details" "$LINENO" 5; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-$as_echo_n "checking for C compiler default output file name... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+printf %s "checking for C compiler default output file name... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+printf "%s\n" "$ac_file" >&6; }
 ac_exeext=$ac_cv_exeext
 
 rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
-$as_echo_n "checking for suffix of executables... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+printf %s "checking for suffix of executables... " >&6; }
 if { { ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+then :
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
 # work properly (i.e., refer to `conftest.exe'), while it won't with
@@ -4330,15 +4960,15 @@
     * ) break;;
   esac
 done
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+else $as_nop
+  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest conftest$ac_cv_exeext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-$as_echo "$ac_cv_exeext" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+printf "%s\n" "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
@@ -4347,7 +4977,7 @@
 /* end confdefs.h.  */
 #include <stdio.h>
 int
-main ()
+main (void)
 {
 FILE *f = fopen ("conftest.out", "w");
  return ferror (f) || fclose (f) != 0;
@@ -4359,8 +4989,8 @@
 ac_clean_files="$ac_clean_files conftest.out"
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+printf %s "checking whether we are cross compiling... " >&6; }
 if test "$cross_compiling" != yes; then
   { { ac_try="$ac_link"
 case "(($ac_try" in
@@ -4368,10 +4998,10 @@
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
   if { ac_try='./conftest$ac_cv_exeext'
   { { case "(($ac_try" in
@@ -4379,39 +5009,40 @@
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run C compiled programs.
+	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
 See \`config.log' for more details" "$LINENO" 5; }
     fi
   fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+printf "%s\n" "$cross_compiling" >&6; }
 
 rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
 ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
-$as_echo_n "checking for suffix of object files... " >&6; }
-if ${ac_cv_objext+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+printf %s "checking for suffix of object files... " >&6; }
+if test ${ac_cv_objext+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
@@ -4425,11 +5056,12 @@
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+then :
   for ac_file in conftest.o conftest.obj conftest.*; do
   test -f "$ac_file" || continue;
   case $ac_file in
@@ -4438,31 +5070,32 @@
        break;;
   esac
 done
-else
-  $as_echo "$as_me: failed program was:" >&5
+else $as_nop
+  printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of object files: cannot compile
 See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
-$as_echo "$ac_cv_objext" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+printf "%s\n" "$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if ${ac_cv_c_compiler_gnu+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5
+printf %s "checking whether the compiler supports GNU C... " >&6; }
+if test ${ac_cv_c_compiler_gnu+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 #ifndef __GNUC__
        choke me
@@ -4472,29 +5105,33 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_compiler_gnu=yes
-else
+else $as_nop
   ac_compiler_gnu=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; }
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
 if test $ac_compiler_gnu = yes; then
   GCC=yes
 else
   GCC=
 fi
-ac_test_CFLAGS=${CFLAGS+set}
+ac_test_CFLAGS=${CFLAGS+y}
 ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
-$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if ${ac_cv_prog_cc_g+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+printf %s "checking whether $CC accepts -g... " >&6; }
+if test ${ac_cv_prog_cc_g+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_save_c_werror_flag=$ac_c_werror_flag
    ac_c_werror_flag=yes
    ac_cv_prog_cc_g=no
@@ -4503,57 +5140,60 @@
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_prog_cc_g=yes
-else
+else $as_nop
   CFLAGS=""
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
-else
+else $as_nop
   ac_c_werror_flag=$ac_save_c_werror_flag
 	 CFLAGS="-g"
 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_prog_cc_g=yes
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
    ac_c_werror_flag=$ac_save_c_werror_flag
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-$as_echo "$ac_cv_prog_cc_g" >&6; }
-if test "$ac_test_CFLAGS" = set; then
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+printf "%s\n" "$ac_cv_prog_cc_g" >&6; }
+if test $ac_test_CFLAGS; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
   if test "$GCC" = yes; then
@@ -4568,94 +5208,144 @@
     CFLAGS=
   fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if ${ac_cv_prog_cc_c89+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_prog_cc_c89=no
+ac_prog_cc_stdc=no
+if test x$ac_prog_cc_stdc = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5
+printf %s "checking for $CC option to enable C11 features... " >&6; }
+if test ${ac_cv_prog_cc_c11+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_cv_prog_cc_c11=no
 ac_save_CC=$CC
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-struct stat;
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return pi;
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std.  */
-int osf4_cc_array '\x00' == 0 ? 1 : -1;
+$ac_c_conftest_c11_program
+_ACEOF
+for ac_arg in '' -std=gnu11
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_cv_prog_cc_c11=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam
+  test "x$ac_cv_prog_cc_c11" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+fi
 
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-   inside strings and character constants.  */
-#define FOO(x) 'x'
-int xlc6_cc_arrayFOO(a) == 'x' ? 1 : -1;
+if test "x$ac_cv_prog_cc_c11" = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf "%s\n" "unsupported" >&6; }
+else $as_nop
+  if test "x$ac_cv_prog_cc_c11" = x
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf "%s\n" "none needed" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5
+printf "%s\n" "$ac_cv_prog_cc_c11" >&6; }
+     CC="$CC $ac_cv_prog_cc_c11"
+fi
+  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11
+  ac_prog_cc_stdc=c11
+fi
+fi
+if test x$ac_prog_cc_stdc = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5
+printf %s "checking for $CC option to enable C99 features... " >&6; }
+if test ${ac_cv_prog_cc_c99+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_cv_prog_cc_c99=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_c_conftest_c99_program
+_ACEOF
+for ac_arg in '' -std=gnu99 -std=c99 -c99 -qlanglvl=extc1x -qlanglvl=extc99 -AC99 -D_STDC_C99=
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_cv_prog_cc_c99=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam
+  test "x$ac_cv_prog_cc_c99" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+fi
 
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv0  ||  f (e, argv, 1) != argv1;
-  ;
-  return 0;
-}
+if test "x$ac_cv_prog_cc_c99" = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf "%s\n" "unsupported" >&6; }
+else $as_nop
+  if test "x$ac_cv_prog_cc_c99" = x
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf "%s\n" "none needed" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
+printf "%s\n" "$ac_cv_prog_cc_c99" >&6; }
+     CC="$CC $ac_cv_prog_cc_c99"
+fi
+  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99
+  ac_prog_cc_stdc=c99
+fi
+fi
+if test x$ac_prog_cc_stdc = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5
+printf %s "checking for $CC option to enable C89 features... " >&6; }
+if test ${ac_cv_prog_cc_c89+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_cv_prog_cc_c89=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_c_conftest_c89_program
 _ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
 do
   CC="$ac_save_CC $ac_arg"
-  if ac_fn_c_try_compile "$LINENO"; then :
+  if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_prog_cc_c89=$ac_arg
 fi
-rm -f core conftest.err conftest.$ac_objext
+rm -f core conftest.err conftest.$ac_objext conftest.beam
   test "x$ac_cv_prog_cc_c89" != "xno" && break
 done
 rm -f conftest.$ac_ext
 CC=$ac_save_CC
-
 fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
-  x)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-$as_echo "none needed" >&6; } ;;
-  xno)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-$as_echo "unsupported" >&6; } ;;
-  *)
-    CC="$CC $ac_cv_prog_cc_c89"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-if test "x$ac_cv_prog_cc_c89" != xno; then :
 
+if test "x$ac_cv_prog_cc_c89" = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf "%s\n" "unsupported" >&6; }
+else $as_nop
+  if test "x$ac_cv_prog_cc_c89" = x
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf "%s\n" "none needed" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+printf "%s\n" "$ac_cv_prog_cc_c89" >&6; }
+     CC="$CC $ac_cv_prog_cc_c89"
+fi
+  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89
+  ac_prog_cc_stdc=c89
+fi
 fi
 
 ac_ext=c
@@ -4670,40 +5360,36 @@
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
-$as_echo_n "checking how to run the C preprocessor... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+printf %s "checking how to run the C preprocessor... " >&6; }
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
 fi
 if test -z "$CPP"; then
-  if ${ac_cv_prog_CPP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-      # Double quotes because CPP needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+  if test ${ac_cv_prog_CPP+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+      # Double quotes because $CC needs to be expanded
+    for CPP in "$CC -E" "$CC -E -traditional-cpp" cpp /lib/cpp
     do
       ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
   # Use a header file that comes with gcc, so configuring glibc
   # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
+#include <limits.h>
 		     Syntax error
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
+if ac_fn_c_try_cpp "$LINENO"
+then :
 
-else
+else $as_nop
   # Broken: fails on valid input.
 continue
 fi
@@ -4715,10 +5401,11 @@
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
+if ac_fn_c_try_cpp "$LINENO"
+then :
   # Broken: success on invalid input.
 continue
-else
+else $as_nop
   # Passes both tests.
 ac_preproc_ok=:
 break
@@ -4728,7 +5415,8 @@
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
+if $ac_preproc_ok
+then :
   break
 fi
 
@@ -4740,29 +5428,24 @@
 else
   ac_cv_prog_CPP=$CPP
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
-$as_echo "$CPP" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+printf "%s\n" "$CPP" >&6; }
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
   # Use a header file that comes with gcc, so configuring glibc
   # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
+#include <limits.h>
 		     Syntax error
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
+if ac_fn_c_try_cpp "$LINENO"
+then :
 
-else
+else $as_nop
   # Broken: fails on valid input.
 continue
 fi
@@ -4774,10 +5457,11 @@
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
+if ac_fn_c_try_cpp "$LINENO"
+then :
   # Broken: success on invalid input.
 continue
-else
+else $as_nop
   # Passes both tests.
 ac_preproc_ok=:
 break
@@ -4787,11 +5471,12 @@
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
+if $ac_preproc_ok
+then :
 
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+else $as_nop
+  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
 See \`config.log' for more details" "$LINENO" 5; }
 fi
@@ -4805,228 +5490,54 @@
 
 
   ICC="no"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for icc" >&5
-$as_echo_n "checking for icc... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for icc" >&5
+printf %s "checking for icc... " >&6; }
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 __INTEL_COMPILER
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "^__INTEL_COMPILER" >/dev/null 2>&1; then :
+  $EGREP "^__INTEL_COMPILER" >/dev/null 2>&1
+then :
   ICC="no"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+else $as_nop
   ICC="yes"
     GCC="no"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
 fi
-rm -f conftest*
+rm -rf conftest*
 
 
 
   SUNCC="no"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suncc" >&5
-$as_echo_n "checking for suncc... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suncc" >&5
+printf %s "checking for suncc... " >&6; }
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 __SUNPRO_C
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "^__SUNPRO_C" >/dev/null 2>&1; then :
+  $EGREP "^__SUNPRO_C" >/dev/null 2>&1
+then :
   SUNCC="no"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+else $as_nop
   SUNCC="yes"
     GCC="no"
     test -n "$auto_cflags" && CFLAGS="-O -xs -xstrconst -zlazyload"
     GCC=""
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-fi
-rm -f conftest*
-
-
-
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C99" >&5
-$as_echo_n "checking for $CC option to accept ISO C99... " >&6; }
-if ${ac_cv_prog_cc_c99+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_prog_cc_c99=no
-ac_save_CC=$CC
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdlib.h>
-#include <wchar.h>
-#include <stdio.h>
-
-// Check varargs macros.  These examples are taken from C99 6.10.3.5.
-#define debug(...) fprintf (stderr, __VA_ARGS__)
-#define showlist(...) puts (#__VA_ARGS__)
-#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__))
-static void
-test_varargs_macros (void)
-{
-  int x = 1234;
-  int y = 5678;
-  debug ("Flag");
-  debug ("X = %d\n", x);
-  showlist (The first, second, and third items.);
-  report (x>y, "x is %d but y is %d", x, y);
-}
-
-// Check long long types.
-#define BIG64 18446744073709551615ull
-#define BIG32 4294967295ul
-#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0)
-#if !BIG_OK
-  your preprocessor is broken;
-#endif
-#if BIG_OK
-#else
-  your preprocessor is broken;
-#endif
-static long long int bignum = -9223372036854775807LL;
-static unsigned long long int ubignum = BIG64;
-
-struct incomplete_array
-{
-  int datasize;
-  double data;
-};
-
-struct named_init {
-  int number;
-  const wchar_t *name;
-  double average;
-};
-
-typedef const char *ccp;
-
-static inline int
-test_restrict (ccp restrict text)
-{
-  // See if C++-style comments work.
-  // Iterate through items via the restricted pointer.
-  // Also check for declarations in for loops.
-  for (unsigned int i = 0; *(text+i) != '\0'; ++i)
-    continue;
-  return 0;
-}
-
-// Check varargs and va_copy.
-static void
-test_varargs (const char *format, ...)
-{
-  va_list args;
-  va_start (args, format);
-  va_list args_copy;
-  va_copy (args_copy, args);
-
-  const char *str;
-  int number;
-  float fnumber;
-
-  while (*format)
-    {
-      switch (*format++)
-	{
-	case 's': // string
-	  str = va_arg (args_copy, const char *);
-	  break;
-	case 'd': // int
-	  number = va_arg (args_copy, int);
-	  break;
-	case 'f': // float
-	  fnumber = va_arg (args_copy, double);
-	  break;
-	default:
-	  break;
-	}
-    }
-  va_end (args_copy);
-  va_end (args);
-}
-
-int
-main ()
-{
-
-  // Check bool.
-  _Bool success = false;
-
-  // Check restrict.
-  if (test_restrict ("String literal") == 0)
-    success = true;
-  char *restrict newvar = "Another string";
-
-  // Check varargs.
-  test_varargs ("s, d' f .", "string", 65, 34.234);
-  test_varargs_macros ();
-
-  // Check flexible array members.
-  struct incomplete_array *ia =
-    malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10));
-  ia->datasize = 10;
-  for (int i = 0; i < ia->datasize; ++i)
-    ia->datai = i * 1.234;
-
-  // Check named initializers.
-  struct named_init ni = {
-    .number = 34,
-    .name = L"Test wide string",
-    .average = 543.34343,
-  };
-
-  ni.number = 58;
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-  int dynamic_arrayni.number;
-  dynamic_arrayni.number - 1 = 543;
-
-  // work around unused variable warnings
-  return (!success || bignum == 0LL || ubignum == 0uLL || newvar0 == 'x'
-	  || dynamic_arrayni.number - 1 != 543);
-
-  ;
-  return 0;
-}
-_ACEOF
-for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -D_STDC_C99= -qlanglvl=extc99
-do
-  CC="$ac_save_CC $ac_arg"
-  if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_c99=$ac_arg
 fi
-rm -f core conftest.err conftest.$ac_objext
-  test "x$ac_cv_prog_cc_c99" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
+rm -rf conftest*
 
-fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c99" in
-  x)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-$as_echo "none needed" >&6; } ;;
-  xno)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-$as_echo "unsupported" >&6; } ;;
-  *)
-    CC="$CC $ac_cv_prog_cc_c99"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
-$as_echo "$ac_cv_prog_cc_c99" >&6; } ;;
-esac
-if test "x$ac_cv_prog_cc_c99" != xno; then :
 
-fi
 
 
 ac_ext=c
@@ -5034,40 +5545,36 @@
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
-$as_echo_n "checking how to run the C preprocessor... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+printf %s "checking how to run the C preprocessor... " >&6; }
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
 fi
 if test -z "$CPP"; then
-  if ${ac_cv_prog_CPP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-      # Double quotes because CPP needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+  if test ${ac_cv_prog_CPP+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+      # Double quotes because $CC needs to be expanded
+    for CPP in "$CC -E" "$CC -E -traditional-cpp" cpp /lib/cpp
     do
       ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
   # Use a header file that comes with gcc, so configuring glibc
   # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
+#include <limits.h>
 		     Syntax error
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
+if ac_fn_c_try_cpp "$LINENO"
+then :
 
-else
+else $as_nop
   # Broken: fails on valid input.
 continue
 fi
@@ -5079,10 +5586,11 @@
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
+if ac_fn_c_try_cpp "$LINENO"
+then :
   # Broken: success on invalid input.
 continue
-else
+else $as_nop
   # Passes both tests.
 ac_preproc_ok=:
 break
@@ -5092,7 +5600,8 @@
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
+if $ac_preproc_ok
+then :
   break
 fi
 
@@ -5104,29 +5613,24 @@
 else
   ac_cv_prog_CPP=$CPP
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
-$as_echo "$CPP" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+printf "%s\n" "$CPP" >&6; }
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
   # Use a header file that comes with gcc, so configuring glibc
   # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
+#include <limits.h>
 		     Syntax error
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
+if ac_fn_c_try_cpp "$LINENO"
+then :
 
-else
+else $as_nop
   # Broken: fails on valid input.
 continue
 fi
@@ -5138,10 +5642,11 @@
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
+if ac_fn_c_try_cpp "$LINENO"
+then :
   # Broken: success on invalid input.
 continue
-else
+else $as_nop
   # Passes both tests.
 ac_preproc_ok=:
 break
@@ -5151,11 +5656,12 @@
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
+if $ac_preproc_ok
+then :
 
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+else $as_nop
+  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
 See \`config.log' for more details" "$LINENO" 5; }
 fi
@@ -5166,220 +5672,201 @@
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if ${ac_cv_header_stdc+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+ac_header= ac_cache=
+for ac_item in $ac_header_c_list
+do
+  if test $ac_cache; then
+    ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default"
+    if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then
+      printf "%s\n" "#define $ac_item 1" >> confdefs.h
+    fi
+    ac_header= ac_cache=
+  elif test $ac_header; then
+    ac_cache=$ac_item
+  else
+    ac_header=$ac_item
+  fi
+done
+
+
+
+
+
+
+
+
+if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes
+then :
+
+printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h
+
+fi
+
+
+
+
+
+
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
+printf %s "checking whether it is safe to define __EXTENSIONS__... " >&6; }
+if test ${ac_cv_safe_to_define___extensions__+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
 
+#         define __EXTENSIONS__ 1
+          $ac_includes_default
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_header_stdc=yes
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then :
-
-else
-  ac_cv_header_stdc=no
+if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_cv_safe_to_define___extensions__=yes
+else $as_nop
+  ac_cv_safe_to_define___extensions__=no
 fi
-rm -f conftest*
-
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
+printf "%s\n" "$ac_cv_safe_to_define___extensions__" >&6; }
 
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5
+printf %s "checking whether _XOPEN_SOURCE should be defined... " >&6; }
+if test ${ac_cv_should_define__xopen_source+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_cv_should_define__xopen_source=no
+    if test $ac_cv_header_wchar_h = yes
+then :
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdlib.h>
 
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
+          #include <wchar.h>
+          mbstate_t x;
+int
+main (void)
+{
 
-fi
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
 
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then :
-  :
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
 
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+            #define _XOPEN_SOURCE 500
+            #include <wchar.h>
+            mbstate_t x;
 int
-main ()
+main (void)
 {
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
-      return 2;
+
+  ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-
-else
-  ac_cv_header_stdc=no
+if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_cv_should_define__xopen_source=yes
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5
+printf "%s\n" "$ac_cv_should_define__xopen_source" >&6; }
 
-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
+  printf "%s\n" "#define _ALL_SOURCE 1" >>confdefs.h
 
-fi
+  printf "%s\n" "#define _DARWIN_C_SOURCE 1" >>confdefs.h
 
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-		  inttypes.h stdint.h unistd.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
+  printf "%s\n" "#define _GNU_SOURCE 1" >>confdefs.h
 
-fi
+  printf "%s\n" "#define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h
 
-done
+  printf "%s\n" "#define _NETBSD_SOURCE 1" >>confdefs.h
 
+  printf "%s\n" "#define _OPENBSD_SOURCE 1" >>confdefs.h
 
+  printf "%s\n" "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
 
-  ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default"
-if test "x$ac_cv_header_minix_config_h" = xyes; then :
-  MINIX=yes
-else
-  MINIX=
-fi
+  printf "%s\n" "#define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h
 
+  printf "%s\n" "#define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h
 
-  if test "$MINIX" = yes; then
+  printf "%s\n" "#define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h
 
-$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h
+  printf "%s\n" "#define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h
 
+  printf "%s\n" "#define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h
 
-$as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h
+  printf "%s\n" "#define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h
 
+  printf "%s\n" "#define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h
 
-$as_echo "#define _MINIX 1" >>confdefs.h
-
-  fi
+  printf "%s\n" "#define _TANDEM_SOURCE 1" >>confdefs.h
 
+  if test $ac_cv_header_minix_config_h = yes
+then :
+  MINIX=yes
+    printf "%s\n" "#define _MINIX 1" >>confdefs.h
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
-$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
-if ${ac_cv_safe_to_define___extensions__+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
+    printf "%s\n" "#define _POSIX_SOURCE 1" >>confdefs.h
 
-#         define __EXTENSIONS__ 1
-          $ac_includes_default
-int
-main ()
-{
+    printf "%s\n" "#define _POSIX_1_SOURCE 2" >>confdefs.h
 
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_safe_to_define___extensions__=yes
-else
-  ac_cv_safe_to_define___extensions__=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else $as_nop
+  MINIX=
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
-$as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
-  test $ac_cv_safe_to_define___extensions__ = yes &&
-    $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h
-
-  $as_echo "#define _ALL_SOURCE 1" >>confdefs.h
-
-  $as_echo "#define _GNU_SOURCE 1" >>confdefs.h
+  if test $ac_cv_safe_to_define___extensions__ = yes
+then :
+  printf "%s\n" "#define __EXTENSIONS__ 1" >>confdefs.h
 
-  $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
-
-  $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h
+fi
+  if test $ac_cv_should_define__xopen_source = yes
+then :
+  printf "%s\n" "#define _XOPEN_SOURCE 500" >>confdefs.h
 
+fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
-$as_echo_n "checking whether ln -s works... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
+printf %s "checking whether ln -s works... " >&6; }
 LN_S=$as_ln_s
 if test "$LN_S" = "ln -s"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
-$as_echo "no, using $LN_S" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
+printf "%s\n" "no, using $LN_S" >&6; }
 fi
 
 
 if test "$cross_compiling" = yes ; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for native build C compiler" >&5
-$as_echo_n "checking for native build C compiler... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for native build C compiler" >&5
+printf %s "checking for native build C compiler... " >&6; }
   for ac_prog in gcc clang c99 c89 cc cl
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_BUILD_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_BUILD_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$BUILD_CC"; then
   ac_cv_prog_BUILD_CC="$BUILD_CC" # Let the user override the test.
 else
@@ -5387,11 +5874,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_BUILD_CC="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5402,11 +5893,11 @@
 fi
 BUILD_CC=$ac_cv_prog_BUILD_CC
 if test -n "$BUILD_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BUILD_CC" >&5
-$as_echo "$BUILD_CC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $BUILD_CC" >&5
+printf "%s\n" "$BUILD_CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -5414,8 +5905,8 @@
 done
 test -n "$BUILD_CC" || BUILD_CC="none"
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BUILD_CC" >&5
-$as_echo "$BUILD_CC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $BUILD_CC" >&5
+printf "%s\n" "$BUILD_CC" >&6; }
 else
   BUILD_CC=$CC
 fi
@@ -5423,13 +5914,14 @@
 
 php_with_libdir=lib
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for system library directory" >&5
-$as_echo_n "checking for system library directory... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for system library directory" >&5
+printf %s "checking for system library directory... " >&6; }
 
 # Check whether --with-libdir was given.
-if test "${with_libdir+set}" = set; then :
+if test ${with_libdir+y}
+then :
   withval=$with_libdir; PHP_LIBDIR=$withval
-else
+else $as_nop
 
   PHP_LIBDIR=lib
 
@@ -5438,8 +5930,8 @@
 
 
 ext_output=$PHP_LIBDIR
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -5447,12 +5939,13 @@
 
 php_enable_rpath=yes
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable runpaths" >&5
-$as_echo_n "checking whether to enable runpaths... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable runpaths" >&5
+printf %s "checking whether to enable runpaths... " >&6; }
 # Check whether --enable-rpath was given.
-if test "${enable_rpath+set}" = set; then :
+if test ${enable_rpath+y}
+then :
   enableval=$enable_rpath; PHP_RPATH=$enableval
-else
+else $as_nop
 
   PHP_RPATH=yes
 
@@ -5461,18 +5954,19 @@
 
 
 ext_output=$PHP_RPATH
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler supports -Wl,-rpath," >&5
-$as_echo_n "checking if compiler supports -Wl,-rpath,... " >&6; }
-if ${php_cv_cc_rpath+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if compiler supports -Wl,-rpath," >&5
+printf %s "checking if compiler supports -Wl,-rpath,... " >&6; }
+if test ${php_cv_cc_rpath+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
   SAVE_LIBS=$LIBS
   LIBS="-Wl,-rpath,/usr/$PHP_LIBDIR $LIBS"
@@ -5480,33 +5974,35 @@
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   php_cv_cc_rpath=yes
-else
+else $as_nop
   php_cv_cc_rpath=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
   LIBS=$SAVE_LIBS
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_cv_cc_rpath" >&5
-$as_echo "$php_cv_cc_rpath" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_cc_rpath" >&5
+printf "%s\n" "$php_cv_cc_rpath" >&6; }
 if test $php_cv_cc_rpath = "yes"; then
   ld_runpath_switch=-Wl,-rpath,
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler supports -R" >&5
-$as_echo_n "checking if compiler supports -R... " >&6; }
-  if ${php_cv_cc_dashr+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if compiler supports -R" >&5
+printf %s "checking if compiler supports -R... " >&6; }
+  if test ${php_cv_cc_dashr+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
     SAVE_LIBS=$LIBS
     LIBS="-R /usr/$PHP_LIBDIR $LIBS"
@@ -5514,25 +6010,26 @@
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   php_cv_cc_dashr=yes
-else
+else $as_nop
   php_cv_cc_dashr=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
     LIBS=$SAVE_LIBS
 fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_cv_cc_dashr" >&5
-$as_echo "$php_cv_cc_dashr" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_cc_dashr" >&5
+printf "%s\n" "$php_cv_cc_dashr" >&6; }
   if test $php_cv_cc_dashr = "yes"; then
     ld_runpath_switch=-R
   else
@@ -5549,11 +6046,12 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AWK+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_AWK+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$AWK"; then
   ac_cv_prog_AWK="$AWK" # Let the user override the test.
 else
@@ -5562,11 +6060,15 @@
 for as_dir in $as_dummy
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_AWK="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5577,11 +6079,11 @@
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
-$as_echo "$AWK" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
+printf "%s\n" "$AWK" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -5591,8 +6093,8 @@
 
   case "$AWK" in
     *mawk)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: mawk is known to have problems on some systems. You should install GNU awk" >&5
-$as_echo "$as_me: WARNING: mawk is known to have problems on some systems. You should install GNU awk" >&2;}
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: mawk is known to have problems on some systems. You should install GNU awk" >&5
+printf "%s\n" "$as_me: WARNING: mawk is known to have problems on some systems. You should install GNU awk" >&2;}
       ;;
     *gawk)
       ;;
@@ -5600,15 +6102,15 @@
       as_fn_error $? "Could not find awk; Install GNU awk" "$LINENO" 5
       ;;
     *)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $AWK is broken" >&5
-$as_echo_n "checking if $AWK is broken... " >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $AWK is broken" >&5
+printf %s "checking if $AWK is broken... " >&6; }
       if ! $AWK 'function foo() {}' >/dev/null 2>&1 ; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
         as_fn_error $? "You should install GNU awk" "$LINENO" 5
       else
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
       fi
       ;;
   esac
@@ -5619,11 +6121,12 @@
 
   # Extract the first word of "bison", so it can be a program name with args.
 set dummy bison; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_YACC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_YACC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$YACC"; then
   ac_cv_prog_YACC="$YACC" # Let the user override the test.
 else
@@ -5631,11 +6134,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_YACC="bison"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5646,11 +6153,11 @@
 fi
 YACC=$ac_cv_prog_YACC
 if test -n "$YACC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $YACC" >&5
-$as_echo "$YACC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $YACC" >&5
+printf "%s\n" "$YACC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -5659,8 +6166,8 @@
   php_bison_excluded_versions='none'
 
   if test -n "$YACC"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bison version" >&5
-$as_echo_n "checking for bison version... " >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for bison version" >&5
+printf %s "checking for bison version... " >&6; }
 
     php_bison_version=$($YACC --version 2> /dev/null | grep 'GNU Bison' | cut -d ' ' -f 4 | tr -d a-z)
     if test -z "$php_bison_version"; then
@@ -5702,11 +6209,11 @@
   PHP_VAR_SUBST="$PHP_VAR_SUBST YFLAGS"
 
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_bison_version (ok)" >&5
-$as_echo "$php_bison_version (ok)" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_bison_version (ok)" >&5
+printf "%s\n" "$php_bison_version (ok)" >&6; }
     else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_bison_version" >&5
-$as_echo "$php_bison_version" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_bison_version" >&5
+printf "%s\n" "$php_bison_version" >&6; }
     fi
   fi
 
@@ -5727,11 +6234,12 @@
 
   # Extract the first word of "re2c", so it can be a program name with args.
 set dummy re2c; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_RE2C+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_RE2C+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$RE2C"; then
   ac_cv_prog_RE2C="$RE2C" # Let the user override the test.
 else
@@ -5739,11 +6247,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_RE2C="re2c"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5754,11 +6266,11 @@
 fi
 RE2C=$ac_cv_prog_RE2C
 if test -n "$RE2C"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RE2C" >&5
-$as_echo "$RE2C" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RE2C" >&5
+printf "%s\n" "$RE2C" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -5766,8 +6278,8 @@
   php_re2c_required_version="1.0.3"
 
   if test -n "$RE2C"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for re2c version" >&5
-$as_echo_n "checking for re2c version... " >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for re2c version" >&5
+printf %s "checking for re2c version... " >&6; }
 
     php_re2c_version=$($RE2C --version | cut -d ' ' -f 2 2>/dev/null)
     if test -z "$php_re2c_version"; then
@@ -5794,11 +6306,11 @@
     fi
 
     if test "$php_re2c_check" != "invalid"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_re2c_version (ok)" >&5
-$as_echo "$php_re2c_version (ok)" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_re2c_version (ok)" >&5
+printf "%s\n" "$php_re2c_version (ok)" >&6; }
     else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_re2c_version (too old)" >&5
-$as_echo "$php_re2c_version (too old)" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_re2c_version (too old)" >&5
+printf "%s\n" "$php_re2c_version (too old)" >&6; }
     fi
   fi
 
@@ -5819,11 +6331,12 @@
 
   # Extract the first word of "php", so it can be a program name with args.
 set dummy php; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_PHP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_PHP+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$PHP"; then
   ac_cv_prog_PHP="$PHP" # Let the user override the test.
 else
@@ -5831,11 +6344,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_PHP="php"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5846,18 +6363,18 @@
 fi
 PHP=$ac_cv_prog_PHP
 if test -n "$PHP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PHP" >&5
-$as_echo "$PHP" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PHP" >&5
+printf "%s\n" "$PHP" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
 
   if test -n "$PHP"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for php version" >&5
-$as_echo_n "checking for php version... " >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for php version" >&5
+printf %s "checking for php version... " >&6; }
     php_version=$($PHP -v | head -n1 | cut -d ' ' -f 2 | cut -d '-' -f 1)
     if test -z "$php_version"; then
       php_version=0.0.0
@@ -5867,12 +6384,12 @@
     IFS=$ac_IFS
     php_version_num=`expr ${1:-0} \* 10000 + ${2:-0} \* 100 + ${3:-0}`
         if test "$php_version_num" -lt 70400; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_version (too old)" >&5
-$as_echo "$php_version (too old)" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_version (too old)" >&5
+printf "%s\n" "$php_version (too old)" >&6; }
       unset PHP
     else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_version (ok)" >&5
-$as_echo "$php_version (ok)" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_version (ok)" >&5
+printf "%s\n" "$php_version (ok)" >&6; }
     fi
   fi
 
@@ -5883,12 +6400,13 @@
 
 php_enable_re2c_cgoto=no
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable computed goto gcc extension with re2c" >&5
-$as_echo_n "checking whether to enable computed goto gcc extension with re2c... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable computed goto gcc extension with re2c" >&5
+printf %s "checking whether to enable computed goto gcc extension with re2c... " >&6; }
 # Check whether --enable-re2c-cgoto was given.
-if test "${enable_re2c_cgoto+set}" = set; then :
+if test ${enable_re2c_cgoto+y}
+then :
   enableval=$enable_re2c_cgoto; PHP_RE2C_CGOTO=$enableval
-else
+else $as_nop
 
   PHP_RE2C_CGOTO=no
 
@@ -5897,8 +6415,8 @@
 
 
 ext_output=$PHP_RE2C_CGOTO
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -5906,13 +6424,13 @@
 if test "$PHP_RE2C_CGOTO" = "no"; then
   RE2C_FLAGS=""
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether re2c -g works" >&5
-$as_echo_n "checking whether re2c -g works... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether re2c -g works" >&5
+printf %s "checking whether re2c -g works... " >&6; }
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
 int main(int argc, const char **argv)
@@ -5930,20 +6448,21 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
     RE2C_FLAGS=""
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
-else
+else $as_nop
 
     RE2C_FLAGS="-g"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
   PHP_VAR_SUBST="$PHP_VAR_SUBST RE2C_FLAGS"
@@ -5965,11 +6484,51 @@
     ;;
 esac
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fvisibility=hidden" >&5
-$as_echo_n "checking whether C compiler accepts -fvisibility=hidden... " >&6; }
-if ${ax_cv_check_cflags___fvisibility_hidden+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -ffp-contract=off" >&5
+printf %s "checking whether C compiler accepts -ffp-contract=off... " >&6; }
+if test ${ax_cv_check_cflags___ffp_contract_off+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+
+  ax_check_save_flags=$CFLAGS
+  CFLAGS="$CFLAGS  -ffp-contract=off"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main (void)
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  ax_cv_check_cflags___ffp_contract_off=yes
+else $as_nop
+  ax_cv_check_cflags___ffp_contract_off=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___ffp_contract_off" >&5
+printf "%s\n" "$ax_cv_check_cflags___ffp_contract_off" >&6; }
+if test "x$ax_cv_check_cflags___ffp_contract_off" = xyes
+then :
+  CFLAGS="$CFLAGS -ffp-contract=off"
+else $as_nop
+  :
+fi
+
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fvisibility=hidden" >&5
+printf %s "checking whether C compiler accepts -fvisibility=hidden... " >&6; }
+if test ${ax_cv_check_cflags___fvisibility_hidden+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
   ax_check_save_flags=$CFLAGS
   CFLAGS="$CFLAGS  -fvisibility=hidden"
@@ -5977,26 +6536,28 @@
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ax_cv_check_cflags___fvisibility_hidden=yes
-else
+else $as_nop
   ax_cv_check_cflags___fvisibility_hidden=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
   CFLAGS=$ax_check_save_flags
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fvisibility_hidden" >&5
-$as_echo "$ax_cv_check_cflags___fvisibility_hidden" >&6; }
-if test "x$ax_cv_check_cflags___fvisibility_hidden" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fvisibility_hidden" >&5
+printf "%s\n" "$ax_cv_check_cflags___fvisibility_hidden" >&6; }
+if test "x$ax_cv_check_cflags___fvisibility_hidden" = xyes
+then :
   CFLAGS="$CFLAGS -fvisibility=hidden"
-else
+else $as_nop
   :
 fi
 
@@ -6018,45 +6579,45 @@
     ;;
 esac
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to force non-PIC code in shared modules" >&5
-$as_echo_n "checking whether to force non-PIC code in shared modules... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to force non-PIC code in shared modules" >&5
+printf %s "checking whether to force non-PIC code in shared modules... " >&6; }
 case $host_alias in
   i?86-*-linux*|i?86-*-freebsd*)
     if test "${with_pic+set}" != "set" || test "$with_pic" = "no"; then
       with_pic=no
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
     else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
     fi
     ;;
   *)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
     ;;
 esac
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using musl libc" >&5
-$as_echo_n "checking whether we are using musl libc... " >&6; }
-if command -v ldd >/dev/null && ldd --version 2>&1 | grep -q ^musl
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are using musl libc" >&5
+printf %s "checking whether we are using musl libc... " >&6; }
+if command -v ldd >/dev/null && ldd --version 2>&1 | grep ^musl >/dev/null 2>&1
 then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-$as_echo "#define __MUSL__ 1" >>confdefs.h
+printf "%s\n" "#define __MUSL__ 1" >>confdefs.h
 
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 if test "$ac_cv_safe_to_define___extensions__" = yes ; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use -D_GNU_SOURCE cflag" >&5
-$as_echo_n "checking whether to use -D_GNU_SOURCE cflag... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use -D_GNU_SOURCE cflag" >&5
+printf %s "checking whether to use -D_GNU_SOURCE cflag... " >&6; }
   CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 fi
 
 
@@ -6068,15 +6629,16 @@
 
 
 # Check whether --enable-gcc-global-regs was given.
-if test "${enable_gcc_global_regs+set}" = set; then :
+if test ${enable_gcc_global_regs+y}
+then :
   enableval=$enable_gcc_global_regs; ZEND_GCC_GLOBAL_REGS=$enableval
-else
+else $as_nop
   ZEND_GCC_GLOBAL_REGS=yes
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for global register variables support" >&5
-$as_echo_n "checking for global register variables support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for global register variables support" >&5
+printf %s "checking for global register variables support... " >&6; }
 if test "$ZEND_GCC_GLOBAL_REGS" != "no"; then
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -6121,7 +6683,7 @@
 }
 
 int
-main ()
+main (void)
 {
 
 
@@ -6129,30 +6691,32 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
     ZEND_GCC_GLOBAL_REGS=yes
 
-else
+else $as_nop
 
     ZEND_GCC_GLOBAL_REGS=no
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 if test "$ZEND_GCC_GLOBAL_REGS" = "yes"; then
 
-$as_echo "#define HAVE_GCC_GLOBAL_REGS 1" >>confdefs.h
+printf "%s\n" "#define HAVE_GCC_GLOBAL_REGS 1" >>confdefs.h
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ZEND_GCC_GLOBAL_REGS" >&5
-$as_echo "$ZEND_GCC_GLOBAL_REGS" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ZEND_GCC_GLOBAL_REGS" >&5
+printf "%s\n" "$ZEND_GCC_GLOBAL_REGS" >&6; }
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether __cpuid_count is available" >&5
-$as_echo_n "checking whether __cpuid_count is available... " >&6; }
-if ${ac_cv_cpuid_count_available+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether __cpuid_count is available" >&5
+printf %s "checking whether __cpuid_count is available... " >&6; }
+if test ${ac_cv_cpuid_count_available+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -6160,7 +6724,7 @@
   #include <cpuid.h>
 
 int
-main ()
+main (void)
 {
 
   unsigned eax, ebx, ecx, edx;
@@ -6170,34 +6734,36 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
 
   ac_cv_cpuid_count_available=yes
 
-else
+else $as_nop
 
   ac_cv_cpuid_count_available=no
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cpuid_count_available" >&5
-$as_echo "$ac_cv_cpuid_count_available" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cpuid_count_available" >&5
+printf "%s\n" "$ac_cv_cpuid_count_available" >&6; }
 if test "$ac_cv_cpuid_count_available" = "yes"; then
 
-$as_echo "#define HAVE_CPUID_COUNT 1" >>confdefs.h
+printf "%s\n" "#define HAVE_CPUID_COUNT 1" >>confdefs.h
 
 fi
 
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthreads_cflags" >&5
-$as_echo_n "checking for pthreads_cflags... " >&6; }
-if ${ac_cv_pthreads_cflags+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthreads_cflags" >&5
+printf %s "checking for pthreads_cflags... " >&6; }
+if test ${ac_cv_pthreads_cflags+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
 ac_cv_pthreads_cflags=
 if test "$pthreads_working" != "yes"; then
@@ -6223,17 +6789,18 @@
     return pthread_create(&thd, NULL, thread_routine, &data);
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
 
   pthreads_checked=yes
 
-else
+else $as_nop
 
   pthreads_checked=no
 
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
     CFLAGS=$ac_save
     if test "$pthreads_checked" = "yes"; then
@@ -6244,14 +6811,15 @@
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pthreads_cflags" >&5
-$as_echo "$ac_cv_pthreads_cflags" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pthreads_cflags" >&5
+printf "%s\n" "$ac_cv_pthreads_cflags" >&6; }
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthreads_lib" >&5
-$as_echo_n "checking for pthreads_lib... " >&6; }
-if ${ac_cv_pthreads_lib+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthreads_lib" >&5
+printf %s "checking for pthreads_lib... " >&6; }
+if test ${ac_cv_pthreads_lib+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
 ac_cv_pthreads_lib=
 if test "$pthreads_working" != "yes"; then
@@ -6277,17 +6845,18 @@
     return pthread_create(&thd, NULL, thread_routine, &data);
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
 
   pthreads_checked=yes
 
-else
+else $as_nop
 
   pthreads_checked=no
 
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
     LIBS=$ac_save
     if test "$pthreads_checked" = "yes"; then
@@ -6298,8 +6867,8 @@
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pthreads_lib" >&5
-$as_echo "$ac_cv_pthreads_lib" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pthreads_lib" >&5
+printf "%s\n" "$ac_cv_pthreads_lib" >&6; }
 
 if test "x$ac_cv_pthreads_cflags" != "x" -o "x$ac_cv_pthreads_lib" != "x"; then
   pthreads_working="yes"
@@ -6307,7 +6876,8 @@
 
 
 # Check whether --enable- was given.
-if test "${enable_+set}" = set; then :
+if test ${enable_+y}
+then :
   enableval=$enable_;
 fi
 
@@ -6368,10 +6938,10 @@
 SAPI_LIBTOOL=libphp.la
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
-$as_echo "" >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${T_MD}Configuring SAPI modules${T_ME}" >&5
-$as_echo "${T_MD}Configuring SAPI modules${T_ME}" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5
+printf "%s\n" "" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${T_MD}Configuring SAPI modules${T_ME}" >&5
+printf "%s\n" "${T_MD}Configuring SAPI modules${T_ME}" >&6; }
 
 
 
@@ -6387,9 +6957,10 @@
 
 
 # Check whether --with-apxs2 was given.
-if test "${with_apxs2+set}" = set; then :
+if test ${with_apxs2+y}
+then :
   withval=$with_apxs2; PHP_APXS2=$withval
-else
+else $as_nop
 
   PHP_APXS2=no
 
@@ -6403,8 +6974,8 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Apache 2 handler module support via DSO through APXS" >&5
-$as_echo_n "checking for Apache 2 handler module support via DSO through APXS... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Apache 2 handler module support via DSO through APXS" >&5
+printf %s "checking for Apache 2 handler module support via DSO through APXS... " >&6; }
 
 if test "$PHP_APXS2" != "no"; then
   if test "$PHP_APXS2" = "yes"; then
@@ -6429,24 +7000,24 @@
 
   $APXS -q CFLAGS >/dev/null 2>&1
   if test "$?" != "0"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
-$as_echo "" >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
-$as_echo "" >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: Sorry, I cannot run apxs.  Possible reasons follow:" >&5
-$as_echo "Sorry, I cannot run apxs.  Possible reasons follow:" >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
-$as_echo "" >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: 1. Perl is not installed" >&5
-$as_echo "1. Perl is not installed" >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2. apxs was not found. Try to pass the path using --with-apxs2=/path/to/apxs" >&5
-$as_echo "2. apxs was not found. Try to pass the path using --with-apxs2=/path/to/apxs" >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: 3. Apache was not built using --enable-so (the apxs usage page is displayed)" >&5
-$as_echo "3. Apache was not built using --enable-so (the apxs usage page is displayed)" >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
-$as_echo "" >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: The output of $APXS follows:" >&5
-$as_echo "The output of $APXS follows:" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5
+printf "%s\n" "" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5
+printf "%s\n" "" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Sorry, I cannot run apxs.  Possible reasons follow:" >&5
+printf "%s\n" "Sorry, I cannot run apxs.  Possible reasons follow:" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5
+printf "%s\n" "" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: 1. Perl is not installed" >&5
+printf "%s\n" "1. Perl is not installed" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: 2. apxs was not found. Try to pass the path using --with-apxs2=/path/to/apxs" >&5
+printf "%s\n" "2. apxs was not found. Try to pass the path using --with-apxs2=/path/to/apxs" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: 3. Apache was not built using --enable-so (the apxs usage page is displayed)" >&5
+printf "%s\n" "3. Apache was not built using --enable-so (the apxs usage page is displayed)" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5
+printf "%s\n" "" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: The output of $APXS follows:" >&5
+printf "%s\n" "The output of $APXS follows:" >&6; }
     $APXS -q CFLAGS
     as_fn_error $? "Aborting" "$LINENO" 5
   fi
@@ -6596,6 +7167,43 @@
   php_cxx_post=$shared_cxx_post
   php_lo=$shared_lo
 ;;
+    shared-dylib)
+
+
+  php_c_pre='$(LIBTOOL) --tag=CC --mode=compile $(CC)'
+  php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
+  php_c_post=
+  php_cxx_pre='$(LIBTOOL) --tag=CXX --mode=compile $(CXX)'
+  php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
+  php_cxx_post=
+  php_lo=lo
+
+  case $with_pic in
+    yes) pic_setting='-prefer-pic';;
+    no)  pic_setting='-prefer-non-pic';;
+  esac
+
+  shared_c_pre='$(LIBTOOL) --tag=CC --mode=compile $(CC)'
+  shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
+  shared_c_post=
+  shared_cxx_pre='$(LIBTOOL) --tag=CXX --mode=compile $(CXX)'
+  shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
+  shared_cxx_post=
+  shared_lo=lo
+
+  OVERALL_TARGET=libphp.la
+  php_sapi_module=shared
+
+  php_c_pre=$shared_c_pre
+  php_c_meta=$shared_c_meta
+  php_c_post=$shared_c_post
+  php_cxx_pre=$shared_cxx_pre
+  php_cxx_meta=$shared_cxx_meta
+  php_cxx_post=$shared_cxx_post
+  php_lo=$shared_lo
+
+  OVERALL_TARGET=libphp.dylib
+;;
     bundle)
 
   php_c_pre='$(LIBTOOL) --tag=CC --mode=compile $(CC)'
@@ -6771,6 +7379,43 @@
   php_cxx_post=$shared_cxx_post
   php_lo=$shared_lo
 ;;
+    shared-dylib)
+
+
+  php_c_pre='$(LIBTOOL) --tag=CC --mode=compile $(CC)'
+  php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
+  php_c_post=
+  php_cxx_pre='$(LIBTOOL) --tag=CXX --mode=compile $(CXX)'
+  php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
+  php_cxx_post=
+  php_lo=lo
+
+  case $with_pic in
+    yes) pic_setting='-prefer-pic';;
+    no)  pic_setting='-prefer-non-pic';;
+  esac
+
+  shared_c_pre='$(LIBTOOL) --tag=CC --mode=compile $(CC)'
+  shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
+  shared_c_post=
+  shared_cxx_pre='$(LIBTOOL) --tag=CXX --mode=compile $(CXX)'
+  shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
+  shared_cxx_post=
+  shared_lo=lo
+
+  OVERALL_TARGET=libphp.la
+  php_sapi_module=shared
+
+  php_c_pre=$shared_c_pre
+  php_c_meta=$shared_c_meta
+  php_c_post=$shared_c_post
+  php_cxx_pre=$shared_cxx_pre
+  php_cxx_meta=$shared_cxx_meta
+  php_cxx_post=$shared_cxx_post
+  php_lo=$shared_lo
+
+  OVERALL_TARGET=libphp.dylib
+;;
     bundle)
 
   php_c_pre='$(LIBTOOL) --tag=CC --mode=compile $(CC)'
@@ -6937,6 +7582,43 @@
   php_cxx_post=$shared_cxx_post
   php_lo=$shared_lo
 ;;
+    shared-dylib)
+
+
+  php_c_pre='$(LIBTOOL) --tag=CC --mode=compile $(CC)'
+  php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
+  php_c_post=
+  php_cxx_pre='$(LIBTOOL) --tag=CXX --mode=compile $(CXX)'
+  php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
+  php_cxx_post=
+  php_lo=lo
+
+  case $with_pic in
+    yes) pic_setting='-prefer-pic';;
+    no)  pic_setting='-prefer-non-pic';;
+  esac
+
+  shared_c_pre='$(LIBTOOL) --tag=CC --mode=compile $(CC)'
+  shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
+  shared_c_post=
+  shared_cxx_pre='$(LIBTOOL) --tag=CXX --mode=compile $(CXX)'
+  shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
+  shared_cxx_post=
+  shared_lo=lo
+
+  OVERALL_TARGET=libphp.la
+  php_sapi_module=shared
+
+  php_c_pre=$shared_c_pre
+  php_c_meta=$shared_c_meta
+  php_c_post=$shared_c_post
+  php_cxx_pre=$shared_cxx_pre
+  php_cxx_meta=$shared_cxx_meta
+  php_cxx_post=$shared_cxx_post
+  php_lo=$shared_lo
+
+  OVERALL_TARGET=libphp.dylib
+;;
     bundle)
 
   php_c_pre='$(LIBTOOL) --tag=CC --mode=compile $(CC)'
@@ -7038,14 +7720,14 @@
 
     fi
   fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
   PHP_VAR_SUBST="$PHP_VAR_SUBST APXS"
 
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -7056,9 +7738,10 @@
 
 
 # Check whether --enable-cli was given.
-if test "${enable_cli+set}" = set; then :
+if test ${enable_cli+y}
+then :
   enableval=$enable_cli; PHP_CLI=$enableval
-else
+else $as_nop
 
   PHP_CLI=yes
 
@@ -7072,43 +7755,35 @@
 
 
 
-for ac_func in setproctitle
-do :
-  ac_fn_c_check_func "$LINENO" "setproctitle" "ac_cv_func_setproctitle"
-if test "x$ac_cv_func_setproctitle" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_SETPROCTITLE 1
-_ACEOF
+ac_fn_c_check_func "$LINENO" "setproctitle" "ac_cv_func_setproctitle"
+if test "x$ac_cv_func_setproctitle" = xyes
+then :
+  printf "%s\n" "#define HAVE_SETPROCTITLE 1" >>confdefs.h
 
 fi
-done
 
 
-for ac_header in sys/pstat.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "sys/pstat.h" "ac_cv_header_sys_pstat_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_pstat_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_SYS_PSTAT_H 1
-_ACEOF
+ac_fn_c_check_header_compile "$LINENO" "sys/pstat.h" "ac_cv_header_sys_pstat_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_pstat_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_PSTAT_H 1" >>confdefs.h
 
 fi
 
-done
-
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PS_STRINGS" >&5
-$as_echo_n "checking for PS_STRINGS... " >&6; }
-if ${cli_cv_var_PS_STRINGS+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PS_STRINGS" >&5
+printf %s "checking for PS_STRINGS... " >&6; }
+if test ${cli_cv_var_PS_STRINGS+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <machine/vmparam.h>
 #include <sys/exec.h>
 
 int
-main ()
+main (void)
 {
 PS_STRINGS->ps_nargvstr = 1;
 PS_STRINGS->ps_argvstr = "foo";
@@ -7116,24 +7791,25 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   cli_cv_var_PS_STRINGS=yes
-else
+else $as_nop
   cli_cv_var_PS_STRINGS=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cli_cv_var_PS_STRINGS" >&5
-$as_echo "$cli_cv_var_PS_STRINGS" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cli_cv_var_PS_STRINGS" >&5
+printf "%s\n" "$cli_cv_var_PS_STRINGS" >&6; }
 if test "$cli_cv_var_PS_STRINGS" = yes ; then
 
-$as_echo "#define HAVE_PS_STRINGS /**/" >>confdefs.h
+printf "%s\n" "#define HAVE_PS_STRINGS /**/" >>confdefs.h
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CLI build" >&5
-$as_echo_n "checking for CLI build... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CLI build" >&5
+printf %s "checking for CLI build... " >&6; }
 if test "$PHP_CLI" != "no"; then
 
   src=$abs_srcdir/sapi/cli/Makefile.frag
@@ -7294,8 +7970,8 @@
 
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PHP_CLI" >&5
-$as_echo "$PHP_CLI" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PHP_CLI" >&5
+printf "%s\n" "$PHP_CLI" >&6; }
 
 
 
@@ -7305,9 +7981,10 @@
 
 
 # Check whether --enable-embed was given.
-if test "${enable_embed+set}" = set; then :
+if test ${enable_embed+y}
+then :
   enableval=$enable_embed; PHP_EMBED=$enableval
-else
+else $as_nop
 
   PHP_EMBED=no
 
@@ -7321,14 +7998,22 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for embedded SAPI library support" >&5
-$as_echo_n "checking for embedded SAPI library support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for embedded SAPI library support" >&5
+printf %s "checking for embedded SAPI library support... " >&6; }
 
 if test "$PHP_EMBED" != "no"; then
   case "$PHP_EMBED" in
     yes|shared)
       LIBPHP_CFLAGS="-shared"
-      PHP_EMBED_TYPE=shared
+      case "$host_alias" in #(
+  *darwin*) :
+
+        SAPI_SHARED="libs/libphp.dylib"
+        PHP_EMBED_TYPE=shared-dylib
+       ;; #(
+  *) :
+    PHP_EMBED_TYPE=shared ;;
+esac
       INSTALL_IT="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(prefix)/lib; \$(INSTALL) -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)\$(prefix)/lib"
       ;;
     static)
@@ -7430,6 +8115,43 @@
   php_cxx_post=$shared_cxx_post
   php_lo=$shared_lo
 ;;
+    shared-dylib)
+
+
+  php_c_pre='$(LIBTOOL) --tag=CC --mode=compile $(CC)'
+  php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
+  php_c_post=
+  php_cxx_pre='$(LIBTOOL) --tag=CXX --mode=compile $(CXX)'
+  php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
+  php_cxx_post=
+  php_lo=lo
+
+  case $with_pic in
+    yes) pic_setting='-prefer-pic';;
+    no)  pic_setting='-prefer-non-pic';;
+  esac
+
+  shared_c_pre='$(LIBTOOL) --tag=CC --mode=compile $(CC)'
+  shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
+  shared_c_post=
+  shared_cxx_pre='$(LIBTOOL) --tag=CXX --mode=compile $(CXX)'
+  shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
+  shared_cxx_post=
+  shared_lo=lo
+
+  OVERALL_TARGET=libphp.la
+  php_sapi_module=shared
+
+  php_c_pre=$shared_c_pre
+  php_c_meta=$shared_c_meta
+  php_c_post=$shared_c_post
+  php_cxx_pre=$shared_cxx_pre
+  php_cxx_meta=$shared_cxx_meta
+  php_cxx_post=$shared_cxx_post
+  php_lo=$shared_lo
+
+  OVERALL_TARGET=libphp.dylib
+;;
     bundle)
 
   php_c_pre='$(LIBTOOL) --tag=CC --mode=compile $(CC)'
@@ -7525,11 +8247,11 @@
 
 
   fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PHP_EMBED_TYPE" >&5
-$as_echo "$PHP_EMBED_TYPE" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PHP_EMBED_TYPE" >&5
+printf "%s\n" "$PHP_EMBED_TYPE" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -7540,9 +8262,10 @@
 
 
 # Check whether --enable-fpm was given.
-if test "${enable_fpm+set}" = set; then :
+if test ${enable_fpm+y}
+then :
   enableval=$enable_fpm; PHP_FPM=$enableval
-else
+else $as_nop
 
   PHP_FPM=no
 
@@ -7582,31 +8305,39 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FPM build" >&5
-$as_echo_n "checking for FPM build... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for FPM build" >&5
+printf %s "checking for FPM build... " >&6; }
 if test "$PHP_FPM" != "no"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PHP_FPM" >&5
-$as_echo "$PHP_FPM" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PHP_FPM" >&5
+printf "%s\n" "$PHP_FPM" >&6; }
 
 
-  for ac_func in clearenv setproctitle setproctitle_fast
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
+  ac_fn_c_check_func "$LINENO" "clearenv" "ac_cv_func_clearenv"
+if test "x$ac_cv_func_clearenv" = xyes
+then :
+  printf "%s\n" "#define HAVE_CLEARENV 1" >>confdefs.h
 
 fi
-done
+ac_fn_c_check_func "$LINENO" "setproctitle" "ac_cv_func_setproctitle"
+if test "x$ac_cv_func_setproctitle" = xyes
+then :
+  printf "%s\n" "#define HAVE_SETPROCTITLE 1" >>confdefs.h
 
+fi
+ac_fn_c_check_func "$LINENO" "setproctitle_fast" "ac_cv_func_setproctitle_fast"
+if test "x$ac_cv_func_setproctitle_fast" = xyes
+then :
+  printf "%s\n" "#define HAVE_SETPROCTITLE_FAST 1" >>confdefs.h
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing socket" >&5
-$as_echo_n "checking for library containing socket... " >&6; }
-if ${ac_cv_search_socket+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+fi
+
+
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing socket" >&5
+printf %s "checking for library containing socket... " >&6; }
+if test ${ac_cv_search_socket+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -7614,55 +8345,58 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char socket ();
 int
-main ()
+main (void)
 {
 return socket ();
   ;
   return 0;
 }
 _ACEOF
-for ac_lib in '' socket; do
+for ac_lib in '' socket
+do
   if test -z "$ac_lib"; then
     ac_res="none required"
   else
     ac_res=-l$ac_lib
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
   fi
-  if ac_fn_c_try_link "$LINENO"; then :
+  if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_search_socket=$ac_res
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext
-  if ${ac_cv_search_socket+:} false; then :
+  if test ${ac_cv_search_socket+y}
+then :
   break
 fi
 done
-if ${ac_cv_search_socket+:} false; then :
+if test ${ac_cv_search_socket+y}
+then :
 
-else
+else $as_nop
   ac_cv_search_socket=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_socket" >&5
-$as_echo "$ac_cv_search_socket" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_socket" >&5
+printf "%s\n" "$ac_cv_search_socket" >&6; }
 ac_res=$ac_cv_search_socket
-if test "$ac_res" != no; then :
+if test "$ac_res" != no
+then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing inet_addr" >&5
-$as_echo_n "checking for library containing inet_addr... " >&6; }
-if ${ac_cv_search_inet_addr+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing inet_addr" >&5
+printf %s "checking for library containing inet_addr... " >&6; }
+if test ${ac_cv_search_inet_addr+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -7670,117 +8404,121 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char inet_addr ();
 int
-main ()
+main (void)
 {
 return inet_addr ();
   ;
   return 0;
 }
 _ACEOF
-for ac_lib in '' nsl; do
+for ac_lib in '' nsl
+do
   if test -z "$ac_lib"; then
     ac_res="none required"
   else
     ac_res=-l$ac_lib
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
   fi
-  if ac_fn_c_try_link "$LINENO"; then :
+  if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_search_inet_addr=$ac_res
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext
-  if ${ac_cv_search_inet_addr+:} false; then :
+  if test ${ac_cv_search_inet_addr+y}
+then :
   break
 fi
 done
-if ${ac_cv_search_inet_addr+:} false; then :
+if test ${ac_cv_search_inet_addr+y}
+then :
 
-else
+else $as_nop
   ac_cv_search_inet_addr=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_inet_addr" >&5
-$as_echo "$ac_cv_search_inet_addr" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_inet_addr" >&5
+printf "%s\n" "$ac_cv_search_inet_addr" >&6; }
 ac_res=$ac_cv_search_inet_addr
-if test "$ac_res" != no; then :
+if test "$ac_res" != no
+then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for setpflags" >&5
-$as_echo_n "checking for setpflags... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for setpflags" >&5
+printf %s "checking for setpflags... " >&6; }
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <priv.h>
 int
-main ()
+main (void)
 {
 setpflags(0, 0);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
 
-$as_echo "#define HAVE_SETPFLAGS 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SETPFLAGS 1" >>confdefs.h
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-else
+else $as_nop
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 
   have_clock_gettime=no
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_gettime" >&5
-$as_echo_n "checking for clock_gettime... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for clock_gettime" >&5
+printf %s "checking for clock_gettime... " >&6; }
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <time.h>
 int
-main ()
+main (void)
 {
 struct timespec ts; clock_gettime(CLOCK_MONOTONIC, &ts);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
 
     have_clock_gettime=yes
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-else
+else $as_nop
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 
   if test "$have_clock_gettime" = "no"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_gettime in -lrt" >&5
-$as_echo_n "checking for clock_gettime in -lrt... " >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for clock_gettime in -lrt" >&5
+printf %s "checking for clock_gettime in -lrt... " >&6; }
 
     SAVED_LIBS="$LIBS"
     LIBS="$LIBS -lrt"
@@ -7789,46 +8527,48 @@
 /* end confdefs.h.  */
 #include <time.h>
 int
-main ()
+main (void)
 {
 struct timespec ts; clock_gettime(CLOCK_MONOTONIC, &ts);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
 
       have_clock_gettime=yes
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-else
+else $as_nop
 
       LIBS="$SAVED_LIBS"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
   fi
 
   if test "$have_clock_gettime" = "yes"; then
 
-$as_echo "#define HAVE_CLOCK_GETTIME 1" >>confdefs.h
+printf "%s\n" "#define HAVE_CLOCK_GETTIME 1" >>confdefs.h
 
   fi
 
   have_clock_get_time=no
 
   if test "$have_clock_gettime" = "no"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_get_time" >&5
-$as_echo_n "checking for clock_get_time... " >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for clock_get_time" >&5
+printf %s "checking for clock_get_time... " >&6; }
 
-    if test "$cross_compiling" = yes; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no (cross-compiling)" >&5
-$as_echo "no (cross-compiling)" >&6; }
-else
+    if test "$cross_compiling" = yes
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no (cross-compiling)" >&5
+printf "%s\n" "no (cross-compiling)" >&6; }
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <mach/mach.h>
@@ -7853,16 +8593,17 @@
       }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
 
       have_clock_get_time=yes
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-else
+else $as_nop
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -7873,7 +8614,7 @@
 
   if test "$have_clock_get_time" = "yes"; then
 
-$as_echo "#define HAVE_CLOCK_GET_TIME 1" >>confdefs.h
+printf "%s\n" "#define HAVE_CLOCK_GET_TIME 1" >>confdefs.h
 
   fi
 
@@ -7881,8 +8622,8 @@
   have_ptrace=no
   have_broken_ptrace=no
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ptrace" >&5
-$as_echo_n "checking for ptrace... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ptrace" >&5
+printf %s "checking for ptrace... " >&6; }
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -7890,37 +8631,39 @@
     #include <sys/types.h>
     #include <sys/ptrace.h>
 int
-main ()
+main (void)
 {
 ptrace(0, 0, (void *) 0, 0);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
     have_ptrace=yes
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-else
+else $as_nop
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
   if test "$have_ptrace" = "yes"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ptrace works" >&5
-$as_echo_n "checking whether ptrace works... " >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ptrace works" >&5
+printf %s "checking whether ptrace works... " >&6; }
 
-    if test "$cross_compiling" = yes; then :
+    if test "$cross_compiling" = yes
+then :
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: skipped (cross-compiling)" >&5
-$as_echo "skipped (cross-compiling)" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: skipped (cross-compiling)" >&5
+printf "%s\n" "skipped (cross-compiling)" >&6; }
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -7992,17 +8735,18 @@
       }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-else
+else $as_nop
 
       have_ptrace=no
       have_broken_ptrace=yes
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -8013,15 +8757,15 @@
 
   if test "$have_ptrace" = "yes"; then
 
-$as_echo "#define HAVE_PTRACE 1" >>confdefs.h
+printf "%s\n" "#define HAVE_PTRACE 1" >>confdefs.h
 
   fi
 
   have_mach_vm_read=no
 
   if test "$have_broken_ptrace" = "yes"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mach_vm_read" >&5
-$as_echo_n "checking for mach_vm_read... " >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mach_vm_read" >&5
+printf %s "checking for mach_vm_read... " >&6; }
 
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -8029,7 +8773,7 @@
       #include <mach/mach_vm.h>
 
 int
-main ()
+main (void)
 {
 
       mach_vm_read((vm_map_t)0, (mach_vm_address_t)0, (mach_vm_size_t)0, (vm_offset_t *)0, (mach_msg_type_number_t*)0);
@@ -8038,24 +8782,25 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
       have_mach_vm_read=yes
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-else
+else $as_nop
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
   fi
 
   if test "$have_mach_vm_read" = "yes"; then
 
-$as_echo "#define HAVE_MACH_VM_READ 1" >>confdefs.h
+printf "%s\n" "#define HAVE_MACH_VM_READ 1" >>confdefs.h
 
   fi
 
@@ -8070,15 +8815,16 @@
   fi
 
   if test -n "$proc_mem_file" ; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for proc mem file" >&5
-$as_echo_n "checking for proc mem file... " >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for proc mem file" >&5
+printf %s "checking for proc mem file... " >&6; }
 
-    if test "$cross_compiling" = yes; then :
+    if test "$cross_compiling" = yes
+then :
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: skipped (cross-compiling)" >&5
-$as_echo "skipped (cross-compiling)" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: skipped (cross-compiling)" >&5
+printf "%s\n" "skipped (cross-compiling)" >&6; }
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -8109,16 +8855,17 @@
       }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $proc_mem_file" >&5
-$as_echo "$proc_mem_file" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $proc_mem_file" >&5
+printf "%s\n" "$proc_mem_file" >&6; }
 
-else
+else $as_nop
 
       proc_mem_file=""
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -8129,9 +8876,7 @@
 
   if test -n "$proc_mem_file"; then
 
-cat >>confdefs.h <<_ACEOF
-#define PROC_MEM_FILE "$proc_mem_file"
-_ACEOF
+printf "%s\n" "#define PROC_MEM_FILE \"$proc_mem_file\"" >>confdefs.h
 
   fi
 
@@ -8147,19 +8892,19 @@
     fpm_trace_type=mach
 
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: FPM Trace - ptrace, pread, or mach: could not be found" >&5
-$as_echo "$as_me: WARNING: FPM Trace - ptrace, pread, or mach: could not be found" >&2;}
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: FPM Trace - ptrace, pread, or mach: could not be found" >&5
+printf "%s\n" "$as_me: WARNING: FPM Trace - ptrace, pread, or mach: could not be found" >&2;}
   fi
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if gcc supports __sync_bool_compare_and_swap" >&5
-$as_echo_n "checking if gcc supports __sync_bool_compare_and_swap... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if gcc supports __sync_bool_compare_and_swap" >&5
+printf %s "checking if gcc supports __sync_bool_compare_and_swap... " >&6; }
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
     int variable = 1;
@@ -8170,195 +8915,201 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-$as_echo "#define HAVE_BUILTIN_ATOMIC 1" >>confdefs.h
+printf "%s\n" "#define HAVE_BUILTIN_ATOMIC 1" >>confdefs.h
 
 
-else
+else $as_nop
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 
 
   have_lq=no
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TCP_INFO" >&5
-$as_echo_n "checking for TCP_INFO... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for TCP_INFO" >&5
+printf %s "checking for TCP_INFO... " >&6; }
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <netinet/tcp.h>
 int
-main ()
+main (void)
 {
 struct tcp_info ti; int x = TCP_INFO;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
     have_lq=tcp_info
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-else
+else $as_nop
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
   if test "$have_lq" = "tcp_info"; then
 
-$as_echo "#define HAVE_LQ_TCP_INFO 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LQ_TCP_INFO 1" >>confdefs.h
 
   fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TCP_CONNECTION_INFO" >&5
-$as_echo_n "checking for TCP_CONNECTION_INFO... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for TCP_CONNECTION_INFO" >&5
+printf %s "checking for TCP_CONNECTION_INFO... " >&6; }
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <netinet/tcp.h>
 int
-main ()
+main (void)
 {
 struct tcp_connection_info ti; int x = TCP_CONNECTION_INFO;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
     have_lq=tcp_connection_info
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-else
+else $as_nop
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
   if test "$have_lq" = "tcp_connection_info"; then
 
-$as_echo "#define HAVE_LQ_TCP_CONNECTION_INFO 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LQ_TCP_CONNECTION_INFO 1" >>confdefs.h
 
   fi
 
   if test "$have_lq" = "no" ; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SO_LISTENQLEN" >&5
-$as_echo_n "checking for SO_LISTENQLEN... " >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SO_LISTENQLEN" >&5
+printf %s "checking for SO_LISTENQLEN... " >&6; }
 
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/socket.h>
 int
-main ()
+main (void)
 {
 int x = SO_LISTENQLIMIT; int y = SO_LISTENQLEN;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
       have_lq=so_listenq
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-else
+else $as_nop
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
     if test "$have_lq" = "tcp_info"; then
 
-$as_echo "#define HAVE_LQ_SO_LISTENQ 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LQ_SO_LISTENQ 1" >>confdefs.h
 
     fi
   fi
 
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysconf" >&5
-$as_echo_n "checking for sysconf... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sysconf" >&5
+printf %s "checking for sysconf... " >&6; }
 
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <unistd.h>
 int
-main ()
+main (void)
 {
 sysconf(_SC_CLK_TCK);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
 
-$as_echo "#define HAVE_SYSCONF 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SYSCONF 1" >>confdefs.h
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-else
+else $as_nop
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for times" >&5
-$as_echo_n "checking for times... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for times" >&5
+printf %s "checking for times... " >&6; }
 
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/times.h>
 int
-main ()
+main (void)
 {
 struct tms t; times(&t);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
 
-$as_echo "#define HAVE_TIMES 1" >>confdefs.h
+printf "%s\n" "#define HAVE_TIMES 1" >>confdefs.h
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-else
+else $as_nop
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for kqueue" >&5
-$as_echo_n "checking for kqueue... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for kqueue" >&5
+printf %s "checking for kqueue... " >&6; }
 
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -8368,7 +9119,7 @@
 		#include <sys/time.h>
 
 int
-main ()
+main (void)
 {
 
 		int kfd;
@@ -8381,25 +9132,26 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
 
-$as_echo "#define HAVE_KQUEUE 1" >>confdefs.h
+printf "%s\n" "#define HAVE_KQUEUE 1" >>confdefs.h
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-else
+else $as_nop
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for port framework" >&5
-$as_echo_n "checking for port framework... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for port framework" >&5
+printf %s "checking for port framework... " >&6; }
 
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -8407,7 +9159,7 @@
 		#include <port.h>
 
 int
-main ()
+main (void)
 {
 
 		int port;
@@ -8421,25 +9173,26 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
 
-$as_echo "#define HAVE_PORT 1" >>confdefs.h
+printf "%s\n" "#define HAVE_PORT 1" >>confdefs.h
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-else
+else $as_nop
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for /dev/poll" >&5
-$as_echo_n "checking for /dev/poll... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for /dev/poll" >&5
+printf %s "checking for /dev/poll... " >&6; }
 
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -8448,7 +9201,7 @@
 		#include <sys/devpoll.h>
 
 int
-main ()
+main (void)
 {
 
 		int n, dp;
@@ -8463,25 +9216,26 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
 
-$as_echo "#define HAVE_DEVPOLL 1" >>confdefs.h
+printf "%s\n" "#define HAVE_DEVPOLL 1" >>confdefs.h
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-else
+else $as_nop
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for epoll" >&5
-$as_echo_n "checking for epoll... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for epoll" >&5
+printf %s "checking for epoll... " >&6; }
 
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -8489,7 +9243,7 @@
 		#include <sys/epoll.h>
 
 int
-main ()
+main (void)
 {
 
 		int epollfd;
@@ -8516,25 +9270,26 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
 
-$as_echo "#define HAVE_EPOLL 1" >>confdefs.h
+printf "%s\n" "#define HAVE_EPOLL 1" >>confdefs.h
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-else
+else $as_nop
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for select" >&5
-$as_echo_n "checking for select... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for select" >&5
+printf %s "checking for select... " >&6; }
 
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -8548,7 +9303,7 @@
 		#include <unistd.h>
 
 int
-main ()
+main (void)
 {
 
 		fd_set fds;
@@ -8564,21 +9319,22 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
 
-$as_echo "#define HAVE_SELECT 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SELECT 1" >>confdefs.h
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-else
+else $as_nop
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 
 
@@ -8587,9 +9343,10 @@
 
 
 # Check whether --with-fpm-user was given.
-if test "${with_fpm_user+set}" = set; then :
+if test ${with_fpm_user+y}
+then :
   withval=$with_fpm_user; PHP_FPM_USER=$withval
-else
+else $as_nop
 
   PHP_FPM_USER=nobody
 
@@ -8609,9 +9366,10 @@
 
 
 # Check whether --with-fpm-group was given.
-if test "${with_fpm_group+set}" = set; then :
+if test ${with_fpm_group+y}
+then :
   withval=$with_fpm_group; PHP_FPM_GROUP=$withval
-else
+else $as_nop
 
   PHP_FPM_GROUP=nobody
 
@@ -8631,9 +9389,10 @@
 
 
 # Check whether --with-fpm-systemd was given.
-if test "${with_fpm_systemd+set}" = set; then :
+if test ${with_fpm_systemd+y}
+then :
   withval=$with_fpm_systemd; PHP_FPM_SYSTEMD=$withval
-else
+else $as_nop
 
   PHP_FPM_SYSTEMD=no
 
@@ -8653,9 +9412,10 @@
 
 
 # Check whether --with-fpm-acl was given.
-if test "${with_fpm_acl+set}" = set; then :
+if test ${with_fpm_acl+y}
+then :
   withval=$with_fpm_acl; PHP_FPM_ACL=$withval
-else
+else $as_nop
 
   PHP_FPM_ACL=no
 
@@ -8675,9 +9435,10 @@
 
 
 # Check whether --with-fpm-apparmor was given.
-if test "${with_fpm_apparmor+set}" = set; then :
+if test ${with_fpm_apparmor+y}
+then :
   withval=$with_fpm_apparmor; PHP_FPM_APPARMOR=$withval
-else
+else $as_nop
 
   PHP_FPM_APPARMOR=no
 
@@ -8697,9 +9458,10 @@
 
 
 # Check whether --with-fpm-selinux was given.
-if test "${with_fpm_selinux+set}" = set; then :
+if test ${with_fpm_selinux+y}
+then :
   withval=$with_fpm_selinux; PHP_FPM_SELINUX=$withval
-else
+else $as_nop
 
   PHP_FPM_SELINUX=no
 
@@ -8716,17 +9478,17 @@
   if test "$PHP_FPM_SYSTEMD" != "no" ; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libsystemd >= 209" >&5
-$as_echo_n "checking for libsystemd >= 209... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libsystemd >= 209" >&5
+printf %s "checking for libsystemd >= 209... " >&6; }
 
 if test -n "$SYSTEMD_CFLAGS"; then
     pkg_cv_SYSTEMD_CFLAGS="$SYSTEMD_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd >= 209\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd >= 209\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libsystemd >= 209") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_SYSTEMD_CFLAGS=`$PKG_CONFIG --cflags "libsystemd >= 209" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -8740,10 +9502,10 @@
     pkg_cv_SYSTEMD_LIBS="$SYSTEMD_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd >= 209\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd >= 209\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libsystemd >= 209") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_SYSTEMD_LIBS=`$PKG_CONFIG --libs "libsystemd >= 209" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -8757,8 +9519,8 @@
 
 
 if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -8784,10 +9546,10 @@
 and SYSTEMD_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -8801,30 +9563,28 @@
 else
 	SYSTEMD_CFLAGS=$pkg_cv_SYSTEMD_CFLAGS
 	SYSTEMD_LIBS=$pkg_cv_SYSTEMD_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
 fi
 
-    for ac_header in systemd/sd-daemon.h
+           for ac_header in systemd/sd-daemon.h
 do :
-  ac_fn_c_check_header_mongrel "$LINENO" "systemd/sd-daemon.h" "ac_cv_header_systemd_sd_daemon_h" "$ac_includes_default"
-if test "x$ac_cv_header_systemd_sd_daemon_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_SYSTEMD_SD_DAEMON_H 1
-_ACEOF
+  ac_fn_c_check_header_compile "$LINENO" "systemd/sd-daemon.h" "ac_cv_header_systemd_sd_daemon_h" "$ac_includes_default"
+if test "x$ac_cv_header_systemd_sd_daemon_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYSTEMD_SD_DAEMON_H 1" >>confdefs.h
  HAVE_SD_DAEMON_H="yes"
-else
+else $as_nop
   HAVE_SD_DAEMON_H="no"
 fi
 
 done
-
     if test $HAVE_SD_DAEMON_H = "no"; then
       as_fn_error $? "Your system does not support systemd." "$LINENO" 5
     else
 
-$as_echo "#define HAVE_SYSTEMD 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SYSTEMD 1" >>confdefs.h
 
       PHP_FPM_SD_FILES="fpm/fpm_systemd.c"
 
@@ -8955,20 +9715,15 @@
   fi
 
   if test "$PHP_FPM_ACL" != "no" ; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for acl user/group permissions support" >&5
-$as_echo_n "checking for acl user/group permissions support... " >&6; }
-    for ac_header in sys/acl.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "sys/acl.h" "ac_cv_header_sys_acl_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_acl_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_SYS_ACL_H 1
-_ACEOF
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for acl user/group permissions support" >&5
+printf %s "checking for acl user/group permissions support... " >&6; }
+    ac_fn_c_check_header_compile "$LINENO" "sys/acl.h" "ac_cv_header_sys_acl_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_acl_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_ACL_H 1" >>confdefs.h
 
 fi
 
-done
-
 
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -8987,13 +9742,15 @@
       }
 
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for acl_free in -lacl" >&5
-$as_echo_n "checking for acl_free in -lacl... " >&6; }
-if ${ac_cv_lib_acl_acl_free+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for acl_free in -lacl" >&5
+printf %s "checking for acl_free in -lacl... " >&6; }
+if test ${ac_cv_lib_acl_acl_free+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lacl  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -9002,30 +9759,29 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char acl_free ();
 int
-main ()
+main (void)
 {
 return acl_free ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_acl_acl_free=yes
-else
+else $as_nop
   ac_cv_lib_acl_acl_free=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_acl_acl_free" >&5
-$as_echo "$ac_cv_lib_acl_acl_free" >&6; }
-if test "x$ac_cv_lib_acl_acl_free" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_acl_acl_free" >&5
+printf "%s\n" "$ac_cv_lib_acl_acl_free" >&6; }
+if test "x$ac_cv_lib_acl_acl_free" = xyes
+then :
 
 
   case acl in
@@ -9037,15 +9793,16 @@
 
 
           have_fpm_acl=yes
-          { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+          { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-else
+else $as_nop
 
-          if test "$cross_compiling" = yes; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: skipped" >&5
-$as_echo "skipped" >&6; }
-else
+          if test "$cross_compiling" = yes
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: skipped" >&5
+printf "%s\n" "skipped" >&6; }
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/acl.h>
@@ -9063,17 +9820,18 @@
             }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
 
             have_fpm_acl=yes
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-else
+else $as_nop
 
             have_fpm_acl=no
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -9084,40 +9842,36 @@
 fi
 
 
-else
+else $as_nop
 
       have_fpm_acl=no
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
     if test "$have_fpm_acl" = "yes"; then
 
-$as_echo "#define HAVE_FPM_ACL 1" >>confdefs.h
+printf "%s\n" "#define HAVE_FPM_ACL 1" >>confdefs.h
 
     fi
   fi
 
   if test "x$PHP_FPM_APPARMOR" != "xno" ; then
-    for ac_header in sys/apparmor.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "sys/apparmor.h" "ac_cv_header_sys_apparmor_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_apparmor_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_SYS_APPARMOR_H 1
-_ACEOF
+    ac_fn_c_check_header_compile "$LINENO" "sys/apparmor.h" "ac_cv_header_sys_apparmor_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_apparmor_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_APPARMOR_H 1" >>confdefs.h
 
 fi
 
-done
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for aa_change_profile in -lapparmor" >&5
-$as_echo_n "checking for aa_change_profile in -lapparmor... " >&6; }
-if ${ac_cv_lib_apparmor_aa_change_profile+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for aa_change_profile in -lapparmor" >&5
+printf %s "checking for aa_change_profile in -lapparmor... " >&6; }
+if test ${ac_cv_lib_apparmor_aa_change_profile+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lapparmor  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -9126,30 +9880,29 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char aa_change_profile ();
 int
-main ()
+main (void)
 {
 return aa_change_profile ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_apparmor_aa_change_profile=yes
-else
+else $as_nop
   ac_cv_lib_apparmor_aa_change_profile=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_apparmor_aa_change_profile" >&5
-$as_echo "$ac_cv_lib_apparmor_aa_change_profile" >&6; }
-if test "x$ac_cv_lib_apparmor_aa_change_profile" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_apparmor_aa_change_profile" >&5
+printf "%s\n" "$ac_cv_lib_apparmor_aa_change_profile" >&6; }
+if test "x$ac_cv_lib_apparmor_aa_change_profile" = xyes
+then :
 
 
 
@@ -9162,10 +9915,10 @@
 
 
 
-$as_echo "#define HAVE_APPARMOR 1" >>confdefs.h
+printf "%s\n" "#define HAVE_APPARMOR 1" >>confdefs.h
 
 
-else
+else $as_nop
 
       as_fn_error $? "libapparmor required but not found" "$LINENO" 5
 
@@ -9174,23 +9927,19 @@
   fi
 
   if test "x$PHP_FPM_SELINUX" != "xno" ; then
-    for ac_header in selinux/selinux.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "selinux/selinux.h" "ac_cv_header_selinux_selinux_h" "$ac_includes_default"
-if test "x$ac_cv_header_selinux_selinux_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_SELINUX_SELINUX_H 1
-_ACEOF
+    ac_fn_c_check_header_compile "$LINENO" "selinux/selinux.h" "ac_cv_header_selinux_selinux_h" "$ac_includes_default"
+if test "x$ac_cv_header_selinux_selinux_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SELINUX_SELINUX_H 1" >>confdefs.h
 
 fi
 
-done
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for security_setenforce in -lselinux" >&5
-$as_echo_n "checking for security_setenforce in -lselinux... " >&6; }
-if ${ac_cv_lib_selinux_security_setenforce+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for security_setenforce in -lselinux" >&5
+printf %s "checking for security_setenforce in -lselinux... " >&6; }
+if test ${ac_cv_lib_selinux_security_setenforce+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lselinux  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -9199,30 +9948,29 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char security_setenforce ();
 int
-main ()
+main (void)
 {
 return security_setenforce ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_selinux_security_setenforce=yes
-else
+else $as_nop
   ac_cv_lib_selinux_security_setenforce=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_selinux_security_setenforce" >&5
-$as_echo "$ac_cv_lib_selinux_security_setenforce" >&6; }
-if test "x$ac_cv_lib_selinux_security_setenforce" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_selinux_security_setenforce" >&5
+printf "%s\n" "$ac_cv_lib_selinux_security_setenforce" >&6; }
+if test "x$ac_cv_lib_selinux_security_setenforce" = xyes
+then :
 
 
 
@@ -9235,7 +9983,7 @@
 
 
 
-$as_echo "#define HAVE_SELINUX 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SELINUX 1" >>confdefs.h
 
 
 fi
@@ -9249,9 +9997,7 @@
 
 
 
-cat >>confdefs.h <<_ACEOF
-#define PHP_FPM_SYSTEMD "$php_fpm_systemd"
-_ACEOF
+printf "%s\n" "#define PHP_FPM_SYSTEMD \"$php_fpm_systemd\"" >>confdefs.h
 
 
   if test -z "$PHP_FPM_USER" -o "$PHP_FPM_USER" = "yes" -o "$PHP_FPM_USER" = "no"; then
@@ -9301,14 +10047,10 @@
 
 
 
-cat >>confdefs.h <<_ACEOF
-#define PHP_FPM_USER "$php_fpm_user"
-_ACEOF
+printf "%s\n" "#define PHP_FPM_USER \"$php_fpm_user\"" >>confdefs.h
 
 
-cat >>confdefs.h <<_ACEOF
-#define PHP_FPM_GROUP "$php_fpm_group"
-_ACEOF
+printf "%s\n" "#define PHP_FPM_GROUP \"$php_fpm_group\"" >>confdefs.h
 
 
 
@@ -9488,24 +10230,25 @@
 
 
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for clang fuzzer SAPI" >&5
-$as_echo_n "checking for clang fuzzer SAPI... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for clang fuzzer SAPI" >&5
+printf %s "checking for clang fuzzer SAPI... " >&6; }
 
 
 php_enable_fuzzer=no
 
 
 # Check whether --enable-fuzzer was given.
-if test "${enable_fuzzer+set}" = set; then :
+if test ${enable_fuzzer+y}
+then :
   enableval=$enable_fuzzer; PHP_FUZZER=$enableval
-else
+else $as_nop
 
   PHP_FUZZER=no
 
@@ -9523,9 +10266,15 @@
 
 
 if test "$PHP_FUZZER" != "no"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-    ac_ext=cpp
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+
+
+
+
+
+
+ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -9535,15 +10284,16 @@
     CXX=$CCC
   else
     if test -n "$ac_tool_prefix"; then
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC clang++
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CXX+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$CXX"; then
   ac_cv_prog_CXX="$CXX" # Let the user override the test.
 else
@@ -9551,11 +10301,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -9566,11 +10320,11 @@
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
-$as_echo "$CXX" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
+printf "%s\n" "$CXX" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -9579,15 +10333,16 @@
 fi
 if test -z "$CXX"; then
   ac_ct_CXX=$CXX
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC clang++
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_CXX+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ac_ct_CXX"; then
   ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
 else
@@ -9595,11 +10350,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CXX="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -9610,11 +10369,11 @@
 fi
 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
 if test -n "$ac_ct_CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
-$as_echo "$ac_ct_CXX" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
+printf "%s\n" "$ac_ct_CXX" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -9626,8 +10385,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CXX=$ac_ct_CXX
@@ -9637,7 +10396,7 @@
   fi
 fi
 # Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
+printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
 set X $ac_compile
 ac_compiler=$2
 for ac_option in --version -v -V -qversion; do
@@ -9647,7 +10406,7 @@
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_compiler $ac_option >&5") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -9657,20 +10416,21 @@
     cat conftest.er1 >&5
   fi
   rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 done
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
-$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
-if ${ac_cv_cxx_compiler_gnu+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C++" >&5
+printf %s "checking whether the compiler supports GNU C++... " >&6; }
+if test ${ac_cv_cxx_compiler_gnu+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 #ifndef __GNUC__
        choke me
@@ -9680,29 +10440,33 @@
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+if ac_fn_cxx_try_compile "$LINENO"
+then :
   ac_compiler_gnu=yes
-else
+else $as_nop
   ac_compiler_gnu=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
-$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
+printf "%s\n" "$ac_cv_cxx_compiler_gnu" >&6; }
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
 if test $ac_compiler_gnu = yes; then
   GXX=yes
 else
   GXX=
 fi
-ac_test_CXXFLAGS=${CXXFLAGS+set}
+ac_test_CXXFLAGS=${CXXFLAGS+y}
 ac_save_CXXFLAGS=$CXXFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
-$as_echo_n "checking whether $CXX accepts -g... " >&6; }
-if ${ac_cv_prog_cxx_g+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
+printf %s "checking whether $CXX accepts -g... " >&6; }
+if test ${ac_cv_prog_cxx_g+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_save_cxx_werror_flag=$ac_cxx_werror_flag
    ac_cxx_werror_flag=yes
    ac_cv_prog_cxx_g=no
@@ -9711,57 +10475,60 @@
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+if ac_fn_cxx_try_compile "$LINENO"
+then :
   ac_cv_prog_cxx_g=yes
-else
+else $as_nop
   CXXFLAGS=""
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+if ac_fn_cxx_try_compile "$LINENO"
+then :
 
-else
+else $as_nop
   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 	 CXXFLAGS="-g"
 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+if ac_fn_cxx_try_compile "$LINENO"
+then :
   ac_cv_prog_cxx_g=yes
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
    ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
-$as_echo "$ac_cv_prog_cxx_g" >&6; }
-if test "$ac_test_CXXFLAGS" = set; then
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
+printf "%s\n" "$ac_cv_prog_cxx_g" >&6; }
+if test $ac_test_CXXFLAGS; then
   CXXFLAGS=$ac_save_CXXFLAGS
 elif test $ac_cv_prog_cxx_g = yes; then
   if test "$GXX" = yes; then
@@ -9776,6 +10543,100 @@
     CXXFLAGS=
   fi
 fi
+ac_prog_cxx_stdcxx=no
+if test x$ac_prog_cxx_stdcxx = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
+printf %s "checking for $CXX option to enable C++11 features... " >&6; }
+if test ${ac_cv_prog_cxx_11+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_cv_prog_cxx_11=no
+ac_save_CXX=$CXX
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_cxx_conftest_cxx11_program
+_ACEOF
+for ac_arg in '' -std=gnu++11 -std=gnu++0x -std=c++11 -std=c++0x -qlanglvl=extended0x -AA
+do
+  CXX="$ac_save_CXX $ac_arg"
+  if ac_fn_cxx_try_compile "$LINENO"
+then :
+  ac_cv_prog_cxx_cxx11=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam
+  test "x$ac_cv_prog_cxx_cxx11" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CXX=$ac_save_CXX
+fi
+
+if test "x$ac_cv_prog_cxx_cxx11" = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf "%s\n" "unsupported" >&6; }
+else $as_nop
+  if test "x$ac_cv_prog_cxx_cxx11" = x
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf "%s\n" "none needed" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx11" >&5
+printf "%s\n" "$ac_cv_prog_cxx_cxx11" >&6; }
+     CXX="$CXX $ac_cv_prog_cxx_cxx11"
+fi
+  ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx11
+  ac_prog_cxx_stdcxx=cxx11
+fi
+fi
+if test x$ac_prog_cxx_stdcxx = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
+printf %s "checking for $CXX option to enable C++98 features... " >&6; }
+if test ${ac_cv_prog_cxx_98+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_cv_prog_cxx_98=no
+ac_save_CXX=$CXX
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_cxx_conftest_cxx98_program
+_ACEOF
+for ac_arg in '' -std=gnu++98 -std=c++98 -qlanglvl=extended -AA
+do
+  CXX="$ac_save_CXX $ac_arg"
+  if ac_fn_cxx_try_compile "$LINENO"
+then :
+  ac_cv_prog_cxx_cxx98=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam
+  test "x$ac_cv_prog_cxx_cxx98" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CXX=$ac_save_CXX
+fi
+
+if test "x$ac_cv_prog_cxx_cxx98" = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf "%s\n" "unsupported" >&6; }
+else $as_nop
+  if test "x$ac_cv_prog_cxx_cxx98" = x
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf "%s\n" "none needed" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx98" >&5
+printf "%s\n" "$ac_cv_prog_cxx_cxx98" >&6; }
+     CXX="$CXX $ac_cv_prog_cxx_cxx98"
+fi
+  ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx98
+  ac_prog_cxx_stdcxx=cxx98
+fi
+fi
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -9787,36 +10648,32 @@
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
-$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
+printf %s "checking how to run the C++ preprocessor... " >&6; }
 if test -z "$CXXCPP"; then
-  if ${ac_cv_prog_CXXCPP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-      # Double quotes because CXXCPP needs to be expanded
-    for CXXCPP in "$CXX -E" "/lib/cpp"
+  if test ${ac_cv_prog_CXXCPP+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+      # Double quotes because $CXX needs to be expanded
+    for CXXCPP in "$CXX -E" cpp /lib/cpp
     do
       ac_preproc_ok=false
 for ac_cxx_preproc_warn_flag in '' yes
 do
   # Use a header file that comes with gcc, so configuring glibc
   # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
+#include <limits.h>
 		     Syntax error
 _ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
+if ac_fn_cxx_try_cpp "$LINENO"
+then :
 
-else
+else $as_nop
   # Broken: fails on valid input.
 continue
 fi
@@ -9828,10 +10685,11 @@
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
+if ac_fn_cxx_try_cpp "$LINENO"
+then :
   # Broken: success on invalid input.
 continue
-else
+else $as_nop
   # Passes both tests.
 ac_preproc_ok=:
 break
@@ -9841,7 +10699,8 @@
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
+if $ac_preproc_ok
+then :
   break
 fi
 
@@ -9853,29 +10712,24 @@
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
-$as_echo "$CXXCPP" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
+printf "%s\n" "$CXXCPP" >&6; }
 ac_preproc_ok=false
 for ac_cxx_preproc_warn_flag in '' yes
 do
   # Use a header file that comes with gcc, so configuring glibc
   # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
+#include <limits.h>
 		     Syntax error
 _ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
+if ac_fn_cxx_try_cpp "$LINENO"
+then :
 
-else
+else $as_nop
   # Broken: fails on valid input.
 continue
 fi
@@ -9887,10 +10741,11 @@
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
+if ac_fn_cxx_try_cpp "$LINENO"
+then :
   # Broken: success on invalid input.
 continue
-else
+else $as_nop
   # Passes both tests.
 ac_preproc_ok=:
 break
@@ -9900,11 +10755,12 @@
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
+if $ac_preproc_ok
+then :
 
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+else $as_nop
+  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
 See \`config.log' for more details" "$LINENO" 5; }
 fi
@@ -9928,11 +10784,12 @@
   if test -z "$LIB_FUZZING_ENGINE"; then
     FUZZING_LIB="-fsanitize=fuzzer"
     FUZZING_CC="$CC"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fsanitize=fuzzer-no-link" >&5
-$as_echo_n "checking whether C compiler accepts -fsanitize=fuzzer-no-link... " >&6; }
-if ${ax_cv_check_cflags___fsanitize_fuzzer_no_link+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fsanitize=fuzzer-no-link" >&5
+printf %s "checking whether C compiler accepts -fsanitize=fuzzer-no-link... " >&6; }
+if test ${ax_cv_check_cflags___fsanitize_fuzzer_no_link+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
   ax_check_save_flags=$CFLAGS
   CFLAGS="$CFLAGS  -fsanitize=fuzzer-no-link"
@@ -9940,29 +10797,31 @@
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ax_cv_check_cflags___fsanitize_fuzzer_no_link=yes
-else
+else $as_nop
   ax_cv_check_cflags___fsanitize_fuzzer_no_link=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
   CFLAGS=$ax_check_save_flags
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fsanitize_fuzzer_no_link" >&5
-$as_echo "$ax_cv_check_cflags___fsanitize_fuzzer_no_link" >&6; }
-if test "x$ax_cv_check_cflags___fsanitize_fuzzer_no_link" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fsanitize_fuzzer_no_link" >&5
+printf "%s\n" "$ax_cv_check_cflags___fsanitize_fuzzer_no_link" >&6; }
+if test "x$ax_cv_check_cflags___fsanitize_fuzzer_no_link" = xyes
+then :
 
       CFLAGS="$CFLAGS -fsanitize=fuzzer-no-link"
       CXXFLAGS="$CXXFLAGS -fsanitize=fuzzer-no-link"
 
-else
+else $as_nop
 
       as_fn_error $? "Compiler doesn't support -fsanitize=fuzzer-no-link" "$LINENO" 5
 
@@ -10557,23 +11416,24 @@
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PHP_FUZZER" >&5
-$as_echo "$PHP_FUZZER" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PHP_FUZZER" >&5
+printf "%s\n" "$PHP_FUZZER" >&6; }
 
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LiteSpeed support" >&5
-$as_echo_n "checking for LiteSpeed support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LiteSpeed support" >&5
+printf %s "checking for LiteSpeed support... " >&6; }
 
 
 php_enable_litespeed=no
 
 
 # Check whether --enable-litespeed was given.
-if test "${enable_litespeed+set}" = set; then :
+if test ${enable_litespeed+y}
+then :
   enableval=$enable_litespeed; PHP_LITESPEED=$enableval
-else
+else $as_nop
 
   PHP_LITESPEED=no
   test "$PHP_ENABLE_ALL" && PHP_LITESPEED=$PHP_ENABLE_ALL
@@ -10735,8 +11595,8 @@
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PHP_LITESPEED" >&5
-$as_echo "$PHP_LITESPEED" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PHP_LITESPEED" >&5
+printf "%s\n" "$PHP_LITESPEED" >&6; }
 
 
 
@@ -10744,12 +11604,13 @@
 
 php_enable_phpdbg=yes
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for phpdbg support" >&5
-$as_echo_n "checking for phpdbg support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for phpdbg support" >&5
+printf %s "checking for phpdbg support... " >&6; }
 # Check whether --enable-phpdbg was given.
-if test "${enable_phpdbg+set}" = set; then :
+if test ${enable_phpdbg+y}
+then :
   enableval=$enable_phpdbg; PHP_PHPDBG=$enableval
-else
+else $as_nop
 
   PHP_PHPDBG=yes
   test "$PHP_ENABLE_ALL" && PHP_PHPDBG=$PHP_ENABLE_ALL
@@ -10779,8 +11640,8 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -10788,12 +11649,13 @@
 
 php_enable_phpdbg_debug=no
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for phpdbg debug build" >&5
-$as_echo_n "checking for phpdbg debug build... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for phpdbg debug build" >&5
+printf %s "checking for phpdbg debug build... " >&6; }
 # Check whether --enable-phpdbg-debug was given.
-if test "${enable_phpdbg_debug+set}" = set; then :
+if test ${enable_phpdbg_debug+y}
+then :
   enableval=$enable_phpdbg_debug; PHP_PHPDBG_DEBUG=$enableval
-else
+else $as_nop
 
   PHP_PHPDBG_DEBUG=no
 
@@ -10802,8 +11664,8 @@
 
 
 ext_output=$PHP_PHPDBG_DEBUG
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -10811,12 +11673,13 @@
 
 php_enable_phpdbg_readline=no
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for phpdbg readline support" >&5
-$as_echo_n "checking for phpdbg readline support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for phpdbg readline support" >&5
+printf %s "checking for phpdbg readline support... " >&6; }
 # Check whether --enable-phpdbg-readline was given.
-if test "${enable_phpdbg_readline+set}" = set; then :
+if test ${enable_phpdbg_readline+y}
+then :
   enableval=$enable_phpdbg_readline; PHP_PHPDBG_READLINE=$enableval
-else
+else $as_nop
 
   PHP_PHPDBG_READLINE=no
 
@@ -10825,18 +11688,19 @@
 
 
 ext_output=$PHP_PHPDBG_READLINE
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
 
 if test "$BUILD_PHPDBG" = "" && test "$PHP_PHPDBG" != "no"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether termios.h defines TIOCGWINSZ" >&5
-$as_echo_n "checking whether termios.h defines TIOCGWINSZ... " >&6; }
-if ${ac_cv_sys_tiocgwinsz_in_termios_h+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether termios.h defines TIOCGWINSZ" >&5
+printf %s "checking whether termios.h defines TIOCGWINSZ... " >&6; }
+if test ${ac_cv_sys_tiocgwinsz_in_termios_h+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
@@ -10847,23 +11711,25 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1; then :
+  $EGREP "yes" >/dev/null 2>&1
+then :
   ac_cv_sys_tiocgwinsz_in_termios_h=yes
-else
+else $as_nop
   ac_cv_sys_tiocgwinsz_in_termios_h=no
 fi
-rm -f conftest*
+rm -rf conftest*
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_tiocgwinsz_in_termios_h" >&5
-$as_echo "$ac_cv_sys_tiocgwinsz_in_termios_h" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_tiocgwinsz_in_termios_h" >&5
+printf "%s\n" "$ac_cv_sys_tiocgwinsz_in_termios_h" >&6; }
 
 if test $ac_cv_sys_tiocgwinsz_in_termios_h != yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether sys/ioctl.h defines TIOCGWINSZ" >&5
-$as_echo_n "checking whether sys/ioctl.h defines TIOCGWINSZ... " >&6; }
-if ${ac_cv_sys_tiocgwinsz_in_sys_ioctl_h+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether sys/ioctl.h defines TIOCGWINSZ" >&5
+printf %s "checking whether sys/ioctl.h defines TIOCGWINSZ... " >&6; }
+if test ${ac_cv_sys_tiocgwinsz_in_sys_ioctl_h+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
@@ -10874,65 +11740,67 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1; then :
+  $EGREP "yes" >/dev/null 2>&1
+then :
   ac_cv_sys_tiocgwinsz_in_sys_ioctl_h=yes
-else
+else $as_nop
   ac_cv_sys_tiocgwinsz_in_sys_ioctl_h=no
 fi
-rm -f conftest*
+rm -rf conftest*
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_tiocgwinsz_in_sys_ioctl_h" >&5
-$as_echo "$ac_cv_sys_tiocgwinsz_in_sys_ioctl_h" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_tiocgwinsz_in_sys_ioctl_h" >&5
+printf "%s\n" "$ac_cv_sys_tiocgwinsz_in_sys_ioctl_h" >&6; }
 
   if test $ac_cv_sys_tiocgwinsz_in_sys_ioctl_h = yes; then
 
-$as_echo "#define GWINSZ_IN_SYS_IOCTL 1" >>confdefs.h
+printf "%s\n" "#define GWINSZ_IN_SYS_IOCTL 1" >>confdefs.h
 
   fi
 fi
 
 
-$as_echo "#define HAVE_PHPDBG 1" >>confdefs.h
+printf "%s\n" "#define HAVE_PHPDBG 1" >>confdefs.h
 
 
   if test "$PHP_PHPDBG_DEBUG" != "no"; then
 
-$as_echo "#define PHPDBG_DEBUG 1" >>confdefs.h
+printf "%s\n" "#define PHPDBG_DEBUG 1" >>confdefs.h
 
   else
 
-$as_echo "#define PHPDBG_DEBUG 0" >>confdefs.h
+printf "%s\n" "#define PHPDBG_DEBUG 0" >>confdefs.h
 
   fi
 
   PHP_PHPDBG_CFLAGS="-D_GNU_SOURCE -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"
   PHP_PHPDBG_FILES="phpdbg.c phpdbg_parser.c phpdbg_lexer.c phpdbg_prompt.c phpdbg_help.c phpdbg_break.c phpdbg_print.c phpdbg_bp.c phpdbg_list.c phpdbg_utils.c phpdbg_info.c phpdbg_cmd.c phpdbg_set.c phpdbg_frame.c phpdbg_watch.c phpdbg_btree.c phpdbg_sigsafe.c phpdbg_io.c phpdbg_out.c"
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for phpdbg and readline integration" >&5
-$as_echo_n "checking for phpdbg and readline integration... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for phpdbg and readline integration" >&5
+printf %s "checking for phpdbg and readline integration... " >&6; }
   if test "$PHP_PHPDBG_READLINE" = "yes"; then
     if test "$PHP_READLINE" != "no" -o  "$PHP_LIBEDIT" != "no"; then
 
-$as_echo "#define HAVE_PHPDBG_READLINE 1" >>confdefs.h
+printf "%s\n" "#define HAVE_PHPDBG_READLINE 1" >>confdefs.h
 
   	  PHPDBG_EXTRA_LIBS="$PHP_READLINE_LIBS"
-  	  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-$as_echo "ok" >&6; }
+  	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+printf "%s\n" "ok" >&6; }
   	else
-  	  { $as_echo "$as_me:${as_lineno-$LINENO}: result: readline is not available" >&5
-$as_echo "readline is not available" >&6; }
+  	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: readline is not available" >&5
+printf "%s\n" "readline is not available" >&6; }
     fi
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5
-$as_echo "disabled" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: disabled" >&5
+printf "%s\n" "disabled" >&6; }
   fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for userfaultfd faulting on write-protected memory support" >&5
-$as_echo_n "checking for userfaultfd faulting on write-protected memory support... " >&6; }
-if ${ac_cv_phpdbg_userfaultfd_writefault+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for userfaultfd faulting on write-protected memory support" >&5
+printf %s "checking for userfaultfd faulting on write-protected memory support... " >&6; }
+if test ${ac_cv_phpdbg_userfaultfd_writefault+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -10942,26 +11810,28 @@
     #endif
 
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_phpdbg_userfaultfd_writefault=yes
-else
+else $as_nop
   ac_cv_phpdbg_userfaultfd_writefault=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_phpdbg_userfaultfd_writefault" >&5
-$as_echo "$ac_cv_phpdbg_userfaultfd_writefault" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_phpdbg_userfaultfd_writefault" >&5
+printf "%s\n" "$ac_cv_phpdbg_userfaultfd_writefault" >&6; }
   if test "$ac_cv_phpdbg_userfaultfd_writefault" = "yes"; then
     if test "$enable_zts" != "yes"; then
       CFLAGS_SAVE="$CFLAGS"
       LIBS_SAVE="$LIBS"
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthreads_cflags" >&5
-$as_echo_n "checking for pthreads_cflags... " >&6; }
-if ${ac_cv_pthreads_cflags+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthreads_cflags" >&5
+printf %s "checking for pthreads_cflags... " >&6; }
+if test ${ac_cv_pthreads_cflags+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
 ac_cv_pthreads_cflags=
 if test "$pthreads_working" != "yes"; then
@@ -10987,17 +11857,18 @@
     return pthread_create(&thd, NULL, thread_routine, &data);
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
 
   pthreads_checked=yes
 
-else
+else $as_nop
 
   pthreads_checked=no
 
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
     CFLAGS=$ac_save
     if test "$pthreads_checked" = "yes"; then
@@ -11008,14 +11879,15 @@
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pthreads_cflags" >&5
-$as_echo "$ac_cv_pthreads_cflags" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pthreads_cflags" >&5
+printf "%s\n" "$ac_cv_pthreads_cflags" >&6; }
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthreads_lib" >&5
-$as_echo_n "checking for pthreads_lib... " >&6; }
-if ${ac_cv_pthreads_lib+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthreads_lib" >&5
+printf %s "checking for pthreads_lib... " >&6; }
+if test ${ac_cv_pthreads_lib+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
 ac_cv_pthreads_lib=
 if test "$pthreads_working" != "yes"; then
@@ -11041,17 +11913,18 @@
     return pthread_create(&thd, NULL, thread_routine, &data);
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
 
   pthreads_checked=yes
 
-else
+else $as_nop
 
   pthreads_checked=no
 
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
     LIBS=$ac_save
     if test "$pthreads_checked" = "yes"; then
@@ -11062,34 +11935,34 @@
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pthreads_lib" >&5
-$as_echo "$ac_cv_pthreads_lib" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pthreads_lib" >&5
+printf "%s\n" "$ac_cv_pthreads_lib" >&6; }
 
 if test "x$ac_cv_pthreads_cflags" != "x" -o "x$ac_cv_pthreads_lib" != "x"; then
   pthreads_working="yes"
 fi
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking working pthreads" >&5
-$as_echo_n "checking working pthreads... " >&6; };
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking working pthreads" >&5
+printf %s "checking working pthreads... " >&6; };
 
       if test "$pthreads_working" = "yes"; then
-      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pthreads_cflags -l$ac_cv_pthreads_lib" >&5
-$as_echo "$ac_cv_pthreads_cflags -l$ac_cv_pthreads_lib" >&6; };
+      	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pthreads_cflags -l$ac_cv_pthreads_lib" >&5
+printf "%s\n" "$ac_cv_pthreads_cflags -l$ac_cv_pthreads_lib" >&6; };
       	PHP_PHPDBG_CFLAGS="$PHP_PHPDBG_CFLAGS $ac_cv_pthreads_cflags"
       	PHPDBG_EXTRA_LIBS="$PHPDBG_EXTRA_LIBS -l$ac_cv_pthreads_lib"
 
-$as_echo "#define HAVE_USERFAULTFD_WRITEFAULT 1" >>confdefs.h
+printf "%s\n" "#define HAVE_USERFAULTFD_WRITEFAULT 1" >>confdefs.h
 
       else
-        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: pthreads not available" >&5
-$as_echo "$as_me: WARNING: pthreads not available" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: pthreads not available" >&5
+printf "%s\n" "$as_me: WARNING: pthreads not available" >&2;}
       fi
 
       CFLAGS="$CFLAGS_SAVE"
       LIBS="$LIBS_SAVE"
     else
 
-$as_echo "#define HAVE_USERFAULTFD_WRITEFAULT 1" >>confdefs.h
+printf "%s\n" "#define HAVE_USERFAULTFD_WRITEFAULT 1" >>confdefs.h
 
     fi
   fi
@@ -11260,9 +12133,10 @@
 
 
 # Check whether --enable-cgi was given.
-if test "${enable_cgi+set}" = set; then :
+if test ${enable_cgi+y}
+then :
   enableval=$enable_cgi; PHP_CGI=$enableval
-else
+else $as_nop
 
   PHP_CGI=yes
 
@@ -11276,46 +12150,47 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CGI build" >&5
-$as_echo_n "checking for CGI build... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CGI build" >&5
+printf %s "checking for CGI build... " >&6; }
 if test "$PHP_CGI" != "no"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sun_len in sys/un.h" >&5
-$as_echo_n "checking for sun_len in sys/un.h... " >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sun_len in sys/un.h" >&5
+printf %s "checking for sun_len in sys/un.h... " >&6; }
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/un.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "sun_len" >/dev/null 2>&1; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+  $EGREP "sun_len" >/dev/null 2>&1
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-$as_echo "#define HAVE_SOCKADDR_UN_SUN_LEN 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SOCKADDR_UN_SUN_LEN 1" >>confdefs.h
 
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
-rm -f conftest*
+rm -rf conftest*
 
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cross-process locking is required by accept()" >&5
-$as_echo_n "checking whether cross-process locking is required by accept()... " >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether cross-process locking is required by accept()" >&5
+printf %s "checking whether cross-process locking is required by accept()... " >&6; }
     case "`uname -sr`" in
       IRIX\ 5.* | SunOS\ 5.* | UNIX_System_V\ 4.0)
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-$as_echo "#define USE_LOCKING 1" >>confdefs.h
+printf "%s\n" "#define USE_LOCKING 1" >>confdefs.h
 
       ;;
       *)
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
       ;;
     esac
 
@@ -11461,25 +12336,25 @@
   PHP_OUTPUT_FILES="$PHP_OUTPUT_FILES sapi/cgi/php-cgi.1"
 
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for chosen SAPI module" >&5
-$as_echo_n "checking for chosen SAPI module... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PHP_SAPI" >&5
-$as_echo "$PHP_SAPI" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for chosen SAPI module" >&5
+printf %s "checking for chosen SAPI module... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PHP_SAPI" >&5
+printf "%s\n" "$PHP_SAPI" >&6; }
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for executable SAPI binaries" >&5
-$as_echo_n "checking for executable SAPI binaries... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for executable SAPI binaries" >&5
+printf %s "checking for executable SAPI binaries... " >&6; }
 if test "$PHP_BINARIES"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PHP_BINARIES" >&5
-$as_echo "$PHP_BINARIES" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PHP_BINARIES" >&5
+printf "%s\n" "$PHP_BINARIES" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
-$as_echo "none" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none" >&5
+printf "%s\n" "none" >&6; }
 fi
 
 if test -z "$PHP_INSTALLED_SAPIS"; then
@@ -11526,21 +12401,22 @@
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
-$as_echo "" >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${T_MD}Running system checks${T_ME}" >&5
-$as_echo "${T_MD}Running system checks${T_ME}" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5
+printf "%s\n" "" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${T_MD}Running system checks${T_ME}" >&5
+printf "%s\n" "${T_MD}Running system checks${T_ME}" >&6; }
 
 
 
   PHP_ALT_PATH=/usr/bin:/usr/sbin:/usr/etc:/etc:/usr/ucblib:/usr/lib
   # Extract the first word of "sendmail", so it can be a program name with args.
 set dummy sendmail; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PROG_SENDMAIL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_PROG_SENDMAIL+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $PROG_SENDMAIL in
   \\/* | ?:\\/*)
   ac_cv_path_PROG_SENDMAIL="$PROG_SENDMAIL" # Let the user override the test with a path.
@@ -11551,11 +12427,15 @@
 for as_dir in $as_dummy
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_PROG_SENDMAIL="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_PROG_SENDMAIL="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -11568,11 +12448,11 @@
 fi
 PROG_SENDMAIL=$ac_cv_path_PROG_SENDMAIL
 if test -n "$PROG_SENDMAIL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PROG_SENDMAIL" >&5
-$as_echo "$PROG_SENDMAIL" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PROG_SENDMAIL" >&5
+printf "%s\n" "$PROG_SENDMAIL" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -11582,17 +12462,19 @@
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether system uses EBCDIC" >&5
-$as_echo_n "checking whether system uses EBCDIC... " >&6; }
-if ${ac_cv_ebcdic+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether system uses EBCDIC" >&5
+printf %s "checking whether system uses EBCDIC... " >&6; }
+if test ${ac_cv_ebcdic+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
-  if test "$cross_compiling" = yes; then :
+  if test "$cross_compiling" = yes
+then :
 
   ac_cv_ebcdic=no
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -11601,11 +12483,12 @@
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
 
   ac_cv_ebcdic=yes
 
-else
+else $as_nop
 
   ac_cv_ebcdic=no
 
@@ -11615,23 +12498,25 @@
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ebcdic" >&5
-$as_echo "$ac_cv_ebcdic" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ebcdic" >&5
+printf "%s\n" "$ac_cv_ebcdic" >&6; }
   if test "$ac_cv_ebcdic" = "yes"; then
     as_fn_error $? "PHP does not support EBCDIC targets" "$LINENO" 5
   fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
-$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
-if ${ac_cv_c_bigendian_php+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
+printf %s "checking whether byte ordering is bigendian... " >&6; }
+if test ${ac_cv_c_bigendian_php+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
   ac_cv_c_bigendian_php=unknown
-  if test "$cross_compiling" = yes; then :
+  if test "$cross_compiling" = yes
+then :
   ac_cv_c_bigendian_php=unknown
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -11648,9 +12533,10 @@
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   ac_cv_c_bigendian_php=yes
-else
+else $as_nop
   ac_cv_c_bigendian_php=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -11659,23 +12545,25 @@
 
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian_php" >&5
-$as_echo "$ac_cv_c_bigendian_php" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian_php" >&5
+printf "%s\n" "$ac_cv_c_bigendian_php" >&6; }
  if test $ac_cv_c_bigendian_php = yes; then
 
-$as_echo "#define WORDS_BIGENDIAN /**/" >>confdefs.h
+printf "%s\n" "#define WORDS_BIGENDIAN /**/" >>confdefs.h
 
  fi
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether writing to stdout works" >&5
-$as_echo_n "checking whether writing to stdout works... " >&6; }
-if ${ac_cv_write_stdout+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether writing to stdout works" >&5
+printf %s "checking whether writing to stdout works... " >&6; }
+if test ${ac_cv_write_stdout+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
-    if test "$cross_compiling" = yes; then :
+    if test "$cross_compiling" = yes
+then :
 
       case $host_alias in
         *linux*)
@@ -11686,7 +12574,7 @@
           ;;
       esac
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -11705,11 +12593,12 @@
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
 
       ac_cv_write_stdout=yes
 
-else
+else $as_nop
 
       ac_cv_write_stdout=no
 
@@ -11720,11 +12609,11 @@
 
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_write_stdout" >&5
-$as_echo "$ac_cv_write_stdout" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_write_stdout" >&5
+printf "%s\n" "$ac_cv_write_stdout" >&6; }
   if test "$ac_cv_write_stdout" = "yes"; then
 
-$as_echo "#define PHP_WRITE_STDOUT 1" >>confdefs.h
+printf "%s\n" "#define PHP_WRITE_STDOUT 1" >>confdefs.h
 
   fi
 
@@ -11775,13 +12664,15 @@
   unset found
 
   ac_fn_c_check_func "$LINENO" "socket" "ac_cv_func_socket"
-if test "x$ac_cv_func_socket" = xyes; then :
+if test "x$ac_cv_func_socket" = xyes
+then :
   found=yes
-else
+else $as_nop
    ac_fn_c_check_func "$LINENO" "__socket" "ac_cv_func___socket"
-if test "x$ac_cv_func___socket" = xyes; then :
+if test "x$ac_cv_func___socket" = xyes
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 
@@ -11791,7 +12682,7 @@
   case $found in
   yes)
 
-$as_echo "#define HAVE_SOCKET 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SOCKET 1" >>confdefs.h
 
     ac_cv_func_socket=yes
   ;;
@@ -11801,11 +12692,12 @@
   unset ac_cv_lib_socket_socket
   unset ac_cv_lib_socket___socket
   unset found
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -lsocket" >&5
-$as_echo_n "checking for socket in -lsocket... " >&6; }
-if ${ac_cv_lib_socket_socket+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for socket in -lsocket" >&5
+printf %s "checking for socket in -lsocket... " >&6; }
+if test ${ac_cv_lib_socket_socket+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -11814,38 +12706,38 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char socket ();
 int
-main ()
+main (void)
 {
 return socket ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_socket_socket=yes
-else
+else $as_nop
   ac_cv_lib_socket_socket=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_socket" >&5
-$as_echo "$ac_cv_lib_socket_socket" >&6; }
-if test "x$ac_cv_lib_socket_socket" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_socket" >&5
+printf "%s\n" "$ac_cv_lib_socket_socket" >&6; }
+if test "x$ac_cv_lib_socket_socket" = xyes
+then :
   found=yes
-else
+else $as_nop
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __socket in -lsocket" >&5
-$as_echo_n "checking for __socket in -lsocket... " >&6; }
-if ${ac_cv_lib_socket___socket+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __socket in -lsocket" >&5
+printf %s "checking for __socket in -lsocket... " >&6; }
+if test ${ac_cv_lib_socket___socket+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -11854,32 +12746,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char __socket ();
 int
-main ()
+main (void)
 {
 return __socket ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_socket___socket=yes
-else
+else $as_nop
   ac_cv_lib_socket___socket=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___socket" >&5
-$as_echo "$ac_cv_lib_socket___socket" >&6; }
-if test "x$ac_cv_lib_socket___socket" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___socket" >&5
+printf "%s\n" "$ac_cv_lib_socket___socket" >&6; }
+if test "x$ac_cv_lib_socket___socket" = xyes
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 
@@ -11890,18 +12781,20 @@
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lsocket"
-    if test "$cross_compiling" = yes; then :
+    if test "$cross_compiling" = yes
+then :
 
             found=yes
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int main(void) { return (0); }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -11923,10 +12816,10 @@
 
 
 
-$as_echo "#define HAVE_SOCKET 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SOCKET 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_LIBSOCKET 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBSOCKET 1" >>confdefs.h
 
     ac_cv_func_socket=yes
   else
@@ -11935,11 +12828,12 @@
   unset ac_cv_lib_network_socket
   unset ac_cv_lib_network___socket
   unset found
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -lnetwork" >&5
-$as_echo_n "checking for socket in -lnetwork... " >&6; }
-if ${ac_cv_lib_network_socket+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for socket in -lnetwork" >&5
+printf %s "checking for socket in -lnetwork... " >&6; }
+if test ${ac_cv_lib_network_socket+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnetwork  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -11948,38 +12842,38 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char socket ();
 int
-main ()
+main (void)
 {
 return socket ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_network_socket=yes
-else
+else $as_nop
   ac_cv_lib_network_socket=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network_socket" >&5
-$as_echo "$ac_cv_lib_network_socket" >&6; }
-if test "x$ac_cv_lib_network_socket" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network_socket" >&5
+printf "%s\n" "$ac_cv_lib_network_socket" >&6; }
+if test "x$ac_cv_lib_network_socket" = xyes
+then :
   found=yes
-else
+else $as_nop
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __socket in -lnetwork" >&5
-$as_echo_n "checking for __socket in -lnetwork... " >&6; }
-if ${ac_cv_lib_network___socket+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __socket in -lnetwork" >&5
+printf %s "checking for __socket in -lnetwork... " >&6; }
+if test ${ac_cv_lib_network___socket+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnetwork  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -11988,32 +12882,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char __socket ();
 int
-main ()
+main (void)
 {
 return __socket ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_network___socket=yes
-else
+else $as_nop
   ac_cv_lib_network___socket=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network___socket" >&5
-$as_echo "$ac_cv_lib_network___socket" >&6; }
-if test "x$ac_cv_lib_network___socket" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network___socket" >&5
+printf "%s\n" "$ac_cv_lib_network___socket" >&6; }
+if test "x$ac_cv_lib_network___socket" = xyes
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 
@@ -12024,18 +12917,20 @@
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lnetwork"
-    if test "$cross_compiling" = yes; then :
+    if test "$cross_compiling" = yes
+then :
 
             found=yes
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int main(void) { return (0); }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -12057,10 +12952,10 @@
 
 
 
-$as_echo "#define HAVE_SOCKET 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SOCKET 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_LIBNETWORK 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBNETWORK 1" >>confdefs.h
 
     ac_cv_func_socket=yes
   else
@@ -12082,13 +12977,15 @@
   unset found
 
   ac_fn_c_check_func "$LINENO" "socketpair" "ac_cv_func_socketpair"
-if test "x$ac_cv_func_socketpair" = xyes; then :
+if test "x$ac_cv_func_socketpair" = xyes
+then :
   found=yes
-else
+else $as_nop
    ac_fn_c_check_func "$LINENO" "__socketpair" "ac_cv_func___socketpair"
-if test "x$ac_cv_func___socketpair" = xyes; then :
+if test "x$ac_cv_func___socketpair" = xyes
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 
@@ -12098,7 +12995,7 @@
   case $found in
   yes)
 
-$as_echo "#define HAVE_SOCKETPAIR 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SOCKETPAIR 1" >>confdefs.h
 
     ac_cv_func_socketpair=yes
   ;;
@@ -12108,11 +13005,12 @@
   unset ac_cv_lib_socket_socketpair
   unset ac_cv_lib_socket___socketpair
   unset found
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socketpair in -lsocket" >&5
-$as_echo_n "checking for socketpair in -lsocket... " >&6; }
-if ${ac_cv_lib_socket_socketpair+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for socketpair in -lsocket" >&5
+printf %s "checking for socketpair in -lsocket... " >&6; }
+if test ${ac_cv_lib_socket_socketpair+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12121,38 +13019,38 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char socketpair ();
 int
-main ()
+main (void)
 {
 return socketpair ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_socket_socketpair=yes
-else
+else $as_nop
   ac_cv_lib_socket_socketpair=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_socketpair" >&5
-$as_echo "$ac_cv_lib_socket_socketpair" >&6; }
-if test "x$ac_cv_lib_socket_socketpair" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_socketpair" >&5
+printf "%s\n" "$ac_cv_lib_socket_socketpair" >&6; }
+if test "x$ac_cv_lib_socket_socketpair" = xyes
+then :
   found=yes
-else
+else $as_nop
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __socketpair in -lsocket" >&5
-$as_echo_n "checking for __socketpair in -lsocket... " >&6; }
-if ${ac_cv_lib_socket___socketpair+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __socketpair in -lsocket" >&5
+printf %s "checking for __socketpair in -lsocket... " >&6; }
+if test ${ac_cv_lib_socket___socketpair+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12161,32 +13059,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char __socketpair ();
 int
-main ()
+main (void)
 {
 return __socketpair ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_socket___socketpair=yes
-else
+else $as_nop
   ac_cv_lib_socket___socketpair=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___socketpair" >&5
-$as_echo "$ac_cv_lib_socket___socketpair" >&6; }
-if test "x$ac_cv_lib_socket___socketpair" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___socketpair" >&5
+printf "%s\n" "$ac_cv_lib_socket___socketpair" >&6; }
+if test "x$ac_cv_lib_socket___socketpair" = xyes
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 
@@ -12197,18 +13094,20 @@
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lsocket"
-    if test "$cross_compiling" = yes; then :
+    if test "$cross_compiling" = yes
+then :
 
             found=yes
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int main(void) { return (0); }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -12230,10 +13129,10 @@
 
 
 
-$as_echo "#define HAVE_SOCKETPAIR 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SOCKETPAIR 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_LIBSOCKET 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBSOCKET 1" >>confdefs.h
 
     ac_cv_func_socketpair=yes
   else
@@ -12242,11 +13141,12 @@
   unset ac_cv_lib_network_socketpair
   unset ac_cv_lib_network___socketpair
   unset found
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socketpair in -lnetwork" >&5
-$as_echo_n "checking for socketpair in -lnetwork... " >&6; }
-if ${ac_cv_lib_network_socketpair+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for socketpair in -lnetwork" >&5
+printf %s "checking for socketpair in -lnetwork... " >&6; }
+if test ${ac_cv_lib_network_socketpair+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnetwork  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12255,38 +13155,38 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char socketpair ();
 int
-main ()
+main (void)
 {
 return socketpair ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_network_socketpair=yes
-else
+else $as_nop
   ac_cv_lib_network_socketpair=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network_socketpair" >&5
-$as_echo "$ac_cv_lib_network_socketpair" >&6; }
-if test "x$ac_cv_lib_network_socketpair" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network_socketpair" >&5
+printf "%s\n" "$ac_cv_lib_network_socketpair" >&6; }
+if test "x$ac_cv_lib_network_socketpair" = xyes
+then :
   found=yes
-else
+else $as_nop
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __socketpair in -lnetwork" >&5
-$as_echo_n "checking for __socketpair in -lnetwork... " >&6; }
-if ${ac_cv_lib_network___socketpair+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __socketpair in -lnetwork" >&5
+printf %s "checking for __socketpair in -lnetwork... " >&6; }
+if test ${ac_cv_lib_network___socketpair+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnetwork  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12295,32 +13195,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char __socketpair ();
 int
-main ()
+main (void)
 {
 return __socketpair ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_network___socketpair=yes
-else
+else $as_nop
   ac_cv_lib_network___socketpair=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network___socketpair" >&5
-$as_echo "$ac_cv_lib_network___socketpair" >&6; }
-if test "x$ac_cv_lib_network___socketpair" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network___socketpair" >&5
+printf "%s\n" "$ac_cv_lib_network___socketpair" >&6; }
+if test "x$ac_cv_lib_network___socketpair" = xyes
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 
@@ -12331,18 +13230,20 @@
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lnetwork"
-    if test "$cross_compiling" = yes; then :
+    if test "$cross_compiling" = yes
+then :
 
             found=yes
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int main(void) { return (0); }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -12364,10 +13265,10 @@
 
 
 
-$as_echo "#define HAVE_SOCKETPAIR 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SOCKETPAIR 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_LIBNETWORK 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBNETWORK 1" >>confdefs.h
 
     ac_cv_func_socketpair=yes
   else
@@ -12389,13 +13290,15 @@
   unset found
 
   ac_fn_c_check_func "$LINENO" "htonl" "ac_cv_func_htonl"
-if test "x$ac_cv_func_htonl" = xyes; then :
+if test "x$ac_cv_func_htonl" = xyes
+then :
   found=yes
-else
+else $as_nop
    ac_fn_c_check_func "$LINENO" "__htonl" "ac_cv_func___htonl"
-if test "x$ac_cv_func___htonl" = xyes; then :
+if test "x$ac_cv_func___htonl" = xyes
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 
@@ -12405,7 +13308,7 @@
   case $found in
   yes)
 
-$as_echo "#define HAVE_HTONL 1" >>confdefs.h
+printf "%s\n" "#define HAVE_HTONL 1" >>confdefs.h
 
     ac_cv_func_htonl=yes
   ;;
@@ -12415,11 +13318,12 @@
   unset ac_cv_lib_socket_htonl
   unset ac_cv_lib_socket___htonl
   unset found
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for htonl in -lsocket" >&5
-$as_echo_n "checking for htonl in -lsocket... " >&6; }
-if ${ac_cv_lib_socket_htonl+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for htonl in -lsocket" >&5
+printf %s "checking for htonl in -lsocket... " >&6; }
+if test ${ac_cv_lib_socket_htonl+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12428,38 +13332,38 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char htonl ();
 int
-main ()
+main (void)
 {
 return htonl ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_socket_htonl=yes
-else
+else $as_nop
   ac_cv_lib_socket_htonl=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_htonl" >&5
-$as_echo "$ac_cv_lib_socket_htonl" >&6; }
-if test "x$ac_cv_lib_socket_htonl" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_htonl" >&5
+printf "%s\n" "$ac_cv_lib_socket_htonl" >&6; }
+if test "x$ac_cv_lib_socket_htonl" = xyes
+then :
   found=yes
-else
+else $as_nop
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __htonl in -lsocket" >&5
-$as_echo_n "checking for __htonl in -lsocket... " >&6; }
-if ${ac_cv_lib_socket___htonl+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __htonl in -lsocket" >&5
+printf %s "checking for __htonl in -lsocket... " >&6; }
+if test ${ac_cv_lib_socket___htonl+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12468,32 +13372,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char __htonl ();
 int
-main ()
+main (void)
 {
 return __htonl ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_socket___htonl=yes
-else
+else $as_nop
   ac_cv_lib_socket___htonl=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___htonl" >&5
-$as_echo "$ac_cv_lib_socket___htonl" >&6; }
-if test "x$ac_cv_lib_socket___htonl" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___htonl" >&5
+printf "%s\n" "$ac_cv_lib_socket___htonl" >&6; }
+if test "x$ac_cv_lib_socket___htonl" = xyes
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 
@@ -12504,18 +13407,20 @@
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lsocket"
-    if test "$cross_compiling" = yes; then :
+    if test "$cross_compiling" = yes
+then :
 
             found=yes
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int main(void) { return (0); }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -12537,10 +13442,10 @@
 
 
 
-$as_echo "#define HAVE_HTONL 1" >>confdefs.h
+printf "%s\n" "#define HAVE_HTONL 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_LIBSOCKET 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBSOCKET 1" >>confdefs.h
 
     ac_cv_func_htonl=yes
   else
@@ -12549,11 +13454,12 @@
   unset ac_cv_lib_network_htonl
   unset ac_cv_lib_network___htonl
   unset found
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for htonl in -lnetwork" >&5
-$as_echo_n "checking for htonl in -lnetwork... " >&6; }
-if ${ac_cv_lib_network_htonl+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for htonl in -lnetwork" >&5
+printf %s "checking for htonl in -lnetwork... " >&6; }
+if test ${ac_cv_lib_network_htonl+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnetwork  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12562,38 +13468,38 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char htonl ();
 int
-main ()
+main (void)
 {
 return htonl ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_network_htonl=yes
-else
+else $as_nop
   ac_cv_lib_network_htonl=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network_htonl" >&5
-$as_echo "$ac_cv_lib_network_htonl" >&6; }
-if test "x$ac_cv_lib_network_htonl" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network_htonl" >&5
+printf "%s\n" "$ac_cv_lib_network_htonl" >&6; }
+if test "x$ac_cv_lib_network_htonl" = xyes
+then :
   found=yes
-else
+else $as_nop
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __htonl in -lnetwork" >&5
-$as_echo_n "checking for __htonl in -lnetwork... " >&6; }
-if ${ac_cv_lib_network___htonl+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __htonl in -lnetwork" >&5
+printf %s "checking for __htonl in -lnetwork... " >&6; }
+if test ${ac_cv_lib_network___htonl+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnetwork  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12602,32 +13508,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char __htonl ();
 int
-main ()
+main (void)
 {
 return __htonl ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_network___htonl=yes
-else
+else $as_nop
   ac_cv_lib_network___htonl=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network___htonl" >&5
-$as_echo "$ac_cv_lib_network___htonl" >&6; }
-if test "x$ac_cv_lib_network___htonl" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network___htonl" >&5
+printf "%s\n" "$ac_cv_lib_network___htonl" >&6; }
+if test "x$ac_cv_lib_network___htonl" = xyes
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 
@@ -12638,18 +13543,20 @@
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lnetwork"
-    if test "$cross_compiling" = yes; then :
+    if test "$cross_compiling" = yes
+then :
 
             found=yes
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int main(void) { return (0); }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -12671,10 +13578,10 @@
 
 
 
-$as_echo "#define HAVE_HTONL 1" >>confdefs.h
+printf "%s\n" "#define HAVE_HTONL 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_LIBNETWORK 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBNETWORK 1" >>confdefs.h
 
     ac_cv_func_htonl=yes
   else
@@ -12696,13 +13603,15 @@
   unset found
 
   ac_fn_c_check_func "$LINENO" "gethostname" "ac_cv_func_gethostname"
-if test "x$ac_cv_func_gethostname" = xyes; then :
+if test "x$ac_cv_func_gethostname" = xyes
+then :
   found=yes
-else
+else $as_nop
    ac_fn_c_check_func "$LINENO" "__gethostname" "ac_cv_func___gethostname"
-if test "x$ac_cv_func___gethostname" = xyes; then :
+if test "x$ac_cv_func___gethostname" = xyes
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 
@@ -12712,7 +13621,7 @@
   case $found in
   yes)
 
-$as_echo "#define HAVE_GETHOSTNAME 1" >>confdefs.h
+printf "%s\n" "#define HAVE_GETHOSTNAME 1" >>confdefs.h
 
     ac_cv_func_gethostname=yes
   ;;
@@ -12722,11 +13631,12 @@
   unset ac_cv_lib_nsl_gethostname
   unset ac_cv_lib_nsl___gethostname
   unset found
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostname in -lnsl" >&5
-$as_echo_n "checking for gethostname in -lnsl... " >&6; }
-if ${ac_cv_lib_nsl_gethostname+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gethostname in -lnsl" >&5
+printf %s "checking for gethostname in -lnsl... " >&6; }
+if test ${ac_cv_lib_nsl_gethostname+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12735,38 +13645,38 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char gethostname ();
 int
-main ()
+main (void)
 {
 return gethostname ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_nsl_gethostname=yes
-else
+else $as_nop
   ac_cv_lib_nsl_gethostname=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostname" >&5
-$as_echo "$ac_cv_lib_nsl_gethostname" >&6; }
-if test "x$ac_cv_lib_nsl_gethostname" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostname" >&5
+printf "%s\n" "$ac_cv_lib_nsl_gethostname" >&6; }
+if test "x$ac_cv_lib_nsl_gethostname" = xyes
+then :
   found=yes
-else
+else $as_nop
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __gethostname in -lnsl" >&5
-$as_echo_n "checking for __gethostname in -lnsl... " >&6; }
-if ${ac_cv_lib_nsl___gethostname+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __gethostname in -lnsl" >&5
+printf %s "checking for __gethostname in -lnsl... " >&6; }
+if test ${ac_cv_lib_nsl___gethostname+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12775,32 +13685,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char __gethostname ();
 int
-main ()
+main (void)
 {
 return __gethostname ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_nsl___gethostname=yes
-else
+else $as_nop
   ac_cv_lib_nsl___gethostname=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl___gethostname" >&5
-$as_echo "$ac_cv_lib_nsl___gethostname" >&6; }
-if test "x$ac_cv_lib_nsl___gethostname" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl___gethostname" >&5
+printf "%s\n" "$ac_cv_lib_nsl___gethostname" >&6; }
+if test "x$ac_cv_lib_nsl___gethostname" = xyes
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 
@@ -12811,18 +13720,20 @@
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lnsl"
-    if test "$cross_compiling" = yes; then :
+    if test "$cross_compiling" = yes
+then :
 
             found=yes
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int main(void) { return (0); }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -12844,10 +13755,10 @@
 
 
 
-$as_echo "#define HAVE_GETHOSTNAME 1" >>confdefs.h
+printf "%s\n" "#define HAVE_GETHOSTNAME 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_LIBNSL 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBNSL 1" >>confdefs.h
 
     ac_cv_func_gethostname=yes
   else
@@ -12856,11 +13767,12 @@
   unset ac_cv_lib_network_gethostname
   unset ac_cv_lib_network___gethostname
   unset found
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostname in -lnetwork" >&5
-$as_echo_n "checking for gethostname in -lnetwork... " >&6; }
-if ${ac_cv_lib_network_gethostname+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gethostname in -lnetwork" >&5
+printf %s "checking for gethostname in -lnetwork... " >&6; }
+if test ${ac_cv_lib_network_gethostname+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnetwork  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12869,38 +13781,38 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char gethostname ();
 int
-main ()
+main (void)
 {
 return gethostname ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_network_gethostname=yes
-else
+else $as_nop
   ac_cv_lib_network_gethostname=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network_gethostname" >&5
-$as_echo "$ac_cv_lib_network_gethostname" >&6; }
-if test "x$ac_cv_lib_network_gethostname" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network_gethostname" >&5
+printf "%s\n" "$ac_cv_lib_network_gethostname" >&6; }
+if test "x$ac_cv_lib_network_gethostname" = xyes
+then :
   found=yes
-else
+else $as_nop
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __gethostname in -lnetwork" >&5
-$as_echo_n "checking for __gethostname in -lnetwork... " >&6; }
-if ${ac_cv_lib_network___gethostname+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __gethostname in -lnetwork" >&5
+printf %s "checking for __gethostname in -lnetwork... " >&6; }
+if test ${ac_cv_lib_network___gethostname+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnetwork  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12909,32 +13821,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char __gethostname ();
 int
-main ()
+main (void)
 {
 return __gethostname ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_network___gethostname=yes
-else
+else $as_nop
   ac_cv_lib_network___gethostname=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network___gethostname" >&5
-$as_echo "$ac_cv_lib_network___gethostname" >&6; }
-if test "x$ac_cv_lib_network___gethostname" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network___gethostname" >&5
+printf "%s\n" "$ac_cv_lib_network___gethostname" >&6; }
+if test "x$ac_cv_lib_network___gethostname" = xyes
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 
@@ -12945,18 +13856,20 @@
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lnetwork"
-    if test "$cross_compiling" = yes; then :
+    if test "$cross_compiling" = yes
+then :
 
             found=yes
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int main(void) { return (0); }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -12978,10 +13891,10 @@
 
 
 
-$as_echo "#define HAVE_GETHOSTNAME 1" >>confdefs.h
+printf "%s\n" "#define HAVE_GETHOSTNAME 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_LIBNETWORK 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBNETWORK 1" >>confdefs.h
 
     ac_cv_func_gethostname=yes
   else
@@ -13003,13 +13916,15 @@
   unset found
 
   ac_fn_c_check_func "$LINENO" "gethostbyaddr" "ac_cv_func_gethostbyaddr"
-if test "x$ac_cv_func_gethostbyaddr" = xyes; then :
+if test "x$ac_cv_func_gethostbyaddr" = xyes
+then :
   found=yes
-else
+else $as_nop
    ac_fn_c_check_func "$LINENO" "__gethostbyaddr" "ac_cv_func___gethostbyaddr"
-if test "x$ac_cv_func___gethostbyaddr" = xyes; then :
+if test "x$ac_cv_func___gethostbyaddr" = xyes
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 
@@ -13019,7 +13934,7 @@
   case $found in
   yes)
 
-$as_echo "#define HAVE_GETHOSTBYADDR 1" >>confdefs.h
+printf "%s\n" "#define HAVE_GETHOSTBYADDR 1" >>confdefs.h
 
     ac_cv_func_gethostbyaddr=yes
   ;;
@@ -13029,11 +13944,12 @@
   unset ac_cv_lib_nsl_gethostbyaddr
   unset ac_cv_lib_nsl___gethostbyaddr
   unset found
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyaddr in -lnsl" >&5
-$as_echo_n "checking for gethostbyaddr in -lnsl... " >&6; }
-if ${ac_cv_lib_nsl_gethostbyaddr+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gethostbyaddr in -lnsl" >&5
+printf %s "checking for gethostbyaddr in -lnsl... " >&6; }
+if test ${ac_cv_lib_nsl_gethostbyaddr+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -13042,38 +13958,38 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char gethostbyaddr ();
 int
-main ()
+main (void)
 {
 return gethostbyaddr ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_nsl_gethostbyaddr=yes
-else
+else $as_nop
   ac_cv_lib_nsl_gethostbyaddr=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyaddr" >&5
-$as_echo "$ac_cv_lib_nsl_gethostbyaddr" >&6; }
-if test "x$ac_cv_lib_nsl_gethostbyaddr" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyaddr" >&5
+printf "%s\n" "$ac_cv_lib_nsl_gethostbyaddr" >&6; }
+if test "x$ac_cv_lib_nsl_gethostbyaddr" = xyes
+then :
   found=yes
-else
+else $as_nop
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __gethostbyaddr in -lnsl" >&5
-$as_echo_n "checking for __gethostbyaddr in -lnsl... " >&6; }
-if ${ac_cv_lib_nsl___gethostbyaddr+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __gethostbyaddr in -lnsl" >&5
+printf %s "checking for __gethostbyaddr in -lnsl... " >&6; }
+if test ${ac_cv_lib_nsl___gethostbyaddr+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -13082,32 +13998,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char __gethostbyaddr ();
 int
-main ()
+main (void)
 {
 return __gethostbyaddr ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_nsl___gethostbyaddr=yes
-else
+else $as_nop
   ac_cv_lib_nsl___gethostbyaddr=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl___gethostbyaddr" >&5
-$as_echo "$ac_cv_lib_nsl___gethostbyaddr" >&6; }
-if test "x$ac_cv_lib_nsl___gethostbyaddr" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl___gethostbyaddr" >&5
+printf "%s\n" "$ac_cv_lib_nsl___gethostbyaddr" >&6; }
+if test "x$ac_cv_lib_nsl___gethostbyaddr" = xyes
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 
@@ -13118,18 +14033,20 @@
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lnsl"
-    if test "$cross_compiling" = yes; then :
+    if test "$cross_compiling" = yes
+then :
 
             found=yes
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int main(void) { return (0); }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -13151,10 +14068,10 @@
 
 
 
-$as_echo "#define HAVE_GETHOSTBYADDR 1" >>confdefs.h
+printf "%s\n" "#define HAVE_GETHOSTBYADDR 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_LIBNSL 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBNSL 1" >>confdefs.h
 
     ac_cv_func_gethostbyaddr=yes
   else
@@ -13163,11 +14080,12 @@
   unset ac_cv_lib_network_gethostbyaddr
   unset ac_cv_lib_network___gethostbyaddr
   unset found
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyaddr in -lnetwork" >&5
-$as_echo_n "checking for gethostbyaddr in -lnetwork... " >&6; }
-if ${ac_cv_lib_network_gethostbyaddr+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gethostbyaddr in -lnetwork" >&5
+printf %s "checking for gethostbyaddr in -lnetwork... " >&6; }
+if test ${ac_cv_lib_network_gethostbyaddr+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnetwork  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -13176,38 +14094,38 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char gethostbyaddr ();
 int
-main ()
+main (void)
 {
 return gethostbyaddr ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_network_gethostbyaddr=yes
-else
+else $as_nop
   ac_cv_lib_network_gethostbyaddr=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network_gethostbyaddr" >&5
-$as_echo "$ac_cv_lib_network_gethostbyaddr" >&6; }
-if test "x$ac_cv_lib_network_gethostbyaddr" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network_gethostbyaddr" >&5
+printf "%s\n" "$ac_cv_lib_network_gethostbyaddr" >&6; }
+if test "x$ac_cv_lib_network_gethostbyaddr" = xyes
+then :
   found=yes
-else
+else $as_nop
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __gethostbyaddr in -lnetwork" >&5
-$as_echo_n "checking for __gethostbyaddr in -lnetwork... " >&6; }
-if ${ac_cv_lib_network___gethostbyaddr+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __gethostbyaddr in -lnetwork" >&5
+printf %s "checking for __gethostbyaddr in -lnetwork... " >&6; }
+if test ${ac_cv_lib_network___gethostbyaddr+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnetwork  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -13216,32 +14134,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char __gethostbyaddr ();
 int
-main ()
+main (void)
 {
 return __gethostbyaddr ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_network___gethostbyaddr=yes
-else
+else $as_nop
   ac_cv_lib_network___gethostbyaddr=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network___gethostbyaddr" >&5
-$as_echo "$ac_cv_lib_network___gethostbyaddr" >&6; }
-if test "x$ac_cv_lib_network___gethostbyaddr" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network___gethostbyaddr" >&5
+printf "%s\n" "$ac_cv_lib_network___gethostbyaddr" >&6; }
+if test "x$ac_cv_lib_network___gethostbyaddr" = xyes
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 
@@ -13252,18 +14169,20 @@
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lnetwork"
-    if test "$cross_compiling" = yes; then :
+    if test "$cross_compiling" = yes
+then :
 
             found=yes
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int main(void) { return (0); }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -13285,10 +14204,10 @@
 
 
 
-$as_echo "#define HAVE_GETHOSTBYADDR 1" >>confdefs.h
+printf "%s\n" "#define HAVE_GETHOSTBYADDR 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_LIBNETWORK 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBNETWORK 1" >>confdefs.h
 
     ac_cv_func_gethostbyaddr=yes
   else
@@ -13310,13 +14229,15 @@
   unset found
 
   ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
-if test "x$ac_cv_func_dlopen" = xyes; then :
+if test "x$ac_cv_func_dlopen" = xyes
+then :
   found=yes
-else
+else $as_nop
    ac_fn_c_check_func "$LINENO" "__dlopen" "ac_cv_func___dlopen"
-if test "x$ac_cv_func___dlopen" = xyes; then :
+if test "x$ac_cv_func___dlopen" = xyes
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 
@@ -13326,7 +14247,7 @@
   case $found in
   yes)
 
-$as_echo "#define HAVE_DLOPEN 1" >>confdefs.h
+printf "%s\n" "#define HAVE_DLOPEN 1" >>confdefs.h
 
     ac_cv_func_dlopen=yes
   ;;
@@ -13336,11 +14257,12 @@
   unset ac_cv_lib_dl_dlopen
   unset ac_cv_lib_dl___dlopen
   unset found
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if ${ac_cv_lib_dl_dlopen+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+printf %s "checking for dlopen in -ldl... " >&6; }
+if test ${ac_cv_lib_dl_dlopen+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -13349,38 +14271,38 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char dlopen ();
 int
-main ()
+main (void)
 {
 return dlopen ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_dl_dlopen=yes
-else
+else $as_nop
   ac_cv_lib_dl_dlopen=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = xyes
+then :
   found=yes
-else
+else $as_nop
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __dlopen in -ldl" >&5
-$as_echo_n "checking for __dlopen in -ldl... " >&6; }
-if ${ac_cv_lib_dl___dlopen+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __dlopen in -ldl" >&5
+printf %s "checking for __dlopen in -ldl... " >&6; }
+if test ${ac_cv_lib_dl___dlopen+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -13389,32 +14311,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char __dlopen ();
 int
-main ()
+main (void)
 {
 return __dlopen ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_dl___dlopen=yes
-else
+else $as_nop
   ac_cv_lib_dl___dlopen=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl___dlopen" >&5
-$as_echo "$ac_cv_lib_dl___dlopen" >&6; }
-if test "x$ac_cv_lib_dl___dlopen" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl___dlopen" >&5
+printf "%s\n" "$ac_cv_lib_dl___dlopen" >&6; }
+if test "x$ac_cv_lib_dl___dlopen" = xyes
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 
@@ -13425,18 +14346,20 @@
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -ldl"
-    if test "$cross_compiling" = yes; then :
+    if test "$cross_compiling" = yes
+then :
 
             found=yes
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int main(void) { return (0); }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -13458,10 +14381,10 @@
 
 
 
-$as_echo "#define HAVE_DLOPEN 1" >>confdefs.h
+printf "%s\n" "#define HAVE_DLOPEN 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_LIBDL 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBDL 1" >>confdefs.h
 
     ac_cv_func_dlopen=yes
   else
@@ -13470,11 +14393,12 @@
   unset ac_cv_lib_root_dlopen
   unset ac_cv_lib_root___dlopen
   unset found
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lroot" >&5
-$as_echo_n "checking for dlopen in -lroot... " >&6; }
-if ${ac_cv_lib_root_dlopen+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lroot" >&5
+printf %s "checking for dlopen in -lroot... " >&6; }
+if test ${ac_cv_lib_root_dlopen+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lroot  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -13483,38 +14407,38 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char dlopen ();
 int
-main ()
+main (void)
 {
 return dlopen ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_root_dlopen=yes
-else
+else $as_nop
   ac_cv_lib_root_dlopen=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_root_dlopen" >&5
-$as_echo "$ac_cv_lib_root_dlopen" >&6; }
-if test "x$ac_cv_lib_root_dlopen" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_root_dlopen" >&5
+printf "%s\n" "$ac_cv_lib_root_dlopen" >&6; }
+if test "x$ac_cv_lib_root_dlopen" = xyes
+then :
   found=yes
-else
+else $as_nop
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __dlopen in -lroot" >&5
-$as_echo_n "checking for __dlopen in -lroot... " >&6; }
-if ${ac_cv_lib_root___dlopen+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __dlopen in -lroot" >&5
+printf %s "checking for __dlopen in -lroot... " >&6; }
+if test ${ac_cv_lib_root___dlopen+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lroot  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -13523,32 +14447,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char __dlopen ();
 int
-main ()
+main (void)
 {
 return __dlopen ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_root___dlopen=yes
-else
+else $as_nop
   ac_cv_lib_root___dlopen=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_root___dlopen" >&5
-$as_echo "$ac_cv_lib_root___dlopen" >&6; }
-if test "x$ac_cv_lib_root___dlopen" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_root___dlopen" >&5
+printf "%s\n" "$ac_cv_lib_root___dlopen" >&6; }
+if test "x$ac_cv_lib_root___dlopen" = xyes
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 
@@ -13559,18 +14482,20 @@
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lroot"
-    if test "$cross_compiling" = yes; then :
+    if test "$cross_compiling" = yes
+then :
 
             found=yes
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int main(void) { return (0); }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -13592,10 +14517,10 @@
 
 
 
-$as_echo "#define HAVE_DLOPEN 1" >>confdefs.h
+printf "%s\n" "#define HAVE_DLOPEN 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_LIBROOT 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBROOT 1" >>confdefs.h
 
     ac_cv_func_dlopen=yes
   else
@@ -13617,13 +14542,15 @@
   unset found
 
   ac_fn_c_check_func "$LINENO" "dlsym" "ac_cv_func_dlsym"
-if test "x$ac_cv_func_dlsym" = xyes; then :
+if test "x$ac_cv_func_dlsym" = xyes
+then :
   found=yes
-else
+else $as_nop
    ac_fn_c_check_func "$LINENO" "__dlsym" "ac_cv_func___dlsym"
-if test "x$ac_cv_func___dlsym" = xyes; then :
+if test "x$ac_cv_func___dlsym" = xyes
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 
@@ -13633,7 +14560,7 @@
   case $found in
   yes)
 
-$as_echo "#define HAVE_DLSYM 1" >>confdefs.h
+printf "%s\n" "#define HAVE_DLSYM 1" >>confdefs.h
 
     ac_cv_func_dlsym=yes
   ;;
@@ -13643,11 +14570,12 @@
   unset ac_cv_lib_dl_dlsym
   unset ac_cv_lib_dl___dlsym
   unset found
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlsym in -ldl" >&5
-$as_echo_n "checking for dlsym in -ldl... " >&6; }
-if ${ac_cv_lib_dl_dlsym+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlsym in -ldl" >&5
+printf %s "checking for dlsym in -ldl... " >&6; }
+if test ${ac_cv_lib_dl_dlsym+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -13656,38 +14584,38 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char dlsym ();
 int
-main ()
+main (void)
 {
 return dlsym ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_dl_dlsym=yes
-else
+else $as_nop
   ac_cv_lib_dl_dlsym=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlsym" >&5
-$as_echo "$ac_cv_lib_dl_dlsym" >&6; }
-if test "x$ac_cv_lib_dl_dlsym" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlsym" >&5
+printf "%s\n" "$ac_cv_lib_dl_dlsym" >&6; }
+if test "x$ac_cv_lib_dl_dlsym" = xyes
+then :
   found=yes
-else
+else $as_nop
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __dlsym in -ldl" >&5
-$as_echo_n "checking for __dlsym in -ldl... " >&6; }
-if ${ac_cv_lib_dl___dlsym+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __dlsym in -ldl" >&5
+printf %s "checking for __dlsym in -ldl... " >&6; }
+if test ${ac_cv_lib_dl___dlsym+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -13696,32 +14624,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char __dlsym ();
 int
-main ()
+main (void)
 {
 return __dlsym ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_dl___dlsym=yes
-else
+else $as_nop
   ac_cv_lib_dl___dlsym=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl___dlsym" >&5
-$as_echo "$ac_cv_lib_dl___dlsym" >&6; }
-if test "x$ac_cv_lib_dl___dlsym" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl___dlsym" >&5
+printf "%s\n" "$ac_cv_lib_dl___dlsym" >&6; }
+if test "x$ac_cv_lib_dl___dlsym" = xyes
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 
@@ -13732,18 +14659,20 @@
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -ldl"
-    if test "$cross_compiling" = yes; then :
+    if test "$cross_compiling" = yes
+then :
 
             found=yes
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int main(void) { return (0); }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -13765,10 +14694,10 @@
 
 
 
-$as_echo "#define HAVE_DLSYM 1" >>confdefs.h
+printf "%s\n" "#define HAVE_DLSYM 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_LIBDL 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBDL 1" >>confdefs.h
 
     ac_cv_func_dlsym=yes
   else
@@ -13777,11 +14706,12 @@
   unset ac_cv_lib_root_dlsym
   unset ac_cv_lib_root___dlsym
   unset found
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlsym in -lroot" >&5
-$as_echo_n "checking for dlsym in -lroot... " >&6; }
-if ${ac_cv_lib_root_dlsym+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlsym in -lroot" >&5
+printf %s "checking for dlsym in -lroot... " >&6; }
+if test ${ac_cv_lib_root_dlsym+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lroot  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -13790,38 +14720,38 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char dlsym ();
 int
-main ()
+main (void)
 {
 return dlsym ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_root_dlsym=yes
-else
+else $as_nop
   ac_cv_lib_root_dlsym=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_root_dlsym" >&5
-$as_echo "$ac_cv_lib_root_dlsym" >&6; }
-if test "x$ac_cv_lib_root_dlsym" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_root_dlsym" >&5
+printf "%s\n" "$ac_cv_lib_root_dlsym" >&6; }
+if test "x$ac_cv_lib_root_dlsym" = xyes
+then :
   found=yes
-else
+else $as_nop
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __dlsym in -lroot" >&5
-$as_echo_n "checking for __dlsym in -lroot... " >&6; }
-if ${ac_cv_lib_root___dlsym+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __dlsym in -lroot" >&5
+printf %s "checking for __dlsym in -lroot... " >&6; }
+if test ${ac_cv_lib_root___dlsym+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lroot  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -13830,32 +14760,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char __dlsym ();
 int
-main ()
+main (void)
 {
 return __dlsym ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_root___dlsym=yes
-else
+else $as_nop
   ac_cv_lib_root___dlsym=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_root___dlsym" >&5
-$as_echo "$ac_cv_lib_root___dlsym" >&6; }
-if test "x$ac_cv_lib_root___dlsym" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_root___dlsym" >&5
+printf "%s\n" "$ac_cv_lib_root___dlsym" >&6; }
+if test "x$ac_cv_lib_root___dlsym" = xyes
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 
@@ -13866,18 +14795,20 @@
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lroot"
-    if test "$cross_compiling" = yes; then :
+    if test "$cross_compiling" = yes
+then :
 
             found=yes
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int main(void) { return (0); }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -13899,10 +14830,10 @@
 
 
 
-$as_echo "#define HAVE_DLSYM 1" >>confdefs.h
+printf "%s\n" "#define HAVE_DLSYM 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_LIBROOT 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBROOT 1" >>confdefs.h
 
     ac_cv_func_dlsym=yes
   else
@@ -13920,14 +14851,15 @@
 
 if test "$ac_cv_func_dlopen" = "yes"; then
 
-$as_echo "#define HAVE_LIBDL 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBDL 1" >>confdefs.h
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sin in -lm" >&5
-$as_echo_n "checking for sin in -lm... " >&6; }
-if ${ac_cv_lib_m_sin+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sin in -lm" >&5
+printf %s "checking for sin in -lm... " >&6; }
+if test ${ac_cv_lib_m_sin+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lm  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -13936,33 +14868,30 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char sin ();
 int
-main ()
+main (void)
 {
 return sin ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_m_sin=yes
-else
+else $as_nop
   ac_cv_lib_m_sin=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_sin" >&5
-$as_echo "$ac_cv_lib_m_sin" >&6; }
-if test "x$ac_cv_lib_m_sin" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBM 1
-_ACEOF
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_sin" >&5
+printf "%s\n" "$ac_cv_lib_m_sin" >&6; }
+if test "x$ac_cv_lib_m_sin" = xyes
+then :
+  printf "%s\n" "#define HAVE_LIBM 1" >>confdefs.h
 
   LIBS="-lm $LIBS"
 
@@ -13977,13 +14906,15 @@
   unset found
 
   ac_fn_c_check_func "$LINENO" "__atomic_exchange_1" "ac_cv_func___atomic_exchange_1"
-if test "x$ac_cv_func___atomic_exchange_1" = xyes; then :
+if test "x$ac_cv_func___atomic_exchange_1" = xyes
+then :
   found=yes
-else
+else $as_nop
    ac_fn_c_check_func "$LINENO" "____atomic_exchange_1" "ac_cv_func_____atomic_exchange_1"
-if test "x$ac_cv_func_____atomic_exchange_1" = xyes; then :
+if test "x$ac_cv_func_____atomic_exchange_1" = xyes
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 
@@ -13993,7 +14924,7 @@
   case $found in
   yes)
 
-$as_echo "#define HAVE___ATOMIC_EXCHANGE_1 1" >>confdefs.h
+printf "%s\n" "#define HAVE___ATOMIC_EXCHANGE_1 1" >>confdefs.h
 
     ac_cv_func___atomic_exchange_1=yes
   ;;
@@ -14003,11 +14934,12 @@
   unset ac_cv_lib_atomic___atomic_exchange_1
   unset ac_cv_lib_atomic_____atomic_exchange_1
   unset found
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __atomic_exchange_1 in -latomic" >&5
-$as_echo_n "checking for __atomic_exchange_1 in -latomic... " >&6; }
-if ${ac_cv_lib_atomic___atomic_exchange_1+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __atomic_exchange_1 in -latomic" >&5
+printf %s "checking for __atomic_exchange_1 in -latomic... " >&6; }
+if test ${ac_cv_lib_atomic___atomic_exchange_1+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-latomic  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -14016,38 +14948,38 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char __atomic_exchange_1 ();
 int
-main ()
+main (void)
 {
 return __atomic_exchange_1 ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_atomic___atomic_exchange_1=yes
-else
+else $as_nop
   ac_cv_lib_atomic___atomic_exchange_1=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_atomic___atomic_exchange_1" >&5
-$as_echo "$ac_cv_lib_atomic___atomic_exchange_1" >&6; }
-if test "x$ac_cv_lib_atomic___atomic_exchange_1" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_atomic___atomic_exchange_1" >&5
+printf "%s\n" "$ac_cv_lib_atomic___atomic_exchange_1" >&6; }
+if test "x$ac_cv_lib_atomic___atomic_exchange_1" = xyes
+then :
   found=yes
-else
+else $as_nop
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ____atomic_exchange_1 in -latomic" >&5
-$as_echo_n "checking for ____atomic_exchange_1 in -latomic... " >&6; }
-if ${ac_cv_lib_atomic_____atomic_exchange_1+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ____atomic_exchange_1 in -latomic" >&5
+printf %s "checking for ____atomic_exchange_1 in -latomic... " >&6; }
+if test ${ac_cv_lib_atomic_____atomic_exchange_1+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-latomic  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -14056,32 +14988,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char ____atomic_exchange_1 ();
 int
-main ()
+main (void)
 {
 return ____atomic_exchange_1 ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_atomic_____atomic_exchange_1=yes
-else
+else $as_nop
   ac_cv_lib_atomic_____atomic_exchange_1=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_atomic_____atomic_exchange_1" >&5
-$as_echo "$ac_cv_lib_atomic_____atomic_exchange_1" >&6; }
-if test "x$ac_cv_lib_atomic_____atomic_exchange_1" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_atomic_____atomic_exchange_1" >&5
+printf "%s\n" "$ac_cv_lib_atomic_____atomic_exchange_1" >&6; }
+if test "x$ac_cv_lib_atomic_____atomic_exchange_1" = xyes
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 
@@ -14092,18 +15023,20 @@
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -latomic"
-    if test "$cross_compiling" = yes; then :
+    if test "$cross_compiling" = yes
+then :
 
             found=yes
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int main(void) { return (0); }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -14125,10 +15058,10 @@
 
 
 
-$as_echo "#define HAVE___ATOMIC_EXCHANGE_1 1" >>confdefs.h
+printf "%s\n" "#define HAVE___ATOMIC_EXCHANGE_1 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_LIBATOMIC 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBATOMIC 1" >>confdefs.h
 
     ac_cv_func___atomic_exchange_1=yes
   else
@@ -14150,13 +15083,15 @@
   unset found
 
   ac_fn_c_check_func "$LINENO" "inet_aton" "ac_cv_func_inet_aton"
-if test "x$ac_cv_func_inet_aton" = xyes; then :
+if test "x$ac_cv_func_inet_aton" = xyes
+then :
   found=yes
-else
+else $as_nop
    ac_fn_c_check_func "$LINENO" "__inet_aton" "ac_cv_func___inet_aton"
-if test "x$ac_cv_func___inet_aton" = xyes; then :
+if test "x$ac_cv_func___inet_aton" = xyes
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 
@@ -14166,7 +15101,7 @@
   case $found in
   yes)
 
-$as_echo "#define HAVE_INET_ATON 1" >>confdefs.h
+printf "%s\n" "#define HAVE_INET_ATON 1" >>confdefs.h
 
     ac_cv_func_inet_aton=yes
   ;;
@@ -14176,11 +15111,12 @@
   unset ac_cv_lib_resolv_inet_aton
   unset ac_cv_lib_resolv___inet_aton
   unset found
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inet_aton in -lresolv" >&5
-$as_echo_n "checking for inet_aton in -lresolv... " >&6; }
-if ${ac_cv_lib_resolv_inet_aton+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for inet_aton in -lresolv" >&5
+printf %s "checking for inet_aton in -lresolv... " >&6; }
+if test ${ac_cv_lib_resolv_inet_aton+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -14189,38 +15125,38 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char inet_aton ();
 int
-main ()
+main (void)
 {
 return inet_aton ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_resolv_inet_aton=yes
-else
+else $as_nop
   ac_cv_lib_resolv_inet_aton=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_inet_aton" >&5
-$as_echo "$ac_cv_lib_resolv_inet_aton" >&6; }
-if test "x$ac_cv_lib_resolv_inet_aton" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_inet_aton" >&5
+printf "%s\n" "$ac_cv_lib_resolv_inet_aton" >&6; }
+if test "x$ac_cv_lib_resolv_inet_aton" = xyes
+then :
   found=yes
-else
+else $as_nop
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __inet_aton in -lresolv" >&5
-$as_echo_n "checking for __inet_aton in -lresolv... " >&6; }
-if ${ac_cv_lib_resolv___inet_aton+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __inet_aton in -lresolv" >&5
+printf %s "checking for __inet_aton in -lresolv... " >&6; }
+if test ${ac_cv_lib_resolv___inet_aton+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -14229,32 +15165,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char __inet_aton ();
 int
-main ()
+main (void)
 {
 return __inet_aton ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_resolv___inet_aton=yes
-else
+else $as_nop
   ac_cv_lib_resolv___inet_aton=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___inet_aton" >&5
-$as_echo "$ac_cv_lib_resolv___inet_aton" >&6; }
-if test "x$ac_cv_lib_resolv___inet_aton" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___inet_aton" >&5
+printf "%s\n" "$ac_cv_lib_resolv___inet_aton" >&6; }
+if test "x$ac_cv_lib_resolv___inet_aton" = xyes
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 
@@ -14265,18 +15200,20 @@
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lresolv"
-    if test "$cross_compiling" = yes; then :
+    if test "$cross_compiling" = yes
+then :
 
             found=yes
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int main(void) { return (0); }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -14298,10 +15235,10 @@
 
 
 
-$as_echo "#define HAVE_INET_ATON 1" >>confdefs.h
+printf "%s\n" "#define HAVE_INET_ATON 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_LIBRESOLV 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBRESOLV 1" >>confdefs.h
 
     ac_cv_func_inet_aton=yes
   else
@@ -14310,11 +15247,12 @@
   unset ac_cv_lib_bind_inet_aton
   unset ac_cv_lib_bind___inet_aton
   unset found
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inet_aton in -lbind" >&5
-$as_echo_n "checking for inet_aton in -lbind... " >&6; }
-if ${ac_cv_lib_bind_inet_aton+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for inet_aton in -lbind" >&5
+printf %s "checking for inet_aton in -lbind... " >&6; }
+if test ${ac_cv_lib_bind_inet_aton+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbind  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -14323,38 +15261,38 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char inet_aton ();
 int
-main ()
+main (void)
 {
 return inet_aton ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_bind_inet_aton=yes
-else
+else $as_nop
   ac_cv_lib_bind_inet_aton=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind_inet_aton" >&5
-$as_echo "$ac_cv_lib_bind_inet_aton" >&6; }
-if test "x$ac_cv_lib_bind_inet_aton" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind_inet_aton" >&5
+printf "%s\n" "$ac_cv_lib_bind_inet_aton" >&6; }
+if test "x$ac_cv_lib_bind_inet_aton" = xyes
+then :
   found=yes
-else
+else $as_nop
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __inet_aton in -lbind" >&5
-$as_echo_n "checking for __inet_aton in -lbind... " >&6; }
-if ${ac_cv_lib_bind___inet_aton+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __inet_aton in -lbind" >&5
+printf %s "checking for __inet_aton in -lbind... " >&6; }
+if test ${ac_cv_lib_bind___inet_aton+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbind  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -14363,32 +15301,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char __inet_aton ();
 int
-main ()
+main (void)
 {
 return __inet_aton ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_bind___inet_aton=yes
-else
+else $as_nop
   ac_cv_lib_bind___inet_aton=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind___inet_aton" >&5
-$as_echo "$ac_cv_lib_bind___inet_aton" >&6; }
-if test "x$ac_cv_lib_bind___inet_aton" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind___inet_aton" >&5
+printf "%s\n" "$ac_cv_lib_bind___inet_aton" >&6; }
+if test "x$ac_cv_lib_bind___inet_aton" = xyes
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 
@@ -14399,18 +15336,20 @@
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lbind"
-    if test "$cross_compiling" = yes; then :
+    if test "$cross_compiling" = yes
+then :
 
             found=yes
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int main(void) { return (0); }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -14432,10 +15371,10 @@
 
 
 
-$as_echo "#define HAVE_INET_ATON 1" >>confdefs.h
+printf "%s\n" "#define HAVE_INET_ATON 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_LIBBIND 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBBIND 1" >>confdefs.h
 
     ac_cv_func_inet_aton=yes
   else
@@ -14453,64 +15392,30 @@
 
 
 
-for ac_header in  \
-stdint.h \
-dirent.h \
-sys/param.h \
-sys/types.h \
-sys/time.h \
-netinet/in.h \
-alloca.h \
-arpa/inet.h \
-arpa/nameser.h \
-crypt.h \
-dns.h \
-fcntl.h \
-grp.h \
-ieeefp.h \
-langinfo.h \
-linux/filter.h \
-linux/sock_diag.h \
-malloc.h \
-os/signpost.h \
-poll.h \
-pty.h \
-pwd.h \
-resolv.h \
-strings.h \
-syslog.h \
-sysexits.h \
-sys/ioctl.h \
-sys/file.h \
-sys/mman.h \
-sys/mount.h \
-sys/poll.h \
-sys/procctl.h \
-sys/resource.h \
-sys/select.h \
-sys/socket.h \
-sys/stat.h \
-sys/statfs.h \
-sys/statvfs.h \
-sys/vfs.h \
-sys/sysexits.h \
-sys/uio.h \
-sys/wait.h \
-sys/loadavg.h \
-unistd.h \
-unix.h \
-utime.h \
-sys/utsname.h \
-sys/ipc.h \
-dlfcn.h \
-tmmintrin.h \
-nmmintrin.h \
-wmmintrin.h \
-immintrin.h
+ac_fn_c_check_header_compile "$LINENO" "stdint.h" "ac_cv_header_stdint_h" "
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_NAMESER_H
+#include <arpa/nameser.h>
+#endif
 
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "
+"
+if test "x$ac_cv_header_stdint_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_STDINT_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "dirent.h" "ac_cv_header_dirent_h" "
 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
 #endif
@@ -14528,19 +15433,1190 @@
 #endif
 
 "
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
+if test "x$ac_cv_header_dirent_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_DIRENT_H 1" >>confdefs.h
 
 fi
+ac_fn_c_check_header_compile "$LINENO" "sys/param.h" "ac_cv_header_sys_param_h" "
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_NAMESER_H
+#include <arpa/nameser.h>
+#endif
 
-done
+"
+if test "x$ac_cv_header_sys_param_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_PARAM_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/types.h" "ac_cv_header_sys_types_h" "
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_NAMESER_H
+#include <arpa/nameser.h>
+#endif
+
+"
+if test "x$ac_cv_header_sys_types_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_TYPES_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/time.h" "ac_cv_header_sys_time_h" "
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_NAMESER_H
+#include <arpa/nameser.h>
+#endif
+
+"
+if test "x$ac_cv_header_sys_time_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_TIME_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "netinet/in.h" "ac_cv_header_netinet_in_h" "
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_NAMESER_H
+#include <arpa/nameser.h>
+#endif
+
+"
+if test "x$ac_cv_header_netinet_in_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_NETINET_IN_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "alloca.h" "ac_cv_header_alloca_h" "
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_NAMESER_H
+#include <arpa/nameser.h>
+#endif
+
+"
+if test "x$ac_cv_header_alloca_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_ALLOCA_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "arpa/inet.h" "ac_cv_header_arpa_inet_h" "
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_NAMESER_H
+#include <arpa/nameser.h>
+#endif
+
+"
+if test "x$ac_cv_header_arpa_inet_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_ARPA_INET_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "arpa/nameser.h" "ac_cv_header_arpa_nameser_h" "
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_NAMESER_H
+#include <arpa/nameser.h>
+#endif
+
+"
+if test "x$ac_cv_header_arpa_nameser_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_ARPA_NAMESER_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "crypt.h" "ac_cv_header_crypt_h" "
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_NAMESER_H
+#include <arpa/nameser.h>
+#endif
+
+"
+if test "x$ac_cv_header_crypt_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_CRYPT_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "dns.h" "ac_cv_header_dns_h" "
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_NAMESER_H
+#include <arpa/nameser.h>
+#endif
+
+"
+if test "x$ac_cv_header_dns_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_DNS_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "fcntl.h" "ac_cv_header_fcntl_h" "
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_NAMESER_H
+#include <arpa/nameser.h>
+#endif
+
+"
+if test "x$ac_cv_header_fcntl_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_FCNTL_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "grp.h" "ac_cv_header_grp_h" "
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_NAMESER_H
+#include <arpa/nameser.h>
+#endif
+
+"
+if test "x$ac_cv_header_grp_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_GRP_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "ieeefp.h" "ac_cv_header_ieeefp_h" "
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_NAMESER_H
+#include <arpa/nameser.h>
+#endif
+
+"
+if test "x$ac_cv_header_ieeefp_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_IEEEFP_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "langinfo.h" "ac_cv_header_langinfo_h" "
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_NAMESER_H
+#include <arpa/nameser.h>
+#endif
+
+"
+if test "x$ac_cv_header_langinfo_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_LANGINFO_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "linux/filter.h" "ac_cv_header_linux_filter_h" "
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_NAMESER_H
+#include <arpa/nameser.h>
+#endif
+
+"
+if test "x$ac_cv_header_linux_filter_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_LINUX_FILTER_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "linux/sock_diag.h" "ac_cv_header_linux_sock_diag_h" "
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_NAMESER_H
+#include <arpa/nameser.h>
+#endif
+
+"
+if test "x$ac_cv_header_linux_sock_diag_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_LINUX_SOCK_DIAG_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "malloc.h" "ac_cv_header_malloc_h" "
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_NAMESER_H
+#include <arpa/nameser.h>
+#endif
+
+"
+if test "x$ac_cv_header_malloc_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_MALLOC_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "os/signpost.h" "ac_cv_header_os_signpost_h" "
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_NAMESER_H
+#include <arpa/nameser.h>
+#endif
+
+"
+if test "x$ac_cv_header_os_signpost_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_OS_SIGNPOST_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "poll.h" "ac_cv_header_poll_h" "
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_NAMESER_H
+#include <arpa/nameser.h>
+#endif
+
+"
+if test "x$ac_cv_header_poll_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_POLL_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "pty.h" "ac_cv_header_pty_h" "
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_NAMESER_H
+#include <arpa/nameser.h>
+#endif
+
+"
+if test "x$ac_cv_header_pty_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_PTY_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "pwd.h" "ac_cv_header_pwd_h" "
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_NAMESER_H
+#include <arpa/nameser.h>
+#endif
+
+"
+if test "x$ac_cv_header_pwd_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_PWD_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "resolv.h" "ac_cv_header_resolv_h" "
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_NAMESER_H
+#include <arpa/nameser.h>
+#endif
+
+"
+if test "x$ac_cv_header_resolv_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_RESOLV_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "strings.h" "ac_cv_header_strings_h" "
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_NAMESER_H
+#include <arpa/nameser.h>
+#endif
+
+"
+if test "x$ac_cv_header_strings_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_STRINGS_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "syslog.h" "ac_cv_header_syslog_h" "
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_NAMESER_H
+#include <arpa/nameser.h>
+#endif
+
+"
+if test "x$ac_cv_header_syslog_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYSLOG_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "sysexits.h" "ac_cv_header_sysexits_h" "
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_NAMESER_H
+#include <arpa/nameser.h>
+#endif
+
+"
+if test "x$ac_cv_header_sysexits_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYSEXITS_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/ioctl.h" "ac_cv_header_sys_ioctl_h" "
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_NAMESER_H
+#include <arpa/nameser.h>
+#endif
+
+"
+if test "x$ac_cv_header_sys_ioctl_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_IOCTL_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/file.h" "ac_cv_header_sys_file_h" "
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_NAMESER_H
+#include <arpa/nameser.h>
+#endif
+
+"
+if test "x$ac_cv_header_sys_file_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_FILE_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/mman.h" "ac_cv_header_sys_mman_h" "
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_NAMESER_H
+#include <arpa/nameser.h>
+#endif
+
+"
+if test "x$ac_cv_header_sys_mman_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_MMAN_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/mount.h" "ac_cv_header_sys_mount_h" "
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_NAMESER_H
+#include <arpa/nameser.h>
+#endif
+
+"
+if test "x$ac_cv_header_sys_mount_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_MOUNT_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/poll.h" "ac_cv_header_sys_poll_h" "
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_NAMESER_H
+#include <arpa/nameser.h>
+#endif
+
+"
+if test "x$ac_cv_header_sys_poll_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_POLL_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/procctl.h" "ac_cv_header_sys_procctl_h" "
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_NAMESER_H
+#include <arpa/nameser.h>
+#endif
+
+"
+if test "x$ac_cv_header_sys_procctl_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_PROCCTL_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/resource.h" "ac_cv_header_sys_resource_h" "
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_NAMESER_H
+#include <arpa/nameser.h>
+#endif
+
+"
+if test "x$ac_cv_header_sys_resource_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_RESOURCE_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/select.h" "ac_cv_header_sys_select_h" "
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_NAMESER_H
+#include <arpa/nameser.h>
+#endif
+
+"
+if test "x$ac_cv_header_sys_select_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_SELECT_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/socket.h" "ac_cv_header_sys_socket_h" "
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_NAMESER_H
+#include <arpa/nameser.h>
+#endif
+
+"
+if test "x$ac_cv_header_sys_socket_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_SOCKET_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/stat.h" "ac_cv_header_sys_stat_h" "
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_NAMESER_H
+#include <arpa/nameser.h>
+#endif
+
+"
+if test "x$ac_cv_header_sys_stat_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_STAT_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/statfs.h" "ac_cv_header_sys_statfs_h" "
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_NAMESER_H
+#include <arpa/nameser.h>
+#endif
+
+"
+if test "x$ac_cv_header_sys_statfs_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_STATFS_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/statvfs.h" "ac_cv_header_sys_statvfs_h" "
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_NAMESER_H
+#include <arpa/nameser.h>
+#endif
+
+"
+if test "x$ac_cv_header_sys_statvfs_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_STATVFS_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/vfs.h" "ac_cv_header_sys_vfs_h" "
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_NAMESER_H
+#include <arpa/nameser.h>
+#endif
+
+"
+if test "x$ac_cv_header_sys_vfs_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_VFS_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/sysexits.h" "ac_cv_header_sys_sysexits_h" "
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_NAMESER_H
+#include <arpa/nameser.h>
+#endif
+
+"
+if test "x$ac_cv_header_sys_sysexits_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_SYSEXITS_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/uio.h" "ac_cv_header_sys_uio_h" "
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_NAMESER_H
+#include <arpa/nameser.h>
+#endif
+
+"
+if test "x$ac_cv_header_sys_uio_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_UIO_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/wait.h" "ac_cv_header_sys_wait_h" "
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_NAMESER_H
+#include <arpa/nameser.h>
+#endif
+
+"
+if test "x$ac_cv_header_sys_wait_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_WAIT_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/loadavg.h" "ac_cv_header_sys_loadavg_h" "
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_NAMESER_H
+#include <arpa/nameser.h>
+#endif
+
+"
+if test "x$ac_cv_header_sys_loadavg_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_LOADAVG_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "unistd.h" "ac_cv_header_unistd_h" "
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_NAMESER_H
+#include <arpa/nameser.h>
+#endif
+
+"
+if test "x$ac_cv_header_unistd_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_UNISTD_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "unix.h" "ac_cv_header_unix_h" "
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_NAMESER_H
+#include <arpa/nameser.h>
+#endif
+
+"
+if test "x$ac_cv_header_unix_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_UNIX_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "utime.h" "ac_cv_header_utime_h" "
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_NAMESER_H
+#include <arpa/nameser.h>
+#endif
+
+"
+if test "x$ac_cv_header_utime_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_UTIME_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/utsname.h" "ac_cv_header_sys_utsname_h" "
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_NAMESER_H
+#include <arpa/nameser.h>
+#endif
+
+"
+if test "x$ac_cv_header_sys_utsname_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_UTSNAME_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/ipc.h" "ac_cv_header_sys_ipc_h" "
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_NAMESER_H
+#include <arpa/nameser.h>
+#endif
+
+"
+if test "x$ac_cv_header_sys_ipc_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_IPC_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_NAMESER_H
+#include <arpa/nameser.h>
+#endif
+
+"
+if test "x$ac_cv_header_dlfcn_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_DLFCN_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "tmmintrin.h" "ac_cv_header_tmmintrin_h" "
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_NAMESER_H
+#include <arpa/nameser.h>
+#endif
+
+"
+if test "x$ac_cv_header_tmmintrin_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_TMMINTRIN_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "nmmintrin.h" "ac_cv_header_nmmintrin_h" "
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_NAMESER_H
+#include <arpa/nameser.h>
+#endif
+
+"
+if test "x$ac_cv_header_nmmintrin_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_NMMINTRIN_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "wmmintrin.h" "ac_cv_header_wmmintrin_h" "
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_NAMESER_H
+#include <arpa/nameser.h>
+#endif
+
+"
+if test "x$ac_cv_header_wmmintrin_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_WMMINTRIN_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "immintrin.h" "ac_cv_header_immintrin_h" "
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_NAMESER_H
+#include <arpa/nameser.h>
+#endif
+
+"
+if test "x$ac_cv_header_immintrin_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_IMMINTRIN_H 1" >>confdefs.h
+
+fi
 
 
 
   ac_fn_c_check_func "$LINENO" "fopencookie" "ac_cv_func_fopencookie"
-if test "x$ac_cv_func_fopencookie" = xyes; then :
+if test "x$ac_cv_func_fopencookie" = xyes
+then :
   have_glibc_fopencookie=yes
 fi
 
@@ -14553,23 +16629,25 @@
 #include <stdio.h>
 
 int
-main ()
+main (void)
 {
 cookie_io_functions_t cookie;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   have_cookie_io_functions_t=yes
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
     if test "$have_cookie_io_functions_t" = "yes"; then
       cookie_io_functions_t=cookie_io_functions_t
       have_fopen_cookie=yes
 
-if test "$cross_compiling" = yes; then :
+if test "$cross_compiling" = yes
+then :
 
     case $host_alias in
     *linux*)
@@ -14580,7 +16658,7 @@
       ;;
   esac
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -14614,11 +16692,12 @@
 
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
 
   cookie_io_functions_use_off64_t=yes
 
-else
+else $as_nop
 
   cookie_io_functions_use_off64_t=no
 
@@ -14637,17 +16716,18 @@
 #include <stdio.h>
 
 int
-main ()
+main (void)
 {
 _IO_cookie_io_functions_t cookie;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   have_IO_cookie_io_functions_t=yes
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
       if test "$have_cookie_io_functions_t" = "yes" ; then
         cookie_io_functions_t=_IO_cookie_io_functions_t
         have_fopen_cookie=yes
@@ -14656,50 +16736,50 @@
 
     if test "$have_fopen_cookie" = "yes" ; then
 
-$as_echo "#define HAVE_FOPENCOOKIE 1" >>confdefs.h
+printf "%s\n" "#define HAVE_FOPENCOOKIE 1" >>confdefs.h
 
 
-cat >>confdefs.h <<_ACEOF
-#define COOKIE_IO_FUNCTIONS_T $cookie_io_functions_t
-_ACEOF
+printf "%s\n" "#define COOKIE_IO_FUNCTIONS_T $cookie_io_functions_t" >>confdefs.h
 
       if test "$cookie_io_functions_use_off64_t" = "yes" ; then
 
-$as_echo "#define COOKIE_SEEKER_USES_OFF64_T 1" >>confdefs.h
+printf "%s\n" "#define COOKIE_SEEKER_USES_OFF64_T 1" >>confdefs.h
 
       fi
     fi
   fi
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken getcwd" >&5
-$as_echo_n "checking for broken getcwd... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for broken getcwd" >&5
+printf %s "checking for broken getcwd... " >&6; }
   os=`uname -sr 2>/dev/null`
   case $os in
     SunOS*)
 
-$as_echo "#define HAVE_BROKEN_GETCWD 1" >>confdefs.h
+printf "%s\n" "#define HAVE_BROKEN_GETCWD 1" >>confdefs.h
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; };;
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; };;
     *)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; };;
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; };;
   esac
 
 if test "$GCC" = "yes"; then
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken gcc optimize-strlen" >&5
-$as_echo_n "checking for broken gcc optimize-strlen... " >&6; }
-if ${ac_cv_have_broken_gcc_strlen_opt+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for broken gcc optimize-strlen" >&5
+printf %s "checking for broken gcc optimize-strlen... " >&6; }
+if test ${ac_cv_have_broken_gcc_strlen_opt+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
-  if test "$cross_compiling" = yes; then :
+  if test "$cross_compiling" = yes
+then :
 
   ac_cv_have_broken_gcc_strlen_opt=no
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -14720,11 +16800,12 @@
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
 
   ac_cv_have_broken_gcc_strlen_opt=yes
 
-else
+else $as_nop
 
   ac_cv_have_broken_gcc_strlen_opt=no
 
@@ -14734,8 +16815,8 @@
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_broken_gcc_strlen_opt" >&5
-$as_echo "$ac_cv_have_broken_gcc_strlen_opt" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_broken_gcc_strlen_opt" >&5
+printf "%s\n" "$ac_cv_have_broken_gcc_strlen_opt" >&6; }
   if test "$ac_cv_have_broken_gcc_strlen_opt" = "yes"; then
     CFLAGS="$CFLAGS -fno-optimize-strlen"
   fi
@@ -14743,18 +16824,19 @@
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5
-$as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; }
-if ${ac_cv_struct_tm+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5
+printf %s "checking whether struct tm is in sys/time.h or time.h... " >&6; }
+if test ${ac_cv_struct_tm+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 #include <time.h>
 
 int
-main ()
+main (void)
 {
 struct tm tm;
 				     int *p = &tm.tm_sec;
@@ -14763,56 +16845,135 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_struct_tm=time.h
-else
+else $as_nop
   ac_cv_struct_tm=sys/time.h
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_tm" >&5
-$as_echo "$ac_cv_struct_tm" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_tm" >&5
+printf "%s\n" "$ac_cv_struct_tm" >&6; }
 if test $ac_cv_struct_tm = sys/time.h; then
 
-$as_echo "#define TM_IN_SYS_TIME 1" >>confdefs.h
+printf "%s\n" "#define TM_IN_SYS_TIME 1" >>confdefs.h
+
+fi
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC options needed to detect all undeclared functions" >&5
+printf %s "checking for $CC options needed to detect all undeclared functions... " >&6; }
+if test ${ac_cv_c_undeclared_builtin_options+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_save_CFLAGS=$CFLAGS
+   ac_cv_c_undeclared_builtin_options='cannot detect'
+   for ac_arg in '' -fno-builtin; do
+     CFLAGS="$ac_save_CFLAGS $ac_arg"
+     # This test program should *not* compile successfully.
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main (void)
+{
+(void) strchr;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+
+else $as_nop
+  # This test program should compile successfully.
+        # No library function is consistently available on
+        # freestanding implementations, so test against a dummy
+        # declaration.  Include always-available headers on the
+        # off chance that they somehow elicit warnings.
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <float.h>
+#include <limits.h>
+#include <stdarg.h>
+#include <stddef.h>
+extern void ac_decl (int, char *);
+
+int
+main (void)
+{
+(void) ac_decl (0, (char *) 0);
+  (void) ac_decl;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  if test x"$ac_arg" = x
+then :
+  ac_cv_c_undeclared_builtin_options='none needed'
+else $as_nop
+  ac_cv_c_undeclared_builtin_options=$ac_arg
+fi
+          break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+    done
+    CFLAGS=$ac_save_CFLAGS
 
 fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_undeclared_builtin_options" >&5
+printf "%s\n" "$ac_cv_c_undeclared_builtin_options" >&6; }
+  case $ac_cv_c_undeclared_builtin_options in #(
+  'cannot detect') :
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot make $CC report undeclared builtins
+See \`config.log' for more details" "$LINENO" 5; } ;; #(
+  'none needed') :
+    ac_c_undeclared_builtin_options='' ;; #(
+  *) :
+    ac_c_undeclared_builtin_options=$ac_cv_c_undeclared_builtin_options ;;
+esac
 
 ac_fn_c_check_member "$LINENO" "struct tm" "tm_zone" "ac_cv_member_struct_tm_tm_zone" "#include <sys/types.h>
 #include <$ac_cv_struct_tm>
 
 "
-if test "x$ac_cv_member_struct_tm_tm_zone" = xyes; then :
+if test "x$ac_cv_member_struct_tm_tm_zone" = xyes
+then :
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_TM_TM_ZONE 1
-_ACEOF
+printf "%s\n" "#define HAVE_STRUCT_TM_TM_ZONE 1" >>confdefs.h
 
 
 fi
 
 if test "$ac_cv_member_struct_tm_tm_zone" = yes; then
 
-$as_echo "#define HAVE_TM_ZONE 1" >>confdefs.h
+printf "%s\n" "#define HAVE_TM_ZONE 1" >>confdefs.h
 
 else
-  ac_fn_c_check_decl "$LINENO" "tzname" "ac_cv_have_decl_tzname" "#include <time.h>
-"
-if test "x$ac_cv_have_decl_tzname" = xyes; then :
+  ac_fn_check_decl "$LINENO" "tzname" "ac_cv_have_decl_tzname" "#include <time.h>
+" "$ac_c_undeclared_builtin_options" "CFLAGS"
+if test "x$ac_cv_have_decl_tzname" = xyes
+then :
   ac_have_decl=1
-else
+else $as_nop
   ac_have_decl=0
 fi
+printf "%s\n" "#define HAVE_DECL_TZNAME $ac_have_decl" >>confdefs.h
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_TZNAME $ac_have_decl
-_ACEOF
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tzname" >&5
-$as_echo_n "checking for tzname... " >&6; }
-if ${ac_cv_var_tzname+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tzname" >&5
+printf %s "checking for tzname... " >&6; }
+if test ${ac_cv_var_tzname+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <time.h>
@@ -14821,191 +16982,125 @@
 #endif
 
 int
-main ()
+main (void)
 {
 return tzname00;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_var_tzname=yes
-else
+else $as_nop
   ac_cv_var_tzname=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_var_tzname" >&5
-$as_echo "$ac_cv_var_tzname" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_var_tzname" >&5
+printf "%s\n" "$ac_cv_var_tzname" >&6; }
   if test $ac_cv_var_tzname = yes; then
 
-$as_echo "#define HAVE_TZNAME 1" >>confdefs.h
+printf "%s\n" "#define HAVE_TZNAME 1" >>confdefs.h
 
   fi
 fi
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for missing declarations of reentrant functions" >&5
-$as_echo_n "checking for missing declarations of reentrant functions... " >&6; }
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <time.h>
-int
-main ()
-{
-struct tm *(*func)(void) = localtime_r
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-    :
-
-else
+ac_fn_check_decl "$LINENO" "localtime_r" "ac_cv_have_decl_localtime_r" "#include <time.h>
+" "$ac_c_undeclared_builtin_options" "CFLAGS"
+if test "x$ac_cv_have_decl_localtime_r" = xyes
+then :
 
+else $as_nop
 
-$as_echo "#define MISSING_LOCALTIME_R_DECL 1" >>confdefs.h
-
+printf "%s\n" "#define MISSING_LOCALTIME_R_DECL 1" >>confdefs.h
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <time.h>
-int
-main ()
-{
-struct tm *(*func)(void) = gmtime_r
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-    :
-
-else
+ac_fn_check_decl "$LINENO" "gmtime_r" "ac_cv_have_decl_gmtime_r" "#include <time.h>
+" "$ac_c_undeclared_builtin_options" "CFLAGS"
+if test "x$ac_cv_have_decl_gmtime_r" = xyes
+then :
 
+else $as_nop
 
-$as_echo "#define MISSING_GMTIME_R_DECL 1" >>confdefs.h
-
+printf "%s\n" "#define MISSING_GMTIME_R_DECL 1" >>confdefs.h
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <time.h>
-int
-main ()
-{
-char *(*func)(void) = asctime_r
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+ac_fn_check_decl "$LINENO" "asctime_r" "ac_cv_have_decl_asctime_r" "#include <time.h>
+" "$ac_c_undeclared_builtin_options" "CFLAGS"
+if test "x$ac_cv_have_decl_asctime_r" = xyes
+then :
 
-    :
-
-else
-
-
-$as_echo "#define MISSING_ASCTIME_R_DECL 1" >>confdefs.h
+else $as_nop
 
+printf "%s\n" "#define MISSING_ASCTIME_R_DECL 1" >>confdefs.h
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <time.h>
-int
-main ()
-{
-char *(*func)(void) = ctime_r
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-    :
-
-else
-
+ac_fn_check_decl "$LINENO" "ctime_r" "ac_cv_have_decl_ctime_r" "#include <time.h>
+" "$ac_c_undeclared_builtin_options" "CFLAGS"
+if test "x$ac_cv_have_decl_ctime_r" = xyes
+then :
 
-$as_echo "#define MISSING_CTIME_R_DECL 1" >>confdefs.h
+else $as_nop
 
+printf "%s\n" "#define MISSING_CTIME_R_DECL 1" >>confdefs.h
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <string.h>
-int
-main ()
-{
-char *(*func)(void) = strtok_r
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+ac_fn_check_decl "$LINENO" "strtok_r" "ac_cv_have_decl_strtok_r" "#include <string.h>
+" "$ac_c_undeclared_builtin_options" "CFLAGS"
+if test "x$ac_cv_have_decl_strtok_r" = xyes
+then :
 
-    :
-
-else
-
-
-$as_echo "#define MISSING_STRTOK_R_DECL 1" >>confdefs.h
+else $as_nop
 
+printf "%s\n" "#define MISSING_STRTOK_R_DECL 1" >>confdefs.h
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
-$as_echo "done" >&6; }
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fclose declaration" >&5
-$as_echo_n "checking for fclose declaration... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fclose declaration" >&5
+printf %s "checking for fclose declaration... " >&6; }
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdio.h>
 int
-main ()
+main (void)
 {
-int (*func)(void) = fclose
+int (*func)(FILE *) = fclose
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
 
-$as_echo "#define MISSING_FCLOSE_DECL 0" >>confdefs.h
+printf "%s\n" "#define MISSING_FCLOSE_DECL 0" >>confdefs.h
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-$as_echo "ok" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+printf "%s\n" "ok" >&6; }
 
-else
+else $as_nop
 
 
-$as_echo "#define MISSING_FCLOSE_DECL 1" >>confdefs.h
+printf "%s\n" "#define MISSING_FCLOSE_DECL 1" >>confdefs.h
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: missing" >&5
-$as_echo "missing" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: missing" >&5
+printf "%s\n" "missing" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct flock" >&5
-$as_echo_n "checking for struct flock... " >&6; }
-if ${ac_cv_struct_flock+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for struct flock" >&5
+printf %s "checking for struct flock... " >&6; }
+if test ${ac_cv_struct_flock+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -15013,30 +17108,31 @@
 #include <fcntl.h>
 
 int
-main ()
+main (void)
 {
 struct flock x;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
           ac_cv_struct_flock=yes
 
-else
+else $as_nop
 
           ac_cv_struct_flock=no
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_flock" >&5
-$as_echo "$ac_cv_struct_flock" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_flock" >&5
+printf "%s\n" "$ac_cv_struct_flock" >&6; }
 if test "$ac_cv_struct_flock" = "yes" ; then
 
-$as_echo "#define HAVE_STRUCT_FLOCK 1" >>confdefs.h
+printf "%s\n" "#define HAVE_STRUCT_FLOCK 1" >>confdefs.h
 
 fi
 
@@ -15050,34 +17146,35 @@
   #endif
 
 "
-if test "x$ac_cv_type_socklen_t" = xyes; then :
+if test "x$ac_cv_type_socklen_t" = xyes
+then :
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_SOCKLEN_T 1
-_ACEOF
+printf "%s\n" "#define HAVE_SOCKLEN_T 1" >>confdefs.h
 
 
 fi
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of intmax_t" >&5
-$as_echo_n "checking size of intmax_t... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of intmax_t" >&5
+printf %s "checking size of intmax_t... " >&6; }
 
   php_cache_value=php_cv_sizeof_intmax_t
-  if ${php_cv_sizeof_intmax_t+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  if test ${php_cv_sizeof_intmax_t+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
     old_LIBS=$LIBS
     LIBS=
     old_LDFLAGS=$LDFLAGS
     LDFLAGS=
-    if test "$cross_compiling" = yes; then :
+    if test "$cross_compiling" = yes
+then :
 
     eval $php_cache_value=0
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdio.h>
@@ -15098,11 +17195,12 @@
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
 
     eval $php_cache_value=`cat conftestval`
 
-else
+else $as_nop
 
     eval $php_cache_value=0
 
@@ -15119,40 +17217,38 @@
   if eval test "\$$php_cache_value" != "0"; then
 
 
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_INTMAX_T $php_cv_sizeof_intmax_t
-_ACEOF
+printf "%s\n" "#define SIZEOF_INTMAX_T $php_cv_sizeof_intmax_t" >>confdefs.h
 
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_INTMAX_T 1
-_ACEOF
+printf "%s\n" "#define HAVE_INTMAX_T 1" >>confdefs.h
 
 
 
   fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_cv_sizeof_intmax_t" >&5
-$as_echo "$php_cv_sizeof_intmax_t" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_sizeof_intmax_t" >&5
+printf "%s\n" "$php_cv_sizeof_intmax_t" >&6; }
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of ssize_t" >&5
-$as_echo_n "checking size of ssize_t... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of ssize_t" >&5
+printf %s "checking size of ssize_t... " >&6; }
 
   php_cache_value=php_cv_sizeof_ssize_t
-  if ${php_cv_sizeof_ssize_t+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  if test ${php_cv_sizeof_ssize_t+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
     old_LIBS=$LIBS
     LIBS=
     old_LDFLAGS=$LDFLAGS
     LDFLAGS=
-    if test "$cross_compiling" = yes; then :
+    if test "$cross_compiling" = yes
+then :
 
     eval $php_cache_value=8
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdio.h>
@@ -15173,11 +17269,12 @@
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
 
     eval $php_cache_value=`cat conftestval`
 
-else
+else $as_nop
 
     eval $php_cache_value=0
 
@@ -15194,40 +17291,38 @@
   if eval test "\$$php_cache_value" != "0"; then
 
 
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_SSIZE_T $php_cv_sizeof_ssize_t
-_ACEOF
+printf "%s\n" "#define SIZEOF_SSIZE_T $php_cv_sizeof_ssize_t" >>confdefs.h
 
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_SSIZE_T 1
-_ACEOF
+printf "%s\n" "#define HAVE_SSIZE_T 1" >>confdefs.h
 
 
 
   fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_cv_sizeof_ssize_t" >&5
-$as_echo "$php_cv_sizeof_ssize_t" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_sizeof_ssize_t" >&5
+printf "%s\n" "$php_cv_sizeof_ssize_t" >&6; }
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of ptrdiff_t" >&5
-$as_echo_n "checking size of ptrdiff_t... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of ptrdiff_t" >&5
+printf %s "checking size of ptrdiff_t... " >&6; }
 
   php_cache_value=php_cv_sizeof_ptrdiff_t
-  if ${php_cv_sizeof_ptrdiff_t+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  if test ${php_cv_sizeof_ptrdiff_t+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
     old_LIBS=$LIBS
     LIBS=
     old_LDFLAGS=$LDFLAGS
     LDFLAGS=
-    if test "$cross_compiling" = yes; then :
+    if test "$cross_compiling" = yes
+then :
 
     eval $php_cache_value=8
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdio.h>
@@ -15248,11 +17343,12 @@
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
 
     eval $php_cache_value=`cat conftestval`
 
-else
+else $as_nop
 
     eval $php_cache_value=0
 
@@ -15269,21 +17365,17 @@
   if eval test "\$$php_cache_value" != "0"; then
 
 
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_PTRDIFF_T $php_cv_sizeof_ptrdiff_t
-_ACEOF
+printf "%s\n" "#define SIZEOF_PTRDIFF_T $php_cv_sizeof_ptrdiff_t" >>confdefs.h
 
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_PTRDIFF_T 1
-_ACEOF
+printf "%s\n" "#define HAVE_PTRDIFF_T 1" >>confdefs.h
 
 
 
   fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_cv_sizeof_ptrdiff_t" >&5
-$as_echo "$php_cv_sizeof_ptrdiff_t" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_sizeof_ptrdiff_t" >&5
+printf "%s\n" "$php_cv_sizeof_ptrdiff_t" >&6; }
 
 
 
@@ -15291,17 +17383,19 @@
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 # declarations like `int a3(sizeof (unsigned char)) >= 0;'.
 # This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of short" >&5
-$as_echo_n "checking size of short... " >&6; }
-if ${ac_cv_sizeof_short+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (short))" "ac_cv_sizeof_short"        "$ac_includes_default"; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of short" >&5
+printf %s "checking size of short... " >&6; }
+if test ${ac_cv_sizeof_short+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (short))" "ac_cv_sizeof_short"        "$ac_includes_default"
+then :
 
-else
+else $as_nop
   if test "$ac_cv_type_short" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (short)
 See \`config.log' for more details" "$LINENO" 5; }
    else
@@ -15310,31 +17404,31 @@
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_short" >&5
-$as_echo "$ac_cv_sizeof_short" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_short" >&5
+printf "%s\n" "$ac_cv_sizeof_short" >&6; }
 
 
 
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_SHORT $ac_cv_sizeof_short
-_ACEOF
+printf "%s\n" "#define SIZEOF_SHORT $ac_cv_sizeof_short" >>confdefs.h
 
 
   # The cast to long int works around a bug in the HP C Compiler
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 # declarations like `int a3(sizeof (unsigned char)) >= 0;'.
 # This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5
-$as_echo_n "checking size of int... " >&6; }
-if ${ac_cv_sizeof_int+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int"        "$ac_includes_default"; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of int" >&5
+printf %s "checking size of int... " >&6; }
+if test ${ac_cv_sizeof_int+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int"        "$ac_includes_default"
+then :
 
-else
+else $as_nop
   if test "$ac_cv_type_int" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (int)
 See \`config.log' for more details" "$LINENO" 5; }
    else
@@ -15343,31 +17437,31 @@
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5
-$as_echo "$ac_cv_sizeof_int" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5
+printf "%s\n" "$ac_cv_sizeof_int" >&6; }
 
 
 
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_INT $ac_cv_sizeof_int
-_ACEOF
+printf "%s\n" "#define SIZEOF_INT $ac_cv_sizeof_int" >>confdefs.h
 
 
   # The cast to long int works around a bug in the HP C Compiler
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 # declarations like `int a3(sizeof (unsigned char)) >= 0;'.
 # This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
-$as_echo_n "checking size of long... " >&6; }
-if ${ac_cv_sizeof_long+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
+printf %s "checking size of long... " >&6; }
+if test ${ac_cv_sizeof_long+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"
+then :
 
-else
+else $as_nop
   if test "$ac_cv_type_long" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (long)
 See \`config.log' for more details" "$LINENO" 5; }
    else
@@ -15376,31 +17470,31 @@
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
-$as_echo "$ac_cv_sizeof_long" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
+printf "%s\n" "$ac_cv_sizeof_long" >&6; }
 
 
 
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_LONG $ac_cv_sizeof_long
-_ACEOF
+printf "%s\n" "#define SIZEOF_LONG $ac_cv_sizeof_long" >>confdefs.h
 
 
   # The cast to long int works around a bug in the HP C Compiler
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 # declarations like `int a3(sizeof (unsigned char)) >= 0;'.
 # This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5
-$as_echo_n "checking size of long long... " >&6; }
-if ${ac_cv_sizeof_long_long+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long"        "$ac_includes_default"; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5
+printf %s "checking size of long long... " >&6; }
+if test ${ac_cv_sizeof_long_long+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long"        "$ac_includes_default"
+then :
 
-else
+else $as_nop
   if test "$ac_cv_type_long_long" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (long long)
 See \`config.log' for more details" "$LINENO" 5; }
    else
@@ -15409,31 +17503,31 @@
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long" >&5
-$as_echo "$ac_cv_sizeof_long_long" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long" >&5
+printf "%s\n" "$ac_cv_sizeof_long_long" >&6; }
 
 
 
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
-_ACEOF
+printf "%s\n" "#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long" >>confdefs.h
 
 
   # The cast to long int works around a bug in the HP C Compiler
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 # declarations like `int a3(sizeof (unsigned char)) >= 0;'.
 # This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of size_t" >&5
-$as_echo_n "checking size of size_t... " >&6; }
-if ${ac_cv_sizeof_size_t+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (size_t))" "ac_cv_sizeof_size_t"        "$ac_includes_default"; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of size_t" >&5
+printf %s "checking size of size_t... " >&6; }
+if test ${ac_cv_sizeof_size_t+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (size_t))" "ac_cv_sizeof_size_t"        "$ac_includes_default"
+then :
 
-else
+else $as_nop
   if test "$ac_cv_type_size_t" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (size_t)
 See \`config.log' for more details" "$LINENO" 5; }
    else
@@ -15442,31 +17536,31 @@
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_size_t" >&5
-$as_echo "$ac_cv_sizeof_size_t" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_size_t" >&5
+printf "%s\n" "$ac_cv_sizeof_size_t" >&6; }
 
 
 
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t
-_ACEOF
+printf "%s\n" "#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t" >>confdefs.h
 
 
   # The cast to long int works around a bug in the HP C Compiler
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 # declarations like `int a3(sizeof (unsigned char)) >= 0;'.
 # This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of off_t" >&5
-$as_echo_n "checking size of off_t... " >&6; }
-if ${ac_cv_sizeof_off_t+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (off_t))" "ac_cv_sizeof_off_t"        "$ac_includes_default"; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of off_t" >&5
+printf %s "checking size of off_t... " >&6; }
+if test ${ac_cv_sizeof_off_t+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (off_t))" "ac_cv_sizeof_off_t"        "$ac_includes_default"
+then :
 
-else
+else $as_nop
   if test "$ac_cv_type_off_t" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (off_t)
 See \`config.log' for more details" "$LINENO" 5; }
    else
@@ -15475,27 +17569,25 @@
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_off_t" >&5
-$as_echo "$ac_cv_sizeof_off_t" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_off_t" >&5
+printf "%s\n" "$ac_cv_sizeof_off_t" >&6; }
 
 
 
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_OFF_T $ac_cv_sizeof_off_t
-_ACEOF
+printf "%s\n" "#define SIZEOF_OFF_T $ac_cv_sizeof_off_t" >>confdefs.h
 
 
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_expect" >&5
-$as_echo_n "checking for __builtin_expect... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_expect" >&5
+printf %s "checking for __builtin_expect... " >&6; }
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
     return __builtin_expect(1,1) ? 1 : 0;
@@ -15504,37 +17596,36 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
 
     have_builtin_expect=1
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-else
+else $as_nop
 
     have_builtin_expect=0
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 
 
-cat >>confdefs.h <<_ACEOF
-#define PHP_HAVE_BUILTIN_EXPECT $have_builtin_expect
-_ACEOF
+printf "%s\n" "#define PHP_HAVE_BUILTIN_EXPECT $have_builtin_expect" >>confdefs.h
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_clz" >&5
-$as_echo_n "checking for __builtin_clz... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_clz" >&5
+printf %s "checking for __builtin_clz... " >&6; }
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
     return __builtin_clz(1) ? 1 : 0;
@@ -15543,37 +17634,36 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
 
     have_builtin_clz=1
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-else
+else $as_nop
 
     have_builtin_clz=0
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 
 
-cat >>confdefs.h <<_ACEOF
-#define PHP_HAVE_BUILTIN_CLZ $have_builtin_clz
-_ACEOF
+printf "%s\n" "#define PHP_HAVE_BUILTIN_CLZ $have_builtin_clz" >>confdefs.h
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_clzl" >&5
-$as_echo_n "checking for __builtin_clzl... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_clzl" >&5
+printf %s "checking for __builtin_clzl... " >&6; }
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
     return __builtin_clzl(1) ? 1 : 0;
@@ -15582,37 +17672,36 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
 
     have_builtin_clzl=1
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-else
+else $as_nop
 
     have_builtin_clzl=0
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 
 
-cat >>confdefs.h <<_ACEOF
-#define PHP_HAVE_BUILTIN_CLZL $have_builtin_clzl
-_ACEOF
+printf "%s\n" "#define PHP_HAVE_BUILTIN_CLZL $have_builtin_clzl" >>confdefs.h
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_clzll" >&5
-$as_echo_n "checking for __builtin_clzll... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_clzll" >&5
+printf %s "checking for __builtin_clzll... " >&6; }
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
     return __builtin_clzll(1) ? 1 : 0;
@@ -15621,37 +17710,36 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
 
     have_builtin_clzll=1
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-else
+else $as_nop
 
     have_builtin_clzll=0
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 
 
-cat >>confdefs.h <<_ACEOF
-#define PHP_HAVE_BUILTIN_CLZLL $have_builtin_clzll
-_ACEOF
+printf "%s\n" "#define PHP_HAVE_BUILTIN_CLZLL $have_builtin_clzll" >>confdefs.h
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_ctzl" >&5
-$as_echo_n "checking for __builtin_ctzl... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_ctzl" >&5
+printf %s "checking for __builtin_ctzl... " >&6; }
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
     return __builtin_ctzl(2L) ? 1 : 0;
@@ -15660,37 +17748,36 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
 
     have_builtin_ctzl=1
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-else
+else $as_nop
 
     have_builtin_ctzl=0
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 
 
-cat >>confdefs.h <<_ACEOF
-#define PHP_HAVE_BUILTIN_CTZL $have_builtin_ctzl
-_ACEOF
+printf "%s\n" "#define PHP_HAVE_BUILTIN_CTZL $have_builtin_ctzl" >>confdefs.h
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_ctzll" >&5
-$as_echo_n "checking for __builtin_ctzll... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_ctzll" >&5
+printf %s "checking for __builtin_ctzll... " >&6; }
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
     return __builtin_ctzll(2LL) ? 1 : 0;
@@ -15699,37 +17786,36 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
 
     have_builtin_ctzll=1
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-else
+else $as_nop
 
     have_builtin_ctzll=0
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 
 
-cat >>confdefs.h <<_ACEOF
-#define PHP_HAVE_BUILTIN_CTZLL $have_builtin_ctzll
-_ACEOF
+printf "%s\n" "#define PHP_HAVE_BUILTIN_CTZLL $have_builtin_ctzll" >>confdefs.h
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_smull_overflow" >&5
-$as_echo_n "checking for __builtin_smull_overflow... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_smull_overflow" >&5
+printf %s "checking for __builtin_smull_overflow... " >&6; }
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
     long tmpvar;
@@ -15739,37 +17825,36 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
 
     have_builtin_smull_overflow=1
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-else
+else $as_nop
 
     have_builtin_smull_overflow=0
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 
 
-cat >>confdefs.h <<_ACEOF
-#define PHP_HAVE_BUILTIN_SMULL_OVERFLOW $have_builtin_smull_overflow
-_ACEOF
+printf "%s\n" "#define PHP_HAVE_BUILTIN_SMULL_OVERFLOW $have_builtin_smull_overflow" >>confdefs.h
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_smulll_overflow" >&5
-$as_echo_n "checking for __builtin_smulll_overflow... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_smulll_overflow" >&5
+printf %s "checking for __builtin_smulll_overflow... " >&6; }
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
     long long tmpvar;
@@ -15779,37 +17864,36 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
 
     have_builtin_smulll_overflow=1
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-else
+else $as_nop
 
     have_builtin_smulll_overflow=0
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 
 
-cat >>confdefs.h <<_ACEOF
-#define PHP_HAVE_BUILTIN_SMULLL_OVERFLOW $have_builtin_smulll_overflow
-_ACEOF
+printf "%s\n" "#define PHP_HAVE_BUILTIN_SMULLL_OVERFLOW $have_builtin_smulll_overflow" >>confdefs.h
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_saddl_overflow" >&5
-$as_echo_n "checking for __builtin_saddl_overflow... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_saddl_overflow" >&5
+printf %s "checking for __builtin_saddl_overflow... " >&6; }
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
     long tmpvar;
@@ -15819,37 +17903,36 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
 
     have_builtin_saddl_overflow=1
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-else
+else $as_nop
 
     have_builtin_saddl_overflow=0
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 
 
-cat >>confdefs.h <<_ACEOF
-#define PHP_HAVE_BUILTIN_SADDL_OVERFLOW $have_builtin_saddl_overflow
-_ACEOF
+printf "%s\n" "#define PHP_HAVE_BUILTIN_SADDL_OVERFLOW $have_builtin_saddl_overflow" >>confdefs.h
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_saddll_overflow" >&5
-$as_echo_n "checking for __builtin_saddll_overflow... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_saddll_overflow" >&5
+printf %s "checking for __builtin_saddll_overflow... " >&6; }
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
     long long tmpvar;
@@ -15859,37 +17942,36 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
 
     have_builtin_saddll_overflow=1
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-else
+else $as_nop
 
     have_builtin_saddll_overflow=0
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 
 
-cat >>confdefs.h <<_ACEOF
-#define PHP_HAVE_BUILTIN_SADDLL_OVERFLOW $have_builtin_saddll_overflow
-_ACEOF
+printf "%s\n" "#define PHP_HAVE_BUILTIN_SADDLL_OVERFLOW $have_builtin_saddll_overflow" >>confdefs.h
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_usub_overflow" >&5
-$as_echo_n "checking for __builtin_usub_overflow... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_usub_overflow" >&5
+printf %s "checking for __builtin_usub_overflow... " >&6; }
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
     unsigned int tmpvar;
@@ -15899,37 +17981,36 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
 
     have_builtin_usub_overflow=1
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-else
+else $as_nop
 
     have_builtin_usub_overflow=0
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 
 
-cat >>confdefs.h <<_ACEOF
-#define PHP_HAVE_BUILTIN_USUB_OVERFLOW $have_builtin_usub_overflow
-_ACEOF
+printf "%s\n" "#define PHP_HAVE_BUILTIN_USUB_OVERFLOW $have_builtin_usub_overflow" >>confdefs.h
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_ssubl_overflow" >&5
-$as_echo_n "checking for __builtin_ssubl_overflow... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_ssubl_overflow" >&5
+printf %s "checking for __builtin_ssubl_overflow... " >&6; }
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
     long tmpvar;
@@ -15939,37 +18020,36 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
 
     have_builtin_ssubl_overflow=1
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-else
+else $as_nop
 
     have_builtin_ssubl_overflow=0
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 
 
-cat >>confdefs.h <<_ACEOF
-#define PHP_HAVE_BUILTIN_SSUBL_OVERFLOW $have_builtin_ssubl_overflow
-_ACEOF
+printf "%s\n" "#define PHP_HAVE_BUILTIN_SSUBL_OVERFLOW $have_builtin_ssubl_overflow" >>confdefs.h
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_ssubll_overflow" >&5
-$as_echo_n "checking for __builtin_ssubll_overflow... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_ssubll_overflow" >&5
+printf %s "checking for __builtin_ssubll_overflow... " >&6; }
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
     long long tmpvar;
@@ -15979,37 +18059,36 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
 
     have_builtin_ssubll_overflow=1
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-else
+else $as_nop
 
     have_builtin_ssubll_overflow=0
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 
 
-cat >>confdefs.h <<_ACEOF
-#define PHP_HAVE_BUILTIN_SSUBLL_OVERFLOW $have_builtin_ssubll_overflow
-_ACEOF
+printf "%s\n" "#define PHP_HAVE_BUILTIN_SSUBLL_OVERFLOW $have_builtin_ssubll_overflow" >>confdefs.h
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_cpu_init" >&5
-$as_echo_n "checking for __builtin_cpu_init... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_cpu_init" >&5
+printf %s "checking for __builtin_cpu_init... " >&6; }
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
     __builtin_cpu_init();
@@ -16018,37 +18097,36 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
 
     have_builtin_cpu_init=1
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-else
+else $as_nop
 
     have_builtin_cpu_init=0
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 
 
-cat >>confdefs.h <<_ACEOF
-#define PHP_HAVE_BUILTIN_CPU_INIT $have_builtin_cpu_init
-_ACEOF
+printf "%s\n" "#define PHP_HAVE_BUILTIN_CPU_INIT $have_builtin_cpu_init" >>confdefs.h
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_cpu_supports" >&5
-$as_echo_n "checking for __builtin_cpu_supports... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_cpu_supports" >&5
+printf %s "checking for __builtin_cpu_supports... " >&6; }
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
     return __builtin_cpu_supports("sse")? 1 : 0;
@@ -16057,37 +18135,36 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
 
     have_builtin_cpu_supports=1
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-else
+else $as_nop
 
     have_builtin_cpu_supports=0
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 
 
-cat >>confdefs.h <<_ACEOF
-#define PHP_HAVE_BUILTIN_CPU_SUPPORTS $have_builtin_cpu_supports
-_ACEOF
+printf "%s\n" "#define PHP_HAVE_BUILTIN_CPU_SUPPORTS $have_builtin_cpu_supports" >>confdefs.h
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_frame_address" >&5
-$as_echo_n "checking for __builtin_frame_address... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_frame_address" >&5
+printf %s "checking for __builtin_frame_address... " >&6; }
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
     return __builtin_frame_address(0) != (void*)0;
@@ -16096,93 +18173,94 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
 
     have_builtin_frame_address=1
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-else
+else $as_nop
 
     have_builtin_frame_address=0
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 
 
-cat >>confdefs.h <<_ACEOF
-#define PHP_HAVE_BUILTIN_FRAME_ADDRESS $have_builtin_frame_address
-_ACEOF
+printf "%s\n" "#define PHP_HAVE_BUILTIN_FRAME_ADDRESS $have_builtin_frame_address" >>confdefs.h
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for prctl" >&5
-$as_echo_n "checking for prctl... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for prctl" >&5
+printf %s "checking for prctl... " >&6; }
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/prctl.h>
 int
-main ()
+main (void)
 {
 prctl(0, 0, 0, 0, 0);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
 
-$as_echo "#define HAVE_PRCTL 1" >>confdefs.h
+printf "%s\n" "#define HAVE_PRCTL 1" >>confdefs.h
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-else
+else $as_nop
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for procctl" >&5
-$as_echo_n "checking for procctl... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for procctl" >&5
+printf %s "checking for procctl... " >&6; }
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/procctl.h>
 int
-main ()
+main (void)
 {
 procctl(0, 0, 0, 0);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
 
-$as_echo "#define HAVE_PROCCTL 1" >>confdefs.h
+printf "%s\n" "#define HAVE_PROCCTL 1" >>confdefs.h
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-else
+else $as_nop
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for avx512 supports in compiler" >&5
-$as_echo_n "checking for avx512 supports in compiler... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for avx512 supports in compiler" >&5
+printf %s "checking for avx512 supports in compiler... " >&6; }
   save_CFLAGS="$CFLAGS"
   CFLAGS="-mavx512f -mavx512cd -mavx512vl -mavx512dq -mavx512bw $CFLAGS"
 
@@ -16197,33 +18275,32 @@
         return 0;
     }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
 
     have_avx512_supports=1
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-else
+else $as_nop
 
     have_avx512_supports=0
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 
   CFLAGS="$save_CFLAGS"
 
 
-cat >>confdefs.h <<_ACEOF
-#define PHP_HAVE_AVX512_SUPPORTS $have_avx512_supports
-_ACEOF
+printf "%s\n" "#define PHP_HAVE_AVX512_SUPPORTS $have_avx512_supports" >>confdefs.h
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for avx512 vbmi supports in compiler" >&5
-$as_echo_n "checking for avx512 vbmi supports in compiler... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for avx512 vbmi supports in compiler" >&5
+printf %s "checking for avx512 vbmi supports in compiler... " >&6; }
   save_CFLAGS="$CFLAGS"
   CFLAGS="-mavx512f -mavx512cd -mavx512vl -mavx512dq -mavx512bw -mavx512vbmi $CFLAGS"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -16237,41 +18314,41 @@
         return 0;
     }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
 
     have_avx512_vbmi_supports=1
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-else
+else $as_nop
 
     have_avx512_vbmi_supports=0
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
   CFLAGS="$save_CFLAGS"
 
-cat >>confdefs.h <<_ACEOF
-#define PHP_HAVE_AVX512_VBMI_SUPPORTS $have_avx512_vbmi_supports
-_ACEOF
+printf "%s\n" "#define PHP_HAVE_AVX512_VBMI_SUPPORTS $have_avx512_vbmi_supports" >>confdefs.h
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports __alignof__" >&5
-$as_echo_n "checking whether the compiler supports __alignof__... " >&6; }
-if ${ac_cv_alignof_exists+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports __alignof__" >&5
+printf %s "checking whether the compiler supports __alignof__... " >&6; }
+if test ${ac_cv_alignof_exists+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
 int
-main ()
+main (void)
 {
 
   int align = __alignof__(int);
@@ -16280,67 +18357,64 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
   ac_cv_alignof_exists=yes
 
-else
+else $as_nop
 
   ac_cv_alignof_exists=no
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_alignof_exists" >&5
-$as_echo "$ac_cv_alignof_exists" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_alignof_exists" >&5
+printf "%s\n" "$ac_cv_alignof_exists" >&6; }
 if test "$ac_cv_alignof_exists" = "yes"; then
 
-$as_echo "#define HAVE_ALIGNOF 1" >>confdefs.h
+printf "%s\n" "#define HAVE_ALIGNOF 1" >>confdefs.h
 
 fi
 
 ac_fn_c_check_member "$LINENO" "struct tm" "tm_gmtoff" "ac_cv_member_struct_tm_tm_gmtoff" "#include <time.h>
 "
-if test "x$ac_cv_member_struct_tm_tm_gmtoff" = xyes; then :
+if test "x$ac_cv_member_struct_tm_tm_gmtoff" = xyes
+then :
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_TM_TM_GMTOFF 1
-_ACEOF
+printf "%s\n" "#define HAVE_STRUCT_TM_TM_GMTOFF 1" >>confdefs.h
 
 
 fi
 
 ac_fn_c_check_member "$LINENO" "struct stat" "st_blksize" "ac_cv_member_struct_stat_st_blksize" "$ac_includes_default"
-if test "x$ac_cv_member_struct_stat_st_blksize" = xyes; then :
+if test "x$ac_cv_member_struct_stat_st_blksize" = xyes
+then :
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-_ACEOF
+printf "%s\n" "#define HAVE_STRUCT_STAT_ST_BLKSIZE 1" >>confdefs.h
 
 
 fi
 ac_fn_c_check_member "$LINENO" "struct stat" "st_rdev" "ac_cv_member_struct_stat_st_rdev" "$ac_includes_default"
-if test "x$ac_cv_member_struct_stat_st_rdev" = xyes; then :
+if test "x$ac_cv_member_struct_stat_st_rdev" = xyes
+then :
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_STAT_ST_RDEV 1
-_ACEOF
+printf "%s\n" "#define HAVE_STRUCT_STAT_ST_RDEV 1" >>confdefs.h
 
 
 fi
 
 if test "`uname -s 2>/dev/null`" != "QNX"; then
   ac_fn_c_check_member "$LINENO" "struct stat" "st_blocks" "ac_cv_member_struct_stat_st_blocks" "$ac_includes_default"
-if test "x$ac_cv_member_struct_stat_st_blocks" = xyes; then :
+if test "x$ac_cv_member_struct_stat_st_blocks" = xyes
+then :
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_STAT_ST_BLOCKS 1
-_ACEOF
+printf "%s\n" "#define HAVE_STRUCT_STAT_ST_BLOCKS 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_ST_BLOCKS 1" >>confdefs.h
+printf "%s\n" "#define HAVE_ST_BLOCKS 1" >>confdefs.h
 
-else
+else $as_nop
   case " $LIBOBJS " in
   *" fileblocks.$ac_objext "* ) ;;
   *) LIBOBJS="$LIBOBJS fileblocks.$ac_objext"
@@ -16353,111 +18427,116 @@
 fi
 
 ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
-if test "x$ac_cv_type_size_t" = xyes; then :
+if test "x$ac_cv_type_size_t" = xyes
+then :
 
-else
+else $as_nop
 
-cat >>confdefs.h <<_ACEOF
-#define size_t unsigned int
-_ACEOF
+printf "%s\n" "#define size_t unsigned int" >>confdefs.h
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5
-$as_echo_n "checking for uid_t in sys/types.h... " >&6; }
-if ${ac_cv_type_uid_t+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5
+printf %s "checking for uid_t in sys/types.h... " >&6; }
+if test ${ac_cv_type_uid_t+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "uid_t" >/dev/null 2>&1; then :
+  $EGREP "uid_t" >/dev/null 2>&1
+then :
   ac_cv_type_uid_t=yes
-else
+else $as_nop
   ac_cv_type_uid_t=no
 fi
-rm -f conftest*
+rm -rf conftest*
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_uid_t" >&5
-$as_echo "$ac_cv_type_uid_t" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_uid_t" >&5
+printf "%s\n" "$ac_cv_type_uid_t" >&6; }
 if test $ac_cv_type_uid_t = no; then
 
-$as_echo "#define uid_t int" >>confdefs.h
+printf "%s\n" "#define uid_t int" >>confdefs.h
 
 
-$as_echo "#define gid_t int" >>confdefs.h
+printf "%s\n" "#define gid_t int" >>confdefs.h
 
 fi
 
 
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct sockaddr_storage" >&5
-$as_echo_n "checking for struct sockaddr_storage... " >&6; }
-if ${ac_cv_sockaddr_storage+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for struct sockaddr_storage" >&5
+printf %s "checking for struct sockaddr_storage... " >&6; }
+if test ${ac_cv_sockaddr_storage+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 #include <sys/socket.h>
 int
-main ()
+main (void)
 {
 struct sockaddr_storage s; s
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_sockaddr_storage=yes
-else
+else $as_nop
   ac_cv_sockaddr_storage=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sockaddr_storage" >&5
-$as_echo "$ac_cv_sockaddr_storage" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sockaddr_storage" >&5
+printf "%s\n" "$ac_cv_sockaddr_storage" >&6; }
   if test "$ac_cv_sockaddr_storage" = "yes"; then
 
-$as_echo "#define HAVE_SOCKADDR_STORAGE 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SOCKADDR_STORAGE 1" >>confdefs.h
 
   fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for field sa_len in struct sockaddr" >&5
-$as_echo_n "checking for field sa_len in struct sockaddr... " >&6; }
-if ${ac_cv_sockaddr_sa_len+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for field sa_len in struct sockaddr" >&5
+printf %s "checking for field sa_len in struct sockaddr... " >&6; }
+if test ${ac_cv_sockaddr_sa_len+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 #include <sys/socket.h>
 int
-main ()
+main (void)
 {
 static struct sockaddr sa; int n = (int) sa.sa_len; return n;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_sockaddr_sa_len=yes
-else
+else $as_nop
   ac_cv_sockaddr_sa_len=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sockaddr_sa_len" >&5
-$as_echo "$ac_cv_sockaddr_sa_len" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sockaddr_sa_len" >&5
+printf "%s\n" "$ac_cv_sockaddr_sa_len" >&6; }
   if test "$ac_cv_sockaddr_sa_len" = "yes"; then
 
-$as_echo "#define HAVE_SOCKADDR_SA_LEN 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SOCKADDR_SA_LEN 1" >>confdefs.h
 
   fi
 
@@ -16470,11 +18549,12 @@
 
 
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __attribute__((ifunc))" >&5
-$as_echo_n "checking for __attribute__((ifunc))... " >&6; }
-if ${ax_cv_have_func_attribute_ifunc+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __attribute__((ifunc))" >&5
+printf %s "checking for __attribute__((ifunc))... " >&6; }
+if test ${ax_cv_have_func_attribute_ifunc+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -16485,7 +18565,7 @@
                     int foo( void ) __attribute__((ifunc("resolve_foo")));
 
 int
-main ()
+main (void)
 {
 
   ;
@@ -16493,27 +18573,28 @@
 }
 
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-                                      if test -s conftest.err; then :
+if ac_fn_c_try_link "$LINENO"
+then :
+                                      if test -s conftest.err
+then :
   ax_cv_have_func_attribute_ifunc=no
-else
+else $as_nop
   ax_cv_have_func_attribute_ifunc=yes
 fi
-else
+else $as_nop
   ax_cv_have_func_attribute_ifunc=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_have_func_attribute_ifunc" >&5
-$as_echo "$ax_cv_have_func_attribute_ifunc" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_have_func_attribute_ifunc" >&5
+printf "%s\n" "$ax_cv_have_func_attribute_ifunc" >&6; }
 
-    if test yes = $ax_cv_have_func_attribute_ifunc; then :
+    if test yes = $ax_cv_have_func_attribute_ifunc
+then :
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_FUNC_ATTRIBUTE_IFUNC 1
-_ACEOF
+printf "%s\n" "#define HAVE_FUNC_ATTRIBUTE_IFUNC 1" >>confdefs.h
 
 fi
 
@@ -16522,11 +18603,12 @@
 
 
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __attribute__((target))" >&5
-$as_echo_n "checking for __attribute__((target))... " >&6; }
-if ${ax_cv_have_func_attribute_target+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __attribute__((target))" >&5
+printf %s "checking for __attribute__((target))... " >&6; }
+if test ${ax_cv_have_func_attribute_target+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -16535,7 +18617,7 @@
                     int bar( void ) __attribute__((target("sse2")));
 
 int
-main ()
+main (void)
 {
 
   ;
@@ -16543,27 +18625,28 @@
 }
 
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-                                      if test -s conftest.err; then :
+if ac_fn_c_try_link "$LINENO"
+then :
+                                      if test -s conftest.err
+then :
   ax_cv_have_func_attribute_target=no
-else
+else $as_nop
   ax_cv_have_func_attribute_target=yes
 fi
-else
+else $as_nop
   ax_cv_have_func_attribute_target=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_have_func_attribute_target" >&5
-$as_echo "$ax_cv_have_func_attribute_target" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_have_func_attribute_target" >&5
+printf "%s\n" "$ax_cv_have_func_attribute_target" >&6; }
 
-    if test yes = $ax_cv_have_func_attribute_target; then :
+    if test yes = $ax_cv_have_func_attribute_target
+then :
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_FUNC_ATTRIBUTE_TARGET 1
-_ACEOF
+printf "%s\n" "#define HAVE_FUNC_ATTRIBUTE_TARGET 1" >>confdefs.h
 
 fi
 
@@ -16572,145 +18655,439 @@
  ;;
 esac
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for IPv6 support" >&5
-$as_echo_n "checking for IPv6 support... " >&6; }
-if ${ac_cv_ipv6_support+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for IPv6 support" >&5
+printf %s "checking for IPv6 support... " >&6; }
+if test ${ac_cv_ipv6_support+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 int
-main ()
+main (void)
 {
 struct sockaddr_in6 s; struct in6_addr t=in6addr_any; int i=AF_INET6; s; t.s6_addr0 = 0;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_ipv6_support=yes
-else
+else $as_nop
   ac_cv_ipv6_support=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ipv6_support" >&5
-$as_echo "$ac_cv_ipv6_support" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ipv6_support" >&5
+printf "%s\n" "$ac_cv_ipv6_support" >&6; }
 
 
-for ac_func in alphasort \
-asctime_r \
-chroot \
-ctime_r \
-explicit_memset \
-fdatasync \
-flock \
-ftok \
-funopen \
-gai_strerror \
-getcwd \
-getloadavg \
-getlogin \
-getprotobyname \
-getprotobynumber \
-getservbyname \
-getservbyport \
-getrusage \
-gettimeofday \
-gmtime_r \
-getpwnam_r \
-getgrnam_r \
-getpwuid_r \
-getwd \
-glob \
-inet_ntoa \
-inet_ntop \
-inet_pton \
-localtime_r \
-lchown \
-memcntl \
-memmove \
-mkstemp \
-mmap \
-nice \
-nl_langinfo \
-poll \
-pthread_jit_write_protect_np \
-putenv \
-scandir \
-setitimer \
-setenv \
-shutdown \
-sigprocmask \
-statfs \
-statvfs \
-std_syslog \
-strcasecmp \
-strnlen \
-strptime \
-strtok_r \
-symlink \
-tzset \
-unsetenv \
-usleep \
-utime \
-vasprintf \
-asprintf \
-nanosleep \
-memmem \
-memrchr \
+ac_fn_c_check_func "$LINENO" "alphasort" "ac_cv_func_alphasort"
+if test "x$ac_cv_func_alphasort" = xyes
+then :
+  printf "%s\n" "#define HAVE_ALPHASORT 1" >>confdefs.h
 
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
+fi
+ac_fn_c_check_func "$LINENO" "asctime_r" "ac_cv_func_asctime_r"
+if test "x$ac_cv_func_asctime_r" = xyes
+then :
+  printf "%s\n" "#define HAVE_ASCTIME_R 1" >>confdefs.h
 
 fi
-done
+ac_fn_c_check_func "$LINENO" "chroot" "ac_cv_func_chroot"
+if test "x$ac_cv_func_chroot" = xyes
+then :
+  printf "%s\n" "#define HAVE_CHROOT 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "ctime_r" "ac_cv_func_ctime_r"
+if test "x$ac_cv_func_ctime_r" = xyes
+then :
+  printf "%s\n" "#define HAVE_CTIME_R 1" >>confdefs.h
 
+fi
+ac_fn_c_check_func "$LINENO" "explicit_memset" "ac_cv_func_explicit_memset"
+if test "x$ac_cv_func_explicit_memset" = xyes
+then :
+  printf "%s\n" "#define HAVE_EXPLICIT_MEMSET 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "fdatasync" "ac_cv_func_fdatasync"
+if test "x$ac_cv_func_fdatasync" = xyes
+then :
+  printf "%s\n" "#define HAVE_FDATASYNC 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "flock" "ac_cv_func_flock"
+if test "x$ac_cv_func_flock" = xyes
+then :
+  printf "%s\n" "#define HAVE_FLOCK 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "ftok" "ac_cv_func_ftok"
+if test "x$ac_cv_func_ftok" = xyes
+then :
+  printf "%s\n" "#define HAVE_FTOK 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "funopen" "ac_cv_func_funopen"
+if test "x$ac_cv_func_funopen" = xyes
+then :
+  printf "%s\n" "#define HAVE_FUNOPEN 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "gai_strerror" "ac_cv_func_gai_strerror"
+if test "x$ac_cv_func_gai_strerror" = xyes
+then :
+  printf "%s\n" "#define HAVE_GAI_STRERROR 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "getcwd" "ac_cv_func_getcwd"
+if test "x$ac_cv_func_getcwd" = xyes
+then :
+  printf "%s\n" "#define HAVE_GETCWD 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "getloadavg" "ac_cv_func_getloadavg"
+if test "x$ac_cv_func_getloadavg" = xyes
+then :
+  printf "%s\n" "#define HAVE_GETLOADAVG 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "getlogin" "ac_cv_func_getlogin"
+if test "x$ac_cv_func_getlogin" = xyes
+then :
+  printf "%s\n" "#define HAVE_GETLOGIN 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "getprotobyname" "ac_cv_func_getprotobyname"
+if test "x$ac_cv_func_getprotobyname" = xyes
+then :
+  printf "%s\n" "#define HAVE_GETPROTOBYNAME 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "getprotobynumber" "ac_cv_func_getprotobynumber"
+if test "x$ac_cv_func_getprotobynumber" = xyes
+then :
+  printf "%s\n" "#define HAVE_GETPROTOBYNUMBER 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "getservbyname" "ac_cv_func_getservbyname"
+if test "x$ac_cv_func_getservbyname" = xyes
+then :
+  printf "%s\n" "#define HAVE_GETSERVBYNAME 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "getservbyport" "ac_cv_func_getservbyport"
+if test "x$ac_cv_func_getservbyport" = xyes
+then :
+  printf "%s\n" "#define HAVE_GETSERVBYPORT 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "getrusage" "ac_cv_func_getrusage"
+if test "x$ac_cv_func_getrusage" = xyes
+then :
+  printf "%s\n" "#define HAVE_GETRUSAGE 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "gettimeofday" "ac_cv_func_gettimeofday"
+if test "x$ac_cv_func_gettimeofday" = xyes
+then :
+  printf "%s\n" "#define HAVE_GETTIMEOFDAY 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "gmtime_r" "ac_cv_func_gmtime_r"
+if test "x$ac_cv_func_gmtime_r" = xyes
+then :
+  printf "%s\n" "#define HAVE_GMTIME_R 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "getpwnam_r" "ac_cv_func_getpwnam_r"
+if test "x$ac_cv_func_getpwnam_r" = xyes
+then :
+  printf "%s\n" "#define HAVE_GETPWNAM_R 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "getgrnam_r" "ac_cv_func_getgrnam_r"
+if test "x$ac_cv_func_getgrnam_r" = xyes
+then :
+  printf "%s\n" "#define HAVE_GETGRNAM_R 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "getpwuid_r" "ac_cv_func_getpwuid_r"
+if test "x$ac_cv_func_getpwuid_r" = xyes
+then :
+  printf "%s\n" "#define HAVE_GETPWUID_R 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "getwd" "ac_cv_func_getwd"
+if test "x$ac_cv_func_getwd" = xyes
+then :
+  printf "%s\n" "#define HAVE_GETWD 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "glob" "ac_cv_func_glob"
+if test "x$ac_cv_func_glob" = xyes
+then :
+  printf "%s\n" "#define HAVE_GLOB 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "inet_ntoa" "ac_cv_func_inet_ntoa"
+if test "x$ac_cv_func_inet_ntoa" = xyes
+then :
+  printf "%s\n" "#define HAVE_INET_NTOA 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "inet_ntop" "ac_cv_func_inet_ntop"
+if test "x$ac_cv_func_inet_ntop" = xyes
+then :
+  printf "%s\n" "#define HAVE_INET_NTOP 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "inet_pton" "ac_cv_func_inet_pton"
+if test "x$ac_cv_func_inet_pton" = xyes
+then :
+  printf "%s\n" "#define HAVE_INET_PTON 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "localtime_r" "ac_cv_func_localtime_r"
+if test "x$ac_cv_func_localtime_r" = xyes
+then :
+  printf "%s\n" "#define HAVE_LOCALTIME_R 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "lchown" "ac_cv_func_lchown"
+if test "x$ac_cv_func_lchown" = xyes
+then :
+  printf "%s\n" "#define HAVE_LCHOWN 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "memcntl" "ac_cv_func_memcntl"
+if test "x$ac_cv_func_memcntl" = xyes
+then :
+  printf "%s\n" "#define HAVE_MEMCNTL 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "memmove" "ac_cv_func_memmove"
+if test "x$ac_cv_func_memmove" = xyes
+then :
+  printf "%s\n" "#define HAVE_MEMMOVE 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "mkstemp" "ac_cv_func_mkstemp"
+if test "x$ac_cv_func_mkstemp" = xyes
+then :
+  printf "%s\n" "#define HAVE_MKSTEMP 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "mmap" "ac_cv_func_mmap"
+if test "x$ac_cv_func_mmap" = xyes
+then :
+  printf "%s\n" "#define HAVE_MMAP 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "nice" "ac_cv_func_nice"
+if test "x$ac_cv_func_nice" = xyes
+then :
+  printf "%s\n" "#define HAVE_NICE 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "nl_langinfo" "ac_cv_func_nl_langinfo"
+if test "x$ac_cv_func_nl_langinfo" = xyes
+then :
+  printf "%s\n" "#define HAVE_NL_LANGINFO 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "poll" "ac_cv_func_poll"
+if test "x$ac_cv_func_poll" = xyes
+then :
+  printf "%s\n" "#define HAVE_POLL 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "pthread_jit_write_protect_np" "ac_cv_func_pthread_jit_write_protect_np"
+if test "x$ac_cv_func_pthread_jit_write_protect_np" = xyes
+then :
+  printf "%s\n" "#define HAVE_PTHREAD_JIT_WRITE_PROTECT_NP 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "putenv" "ac_cv_func_putenv"
+if test "x$ac_cv_func_putenv" = xyes
+then :
+  printf "%s\n" "#define HAVE_PUTENV 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "scandir" "ac_cv_func_scandir"
+if test "x$ac_cv_func_scandir" = xyes
+then :
+  printf "%s\n" "#define HAVE_SCANDIR 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "setitimer" "ac_cv_func_setitimer"
+if test "x$ac_cv_func_setitimer" = xyes
+then :
+  printf "%s\n" "#define HAVE_SETITIMER 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "setenv" "ac_cv_func_setenv"
+if test "x$ac_cv_func_setenv" = xyes
+then :
+  printf "%s\n" "#define HAVE_SETENV 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "shutdown" "ac_cv_func_shutdown"
+if test "x$ac_cv_func_shutdown" = xyes
+then :
+  printf "%s\n" "#define HAVE_SHUTDOWN 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "sigprocmask" "ac_cv_func_sigprocmask"
+if test "x$ac_cv_func_sigprocmask" = xyes
+then :
+  printf "%s\n" "#define HAVE_SIGPROCMASK 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "statfs" "ac_cv_func_statfs"
+if test "x$ac_cv_func_statfs" = xyes
+then :
+  printf "%s\n" "#define HAVE_STATFS 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "statvfs" "ac_cv_func_statvfs"
+if test "x$ac_cv_func_statvfs" = xyes
+then :
+  printf "%s\n" "#define HAVE_STATVFS 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "std_syslog" "ac_cv_func_std_syslog"
+if test "x$ac_cv_func_std_syslog" = xyes
+then :
+  printf "%s\n" "#define HAVE_STD_SYSLOG 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "strcasecmp" "ac_cv_func_strcasecmp"
+if test "x$ac_cv_func_strcasecmp" = xyes
+then :
+  printf "%s\n" "#define HAVE_STRCASECMP 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "strnlen" "ac_cv_func_strnlen"
+if test "x$ac_cv_func_strnlen" = xyes
+then :
+  printf "%s\n" "#define HAVE_STRNLEN 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "strptime" "ac_cv_func_strptime"
+if test "x$ac_cv_func_strptime" = xyes
+then :
+  printf "%s\n" "#define HAVE_STRPTIME 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "strtok_r" "ac_cv_func_strtok_r"
+if test "x$ac_cv_func_strtok_r" = xyes
+then :
+  printf "%s\n" "#define HAVE_STRTOK_R 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "symlink" "ac_cv_func_symlink"
+if test "x$ac_cv_func_symlink" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYMLINK 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "tzset" "ac_cv_func_tzset"
+if test "x$ac_cv_func_tzset" = xyes
+then :
+  printf "%s\n" "#define HAVE_TZSET 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "unsetenv" "ac_cv_func_unsetenv"
+if test "x$ac_cv_func_unsetenv" = xyes
+then :
+  printf "%s\n" "#define HAVE_UNSETENV 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "usleep" "ac_cv_func_usleep"
+if test "x$ac_cv_func_usleep" = xyes
+then :
+  printf "%s\n" "#define HAVE_USLEEP 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "utime" "ac_cv_func_utime"
+if test "x$ac_cv_func_utime" = xyes
+then :
+  printf "%s\n" "#define HAVE_UTIME 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "vasprintf" "ac_cv_func_vasprintf"
+if test "x$ac_cv_func_vasprintf" = xyes
+then :
+  printf "%s\n" "#define HAVE_VASPRINTF 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "asprintf" "ac_cv_func_asprintf"
+if test "x$ac_cv_func_asprintf" = xyes
+then :
+  printf "%s\n" "#define HAVE_ASPRINTF 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "nanosleep" "ac_cv_func_nanosleep"
+if test "x$ac_cv_func_nanosleep" = xyes
+then :
+  printf "%s\n" "#define HAVE_NANOSLEEP 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "memmem" "ac_cv_func_memmem"
+if test "x$ac_cv_func_memmem" = xyes
+then :
+  printf "%s\n" "#define HAVE_MEMMEM 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "memrchr" "ac_cv_func_memrchr"
+if test "x$ac_cv_func_memrchr" = xyes
+then :
+  printf "%s\n" "#define HAVE_MEMRCHR 1" >>confdefs.h
+
+fi
 
-ac_fn_c_check_decl "$LINENO" "strerror_r" "ac_cv_have_decl_strerror_r" "$ac_includes_default"
-if test "x$ac_cv_have_decl_strerror_r" = xyes; then :
+
+ac_fn_check_decl "$LINENO" "strerror_r" "ac_cv_have_decl_strerror_r" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+if test "x$ac_cv_have_decl_strerror_r" = xyes
+then :
   ac_have_decl=1
-else
+else $as_nop
   ac_have_decl=0
 fi
+printf "%s\n" "#define HAVE_DECL_STRERROR_R $ac_have_decl" >>confdefs.h
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_STRERROR_R $ac_have_decl
-_ACEOF
 
-for ac_func in strerror_r
-do :
-  ac_fn_c_check_func "$LINENO" "strerror_r" "ac_cv_func_strerror_r"
-if test "x$ac_cv_func_strerror_r" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_STRERROR_R 1
-_ACEOF
+if test $ac_cv_have_decl_strerror_r = yes; then
+  # For backward compatibility's sake, define HAVE_STRERROR_R.
+  # (We used to run AC_CHECK_FUNCS_ONCE for strerror_r, as well
+  # as AC_CHECK_DECLS_ONCE.)
+
+printf "%s\n" "#define HAVE_STRERROR_R 1" >>confdefs.h
 
 fi
-done
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether strerror_r returns char *" >&5
-$as_echo_n "checking whether strerror_r returns char *... " >&6; }
-if ${ac_cv_func_strerror_r_char_p+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether strerror_r returns char *" >&5
+printf %s "checking whether strerror_r returns char *... " >&6; }
+if test ${ac_cv_func_strerror_r_char_p+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
     ac_cv_func_strerror_r_char_p=no
     if test $ac_cv_have_decl_strerror_r = yes; then
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-$ac_includes_default
+#include <string.h>
 int
-main ()
+main (void)
 {
 
 	  char buf100;
@@ -16722,49 +19099,20 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_func_strerror_r_char_p=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    else
-      # strerror_r is not declared.  Choose between
-      # systems that have relatively inaccessible declarations for the
-      # function.  BeOS and DEC UNIX 4.0 fall in this category, but the
-      # former has a strerror_r that returns char*, while the latter
-      # has a strerror_r that returns `int'.
-      # This test should segfault on the DEC system.
-      if test "$cross_compiling" = yes; then :
-  :
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$ac_includes_default
-	extern char *strerror_r ();
-int
-main ()
-{
-char buf100;
-	  char x = *strerror_r (0, buf, sizeof buf);
-	  return ! isalpha (x);
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_func_strerror_r_char_p=yes
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
     fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strerror_r_char_p" >&5
-$as_echo "$ac_cv_func_strerror_r_char_p" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strerror_r_char_p" >&5
+printf "%s\n" "$ac_cv_func_strerror_r_char_p" >&6; }
 if test $ac_cv_func_strerror_r_char_p = yes; then
 
-$as_echo "#define STRERROR_R_CHAR_P 1" >>confdefs.h
+printf "%s\n" "#define STRERROR_R_CHAR_P 1" >>confdefs.h
 
 fi
 
@@ -16777,12 +19125,13 @@
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking how many arguments gethostbyname_r() takes" >&5
-$as_echo_n "checking how many arguments gethostbyname_r() takes... " >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how many arguments gethostbyname_r() takes" >&5
+printf %s "checking how many arguments gethostbyname_r() takes... " >&6; }
 
-    if ${ac_cv_func_which_gethostbyname_r+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    if test ${ac_cv_func_which_gethostbyname_r+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
 
 ################################################################
@@ -16802,7 +19151,7 @@
 /* end confdefs.h.  */
 #include <netdb.h>
 int
-main ()
+main (void)
 {
 
             char *name = "www.gnu.org";
@@ -16812,10 +19161,11 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_func_which_gethostbyname_r=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 #
 # SIX ARGUMENTS
@@ -16828,7 +19178,7 @@
 /* end confdefs.h.  */
 #include <netdb.h>
 int
-main ()
+main (void)
 {
 
             char *name = "www.gnu.org";
@@ -16842,10 +19192,11 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_func_which_gethostbyname_r=six
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 fi
 
@@ -16860,7 +19211,7 @@
 /* end confdefs.h.  */
 #include <netdb.h>
 int
-main ()
+main (void)
 {
 
             char *name = "www.gnu.org";
@@ -16874,10 +19225,11 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_func_which_gethostbyname_r=five
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 fi
 
@@ -16892,7 +19244,7 @@
 /* end confdefs.h.  */
 #include <netdb.h>
 int
-main ()
+main (void)
 {
 
             char *name = "www.gnu.org";
@@ -16904,10 +19256,11 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_func_which_gethostbyname_r=three
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 fi
 
@@ -16919,44 +19272,44 @@
 case "$ac_cv_func_which_gethostbyname_r" in
     three|five|six)
 
-$as_echo "#define HAVE_GETHOSTBYNAME_R 1" >>confdefs.h
+printf "%s\n" "#define HAVE_GETHOSTBYNAME_R 1" >>confdefs.h
 
     ;;
 esac
 
 case "$ac_cv_func_which_gethostbyname_r" in
     three)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: three" >&5
-$as_echo "three" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: three" >&5
+printf "%s\n" "three" >&6; }
 
-$as_echo "#define HAVE_FUNC_GETHOSTBYNAME_R_3 1" >>confdefs.h
+printf "%s\n" "#define HAVE_FUNC_GETHOSTBYNAME_R_3 1" >>confdefs.h
 
     ;;
 
     five)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: five" >&5
-$as_echo "five" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: five" >&5
+printf "%s\n" "five" >&6; }
 
-$as_echo "#define HAVE_FUNC_GETHOSTBYNAME_R_5 1" >>confdefs.h
+printf "%s\n" "#define HAVE_FUNC_GETHOSTBYNAME_R_5 1" >>confdefs.h
 
     ;;
 
     six)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: six" >&5
-$as_echo "six" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: six" >&5
+printf "%s\n" "six" >&6; }
 
-$as_echo "#define HAVE_FUNC_GETHOSTBYNAME_R_6 1" >>confdefs.h
+printf "%s\n" "#define HAVE_FUNC_GETHOSTBYNAME_R_6 1" >>confdefs.h
 
     ;;
 
     no)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: cannot find function declaration in netdb.h" >&5
-$as_echo "cannot find function declaration in netdb.h" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: cannot find function declaration in netdb.h" >&5
+printf "%s\n" "cannot find function declaration in netdb.h" >&6; }
     ;;
 
     unknown)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: can't tell" >&5
-$as_echo "can't tell" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: can't tell" >&5
+printf "%s\n" "can't tell" >&6; }
     ;;
 
     *)
@@ -16978,11 +19331,12 @@
   unset ac_cv_lib_rt_nanosleep
   unset ac_cv_lib_rt___nanosleep
   unset found
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nanosleep in -lrt" >&5
-$as_echo_n "checking for nanosleep in -lrt... " >&6; }
-if ${ac_cv_lib_rt_nanosleep+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for nanosleep in -lrt" >&5
+printf %s "checking for nanosleep in -lrt... " >&6; }
+if test ${ac_cv_lib_rt_nanosleep+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lrt  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -16991,38 +19345,38 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char nanosleep ();
 int
-main ()
+main (void)
 {
 return nanosleep ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_rt_nanosleep=yes
-else
+else $as_nop
   ac_cv_lib_rt_nanosleep=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_nanosleep" >&5
-$as_echo "$ac_cv_lib_rt_nanosleep" >&6; }
-if test "x$ac_cv_lib_rt_nanosleep" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_nanosleep" >&5
+printf "%s\n" "$ac_cv_lib_rt_nanosleep" >&6; }
+if test "x$ac_cv_lib_rt_nanosleep" = xyes
+then :
   found=yes
-else
+else $as_nop
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __nanosleep in -lrt" >&5
-$as_echo_n "checking for __nanosleep in -lrt... " >&6; }
-if ${ac_cv_lib_rt___nanosleep+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __nanosleep in -lrt" >&5
+printf %s "checking for __nanosleep in -lrt... " >&6; }
+if test ${ac_cv_lib_rt___nanosleep+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lrt  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -17031,32 +19385,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char __nanosleep ();
 int
-main ()
+main (void)
 {
 return __nanosleep ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_rt___nanosleep=yes
-else
+else $as_nop
   ac_cv_lib_rt___nanosleep=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt___nanosleep" >&5
-$as_echo "$ac_cv_lib_rt___nanosleep" >&6; }
-if test "x$ac_cv_lib_rt___nanosleep" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt___nanosleep" >&5
+printf "%s\n" "$ac_cv_lib_rt___nanosleep" >&6; }
+if test "x$ac_cv_lib_rt___nanosleep" = xyes
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 
@@ -17067,18 +19420,20 @@
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lrt"
-    if test "$cross_compiling" = yes; then :
+    if test "$cross_compiling" = yes
+then :
 
             found=yes
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int main(void) { return (0); }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -17100,10 +19455,10 @@
 
 
 
-$as_echo "#define HAVE_NANOSLEEP 1" >>confdefs.h
+printf "%s\n" "#define HAVE_NANOSLEEP 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_LIBRT 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBRT 1" >>confdefs.h
 
     ac_cv_func_nanosleep=yes
   else
@@ -17119,11 +19474,12 @@
   unset ac_cv_lib_network_setsockopt
   unset ac_cv_lib_network___setsockopt
   unset found
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for setsockopt in -lnetwork" >&5
-$as_echo_n "checking for setsockopt in -lnetwork... " >&6; }
-if ${ac_cv_lib_network_setsockopt+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for setsockopt in -lnetwork" >&5
+printf %s "checking for setsockopt in -lnetwork... " >&6; }
+if test ${ac_cv_lib_network_setsockopt+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnetwork  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -17132,38 +19488,38 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char setsockopt ();
 int
-main ()
+main (void)
 {
 return setsockopt ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_network_setsockopt=yes
-else
+else $as_nop
   ac_cv_lib_network_setsockopt=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network_setsockopt" >&5
-$as_echo "$ac_cv_lib_network_setsockopt" >&6; }
-if test "x$ac_cv_lib_network_setsockopt" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network_setsockopt" >&5
+printf "%s\n" "$ac_cv_lib_network_setsockopt" >&6; }
+if test "x$ac_cv_lib_network_setsockopt" = xyes
+then :
   found=yes
-else
+else $as_nop
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __setsockopt in -lnetwork" >&5
-$as_echo_n "checking for __setsockopt in -lnetwork... " >&6; }
-if ${ac_cv_lib_network___setsockopt+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __setsockopt in -lnetwork" >&5
+printf %s "checking for __setsockopt in -lnetwork... " >&6; }
+if test ${ac_cv_lib_network___setsockopt+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnetwork  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -17172,32 +19528,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char __setsockopt ();
 int
-main ()
+main (void)
 {
 return __setsockopt ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_network___setsockopt=yes
-else
+else $as_nop
   ac_cv_lib_network___setsockopt=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network___setsockopt" >&5
-$as_echo "$ac_cv_lib_network___setsockopt" >&6; }
-if test "x$ac_cv_lib_network___setsockopt" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network___setsockopt" >&5
+printf "%s\n" "$ac_cv_lib_network___setsockopt" >&6; }
+if test "x$ac_cv_lib_network___setsockopt" = xyes
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 
@@ -17208,18 +19563,20 @@
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lnetwork"
-    if test "$cross_compiling" = yes; then :
+    if test "$cross_compiling" = yes
+then :
 
             found=yes
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int main(void) { return (0); }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -17241,10 +19598,10 @@
 
 
 
-$as_echo "#define HAVE_SETSOCKOPT 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SETSOCKOPT 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_LIBNETWORK 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBNETWORK 1" >>confdefs.h
 
     ac_cv_func_setsockopt=yes
   else
@@ -17255,24 +19612,27 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for getaddrinfo" >&5
-$as_echo_n "checking for getaddrinfo... " >&6; }
-if ${ac_cv_func_getaddrinfo+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for getaddrinfo" >&5
+printf %s "checking for getaddrinfo... " >&6; }
+if test ${ac_cv_func_getaddrinfo+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <netdb.h>
 int
-main ()
+main (void)
 {
 struct addrinfo *g,h;g=&h;getaddrinfo("","",g,&g);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  if test "$cross_compiling" = yes; then :
+if ac_fn_c_try_link "$LINENO"
+then :
+  if test "$cross_compiling" = yes
+then :
 
         case $host_alias in
       *linux*)
@@ -17283,7 +19643,7 @@
         ;;
     esac
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -17327,37 +19687,40 @@
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   ac_cv_func_getaddrinfo=yes
-else
+else $as_nop
   ac_cv_func_getaddrinfo=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-else
+else $as_nop
   ac_cv_func_getaddrinfo=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_getaddrinfo" >&5
-$as_echo "$ac_cv_func_getaddrinfo" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_getaddrinfo" >&5
+printf "%s\n" "$ac_cv_func_getaddrinfo" >&6; }
 if test "$ac_cv_func_getaddrinfo" = yes; then
 
-$as_echo "#define HAVE_GETADDRINFO 1" >>confdefs.h
+printf "%s\n" "#define HAVE_GETADDRINFO 1" >>confdefs.h
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for copy_file_range" >&5
-$as_echo_n "checking for copy_file_range... " >&6; }
-if ${ac_cv_copy_file_range+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for copy_file_range" >&5
+printf %s "checking for copy_file_range... " >&6; }
+if test ${ac_cv_copy_file_range+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test "$cross_compiling" = yes
+then :
   ac_cv_copy_file_range=no
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -17381,9 +19744,10 @@
 #endif
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   ac_cv_copy_file_range=yes
-else
+else $as_nop
   ac_cv_copy_file_range=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -17392,20 +19756,21 @@
 
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_copy_file_range" >&5
-$as_echo "$ac_cv_copy_file_range" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_copy_file_range" >&5
+printf "%s\n" "$ac_cv_copy_file_range" >&6; }
 
 if test "$ac_cv_copy_file_range" = yes; then
 
-$as_echo "#define HAVE_COPY_FILE_RANGE 1" >>confdefs.h
+printf "%s\n" "#define HAVE_COPY_FILE_RANGE 1" >>confdefs.h
 
 fi
 
 ac_fn_c_check_func "$LINENO" "strlcat" "ac_cv_func_strlcat"
-if test "x$ac_cv_func_strlcat" = xyes; then :
-  $as_echo "#define HAVE_STRLCAT 1" >>confdefs.h
+if test "x$ac_cv_func_strlcat" = xyes
+then :
+  printf "%s\n" "#define HAVE_STRLCAT 1" >>confdefs.h
 
-else
+else $as_nop
   case " $LIBOBJS " in
   *" strlcat.$ac_objext "* ) ;;
   *) LIBOBJS="$LIBOBJS strlcat.$ac_objext"
@@ -17413,12 +19778,12 @@
 esac
 
 fi
-
 ac_fn_c_check_func "$LINENO" "strlcpy" "ac_cv_func_strlcpy"
-if test "x$ac_cv_func_strlcpy" = xyes; then :
-  $as_echo "#define HAVE_STRLCPY 1" >>confdefs.h
+if test "x$ac_cv_func_strlcpy" = xyes
+then :
+  printf "%s\n" "#define HAVE_STRLCPY 1" >>confdefs.h
 
-else
+else $as_nop
   case " $LIBOBJS " in
   *" strlcpy.$ac_objext "* ) ;;
   *) LIBOBJS="$LIBOBJS strlcpy.$ac_objext"
@@ -17426,12 +19791,12 @@
 esac
 
 fi
-
 ac_fn_c_check_func "$LINENO" "explicit_bzero" "ac_cv_func_explicit_bzero"
-if test "x$ac_cv_func_explicit_bzero" = xyes; then :
-  $as_echo "#define HAVE_EXPLICIT_BZERO 1" >>confdefs.h
+if test "x$ac_cv_func_explicit_bzero" = xyes
+then :
+  printf "%s\n" "#define HAVE_EXPLICIT_BZERO 1" >>confdefs.h
 
-else
+else $as_nop
   case " $LIBOBJS " in
   *" explicit_bzero.$ac_objext "* ) ;;
   *) LIBOBJS="$LIBOBJS explicit_bzero.$ac_objext"
@@ -17439,12 +19804,12 @@
 esac
 
 fi
-
 ac_fn_c_check_func "$LINENO" "getopt" "ac_cv_func_getopt"
-if test "x$ac_cv_func_getopt" = xyes; then :
-  $as_echo "#define HAVE_GETOPT 1" >>confdefs.h
+if test "x$ac_cv_func_getopt" = xyes
+then :
+  printf "%s\n" "#define HAVE_GETOPT 1" >>confdefs.h
 
-else
+else $as_nop
   case " $LIBOBJS " in
   *" getopt.$ac_objext "* ) ;;
   *) LIBOBJS="$LIBOBJS getopt.$ac_objext"
@@ -17453,19 +19818,19 @@
 
 fi
 
-
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
-$as_echo_n "checking for working alloca.h... " >&6; }
-if ${ac_cv_working_alloca_h+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
+printf %s "checking for working alloca.h... " >&6; }
+if test ${ac_cv_working_alloca_h+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <alloca.h>
 int
-main ()
+main (void)
 {
 char *p = (char *) alloca (2 * sizeof (int));
 			  if (p) return 0;
@@ -17473,52 +19838,52 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_working_alloca_h=yes
-else
+else $as_nop
   ac_cv_working_alloca_h=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5
-$as_echo "$ac_cv_working_alloca_h" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5
+printf "%s\n" "$ac_cv_working_alloca_h" >&6; }
 if test $ac_cv_working_alloca_h = yes; then
 
-$as_echo "#define HAVE_ALLOCA_H 1" >>confdefs.h
+printf "%s\n" "#define HAVE_ALLOCA_H 1" >>confdefs.h
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
-$as_echo_n "checking for alloca... " >&6; }
-if ${ac_cv_func_alloca_works+:} false; then :
-  $as_echo_n "(cached) " >&6
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
+printf %s "checking for alloca... " >&6; }
+if test ${ac_cv_func_alloca_works+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test $ac_cv_working_alloca_h = yes; then
+  ac_cv_func_alloca_works=yes
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#ifdef __GNUC__
-# define alloca __builtin_alloca
-#else
-# ifdef _MSC_VER
+#include <stdlib.h>
+#include <stddef.h>
+#ifndef alloca
+# ifdef __GNUC__
+#  define alloca __builtin_alloca
+# elif defined _MSC_VER
 #  include <malloc.h>
 #  define alloca _alloca
 # else
-#  ifdef HAVE_ALLOCA_H
-#   include <alloca.h>
-#  else
-#   ifdef _AIX
- #pragma alloca
-#   else
-#    ifndef alloca /* predefined by HP cc +Olibcalls */
-void *alloca (size_t);
-#    endif
-#   endif
+#  ifdef  __cplusplus
+extern "C"
 #  endif
+void *alloca (size_t);
 # endif
 #endif
 
 int
-main ()
+main (void)
 {
 char *p = (char *) alloca (1);
 				    if (p) return 0;
@@ -17526,20 +19891,22 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_func_alloca_works=yes
-else
+else $as_nop
   ac_cv_func_alloca_works=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5
-$as_echo "$ac_cv_func_alloca_works" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5
+printf "%s\n" "$ac_cv_func_alloca_works" >&6; }
+fi
 
 if test $ac_cv_func_alloca_works = yes; then
 
-$as_echo "#define HAVE_ALLOCA 1" >>confdefs.h
+printf "%s\n" "#define HAVE_ALLOCA 1" >>confdefs.h
 
 else
   # The SVR3 libPW and SVR4 libucb both contain incompatible functions
@@ -17549,58 +19916,19 @@
 
 ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
 
-$as_echo "#define C_ALLOCA 1" >>confdefs.h
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5
-$as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; }
-if ${ac_cv_os_cray+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#if defined CRAY && ! defined CRAY2
-webecray
-#else
-wenotbecray
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "webecray" >/dev/null 2>&1; then :
-  ac_cv_os_cray=yes
-else
-  ac_cv_os_cray=no
-fi
-rm -f conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_os_cray" >&5
-$as_echo "$ac_cv_os_cray" >&6; }
-if test $ac_cv_os_cray = yes; then
-  for ac_func in _getb67 GETB67 getb67; do
-    as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+printf "%s\n" "#define C_ALLOCA 1" >>confdefs.h
 
-cat >>confdefs.h <<_ACEOF
-#define CRAY_STACKSEG_END $ac_func
-_ACEOF
 
-    break
-fi
-
-  done
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5
-$as_echo_n "checking stack direction for C alloca... " >&6; }
-if ${ac_cv_c_stack_direction+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5
+printf %s "checking stack direction for C alloca... " >&6; }
+if test ${ac_cv_c_stack_direction+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test "$cross_compiling" = yes
+then :
   ac_cv_c_stack_direction=0
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
@@ -17621,9 +19949,10 @@
   return find_stack_direction (0, argc + !argv + 20) < 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   ac_cv_c_stack_direction=1
-else
+else $as_nop
   ac_cv_c_stack_direction=-1
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -17631,27 +19960,27 @@
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5
-$as_echo "$ac_cv_c_stack_direction" >&6; }
-cat >>confdefs.h <<_ACEOF
-#define STACK_DIRECTION $ac_cv_c_stack_direction
-_ACEOF
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5
+printf "%s\n" "$ac_cv_c_stack_direction" >&6; }
+printf "%s\n" "#define STACK_DIRECTION $ac_cv_c_stack_direction" >>confdefs.h
 
 
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for type of reentrant time-related functions" >&5
-$as_echo_n "checking for type of reentrant time-related functions... " >&6; }
-if ${ac_cv_time_r_type+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for type of reentrant time-related functions" >&5
+printf %s "checking for type of reentrant time-related functions... " >&6; }
+if test ${ac_cv_time_r_type+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
-if test "$cross_compiling" = yes; then :
+if test "$cross_compiling" = yes
+then :
 
   ac_cv_time_r_type=POSIX
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -17670,17 +19999,19 @@
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
 
   ac_cv_time_r_type=hpux
 
-else
+else $as_nop
 
-  if test "$cross_compiling" = yes; then :
+  if test "$cross_compiling" = yes
+then :
 
     ac_cv_time_r_type=POSIX
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -17697,11 +20028,12 @@
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
 
     ac_cv_time_r_type=irix
 
-else
+else $as_nop
 
     ac_cv_time_r_type=POSIX
 
@@ -17718,23 +20050,24 @@
 
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_time_r_type" >&5
-$as_echo "$ac_cv_time_r_type" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_time_r_type" >&5
+printf "%s\n" "$ac_cv_time_r_type" >&6; }
   case $ac_cv_time_r_type in
   hpux)
-$as_echo "#define PHP_HPUX_TIME_R 1" >>confdefs.h
+printf "%s\n" "#define PHP_HPUX_TIME_R 1" >>confdefs.h
  ;;
   irix)
-$as_echo "#define PHP_IRIX_TIME_R 1" >>confdefs.h
+printf "%s\n" "#define PHP_IRIX_TIME_R 1" >>confdefs.h
  ;;
   esac
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for in_addr_t" >&5
-$as_echo_n "checking for in_addr_t... " >&6; }
-if ${ac_cv_type_in_addr_t+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for in_addr_t" >&5
+printf %s "checking for in_addr_t... " >&6; }
+if test ${ac_cv_type_in_addr_t+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
@@ -17745,61 +20078,79 @@
 #endif
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "in_addr_t^a-zA-Z_0-9" >/dev/null 2>&1; then :
+  $EGREP "in_addr_t^a-zA-Z_0-9" >/dev/null 2>&1
+then :
   ac_cv_type_in_addr_t=yes
-else
+else $as_nop
   ac_cv_type_in_addr_t=no
 fi
-rm -f conftest*
+rm -rf conftest*
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_in_addr_t" >&5
-$as_echo "$ac_cv_type_in_addr_t" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_in_addr_t" >&5
+printf "%s\n" "$ac_cv_type_in_addr_t" >&6; }
 if test $ac_cv_type_in_addr_t = no; then
 
-$as_echo "#define in_addr_t u_int" >>confdefs.h
+printf "%s\n" "#define in_addr_t u_int" >>confdefs.h
 
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for aarch64 CRC32 API" >&5
-$as_echo_n "checking for aarch64 CRC32 API... " >&6; }
-if ${ac_cv_func___crc32d+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for aarch64 CRC32 API" >&5
+printf %s "checking for aarch64 CRC32 API... " >&6; }
+if test ${ac_cv_func___crc32d+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+
 #include <arm_acle.h>
+# if defined(__GNUC__)
+#  if!defined(__clang__)
+#   pragma GCC push_options
+#   pragma GCC target ("+nothing+crc")
+#  elif defined(__APPLE__)
+#   pragma clang attribute push(__attribute__((target("crc"))), apply_to=function)
+#  else
+#   pragma clang attribute push(__attribute__((target("+nothing+crc"))), apply_to=function)
+#  endif
+# endif
+
 int
-main ()
+main (void)
 {
 __crc32d(0, 0);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_func___crc32d=yes
-else
-  ac_cv_func___crc32d="no"
+else $as_nop
+  ac_cv_func___crc32d=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func___crc32d" >&5
-$as_echo "$ac_cv_func___crc32d" >&6; }
-if test "$ac_cv_func___crc32d" = "yes"; then
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func___crc32d" >&5
+printf "%s\n" "$ac_cv_func___crc32d" >&6; }
+if test "x$ac_cv_func___crc32d" = xyes
+then :
 
-$as_echo "#define HAVE_AARCH64_CRC32 1" >>confdefs.h
+printf "%s\n" "#define HAVE_AARCH64_CRC32 1" >>confdefs.h
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for asm goto" >&5
-$as_echo_n "checking for asm goto... " >&6; }
-if ${ac_cv__asm_goto+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for asm goto" >&5
+printf %s "checking for asm goto... " >&6; }
+if test ${ac_cv__asm_goto+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test "$cross_compiling" = yes
+then :
 
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -17815,14 +20166,15 @@
 }
 
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv__asm_goto=yes
-else
+else $as_nop
   ac_cv__asm_goto=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -17837,9 +20189,10 @@
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   ac_cv__asm_goto=yes
-else
+else $as_nop
   ac_cv__asm_goto=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -17847,25 +20200,26 @@
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv__asm_goto" >&5
-$as_echo "$ac_cv__asm_goto" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv__asm_goto" >&5
+printf "%s\n" "$ac_cv__asm_goto" >&6; }
 
 if test "$ac_cv__asm_goto" = yes; then
 
-$as_echo "#define HAVE_ASM_GOTO 1" >>confdefs.h
+printf "%s\n" "#define HAVE_ASM_GOTO 1" >>confdefs.h
 
 fi
 
 
 php_with_valgrind=no
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable valgrind support" >&5
-$as_echo_n "checking whether to enable valgrind support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable valgrind support" >&5
+printf %s "checking whether to enable valgrind support... " >&6; }
 
 # Check whether --with-valgrind was given.
-if test "${with_valgrind+set}" = set; then :
+if test ${with_valgrind+y}
+then :
   withval=$with_valgrind; PHP_VALGRIND=$withval
-else
+else $as_nop
 
   PHP_VALGRIND=no
 
@@ -17874,8 +20228,8 @@
 
 
 ext_output=$PHP_VALGRIND
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -17883,17 +20237,17 @@
 if test "$PHP_VALGRIND" != "no"; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for valgrind" >&5
-$as_echo_n "checking for valgrind... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for valgrind" >&5
+printf %s "checking for valgrind... " >&6; }
 
 if test -n "$VALGRIND_CFLAGS"; then
     pkg_cv_VALGRIND_CFLAGS="$VALGRIND_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"valgrind\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"valgrind\""; } >&5
   ($PKG_CONFIG --exists --print-errors "valgrind") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_VALGRIND_CFLAGS=`$PKG_CONFIG --cflags "valgrind" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -17907,10 +20261,10 @@
     pkg_cv_VALGRIND_LIBS="$VALGRIND_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"valgrind\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"valgrind\""; } >&5
   ($PKG_CONFIG --exists --print-errors "valgrind") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_VALGRIND_LIBS=`$PKG_CONFIG --libs "valgrind" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -17924,8 +20278,8 @@
 
 
 if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -17942,14 +20296,14 @@
 
 	have_valgrind="no"
 elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 	have_valgrind="no"
 else
 	VALGRIND_CFLAGS=$pkg_cv_VALGRIND_CFLAGS
 	VALGRIND_LIBS=$pkg_cv_VALGRIND_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 	have_valgrind="yes"
 fi
 
@@ -17995,7 +20349,7 @@
   done
 
 
-$as_echo "#define HAVE_VALGRIND 1" >>confdefs.h
+printf "%s\n" "#define HAVE_VALGRIND 1" >>confdefs.h
 
   else
     if test "$with_valgrind" = "yes"; then
@@ -18010,13 +20364,15 @@
   unset found
 
   ac_fn_c_check_func "$LINENO" "openpty" "ac_cv_func_openpty"
-if test "x$ac_cv_func_openpty" = xyes; then :
+if test "x$ac_cv_func_openpty" = xyes
+then :
   found=yes
-else
+else $as_nop
    ac_fn_c_check_func "$LINENO" "__openpty" "ac_cv_func___openpty"
-if test "x$ac_cv_func___openpty" = xyes; then :
+if test "x$ac_cv_func___openpty" = xyes
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 
@@ -18026,7 +20382,7 @@
   case $found in
   yes)
 
-$as_echo "#define HAVE_OPENPTY 1" >>confdefs.h
+printf "%s\n" "#define HAVE_OPENPTY 1" >>confdefs.h
 
     ac_cv_func_openpty=yes
   ;;
@@ -18036,11 +20392,12 @@
   unset ac_cv_lib_util_openpty
   unset ac_cv_lib_util___openpty
   unset found
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for openpty in -lutil" >&5
-$as_echo_n "checking for openpty in -lutil... " >&6; }
-if ${ac_cv_lib_util_openpty+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for openpty in -lutil" >&5
+printf %s "checking for openpty in -lutil... " >&6; }
+if test ${ac_cv_lib_util_openpty+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lutil  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -18049,38 +20406,38 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char openpty ();
 int
-main ()
+main (void)
 {
 return openpty ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_util_openpty=yes
-else
+else $as_nop
   ac_cv_lib_util_openpty=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_util_openpty" >&5
-$as_echo "$ac_cv_lib_util_openpty" >&6; }
-if test "x$ac_cv_lib_util_openpty" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_util_openpty" >&5
+printf "%s\n" "$ac_cv_lib_util_openpty" >&6; }
+if test "x$ac_cv_lib_util_openpty" = xyes
+then :
   found=yes
-else
+else $as_nop
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __openpty in -lutil" >&5
-$as_echo_n "checking for __openpty in -lutil... " >&6; }
-if ${ac_cv_lib_util___openpty+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __openpty in -lutil" >&5
+printf %s "checking for __openpty in -lutil... " >&6; }
+if test ${ac_cv_lib_util___openpty+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lutil  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -18089,32 +20446,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char __openpty ();
 int
-main ()
+main (void)
 {
 return __openpty ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_util___openpty=yes
-else
+else $as_nop
   ac_cv_lib_util___openpty=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_util___openpty" >&5
-$as_echo "$ac_cv_lib_util___openpty" >&6; }
-if test "x$ac_cv_lib_util___openpty" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_util___openpty" >&5
+printf "%s\n" "$ac_cv_lib_util___openpty" >&6; }
+if test "x$ac_cv_lib_util___openpty" = xyes
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 
@@ -18125,18 +20481,20 @@
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lutil"
-    if test "$cross_compiling" = yes; then :
+    if test "$cross_compiling" = yes
+then :
 
             found=yes
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int main(void) { return (0); }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -18158,10 +20516,10 @@
 
 
 
-$as_echo "#define HAVE_OPENPTY 1" >>confdefs.h
+printf "%s\n" "#define HAVE_OPENPTY 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_LIBUTIL 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBUTIL 1" >>confdefs.h
 
     ac_cv_func_openpty=yes
   else
@@ -18170,11 +20528,12 @@
   unset ac_cv_lib_bsd_openpty
   unset ac_cv_lib_bsd___openpty
   unset found
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for openpty in -lbsd" >&5
-$as_echo_n "checking for openpty in -lbsd... " >&6; }
-if ${ac_cv_lib_bsd_openpty+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for openpty in -lbsd" >&5
+printf %s "checking for openpty in -lbsd... " >&6; }
+if test ${ac_cv_lib_bsd_openpty+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -18183,38 +20542,38 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char openpty ();
 int
-main ()
+main (void)
 {
 return openpty ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_bsd_openpty=yes
-else
+else $as_nop
   ac_cv_lib_bsd_openpty=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_openpty" >&5
-$as_echo "$ac_cv_lib_bsd_openpty" >&6; }
-if test "x$ac_cv_lib_bsd_openpty" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_openpty" >&5
+printf "%s\n" "$ac_cv_lib_bsd_openpty" >&6; }
+if test "x$ac_cv_lib_bsd_openpty" = xyes
+then :
   found=yes
-else
+else $as_nop
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __openpty in -lbsd" >&5
-$as_echo_n "checking for __openpty in -lbsd... " >&6; }
-if ${ac_cv_lib_bsd___openpty+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __openpty in -lbsd" >&5
+printf %s "checking for __openpty in -lbsd... " >&6; }
+if test ${ac_cv_lib_bsd___openpty+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -18223,32 +20582,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char __openpty ();
 int
-main ()
+main (void)
 {
 return __openpty ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_bsd___openpty=yes
-else
+else $as_nop
   ac_cv_lib_bsd___openpty=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd___openpty" >&5
-$as_echo "$ac_cv_lib_bsd___openpty" >&6; }
-if test "x$ac_cv_lib_bsd___openpty" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd___openpty" >&5
+printf "%s\n" "$ac_cv_lib_bsd___openpty" >&6; }
+if test "x$ac_cv_lib_bsd___openpty" = xyes
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 
@@ -18259,18 +20617,20 @@
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lbsd"
-    if test "$cross_compiling" = yes; then :
+    if test "$cross_compiling" = yes
+then :
 
             found=yes
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int main(void) { return (0); }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -18292,10 +20652,10 @@
 
 
 
-$as_echo "#define HAVE_OPENPTY 1" >>confdefs.h
+printf "%s\n" "#define HAVE_OPENPTY 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_LIBBSD 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBBSD 1" >>confdefs.h
 
     ac_cv_func_openpty=yes
   else
@@ -18313,15 +20673,16 @@
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
-$as_echo "" >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${T_MD}General settings${T_ME}" >&5
-$as_echo "${T_MD}General settings${T_ME}" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5
+printf "%s\n" "" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${T_MD}General settings${T_ME}" >&5
+printf "%s\n" "${T_MD}General settings${T_ME}" >&6; }
 
 
 
 # Check whether --enable- was given.
-if test "${enable_+set}" = set; then :
+if test ${enable_+y}
+then :
   enableval=$enable_;
 fi
 
@@ -18330,12 +20691,13 @@
 
 php_enable_gcov=no
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to include gcov symbols" >&5
-$as_echo_n "checking whether to include gcov symbols... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to include gcov symbols" >&5
+printf %s "checking whether to include gcov symbols... " >&6; }
 # Check whether --enable-gcov was given.
-if test "${enable_gcov+set}" = set; then :
+if test ${enable_gcov+y}
+then :
   enableval=$enable_gcov; PHP_GCOV=$enableval
-else
+else $as_nop
 
   PHP_GCOV=no
 
@@ -18344,8 +20706,8 @@
 
 
 ext_output=$PHP_GCOV
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -18366,7 +20728,7 @@
   fi
 
 
-$as_echo "#define HAVE_GCOV 1" >>confdefs.h
+printf "%s\n" "#define HAVE_GCOV 1" >>confdefs.h
 
 
   src=$abs_srcdir/build/Makefile.gcov
@@ -18376,8 +20738,9 @@
 
 
 
-  CFLAGS=`echo "$CFLAGS" | "$SED" -e 's/-O0-9s*//g'`
-  CXXFLAGS=`echo "$CXXFLAGS" | "$SED" -e 's/-O0-9s*//g'`
+  sed_script='s/$\t \|^$-O$0-9gsz\|fast\|$$\t \|$$/\1/g'
+  CFLAGS=$(echo "$CFLAGS" | $SED -e "$sed_script")
+  CXXFLAGS=$(echo "$CXXFLAGS" | $SED -e "$sed_script")
 
 
     CFLAGS="$CFLAGS -O0 -fprofile-arcs -ftest-coverage"
@@ -18387,12 +20750,13 @@
 
 php_enable_debug=no
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to include debugging symbols" >&5
-$as_echo_n "checking whether to include debugging symbols... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to include debugging symbols" >&5
+printf %s "checking whether to include debugging symbols... " >&6; }
 # Check whether --enable-debug was given.
-if test "${enable_debug+set}" = set; then :
+if test ${enable_debug+y}
+then :
   enableval=$enable_debug; PHP_DEBUG=$enableval
-else
+else $as_nop
 
   PHP_DEBUG=no
 
@@ -18401,8 +20765,8 @@
 
 
 ext_output=$PHP_DEBUG
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -18411,8 +20775,9 @@
   PHP_DEBUG=1
   ZEND_DEBUG=yes
 
-  CFLAGS=`echo "$CFLAGS" | "$SED" -e 's/-O0-9s*//g'`
-  CXXFLAGS=`echo "$CXXFLAGS" | "$SED" -e 's/-O0-9s*//g'`
+  sed_script='s/$\t \|^$-O$0-9gsz\|fast\|$$\t \|$$/\1/g'
+  CFLAGS=$(echo "$CFLAGS" | $SED -e "$sed_script")
+  CXXFLAGS=$(echo "$CXXFLAGS" | $SED -e "$sed_script")
 
     if test "$GCC" = "yes" || test "$ICC" = "yes"; then
     CFLAGS="$CFLAGS -O0"
@@ -18435,12 +20800,13 @@
 
 php_enable_debug_assertions=no
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable debug assertions in release mode" >&5
-$as_echo_n "checking whether to enable debug assertions in release mode... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable debug assertions in release mode" >&5
+printf %s "checking whether to enable debug assertions in release mode... " >&6; }
 # Check whether --enable-debug-assertions was given.
-if test "${enable_debug_assertions+set}" = set; then :
+if test ${enable_debug_assertions+y}
+then :
   enableval=$enable_debug_assertions; PHP_DEBUG_ASSERTIONS=$enableval
-else
+else $as_nop
 
   PHP_DEBUG_ASSERTIONS=no
 
@@ -18449,8 +20815,8 @@
 
 
 ext_output=$PHP_DEBUG_ASSERTIONS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -18461,16 +20827,17 @@
 fi
 
 # Check whether --enable-zts was given.
-if test "${enable_zts+set}" = set; then :
+if test ${enable_zts+y}
+then :
   enableval=$enable_zts; ZEND_ZTS=$enableval
-else
+else $as_nop
   ZEND_ZTS=no
 fi
 
 
 if test "$ZEND_ZTS" = "yes"; then
 
-$as_echo "#define ZTS 1" >>confdefs.h
+printf "%s\n" "#define ZTS 1" >>confdefs.h
 
   PHP_THREAD_SAFETY=yes
 else
@@ -18480,12 +20847,13 @@
 
 php_enable_rtld_now=no
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to dlopen extensions with RTLD_NOW instead of RTLD_LAZY" >&5
-$as_echo_n "checking whether to dlopen extensions with RTLD_NOW instead of RTLD_LAZY... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to dlopen extensions with RTLD_NOW instead of RTLD_LAZY" >&5
+printf %s "checking whether to dlopen extensions with RTLD_NOW instead of RTLD_LAZY... " >&6; }
 # Check whether --enable-rtld-now was given.
-if test "${enable_rtld_now+set}" = set; then :
+if test ${enable_rtld_now+y}
+then :
   enableval=$enable_rtld_now; PHP_RTLD_NOW=$enableval
-else
+else $as_nop
 
   PHP_RTLD_NOW=no
 
@@ -18494,28 +20862,29 @@
 
 
 ext_output=$PHP_RTLD_NOW
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
 
 if test "$PHP_RTLD_NOW" = "yes"; then
 
-$as_echo "#define PHP_USE_RTLD_NOW 1" >>confdefs.h
+printf "%s\n" "#define PHP_USE_RTLD_NOW 1" >>confdefs.h
 
 fi
 
 
 php_with_layout=PHP
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking layout of installed files" >&5
-$as_echo_n "checking layout of installed files... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking layout of installed files" >&5
+printf %s "checking layout of installed files... " >&6; }
 
 # Check whether --with-layout was given.
-if test "${with_layout+set}" = set; then :
+if test ${with_layout+y}
+then :
   withval=$with_layout; PHP_LAYOUT=$withval
-else
+else $as_nop
 
   PHP_LAYOUT=PHP
 
@@ -18524,8 +20893,8 @@
 
 
 ext_output=$PHP_LAYOUT
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -18542,13 +20911,14 @@
 
 php_with_config_file_path=DEFAULT
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking path to configuration file" >&5
-$as_echo_n "checking path to configuration file... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking path to configuration file" >&5
+printf %s "checking path to configuration file... " >&6; }
 
 # Check whether --with-config-file-path was given.
-if test "${with_config_file_path+set}" = set; then :
+if test ${with_config_file_path+y}
+then :
   withval=$with_config_file_path; PHP_CONFIG_FILE_PATH=$withval
-else
+else $as_nop
 
   PHP_CONFIG_FILE_PATH=DEFAULT
 
@@ -18557,8 +20927,8 @@
 
 
 ext_output=$PHP_CONFIG_FILE_PATH
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -18574,17 +20944,18 @@
   esac
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking where to scan for configuration files" >&5
-$as_echo_n "checking where to scan for configuration files... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking where to scan for configuration files" >&5
+printf %s "checking where to scan for configuration files... " >&6; }
 
 php_with_config_file_scan_dir=DEFAULT
 
 
 
 # Check whether --with-config-file-scan-dir was given.
-if test "${with_config_file_scan_dir+set}" = set; then :
+if test ${with_config_file_scan_dir+y}
+then :
   withval=$with_config_file_scan_dir; PHP_CONFIG_FILE_SCAN_DIR=$withval
-else
+else $as_nop
 
   PHP_CONFIG_FILE_SCAN_DIR=DEFAULT
 
@@ -18601,20 +20972,21 @@
 if test "$PHP_CONFIG_FILE_SCAN_DIR" = "DEFAULT"; then
   PHP_CONFIG_FILE_SCAN_DIR=
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PHP_CONFIG_FILE_SCAN_DIR" >&5
-$as_echo "$PHP_CONFIG_FILE_SCAN_DIR" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PHP_CONFIG_FILE_SCAN_DIR" >&5
+printf "%s\n" "$PHP_CONFIG_FILE_SCAN_DIR" >&6; }
 
 test -n "$DEBUG_CFLAGS" && CFLAGS="$CFLAGS $DEBUG_CFLAGS"
 
 
 php_enable_sigchild=no
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable PHP's own SIGCHLD handler" >&5
-$as_echo_n "checking whether to enable PHP's own SIGCHLD handler... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable PHP's own SIGCHLD handler" >&5
+printf %s "checking whether to enable PHP's own SIGCHLD handler... " >&6; }
 # Check whether --enable-sigchild was given.
-if test "${enable_sigchild+set}" = set; then :
+if test ${enable_sigchild+y}
+then :
   enableval=$enable_sigchild; PHP_SIGCHILD=$enableval
-else
+else $as_nop
 
   PHP_SIGCHILD=no
 
@@ -18623,31 +20995,32 @@
 
 
 ext_output=$PHP_SIGCHILD
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
 
 if test "$PHP_SIGCHILD" = "yes"; then
 
-$as_echo "#define PHP_SIGCHILD 1" >>confdefs.h
+printf "%s\n" "#define PHP_SIGCHILD 1" >>confdefs.h
 
 else
 
-$as_echo "#define PHP_SIGCHILD 0" >>confdefs.h
+printf "%s\n" "#define PHP_SIGCHILD 0" >>confdefs.h
 
 fi
 
 
 php_enable_libgcc=no
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to explicitly link against libgcc" >&5
-$as_echo_n "checking whether to explicitly link against libgcc... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to explicitly link against libgcc" >&5
+printf %s "checking whether to explicitly link against libgcc... " >&6; }
 # Check whether --enable-libgcc was given.
-if test "${enable_libgcc+set}" = set; then :
+if test ${enable_libgcc+y}
+then :
   enableval=$enable_libgcc; PHP_LIBGCC=$enableval
-else
+else $as_nop
 
   PHP_LIBGCC=no
 
@@ -18656,8 +21029,8 @@
 
 
 ext_output=$PHP_LIBGCC
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -18719,12 +21092,13 @@
 
 php_enable_short_tags=yes
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable short tags by default" >&5
-$as_echo_n "checking whether to enable short tags by default... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable short tags by default" >&5
+printf %s "checking whether to enable short tags by default... " >&6; }
 # Check whether --enable-short-tags was given.
-if test "${enable_short_tags+set}" = set; then :
+if test ${enable_short_tags+y}
+then :
   enableval=$enable_short_tags; PHP_SHORT_TAGS=$enableval
-else
+else $as_nop
 
   PHP_SHORT_TAGS=yes
 
@@ -18733,31 +21107,32 @@
 
 
 ext_output=$PHP_SHORT_TAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
 
 if test "$PHP_SHORT_TAGS" = "yes"; then
 
-$as_echo "#define DEFAULT_SHORT_OPEN_TAG \"1\"" >>confdefs.h
+printf "%s\n" "#define DEFAULT_SHORT_OPEN_TAG \"1\"" >>confdefs.h
 
 else
 
-$as_echo "#define DEFAULT_SHORT_OPEN_TAG \"0\"" >>confdefs.h
+printf "%s\n" "#define DEFAULT_SHORT_OPEN_TAG \"0\"" >>confdefs.h
 
 fi
 
 
 php_enable_dmalloc=no
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable dmalloc" >&5
-$as_echo_n "checking whether to enable dmalloc... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable dmalloc" >&5
+printf %s "checking whether to enable dmalloc... " >&6; }
 # Check whether --enable-dmalloc was given.
-if test "${enable_dmalloc+set}" = set; then :
+if test ${enable_dmalloc+y}
+then :
   enableval=$enable_dmalloc; PHP_DMALLOC=$enableval
-else
+else $as_nop
 
   PHP_DMALLOC=no
 
@@ -18766,18 +21141,19 @@
 
 
 ext_output=$PHP_DMALLOC
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
 
 if test "$PHP_DMALLOC" = "yes"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dmalloc_error in -ldmalloc" >&5
-$as_echo_n "checking for dmalloc_error in -ldmalloc... " >&6; }
-if ${ac_cv_lib_dmalloc_dmalloc_error+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dmalloc_error in -ldmalloc" >&5
+printf %s "checking for dmalloc_error in -ldmalloc... " >&6; }
+if test ${ac_cv_lib_dmalloc_dmalloc_error+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -18786,30 +21162,29 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char dmalloc_error ();
 int
-main ()
+main (void)
 {
 return dmalloc_error ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_dmalloc_dmalloc_error=yes
-else
+else $as_nop
   ac_cv_lib_dmalloc_dmalloc_error=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dmalloc_dmalloc_error" >&5
-$as_echo "$ac_cv_lib_dmalloc_dmalloc_error" >&6; }
-if test "x$ac_cv_lib_dmalloc_dmalloc_error" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dmalloc_dmalloc_error" >&5
+printf "%s\n" "$ac_cv_lib_dmalloc_dmalloc_error" >&6; }
+if test "x$ac_cv_lib_dmalloc_dmalloc_error" = xyes
+then :
 
 
 
@@ -18822,11 +21197,11 @@
 
 
 
-$as_echo "#define HAVE_DMALLOC 1" >>confdefs.h
+printf "%s\n" "#define HAVE_DMALLOC 1" >>confdefs.h
 
     CPPFLAGS="$CPPFLAGS -DDMALLOC_FUNC_CHECK"
 
-else
+else $as_nop
 
     as_fn_error $? "Problem with enabling dmalloc. Please check config.log for details." "$LINENO" 5
 
@@ -18837,12 +21212,13 @@
 
 php_enable_ipv6=yes
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable IPv6 support" >&5
-$as_echo_n "checking whether to enable IPv6 support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable IPv6 support" >&5
+printf %s "checking whether to enable IPv6 support... " >&6; }
 # Check whether --enable-ipv6 was given.
-if test "${enable_ipv6+set}" = set; then :
+if test ${enable_ipv6+y}
+then :
   enableval=$enable_ipv6; PHP_IPV6=$enableval
-else
+else $as_nop
 
   PHP_IPV6=yes
 
@@ -18851,27 +21227,28 @@
 
 
 ext_output=$PHP_IPV6
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
 
 if test "$PHP_IPV6" != "no" && test "$ac_cv_ipv6_support" = yes; then
 
-$as_echo "#define HAVE_IPV6 1" >>confdefs.h
+printf "%s\n" "#define HAVE_IPV6 1" >>confdefs.h
 
 fi
 
 
 php_enable_dtrace=no
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable DTrace support" >&5
-$as_echo_n "checking whether to enable DTrace support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable DTrace support" >&5
+printf %s "checking whether to enable DTrace support... " >&6; }
 # Check whether --enable-dtrace was given.
-if test "${enable_dtrace+set}" = set; then :
+if test ${enable_dtrace+y}
+then :
   enableval=$enable_dtrace; PHP_DTRACE=$enableval
-else
+else $as_nop
 
   PHP_DTRACE=no
 
@@ -18880,20 +21257,19 @@
 
 
 ext_output=$PHP_DTRACE
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
 
 if test "$PHP_DTRACE" = "yes"; then
-  for ac_header in sys/sdt.h
+         for ac_header in sys/sdt.h
 do :
-  ac_fn_c_check_header_mongrel "$LINENO" "sys/sdt.h" "ac_cv_header_sys_sdt_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_sdt_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_SYS_SDT_H 1
-_ACEOF
+  ac_fn_c_check_header_compile "$LINENO" "sys/sdt.h" "ac_cv_header_sys_sdt_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_sdt_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_SDT_H 1" >>confdefs.h
 
 
   case "" in
@@ -18995,32 +21371,32 @@
   esac
 
 
-$as_echo "#define HAVE_DTRACE 1" >>confdefs.h
+printf "%s\n" "#define HAVE_DTRACE 1" >>confdefs.h
 
 
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_DTRACE_OBJS"
 
 
-else
+else $as_nop
 
     as_fn_error $? "Cannot find sys/sdt.h which is required for DTrace support" "$LINENO" 5
 
 fi
 
 done
-
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how big to make fd sets" >&5
-$as_echo_n "checking how big to make fd sets... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how big to make fd sets" >&5
+printf %s "checking how big to make fd sets... " >&6; }
 
 php_enable_fd_setsize=no
 
 
 # Check whether --enable-fd-setsize was given.
-if test "${enable_fd_setsize+set}" = set; then :
+if test ${enable_fd_setsize+y}
+then :
   enableval=$enable_fd_setsize; PHP_FD_SETSIZE=$enableval
-else
+else $as_nop
 
   PHP_FD_SETSIZE=no
 
@@ -19037,14 +21413,14 @@
 if test "$PHP_FD_SETSIZE" != "no"; then
   if test "0$PHP_FD_SETSIZE" -gt 0 2>/dev/null; then
     CPPFLAGS="$CPPFLAGS -DFD_SETSIZE=$PHP_FD_SETSIZE"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: using $PHP_FD_SETSIZE" >&5
-$as_echo "using $PHP_FD_SETSIZE" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: using $PHP_FD_SETSIZE" >&5
+printf "%s\n" "using $PHP_FD_SETSIZE" >&6; }
   else
     as_fn_error $? "Invalid value passed to --enable-fd-setsize!" "$LINENO" 5
   fi
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: using system default" >&5
-$as_echo "using system default" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: using system default" >&5
+printf "%s\n" "using system default" >&6; }
 fi
 
 
@@ -19052,9 +21428,10 @@
 
 
 # Check whether --enable-werror was given.
-if test "${enable_werror+set}" = set; then :
+if test ${enable_werror+y}
+then :
   enableval=$enable_werror; PHP_WERROR=$enableval
-else
+else $as_nop
 
   PHP_WERROR=no
 
@@ -19072,9 +21449,10 @@
 
 
 # Check whether --enable-memory-sanitizer was given.
-if test "${enable_memory_sanitizer+set}" = set; then :
+if test ${enable_memory_sanitizer+y}
+then :
   enableval=$enable_memory_sanitizer; PHP_MEMORY_SANITIZER=$enableval
-else
+else $as_nop
 
   PHP_MEMORY_SANITIZER=no
 
@@ -19092,9 +21470,10 @@
 
 
 # Check whether --enable-address-sanitizer was given.
-if test "${enable_address_sanitizer+set}" = set; then :
+if test ${enable_address_sanitizer+y}
+then :
   enableval=$enable_address_sanitizer; PHP_ADDRESS_SANITIZER=$enableval
-else
+else $as_nop
 
   PHP_ADDRESS_SANITIZER=no
 
@@ -19112,9 +21491,10 @@
 
 
 # Check whether --enable-undefined-sanitizer was given.
-if test "${enable_undefined_sanitizer+set}" = set; then :
+if test ${enable_undefined_sanitizer+y}
+then :
   enableval=$enable_undefined_sanitizer; PHP_UNDEFINED_SANITIZER=$enableval
-else
+else $as_nop
 
   PHP_UNDEFINED_SANITIZER=no
 
@@ -19131,21 +21511,23 @@
 
 
 # Check whether --enable- was given.
-if test "${enable_+set}" = set; then :
+if test ${enable_+y}
+then :
   enableval=$enable_;
 fi
 
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
-$as_echo "" >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${T_MD}Configuring extensions${T_ME}" >&5
-$as_echo "${T_MD}Configuring extensions${T_ME}" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5
+printf "%s\n" "" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${T_MD}Configuring extensions${T_ME}" >&5
+printf "%s\n" "${T_MD}Configuring extensions${T_ME}" >&6; }
 
 
 # Check whether --enable-all was given.
-if test "${enable_all+set}" = set; then :
+if test ${enable_all+y}
+then :
   enableval=$enable_all; PHP_ENABLE_ALL=$enableval
 fi
 
@@ -19153,33 +21535,68 @@
 
 
 
-for ac_header in io.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "io.h" "ac_cv_header_io_h" "$ac_includes_default"
-if test "x$ac_cv_header_io_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_IO_H 1
-_ACEOF
+ac_fn_c_check_header_compile "$LINENO" "io.h" "ac_cv_header_io_h" "$ac_includes_default"
+if test "x$ac_cv_header_io_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_IO_H 1" >>confdefs.h
 
 fi
 
-done
 
+ac_fn_c_check_func "$LINENO" "strtoll" "ac_cv_func_strtoll"
+if test "x$ac_cv_func_strtoll" = xyes
+then :
+  printf "%s\n" "#define HAVE_STRTOLL 1" >>confdefs.h
 
-for ac_func in strtoll atoll
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
+fi
+ac_fn_c_check_func "$LINENO" "atoll" "ac_cv_func_atoll"
+if test "x$ac_cv_func_atoll" = xyes
+then :
+  printf "%s\n" "#define HAVE_ATOLL 1" >>confdefs.h
 
 fi
-done
 
 
-PHP_DATE_CFLAGS="-Wno-implicit-fallthrough -I@ext_builddir@/lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 -DHAVE_TIMELIB_CONFIG_H=1"
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wno-implicit-fallthrough" >&5
+printf %s "checking whether C compiler accepts -Wno-implicit-fallthrough... " >&6; }
+if test ${ax_cv_check_cflags__Werror__Wno_implicit_fallthrough+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+
+  ax_check_save_flags=$CFLAGS
+  CFLAGS="$CFLAGS -Werror -Wno-implicit-fallthrough"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main (void)
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  ax_cv_check_cflags__Werror__Wno_implicit_fallthrough=yes
+else $as_nop
+  ax_cv_check_cflags__Werror__Wno_implicit_fallthrough=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wno_implicit_fallthrough" >&5
+printf "%s\n" "$ax_cv_check_cflags__Werror__Wno_implicit_fallthrough" >&6; }
+if test "x$ax_cv_check_cflags__Werror__Wno_implicit_fallthrough" = xyes
+then :
+  PHP_DATE_CFLAGS="$PHP_DATE_CFLAGS -Wno-implicit-fallthrough"
+else $as_nop
+  :
+fi
+
+
+PHP_DATE_CFLAGS="$PHP_DATE_CFLAGS -I@ext_builddir@/lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 -DHAVE_TIMELIB_CONFIG_H=1"
 timelib_sources="lib/astro.c lib/dow.c lib/parse_date.c lib/parse_tz.c lib/parse_posix.c
                  lib/timelib.c lib/tm2unixtime.c lib/unixtime2tm.c lib/parse_iso_intervals.c lib/interval.c"
 
@@ -19317,9 +21734,7 @@
 EOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define COMPILE_DL_DATE 1
-_ACEOF
+printf "%s\n" "#define COMPILE_DL_DATE 1" >>confdefs.h
 
     fi
   fi
@@ -19530,7 +21945,7 @@
 
 
 
-$as_echo "#define HAVE_TIMELIB_CONFIG_H 1" >>confdefs.h
+printf "%s\n" "#define HAVE_TIMELIB_CONFIG_H 1" >>confdefs.h
 
 
 cat > $ext_builddir/lib/timelib_config.h <<EOF
@@ -19558,13 +21973,14 @@
 
 php_with_libxml=yes
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build with LIBXML support" >&5
-$as_echo_n "checking whether to build with LIBXML support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build with LIBXML support" >&5
+printf %s "checking whether to build with LIBXML support... " >&6; }
 
 # Check whether --with-libxml was given.
-if test "${with_libxml+set}" = set; then :
+if test ${with_libxml+y}
+then :
   withval=$with_libxml; PHP_LIBXML=$withval
-else
+else $as_nop
 
   PHP_LIBXML=yes
   test "$PHP_ENABLE_ALL" && PHP_LIBXML=$PHP_ENABLE_ALL
@@ -19594,8 +22010,8 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -19607,17 +22023,17 @@
 
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 >= 2.9.0" >&5
-$as_echo_n "checking for libxml-2.0 >= 2.9.0... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 >= 2.9.0" >&5
+printf %s "checking for libxml-2.0 >= 2.9.0... " >&6; }
 
 if test -n "$LIBXML_CFLAGS"; then
     pkg_cv_LIBXML_CFLAGS="$LIBXML_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.9.0") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBXML_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 >= 2.9.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -19631,10 +22047,10 @@
     pkg_cv_LIBXML_LIBS="$LIBXML_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.9.0") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBXML_LIBS=`$PKG_CONFIG --libs "libxml-2.0 >= 2.9.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -19648,8 +22064,8 @@
 
 
 if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -19675,10 +22091,10 @@
 and LIBXML_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -19692,8 +22108,8 @@
 else
 	LIBXML_CFLAGS=$pkg_cv_LIBXML_CFLAGS
 	LIBXML_LIBS=$pkg_cv_LIBXML_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
 fi
 
@@ -19838,12 +22254,12 @@
 
 
 
-$as_echo "#define HAVE_LIBXML 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBXML 1" >>confdefs.h
 
 
 
 
-$as_echo "#define HAVE_LIBXML 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBXML 1" >>confdefs.h
 
 
   ext_builddir=ext/libxml
@@ -19979,9 +22395,7 @@
 EOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define COMPILE_DL_LIBXML 1
-_ACEOF
+printf "%s\n" "#define COMPILE_DL_LIBXML 1" >>confdefs.h
 
     fi
   fi
@@ -20130,13 +22544,14 @@
 
 php_with_openssl=no
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenSSL support" >&5
-$as_echo_n "checking for OpenSSL support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for OpenSSL support" >&5
+printf %s "checking for OpenSSL support... " >&6; }
 
 # Check whether --with-openssl was given.
-if test "${with_openssl+set}" = set; then :
+if test ${with_openssl+y}
+then :
   withval=$with_openssl; PHP_OPENSSL=$withval
-else
+else $as_nop
 
   PHP_OPENSSL=no
   test "$PHP_ENABLE_ALL" && PHP_OPENSSL=$PHP_ENABLE_ALL
@@ -20166,8 +22581,8 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -20175,13 +22590,14 @@
 
 php_with_kerberos=no
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Kerberos support" >&5
-$as_echo_n "checking for Kerberos support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Kerberos support" >&5
+printf %s "checking for Kerberos support... " >&6; }
 
 # Check whether --with-kerberos was given.
-if test "${with_kerberos+set}" = set; then :
+if test ${with_kerberos+y}
+then :
   withval=$with_kerberos; PHP_KERBEROS=$withval
-else
+else $as_nop
 
   PHP_KERBEROS=no
 
@@ -20190,8 +22606,8 @@
 
 
 ext_output=$PHP_KERBEROS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -20199,13 +22615,14 @@
 
 php_with_system_ciphers=no
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use system default cipher list instead of hardcoded value" >&5
-$as_echo_n "checking whether to use system default cipher list instead of hardcoded value... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use system default cipher list instead of hardcoded value" >&5
+printf %s "checking whether to use system default cipher list instead of hardcoded value... " >&6; }
 
 # Check whether --with-system-ciphers was given.
-if test "${with_system_ciphers+set}" = set; then :
+if test ${with_system_ciphers+y}
+then :
   withval=$with_system_ciphers; PHP_SYSTEM_CIPHERS=$withval
-else
+else $as_nop
 
   PHP_SYSTEM_CIPHERS=no
 
@@ -20214,8 +22631,8 @@
 
 
 ext_output=$PHP_SYSTEM_CIPHERS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -20355,9 +22772,7 @@
 EOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define COMPILE_DL_OPENSSL 1
-_ACEOF
+printf "%s\n" "#define COMPILE_DL_OPENSSL 1" >>confdefs.h
 
     fi
   fi
@@ -20485,17 +22900,17 @@
   if test "$PHP_KERBEROS" != "no"; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5-gssapi krb5" >&5
-$as_echo_n "checking for krb5-gssapi krb5... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for krb5-gssapi krb5" >&5
+printf %s "checking for krb5-gssapi krb5... " >&6; }
 
 if test -n "$KERBEROS_CFLAGS"; then
     pkg_cv_KERBEROS_CFLAGS="$KERBEROS_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"krb5-gssapi krb5\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"krb5-gssapi krb5\""; } >&5
   ($PKG_CONFIG --exists --print-errors "krb5-gssapi krb5") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_KERBEROS_CFLAGS=`$PKG_CONFIG --cflags "krb5-gssapi krb5" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -20509,10 +22924,10 @@
     pkg_cv_KERBEROS_LIBS="$KERBEROS_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"krb5-gssapi krb5\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"krb5-gssapi krb5\""; } >&5
   ($PKG_CONFIG --exists --print-errors "krb5-gssapi krb5") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_KERBEROS_LIBS=`$PKG_CONFIG --libs "krb5-gssapi krb5" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -20526,8 +22941,8 @@
 
 
 if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -20553,10 +22968,10 @@
 and KERBEROS_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -20570,8 +22985,8 @@
 else
 	KERBEROS_CFLAGS=$pkg_cv_KERBEROS_CFLAGS
 	KERBEROS_LIBS=$pkg_cv_KERBEROS_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
 fi
 
@@ -20721,17 +23136,17 @@
 
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for openssl >= 1.0.2" >&5
-$as_echo_n "checking for openssl >= 1.0.2... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for openssl >= 1.0.2" >&5
+printf %s "checking for openssl >= 1.0.2... " >&6; }
 
 if test -n "$OPENSSL_CFLAGS"; then
     pkg_cv_OPENSSL_CFLAGS="$OPENSSL_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 1.0.2\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 1.0.2\""; } >&5
   ($PKG_CONFIG --exists --print-errors "openssl >= 1.0.2") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_OPENSSL_CFLAGS=`$PKG_CONFIG --cflags "openssl >= 1.0.2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -20745,10 +23160,10 @@
     pkg_cv_OPENSSL_LIBS="$OPENSSL_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 1.0.2\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 1.0.2\""; } >&5
   ($PKG_CONFIG --exists --print-errors "openssl >= 1.0.2") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_OPENSSL_LIBS=`$PKG_CONFIG --libs "openssl >= 1.0.2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -20762,8 +23177,8 @@
 
 
 if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -20789,10 +23204,10 @@
 and OPENSSL_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -20806,8 +23221,8 @@
 else
 	OPENSSL_CFLAGS=$pkg_cv_OPENSSL_CFLAGS
 	OPENSSL_LIBS=$pkg_cv_OPENSSL_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 	found_openssl=yes
 fi
 
@@ -20953,7 +23368,7 @@
 
 
 
-$as_echo "#define HAVE_OPENSSL_EXT 1" >>confdefs.h
+printf "%s\n" "#define HAVE_OPENSSL_EXT 1" >>confdefs.h
 
 
 else
@@ -20962,21 +23377,17 @@
   fi
 
 
-  for ac_func in RAND_egd
-do :
   ac_fn_c_check_func "$LINENO" "RAND_egd" "ac_cv_func_RAND_egd"
-if test "x$ac_cv_func_RAND_egd" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_RAND_EGD 1
-_ACEOF
+if test "x$ac_cv_func_RAND_egd" = xyes
+then :
+  printf "%s\n" "#define HAVE_RAND_EGD 1" >>confdefs.h
 
 fi
-done
 
 
   if test "$PHP_SYSTEM_CIPHERS" != "no"; then
 
-$as_echo "#define USE_OPENSSL_SYSTEM_CIPHERS 1" >>confdefs.h
+printf "%s\n" "#define USE_OPENSSL_SYSTEM_CIPHERS 1" >>confdefs.h
 
   fi
 fi
@@ -20990,9 +23401,10 @@
 
 
 # Check whether --with-external-pcre was given.
-if test "${with_external_pcre+set}" = set; then :
+if test ${with_external_pcre+y}
+then :
   withval=$with_external_pcre; PHP_EXTERNAL_PCRE=$withval
-else
+else $as_nop
 
   PHP_EXTERNAL_PCRE=no
 
@@ -21012,9 +23424,10 @@
 
 
 # Check whether --with-pcre-jit was given.
-if test "${with_pcre_jit+set}" = set; then :
+if test ${with_pcre_jit+y}
+then :
   withval=$with_pcre_jit; PHP_PCRE_JIT=$withval
-else
+else $as_nop
 
   PHP_PCRE_JIT=yes
 
@@ -21032,17 +23445,17 @@
 
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpcre2-8 >= 10.30" >&5
-$as_echo_n "checking for libpcre2-8 >= 10.30... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libpcre2-8 >= 10.30" >&5
+printf %s "checking for libpcre2-8 >= 10.30... " >&6; }
 
 if test -n "$PCRE2_CFLAGS"; then
     pkg_cv_PCRE2_CFLAGS="$PCRE2_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpcre2-8 >= 10.30\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpcre2-8 >= 10.30\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libpcre2-8 >= 10.30") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_PCRE2_CFLAGS=`$PKG_CONFIG --cflags "libpcre2-8 >= 10.30" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -21056,10 +23469,10 @@
     pkg_cv_PCRE2_LIBS="$PCRE2_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpcre2-8 >= 10.30\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpcre2-8 >= 10.30\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libpcre2-8 >= 10.30") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_PCRE2_LIBS=`$PKG_CONFIG --libs "libpcre2-8 >= 10.30" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -21073,8 +23486,8 @@
 
 
 if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -21100,10 +23513,10 @@
 and PCRE2_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -21117,8 +23530,8 @@
 else
 	PCRE2_CFLAGS=$pkg_cv_PCRE2_CFLAGS
 	PCRE2_LIBS=$pkg_cv_PCRE2_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
 fi
 
@@ -21244,17 +23657,19 @@
   done
 
 
-$as_echo "#define PCRE2_CODE_UNIT_WIDTH 8" >>confdefs.h
+printf "%s\n" "#define PCRE2_CODE_UNIT_WIDTH 8" >>confdefs.h
 
 
   if test "$PHP_PCRE_JIT" != "no"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JIT support in PCRE2" >&5
-$as_echo_n "checking for JIT support in PCRE2... " >&6; }
-if ${ac_cv_have_pcre2_jit+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for JIT support in PCRE2" >&5
+printf %s "checking for JIT support in PCRE2... " >&6; }
+if test ${ac_cv_have_pcre2_jit+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
-      if test "$cross_compiling" = yes; then :
+      if test "$cross_compiling" = yes
+then :
 
 
           case $host_cpu in
@@ -21266,7 +23681,7 @@
             ;;
           esac
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -21280,11 +23695,12 @@
               }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
 
           ac_cv_have_pcre2_jit=yes
 
-else
+else $as_nop
 
           ac_cv_have_pcre2_jit=no
 
@@ -21295,10 +23711,10 @@
 
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_pcre2_jit" >&5
-$as_echo "$ac_cv_have_pcre2_jit" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_pcre2_jit" >&5
+printf "%s\n" "$ac_cv_have_pcre2_jit" >&6; }
       if test $ac_cv_have_pcre2_jit = yes; then
-        $as_echo "#define HAVE_PCRE_JIT_SUPPORT 1" >>confdefs.h
+        printf "%s\n" "#define HAVE_PCRE_JIT_SUPPORT 1" >>confdefs.h
 
       fi
   fi
@@ -21437,9 +23853,7 @@
 EOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define COMPILE_DL_PCRE 1
-_ACEOF
+printf "%s\n" "#define COMPILE_DL_PCRE 1" >>confdefs.h
 
     fi
   fi
@@ -21581,10 +23995,10 @@
 
 
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PCRE library to use" >&5
-$as_echo_n "checking for PCRE library to use... " >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: bundled" >&5
-$as_echo "bundled" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PCRE library to use" >&5
+printf %s "checking for PCRE library to use... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: bundled" >&5
+printf "%s\n" "bundled" >&6; }
   pcrelib_sources="pcre2lib/pcre2_auto_possess.c pcre2lib/pcre2_chartables.c pcre2lib/pcre2_compile.c \
       pcre2lib/pcre2_config.c pcre2lib/pcre2_context.c pcre2lib/pcre2_dfa_match.c pcre2lib/pcre2_error.c \
   pcre2lib/pcre2_jit_compile.c pcre2lib/pcre2_maketables.c pcre2lib/pcre2_match.c pcre2lib/pcre2_match_data.c \
@@ -21592,28 +24006,69 @@
   pcre2lib/pcre2_string_utils.c pcre2lib/pcre2_study.c pcre2lib/pcre2_substitute.c  pcre2lib/pcre2_substring.c \
   pcre2lib/pcre2_tables.c pcre2lib/pcre2_ucd.c pcre2lib/pcre2_valid_utf.c pcre2lib/pcre2_xclass.c \
   pcre2lib/pcre2_find_bracket.c pcre2lib/pcre2_convert.c pcre2lib/pcre2_extuni.c pcre2lib/pcre2_script_run.c"
-  PHP_PCRE_CFLAGS="-Wno-implicit-fallthrough -DHAVE_CONFIG_H -I@ext_srcdir@/pcre2lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"
 
-$as_echo "#define HAVE_BUNDLED_PCRE 1" >>confdefs.h
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wno-implicit-fallthrough" >&5
+printf %s "checking whether C compiler accepts -Wno-implicit-fallthrough... " >&6; }
+if test ${ax_cv_check_cflags__Werror__Wno_implicit_fallthrough+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+
+  ax_check_save_flags=$CFLAGS
+  CFLAGS="$CFLAGS -Werror -Wno-implicit-fallthrough"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main (void)
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  ax_cv_check_cflags__Werror__Wno_implicit_fallthrough=yes
+else $as_nop
+  ax_cv_check_cflags__Werror__Wno_implicit_fallthrough=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wno_implicit_fallthrough" >&5
+printf "%s\n" "$ax_cv_check_cflags__Werror__Wno_implicit_fallthrough" >&6; }
+if test "x$ax_cv_check_cflags__Werror__Wno_implicit_fallthrough" = xyes
+then :
+  PHP_PCRE_CFLAGS="$PHP_PCRE_CFLAGS -Wno-implicit-fallthrough"
+else $as_nop
+  :
+fi
+
+
+  PHP_PCRE_CFLAGS="$PHP_PCRE_CFLAGS -DHAVE_CONFIG_H -I@ext_srcdir@/pcre2lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"
 
+printf "%s\n" "#define HAVE_BUNDLED_PCRE 1" >>confdefs.h
 
-$as_echo "#define PCRE2_CODE_UNIT_WIDTH 8" >>confdefs.h
 
+printf "%s\n" "#define PCRE2_CODE_UNIT_WIDTH 8" >>confdefs.h
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable PCRE JIT functionality" >&5
-$as_echo_n "checking whether to enable PCRE JIT functionality... " >&6; }
+
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable PCRE JIT functionality" >&5
+printf %s "checking whether to enable PCRE JIT functionality... " >&6; }
   if test "$PHP_PCRE_JIT" != "no"; then
 
-$as_echo "#define HAVE_PCRE_JIT_SUPPORT 1" >>confdefs.h
+printf "%s\n" "#define HAVE_PCRE_JIT_SUPPORT 1" >>confdefs.h
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether Intel CET is enabled" >&5
-$as_echo_n "checking whether Intel CET is enabled... " >&6; }
-if ${ac_cv_have_pcre2_intel_cet+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether Intel CET is enabled" >&5
+printf %s "checking whether Intel CET is enabled... " >&6; }
+if test ${ac_cv_have_pcre2_intel_cet+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -21624,27 +24079,28 @@
           #endif
 
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
           ac_cv_have_pcre2_intel_cet=yes
 
-else
+else $as_nop
 
           ac_cv_have_pcre2_intel_cet=no
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
       if test "$ac_cv_have_pcre2_intel_cet" = yes; then
         PHP_PCRE_CFLAGS="-mshstk $PHP_PCRE_CFLAGS"
       fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_pcre2_intel_cet" >&5
-$as_echo "$ac_cv_have_pcre2_intel_cet" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_pcre2_intel_cet" >&5
+printf "%s\n" "$ac_cv_have_pcre2_intel_cet" >&6; }
 
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
   fi
 
 
@@ -21781,9 +24237,7 @@
 EOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define COMPILE_DL_PCRE 1
-_ACEOF
+printf "%s\n" "#define COMPILE_DL_PCRE 1" >>confdefs.h
 
     fi
   fi
@@ -21933,7 +24387,7 @@
   if test "$PHP_VALGRIND" != "no" && test "$have_valgrind" = "yes"; then
             if test "$ZEND_DEBUG" = "yes"; then
 
-$as_echo "#define HAVE_PCRE_VALGRIND_SUPPORT 1" >>confdefs.h
+printf "%s\n" "#define HAVE_PCRE_VALGRIND_SUPPORT 1" >>confdefs.h
 
       fi
   fi
@@ -21945,13 +24399,14 @@
 
 php_with_sqlite3=yes
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable the SQLite3 extension" >&5
-$as_echo_n "checking whether to enable the SQLite3 extension... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable the SQLite3 extension" >&5
+printf %s "checking whether to enable the SQLite3 extension... " >&6; }
 
 # Check whether --with-sqlite3 was given.
-if test "${with_sqlite3+set}" = set; then :
+if test ${with_sqlite3+y}
+then :
   withval=$with_sqlite3; PHP_SQLITE3=$withval
-else
+else $as_nop
 
   PHP_SQLITE3=yes
   test "$PHP_ENABLE_ALL" && PHP_SQLITE3=$PHP_ENABLE_ALL
@@ -21981,8 +24436,8 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -21990,17 +24445,17 @@
 if test $PHP_SQLITE3 != "no"; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3 >= 3.7.7" >&5
-$as_echo_n "checking for sqlite3 >= 3.7.7... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sqlite3 >= 3.7.7" >&5
+printf %s "checking for sqlite3 >= 3.7.7... " >&6; }
 
 if test -n "$SQLITE_CFLAGS"; then
     pkg_cv_SQLITE_CFLAGS="$SQLITE_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sqlite3 >= 3.7.7\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sqlite3 >= 3.7.7\""; } >&5
   ($PKG_CONFIG --exists --print-errors "sqlite3 >= 3.7.7") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_SQLITE_CFLAGS=`$PKG_CONFIG --cflags "sqlite3 >= 3.7.7" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -22014,10 +24469,10 @@
     pkg_cv_SQLITE_LIBS="$SQLITE_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sqlite3 >= 3.7.7\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sqlite3 >= 3.7.7\""; } >&5
   ($PKG_CONFIG --exists --print-errors "sqlite3 >= 3.7.7") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_SQLITE_LIBS=`$PKG_CONFIG --libs "sqlite3 >= 3.7.7" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -22031,8 +24486,8 @@
 
 
 if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -22058,10 +24513,10 @@
 and SQLITE_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -22075,8 +24530,8 @@
 else
 	SQLITE_CFLAGS=$pkg_cv_SQLITE_CFLAGS
 	SQLITE_LIBS=$pkg_cv_SQLITE_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
 fi
 
@@ -22220,7 +24675,7 @@
   done
 
 
-$as_echo "#define HAVE_SQLITE3 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SQLITE3 1" >>confdefs.h
 
 
 
@@ -22328,11 +24783,12 @@
     esac
   done
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_errstr in -lsqlite3" >&5
-$as_echo_n "checking for sqlite3_errstr in -lsqlite3... " >&6; }
-if ${ac_cv_lib_sqlite3_sqlite3_errstr+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sqlite3_errstr in -lsqlite3" >&5
+printf %s "checking for sqlite3_errstr in -lsqlite3... " >&6; }
+if test ${ac_cv_lib_sqlite3_sqlite3_errstr+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsqlite3  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -22341,40 +24797,39 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char sqlite3_errstr ();
 int
-main ()
+main (void)
 {
 return sqlite3_errstr ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_sqlite3_sqlite3_errstr=yes
-else
+else $as_nop
   ac_cv_lib_sqlite3_sqlite3_errstr=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_errstr" >&5
-$as_echo "$ac_cv_lib_sqlite3_sqlite3_errstr" >&6; }
-if test "x$ac_cv_lib_sqlite3_sqlite3_errstr" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_errstr" >&5
+printf "%s\n" "$ac_cv_lib_sqlite3_sqlite3_errstr" >&6; }
+if test "x$ac_cv_lib_sqlite3_sqlite3_errstr" = xyes
+then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-$as_echo "#define HAVE_SQLITE3_ERRSTR 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SQLITE3_ERRSTR 1" >>confdefs.h
 
 
 
-else
+else $as_nop
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -22489,11 +24944,12 @@
     esac
   done
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_expanded_sql in -lsqlite3" >&5
-$as_echo_n "checking for sqlite3_expanded_sql in -lsqlite3... " >&6; }
-if ${ac_cv_lib_sqlite3_sqlite3_expanded_sql+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sqlite3_expanded_sql in -lsqlite3" >&5
+printf %s "checking for sqlite3_expanded_sql in -lsqlite3... " >&6; }
+if test ${ac_cv_lib_sqlite3_sqlite3_expanded_sql+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsqlite3  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -22502,40 +24958,39 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char sqlite3_expanded_sql ();
 int
-main ()
+main (void)
 {
 return sqlite3_expanded_sql ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_sqlite3_sqlite3_expanded_sql=yes
-else
+else $as_nop
   ac_cv_lib_sqlite3_sqlite3_expanded_sql=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_expanded_sql" >&5
-$as_echo "$ac_cv_lib_sqlite3_sqlite3_expanded_sql" >&6; }
-if test "x$ac_cv_lib_sqlite3_sqlite3_expanded_sql" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_expanded_sql" >&5
+printf "%s\n" "$ac_cv_lib_sqlite3_sqlite3_expanded_sql" >&6; }
+if test "x$ac_cv_lib_sqlite3_sqlite3_expanded_sql" = xyes
+then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-$as_echo "#define HAVE_SQLITE3_EXPANDED_SQL 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SQLITE3_EXPANDED_SQL 1" >>confdefs.h
 
 
 
-else
+else $as_nop
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -22651,11 +25106,12 @@
     esac
   done
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_load_extension in -lsqlite3" >&5
-$as_echo_n "checking for sqlite3_load_extension in -lsqlite3... " >&6; }
-if ${ac_cv_lib_sqlite3_sqlite3_load_extension+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sqlite3_load_extension in -lsqlite3" >&5
+printf %s "checking for sqlite3_load_extension in -lsqlite3... " >&6; }
+if test ${ac_cv_lib_sqlite3_sqlite3_load_extension+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsqlite3  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -22664,42 +25120,41 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char sqlite3_load_extension ();
 int
-main ()
+main (void)
 {
 return sqlite3_load_extension ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_sqlite3_sqlite3_load_extension=yes
-else
+else $as_nop
   ac_cv_lib_sqlite3_sqlite3_load_extension=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_load_extension" >&5
-$as_echo "$ac_cv_lib_sqlite3_sqlite3_load_extension" >&6; }
-if test "x$ac_cv_lib_sqlite3_sqlite3_load_extension" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_load_extension" >&5
+printf "%s\n" "$ac_cv_lib_sqlite3_sqlite3_load_extension" >&6; }
+if test "x$ac_cv_lib_sqlite3_sqlite3_load_extension" = xyes
+then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-else
+else $as_nop
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_sqlite3_sqlite3_load_extension
 
-$as_echo "#define SQLITE_OMIT_LOAD_EXTENSION 1" >>confdefs.h
+printf "%s\n" "#define SQLITE_OMIT_LOAD_EXTENSION 1" >>confdefs.h
 
 
 fi
@@ -22839,9 +25294,7 @@
 EOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define COMPILE_DL_SQLITE3 1
-_ACEOF
+printf "%s\n" "#define COMPILE_DL_SQLITE3 1" >>confdefs.h
 
     fi
   fi
@@ -22973,13 +25426,14 @@
 
 php_with_zlib=no
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ZLIB support" >&5
-$as_echo_n "checking for ZLIB support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ZLIB support" >&5
+printf %s "checking for ZLIB support... " >&6; }
 
 # Check whether --with-zlib was given.
-if test "${with_zlib+set}" = set; then :
+if test ${with_zlib+y}
+then :
   withval=$with_zlib; PHP_ZLIB=$withval
-else
+else $as_nop
 
   PHP_ZLIB=no
   test "$PHP_ENABLE_ALL" && PHP_ZLIB=$PHP_ENABLE_ALL
@@ -23009,8 +25463,8 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -23018,17 +25472,17 @@
 if test "$PHP_ZLIB" != "no"; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for zlib >= 1.2.0.4" >&5
-$as_echo_n "checking for zlib >= 1.2.0.4... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for zlib >= 1.2.0.4" >&5
+printf %s "checking for zlib >= 1.2.0.4... " >&6; }
 
 if test -n "$ZLIB_CFLAGS"; then
     pkg_cv_ZLIB_CFLAGS="$ZLIB_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zlib >= 1.2.0.4\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zlib >= 1.2.0.4\""; } >&5
   ($PKG_CONFIG --exists --print-errors "zlib >= 1.2.0.4") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_ZLIB_CFLAGS=`$PKG_CONFIG --cflags "zlib >= 1.2.0.4" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -23042,10 +25496,10 @@
     pkg_cv_ZLIB_LIBS="$ZLIB_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zlib >= 1.2.0.4\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zlib >= 1.2.0.4\""; } >&5
   ($PKG_CONFIG --exists --print-errors "zlib >= 1.2.0.4") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_ZLIB_LIBS=`$PKG_CONFIG --libs "zlib >= 1.2.0.4" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -23059,8 +25513,8 @@
 
 
 if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -23086,10 +25540,10 @@
 and ZLIB_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -23103,8 +25557,8 @@
 else
 	ZLIB_CFLAGS=$pkg_cv_ZLIB_CFLAGS
 	ZLIB_LIBS=$pkg_cv_ZLIB_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
 fi
 
@@ -23249,7 +25703,7 @@
 
 
 
-$as_echo "#define HAVE_ZLIB 1" >>confdefs.h
+printf "%s\n" "#define HAVE_ZLIB 1" >>confdefs.h
 
 
 
@@ -23386,9 +25840,7 @@
 EOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define COMPILE_DL_ZLIB 1
-_ACEOF
+printf "%s\n" "#define COMPILE_DL_ZLIB 1" >>confdefs.h
 
     fi
   fi
@@ -23520,12 +25972,13 @@
 
 php_enable_bcmath=no
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable bc style precision math functions" >&5
-$as_echo_n "checking whether to enable bc style precision math functions... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable bc style precision math functions" >&5
+printf %s "checking whether to enable bc style precision math functions... " >&6; }
 # Check whether --enable-bcmath was given.
-if test "${enable_bcmath+set}" = set; then :
+if test ${enable_bcmath+y}
+then :
   enableval=$enable_bcmath; PHP_BCMATH=$enableval
-else
+else $as_nop
 
   PHP_BCMATH=no
   test "$PHP_ENABLE_ALL" && PHP_BCMATH=$PHP_ENABLE_ALL
@@ -23555,8 +26008,8 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -23704,9 +26157,7 @@
 EOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define COMPILE_DL_BCMATH 1
-_ACEOF
+printf "%s\n" "#define COMPILE_DL_BCMATH 1" >>confdefs.h
 
     fi
   fi
@@ -23841,7 +26292,7 @@
 
 
 
-$as_echo "#define HAVE_BCMATH 1" >>confdefs.h
+printf "%s\n" "#define HAVE_BCMATH 1" >>confdefs.h
 
 fi
 
@@ -23851,13 +26302,14 @@
 
 php_with_bz2=no
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BZip2 support" >&5
-$as_echo_n "checking for BZip2 support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for BZip2 support" >&5
+printf %s "checking for BZip2 support... " >&6; }
 
 # Check whether --with-bz2 was given.
-if test "${with_bz2+set}" = set; then :
+if test ${with_bz2+y}
+then :
   withval=$with_bz2; PHP_BZ2=$withval
-else
+else $as_nop
 
   PHP_BZ2=no
   test "$PHP_ENABLE_ALL" && PHP_BZ2=$PHP_ENABLE_ALL
@@ -23887,8 +26339,8 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -23897,21 +26349,21 @@
   if test -r $PHP_BZ2/include/bzlib.h; then
     BZIP_DIR=$PHP_BZ2
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BZip2 in default path" >&5
-$as_echo_n "checking for BZip2 in default path... " >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for BZip2 in default path" >&5
+printf %s "checking for BZip2 in default path... " >&6; }
     for i in /usr/local /usr; do
       if test -r $i/include/bzlib.h; then
         BZIP_DIR=$i
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: found in $i" >&5
-$as_echo "found in $i" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: found in $i" >&5
+printf "%s\n" "found in $i" >&6; }
         break
       fi
     done
   fi
 
   if test -z "$BZIP_DIR"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
-$as_echo "not found" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+printf "%s\n" "not found" >&6; }
     as_fn_error $? "Please reinstall the BZip2 distribution" "$LINENO" 5
   fi
 
@@ -24022,11 +26474,12 @@
     esac
   done
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BZ2_bzerror in -lbz2" >&5
-$as_echo_n "checking for BZ2_bzerror in -lbz2... " >&6; }
-if ${ac_cv_lib_bz2_BZ2_bzerror+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for BZ2_bzerror in -lbz2" >&5
+printf %s "checking for BZ2_bzerror in -lbz2... " >&6; }
+if test ${ac_cv_lib_bz2_BZ2_bzerror+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbz2  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -24035,30 +26488,29 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char BZ2_bzerror ();
 int
-main ()
+main (void)
 {
 return BZ2_bzerror ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_bz2_BZ2_bzerror=yes
-else
+else $as_nop
   ac_cv_lib_bz2_BZ2_bzerror=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bz2_BZ2_bzerror" >&5
-$as_echo "$ac_cv_lib_bz2_BZ2_bzerror" >&6; }
-if test "x$ac_cv_lib_bz2_BZ2_bzerror" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bz2_BZ2_bzerror" >&5
+printf "%s\n" "$ac_cv_lib_bz2_BZ2_bzerror" >&6; }
+if test "x$ac_cv_lib_bz2_BZ2_bzerror" = xyes
+then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -24192,11 +26644,11 @@
 
 
 
-$as_echo "#define HAVE_BZ2 1" >>confdefs.h
+printf "%s\n" "#define HAVE_BZ2 1" >>confdefs.h
 
 
 
-else
+else $as_nop
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -24342,9 +26794,7 @@
 EOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define COMPILE_DL_BZ2 1
-_ACEOF
+printf "%s\n" "#define COMPILE_DL_BZ2 1" >>confdefs.h
 
     fi
   fi
@@ -24476,12 +26926,13 @@
 
 php_enable_calendar=no
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable calendar conversion support" >&5
-$as_echo_n "checking whether to enable calendar conversion support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable calendar conversion support" >&5
+printf %s "checking whether to enable calendar conversion support... " >&6; }
 # Check whether --enable-calendar was given.
-if test "${enable_calendar+set}" = set; then :
+if test ${enable_calendar+y}
+then :
   enableval=$enable_calendar; PHP_CALENDAR=$enableval
-else
+else $as_nop
 
   PHP_CALENDAR=no
   test "$PHP_ENABLE_ALL" && PHP_CALENDAR=$PHP_ENABLE_ALL
@@ -24511,15 +26962,15 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
 
 if test "$PHP_CALENDAR" = "yes"; then
 
-$as_echo "#define HAVE_CALENDAR 1" >>confdefs.h
+printf "%s\n" "#define HAVE_CALENDAR 1" >>confdefs.h
 
 
   ext_builddir=ext/calendar
@@ -24655,9 +27106,7 @@
 EOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define COMPILE_DL_CALENDAR 1
-_ACEOF
+printf "%s\n" "#define COMPILE_DL_CALENDAR 1" >>confdefs.h
 
     fi
   fi
@@ -24786,12 +27235,13 @@
 
 php_enable_ctype=yes
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable ctype functions" >&5
-$as_echo_n "checking whether to enable ctype functions... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable ctype functions" >&5
+printf %s "checking whether to enable ctype functions... " >&6; }
 # Check whether --enable-ctype was given.
-if test "${enable_ctype+set}" = set; then :
+if test ${enable_ctype+y}
+then :
   enableval=$enable_ctype; PHP_CTYPE=$enableval
-else
+else $as_nop
 
   PHP_CTYPE=yes
   test "$PHP_ENABLE_ALL" && PHP_CTYPE=$PHP_ENABLE_ALL
@@ -24821,15 +27271,15 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
 
 if test "$PHP_CTYPE" != "no"; then
 
-$as_echo "#define HAVE_CTYPE 1" >>confdefs.h
+printf "%s\n" "#define HAVE_CTYPE 1" >>confdefs.h
 
 
   ext_builddir=ext/ctype
@@ -24965,9 +27415,7 @@
 EOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define COMPILE_DL_CTYPE 1
-_ACEOF
+printf "%s\n" "#define COMPILE_DL_CTYPE 1" >>confdefs.h
 
     fi
   fi
@@ -25096,13 +27544,14 @@
 
 php_with_curl=no
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cURL support" >&5
-$as_echo_n "checking for cURL support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for cURL support" >&5
+printf %s "checking for cURL support... " >&6; }
 
 # Check whether --with-curl was given.
-if test "${with_curl+set}" = set; then :
+if test ${with_curl+y}
+then :
   withval=$with_curl; PHP_CURL=$withval
-else
+else $as_nop
 
   PHP_CURL=no
   test "$PHP_ENABLE_ALL" && PHP_CURL=$PHP_ENABLE_ALL
@@ -25132,8 +27581,8 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -25141,17 +27590,17 @@
 if test "$PHP_CURL" != "no"; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libcurl >= 7.29.0" >&5
-$as_echo_n "checking for libcurl >= 7.29.0... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libcurl >= 7.29.0" >&5
+printf %s "checking for libcurl >= 7.29.0... " >&6; }
 
 if test -n "$CURL_CFLAGS"; then
     pkg_cv_CURL_CFLAGS="$CURL_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl >= 7.29.0\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl >= 7.29.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libcurl >= 7.29.0") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_CURL_CFLAGS=`$PKG_CONFIG --cflags "libcurl >= 7.29.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -25165,10 +27614,10 @@
     pkg_cv_CURL_LIBS="$CURL_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl >= 7.29.0\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl >= 7.29.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libcurl >= 7.29.0") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_CURL_LIBS=`$PKG_CONFIG --libs "libcurl >= 7.29.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -25182,8 +27631,8 @@
 
 
 if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -25209,10 +27658,10 @@
 and CURL_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -25226,8 +27675,8 @@
 else
 	CURL_CFLAGS=$pkg_cv_CURL_CFLAGS
 	CURL_LIBS=$pkg_cv_CURL_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
 fi
 
@@ -25235,10 +27684,10 @@
     pkg_cv_CURL_FEATURES="$CURL_FEATURES"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libcurl") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_CURL_FEATURES=`$PKG_CONFIG --variable="supported_features" "libcurl" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -25250,7 +27699,8 @@
 fi
 CURL_FEATURES=$pkg_cv_CURL_FEATURES
 
-if test "x$CURL_FEATURES" = x""; then :
+if test "x$CURL_FEATURES" = x""
+then :
 
 fi
 
@@ -25394,18 +27844,18 @@
   done
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL support in libcurl" >&5
-$as_echo_n "checking for SSL support in libcurl... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SSL support in libcurl" >&5
+printf %s "checking for SSL support in libcurl... " >&6; }
   case "$CURL_FEATURES" in
     *SSL*)
       CURL_SSL=yes
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
       ;;
     *)
       CURL_SSL=no
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
       ;;
   esac
 
@@ -25413,14 +27863,15 @@
     save_LDFLAGS="$LDFLAGS"
     LDFLAGS="$LDFLAGS $CURL_LIBS"
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libcurl linked against old openssl" >&5
-$as_echo_n "checking for libcurl linked against old openssl... " >&6; }
-    if test "$cross_compiling" = yes; then :
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libcurl linked against old openssl" >&5
+printf %s "checking for libcurl linked against old openssl... " >&6; }
+    if test "$cross_compiling" = yes
+then :
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -25451,26 +27902,27 @@
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-$as_echo "#define HAVE_CURL_OLD_OPENSSL 1" >>confdefs.h
+printf "%s\n" "#define HAVE_CURL_OLD_OPENSSL 1" >>confdefs.h
 
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for openssl" >&5
-$as_echo_n "checking for openssl... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for openssl" >&5
+printf %s "checking for openssl... " >&6; }
 
 if test -n "$OPENSSL_CFLAGS"; then
     pkg_cv_OPENSSL_CFLAGS="$OPENSSL_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl\""; } >&5
   ($PKG_CONFIG --exists --print-errors "openssl") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_OPENSSL_CFLAGS=`$PKG_CONFIG --cflags "openssl" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -25484,10 +27936,10 @@
     pkg_cv_OPENSSL_LIBS="$OPENSSL_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl\""; } >&5
   ($PKG_CONFIG --exists --print-errors "openssl") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_OPENSSL_LIBS=`$PKG_CONFIG --libs "openssl" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -25501,8 +27953,8 @@
 
 
 if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -25528,10 +27980,10 @@
 and OPENSSL_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -25545,8 +27997,8 @@
 else
 	OPENSSL_CFLAGS=$pkg_cv_OPENSSL_CFLAGS
 	OPENSSL_LIBS=$pkg_cv_OPENSSL_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
 
   for ac_i in $OPENSSL_LIBS; do
@@ -25687,25 +28139,20 @@
     esac
   done
 
-        for ac_header in openssl/crypto.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "openssl/crypto.h" "ac_cv_header_openssl_crypto_h" "$ac_includes_default"
-if test "x$ac_cv_header_openssl_crypto_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_OPENSSL_CRYPTO_H 1
-_ACEOF
+        ac_fn_c_check_header_compile "$LINENO" "openssl/crypto.h" "ac_cv_header_openssl_crypto_h" "$ac_includes_default"
+if test "x$ac_cv_header_openssl_crypto_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_OPENSSL_CRYPTO_H 1" >>confdefs.h
 
 fi
 
-done
-
 
 fi
 
-else
+else $as_nop
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -25715,8 +28162,8 @@
 
     LDFLAGS="$save_LDFLAGS"
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
   fi
 
 
@@ -25826,11 +28273,12 @@
     esac
   done
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for curl_easy_perform in -lcurl" >&5
-$as_echo_n "checking for curl_easy_perform in -lcurl... " >&6; }
-if ${ac_cv_lib_curl_curl_easy_perform+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for curl_easy_perform in -lcurl" >&5
+printf %s "checking for curl_easy_perform in -lcurl... " >&6; }
+if test ${ac_cv_lib_curl_curl_easy_perform+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcurl  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -25839,40 +28287,39 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char curl_easy_perform ();
 int
-main ()
+main (void)
 {
 return curl_easy_perform ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_curl_curl_easy_perform=yes
-else
+else $as_nop
   ac_cv_lib_curl_curl_easy_perform=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curl_curl_easy_perform" >&5
-$as_echo "$ac_cv_lib_curl_curl_easy_perform" >&6; }
-if test "x$ac_cv_lib_curl_curl_easy_perform" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curl_curl_easy_perform" >&5
+printf "%s\n" "$ac_cv_lib_curl_curl_easy_perform" >&6; }
+if test "x$ac_cv_lib_curl_curl_easy_perform" = xyes
+then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-$as_echo "#define HAVE_CURL 1" >>confdefs.h
+printf "%s\n" "#define HAVE_CURL 1" >>confdefs.h
 
 
 
-else
+else $as_nop
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -26018,9 +28465,7 @@
 EOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define COMPILE_DL_CURL 1
-_ACEOF
+printf "%s\n" "#define COMPILE_DL_CURL 1" >>confdefs.h
 
     fi
   fi
@@ -26187,9 +28632,10 @@
 
 
 # Check whether --enable-dba was given.
-if test "${enable_dba+set}" = set; then :
+if test ${enable_dba+y}
+then :
   enableval=$enable_dba; PHP_DBA=$enableval
-else
+else $as_nop
 
   PHP_DBA=no
   test "$PHP_ENABLE_ALL" && PHP_DBA=$PHP_ENABLE_ALL
@@ -26230,9 +28676,10 @@
 
 
 # Check whether --with-qdbm was given.
-if test "${with_qdbm+set}" = set; then :
+if test ${with_qdbm+y}
+then :
   withval=$with_qdbm; PHP_QDBM=$withval
-else
+else $as_nop
 
   PHP_QDBM=no
 
@@ -26252,9 +28699,10 @@
 
 
 # Check whether --with-gdbm was given.
-if test "${with_gdbm+set}" = set; then :
+if test ${with_gdbm+y}
+then :
   withval=$with_gdbm; PHP_GDBM=$withval
-else
+else $as_nop
 
   PHP_GDBM=no
 
@@ -26274,9 +28722,10 @@
 
 
 # Check whether --with-ndbm was given.
-if test "${with_ndbm+set}" = set; then :
+if test ${with_ndbm+y}
+then :
   withval=$with_ndbm; PHP_NDBM=$withval
-else
+else $as_nop
 
   PHP_NDBM=no
 
@@ -26296,9 +28745,10 @@
 
 
 # Check whether --with-db4 was given.
-if test "${with_db4+set}" = set; then :
+if test ${with_db4+y}
+then :
   withval=$with_db4; PHP_DB4=$withval
-else
+else $as_nop
 
   PHP_DB4=no
 
@@ -26318,9 +28768,10 @@
 
 
 # Check whether --with-db3 was given.
-if test "${with_db3+set}" = set; then :
+if test ${with_db3+y}
+then :
   withval=$with_db3; PHP_DB3=$withval
-else
+else $as_nop
 
   PHP_DB3=no
 
@@ -26340,9 +28791,10 @@
 
 
 # Check whether --with-db2 was given.
-if test "${with_db2+set}" = set; then :
+if test ${with_db2+y}
+then :
   withval=$with_db2; PHP_DB2=$withval
-else
+else $as_nop
 
   PHP_DB2=no
 
@@ -26362,9 +28814,10 @@
 
 
 # Check whether --with-db1 was given.
-if test "${with_db1+set}" = set; then :
+if test ${with_db1+y}
+then :
   withval=$with_db1; PHP_DB1=$withval
-else
+else $as_nop
 
   PHP_DB1=no
 
@@ -26384,9 +28837,10 @@
 
 
 # Check whether --with-dbm was given.
-if test "${with_dbm+set}" = set; then :
+if test ${with_dbm+y}
+then :
   withval=$with_dbm; PHP_DBM=$withval
-else
+else $as_nop
 
   PHP_DBM=no
 
@@ -26406,9 +28860,10 @@
 
 
 # Check whether --with-tcadb was given.
-if test "${with_tcadb+set}" = set; then :
+if test ${with_tcadb+y}
+then :
   withval=$with_tcadb; PHP_TCADB=$withval
-else
+else $as_nop
 
   PHP_TCADB=no
 
@@ -26428,9 +28883,10 @@
 
 
 # Check whether --with-lmdb was given.
-if test "${with_lmdb+set}" = set; then :
+if test ${with_lmdb+y}
+then :
   withval=$with_lmdb; PHP_LMDB=$withval
-else
+else $as_nop
 
   PHP_LMDB=no
 
@@ -26568,12 +29024,13 @@
     esac
   done
 
-  as_ac_Lib=`$as_echo "ac_cv_lib_$LIB''_dpopen" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dpopen in -l$LIB" >&5
-$as_echo_n "checking for dpopen in -l$LIB... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  as_ac_Lib=`printf "%s\n" "ac_cv_lib_$LIB""_dpopen" | $as_tr_sh`
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dpopen in -l$LIB" >&5
+printf %s "checking for dpopen in -l$LIB... " >&6; }
+if eval test \${$as_ac_Lib+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$LIB  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -26582,47 +29039,44 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char dpopen ();
 int
-main ()
+main (void)
 {
 return dpopen ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   eval "$as_ac_Lib=yes"
-else
+else $as_nop
   eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"
+then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-cat >>confdefs.h <<_ACEOF
-#define QDBM_INCLUDE_FILE "$THIS_INCLUDE"
-_ACEOF
+printf "%s\n" "#define QDBM_INCLUDE_FILE \"$THIS_INCLUDE\"" >>confdefs.h
 
 
-$as_echo "#define DBA_QDBM 1" >>confdefs.h
+printf "%s\n" "#define DBA_QDBM 1" >>confdefs.h
 
         THIS_LIBS=$LIB
 
 
-else
+else $as_nop
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -26759,19 +29213,19 @@
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
-$as_echo_n "checking for $THIS_FULL_NAME support... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
+printf %s "checking for $THIS_FULL_NAME support... " >&6; }
   if test -n ""; then
     as_fn_error $? "" "$LINENO" 5
   fi
   if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then
     HAVE_DBA=1
     eval HAVE_$THIS_NAME=1
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
-$as_echo "$THIS_RESULT" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
+printf "%s\n" "$THIS_RESULT" >&6; }
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
@@ -26788,19 +29242,19 @@
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
-$as_echo_n "checking for $THIS_FULL_NAME support... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
+printf %s "checking for $THIS_FULL_NAME support... " >&6; }
   if test -n "You cannot combine --with-gdbm with --with-qdbm"; then
     as_fn_error $? "You cannot combine --with-gdbm with --with-qdbm" "$LINENO" 5
   fi
   if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then
     HAVE_DBA=1
     eval HAVE_$THIS_NAME=1
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
-$as_echo "$THIS_RESULT" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
+printf "%s\n" "$THIS_RESULT" >&6; }
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
@@ -26919,11 +29373,12 @@
     esac
   done
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdbm_open in -lgdbm" >&5
-$as_echo_n "checking for gdbm_open in -lgdbm... " >&6; }
-if ${ac_cv_lib_gdbm_gdbm_open+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gdbm_open in -lgdbm" >&5
+printf %s "checking for gdbm_open in -lgdbm... " >&6; }
+if test ${ac_cv_lib_gdbm_gdbm_open+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgdbm  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -26932,46 +29387,43 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char gdbm_open ();
 int
-main ()
+main (void)
 {
 return gdbm_open ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_gdbm_gdbm_open=yes
-else
+else $as_nop
   ac_cv_lib_gdbm_gdbm_open=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gdbm_gdbm_open" >&5
-$as_echo "$ac_cv_lib_gdbm_gdbm_open" >&6; }
-if test "x$ac_cv_lib_gdbm_gdbm_open" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gdbm_gdbm_open" >&5
+printf "%s\n" "$ac_cv_lib_gdbm_gdbm_open" >&6; }
+if test "x$ac_cv_lib_gdbm_gdbm_open" = xyes
+then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-cat >>confdefs.h <<_ACEOF
-#define GDBM_INCLUDE_FILE "$THIS_INCLUDE"
-_ACEOF
+printf "%s\n" "#define GDBM_INCLUDE_FILE \"$THIS_INCLUDE\"" >>confdefs.h
 
 
-$as_echo "#define DBA_GDBM 1" >>confdefs.h
+printf "%s\n" "#define DBA_GDBM 1" >>confdefs.h
 
       THIS_LIBS=gdbm
 
 
-else
+else $as_nop
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -27104,19 +29556,19 @@
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
-$as_echo_n "checking for $THIS_FULL_NAME support... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
+printf %s "checking for $THIS_FULL_NAME support... " >&6; }
   if test -n ""; then
     as_fn_error $? "" "$LINENO" 5
   fi
   if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then
     HAVE_DBA=1
     eval HAVE_$THIS_NAME=1
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
-$as_echo "$THIS_RESULT" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
+printf "%s\n" "$THIS_RESULT" >&6; }
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
@@ -27244,12 +29696,13 @@
     esac
   done
 
-  as_ac_Lib=`$as_echo "ac_cv_lib_$LIB''_dbm_open" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbm_open in -l$LIB" >&5
-$as_echo_n "checking for dbm_open in -l$LIB... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  as_ac_Lib=`printf "%s\n" "ac_cv_lib_$LIB""_dbm_open" | $as_tr_sh`
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dbm_open in -l$LIB" >&5
+printf %s "checking for dbm_open in -l$LIB... " >&6; }
+if eval test \${$as_ac_Lib+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$LIB  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -27258,47 +29711,44 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char dbm_open ();
 int
-main ()
+main (void)
 {
 return dbm_open ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   eval "$as_ac_Lib=yes"
-else
+else $as_nop
   eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"
+then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-cat >>confdefs.h <<_ACEOF
-#define NDBM_INCLUDE_FILE "$THIS_INCLUDE"
-_ACEOF
+printf "%s\n" "#define NDBM_INCLUDE_FILE \"$THIS_INCLUDE\"" >>confdefs.h
 
 
-$as_echo "#define DBA_NDBM 1" >>confdefs.h
+printf "%s\n" "#define DBA_NDBM 1" >>confdefs.h
 
         THIS_LIBS=$LIB
 
 
-else
+else $as_nop
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -27435,19 +29885,19 @@
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
-$as_echo_n "checking for $THIS_FULL_NAME support... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
+printf %s "checking for $THIS_FULL_NAME support... " >&6; }
   if test -n ""; then
     as_fn_error $? "" "$LINENO" 5
   fi
   if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then
     HAVE_DBA=1
     eval HAVE_$THIS_NAME=1
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
-$as_echo "$THIS_RESULT" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
+printf "%s\n" "$THIS_RESULT" >&6; }
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
@@ -27602,12 +30052,13 @@
     esac
   done
 
-  as_ac_Lib=`$as_echo "ac_cv_lib_$LIB''_tcadbopen" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tcadbopen in -l$LIB" >&5
-$as_echo_n "checking for tcadbopen in -l$LIB... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  as_ac_Lib=`printf "%s\n" "ac_cv_lib_$LIB""_tcadbopen" | $as_tr_sh`
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tcadbopen in -l$LIB" >&5
+printf %s "checking for tcadbopen in -l$LIB... " >&6; }
+if eval test \${$as_ac_Lib+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$LIB  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -27616,47 +30067,44 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char tcadbopen ();
 int
-main ()
+main (void)
 {
 return tcadbopen ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   eval "$as_ac_Lib=yes"
-else
+else $as_nop
   eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"
+then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-cat >>confdefs.h <<_ACEOF
-#define TCADB_INCLUDE_FILE "$THIS_INCLUDE"
-_ACEOF
+printf "%s\n" "#define TCADB_INCLUDE_FILE \"$THIS_INCLUDE\"" >>confdefs.h
 
 
-$as_echo "#define DBA_TCADB 1" >>confdefs.h
+printf "%s\n" "#define DBA_TCADB 1" >>confdefs.h
 
 		THIS_LIBS=$LIB
 
 
-else
+else $as_nop
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -27793,19 +30241,19 @@
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
-$as_echo_n "checking for $THIS_FULL_NAME support... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
+printf %s "checking for $THIS_FULL_NAME support... " >&6; }
   if test -n ""; then
     as_fn_error $? "" "$LINENO" 5
   fi
   if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then
     HAVE_DBA=1
     eval HAVE_$THIS_NAME=1
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
-$as_echo "$THIS_RESULT" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
+printf "%s\n" "$THIS_RESULT" >&6; }
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
@@ -27960,12 +30408,13 @@
     esac
   done
 
-  as_ac_Lib=`$as_echo "ac_cv_lib_$LIB''_mdb_env_open" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mdb_env_open in -l$LIB" >&5
-$as_echo_n "checking for mdb_env_open in -l$LIB... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  as_ac_Lib=`printf "%s\n" "ac_cv_lib_$LIB""_mdb_env_open" | $as_tr_sh`
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mdb_env_open in -l$LIB" >&5
+printf %s "checking for mdb_env_open in -l$LIB... " >&6; }
+if eval test \${$as_ac_Lib+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$LIB  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -27974,47 +30423,44 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char mdb_env_open ();
 int
-main ()
+main (void)
 {
 return mdb_env_open ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   eval "$as_ac_Lib=yes"
-else
+else $as_nop
   eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"
+then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-cat >>confdefs.h <<_ACEOF
-#define LMDB_INCLUDE_FILE "$THIS_INCLUDE"
-_ACEOF
+printf "%s\n" "#define LMDB_INCLUDE_FILE \"$THIS_INCLUDE\"" >>confdefs.h
 
 
-$as_echo "#define DBA_LMDB 1" >>confdefs.h
+printf "%s\n" "#define DBA_LMDB 1" >>confdefs.h
 
 		THIS_LIBS=$LIB
 
 
-else
+else $as_nop
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -28151,19 +30597,19 @@
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
-$as_echo_n "checking for $THIS_FULL_NAME support... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
+printf %s "checking for $THIS_FULL_NAME support... " >&6; }
   if test -n ""; then
     as_fn_error $? "" "$LINENO" 5
   fi
   if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then
     HAVE_DBA=1
     eval HAVE_$THIS_NAME=1
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
-$as_echo "$THIS_RESULT" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
+printf "%s\n" "$THIS_RESULT" >&6; }
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
@@ -28250,7 +30696,7 @@
 #include "$THIS_INCLUDE"
 
 int
-main ()
+main (void)
 {
 
           (void)db_create((DB**)0, (DB_ENV*)0, 0);
@@ -28259,7 +30705,8 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
 
           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -28271,17 +30718,18 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1; then :
+  $EGREP "yes" >/dev/null 2>&1
+then :
 
             THIS_LIBS=$LIB
             lib_found=1
 
 fi
-rm -f conftest*
+rm -rf conftest*
 
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 
   LDFLAGS=$old_LDFLAGS
@@ -28294,13 +30742,13 @@
     fi
   done
   if test -z "$THIS_LIBS"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DB4 major version" >&5
-$as_echo_n "checking for DB4 major version... " >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for DB4 major version" >&5
+printf %s "checking for DB4 major version... " >&6; }
     as_fn_error $? "Header contains different version" "$LINENO" 5
   fi
   if test "4" = "4"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DB4 minor version and patch level" >&5
-$as_echo_n "checking for DB4 minor version and patch level... " >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for DB4 minor version and patch level" >&5
+printf %s "checking for DB4 minor version and patch level... " >&6; }
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -28311,22 +30759,23 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1; then :
+  $EGREP "yes" >/dev/null 2>&1
+then :
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-$as_echo "ok" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+printf "%s\n" "ok" >&6; }
 
-else
+else $as_nop
 
       as_fn_error $? "Version 4.1 requires patch level 25" "$LINENO" 5
 
 fi
-rm -f conftest*
+rm -rf conftest*
 
   fi
   if test "$ext_shared" = "yes"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if dba can be used as shared extension" >&5
-$as_echo_n "checking if dba can be used as shared extension... " >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if dba can be used as shared extension" >&5
+printf %s "checking if dba can be used as shared extension... " >&6; }
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -28337,28 +30786,27 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1; then :
+  $EGREP "yes" >/dev/null 2>&1
+then :
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-else
+else $as_nop
 
       as_fn_error $? "At least version 3.3 is required" "$LINENO" 5
 
 fi
-rm -f conftest*
+rm -rf conftest*
 
   fi
   if test -n "$THIS_LIBS"; then
 
-$as_echo "#define DBA_DB4 1" >>confdefs.h
+printf "%s\n" "#define DBA_DB4 1" >>confdefs.h
 
     if test -n "$THIS_INCLUDE"; then
 
-cat >>confdefs.h <<_ACEOF
-#define DB4_INCLUDE_FILE "$THIS_INCLUDE"
-_ACEOF
+printf "%s\n" "#define DB4_INCLUDE_FILE \"$THIS_INCLUDE\"" >>confdefs.h
 
     fi
   else
@@ -28482,19 +30930,19 @@
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
-$as_echo_n "checking for $THIS_FULL_NAME support... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
+printf %s "checking for $THIS_FULL_NAME support... " >&6; }
   if test -n ""; then
     as_fn_error $? "" "$LINENO" 5
   fi
   if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then
     HAVE_DBA=1
     eval HAVE_$THIS_NAME=1
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
-$as_echo "$THIS_RESULT" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
+printf "%s\n" "$THIS_RESULT" >&6; }
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
@@ -28511,19 +30959,19 @@
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
-$as_echo_n "checking for $THIS_FULL_NAME support... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
+printf %s "checking for $THIS_FULL_NAME support... " >&6; }
   if test -n "You cannot combine --with-db3 with --with-db4"; then
     as_fn_error $? "You cannot combine --with-db3 with --with-db4" "$LINENO" 5
   fi
   if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then
     HAVE_DBA=1
     eval HAVE_$THIS_NAME=1
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
-$as_echo "$THIS_RESULT" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
+printf "%s\n" "$THIS_RESULT" >&6; }
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
@@ -28570,7 +31018,7 @@
 #include "$THIS_INCLUDE"
 
 int
-main ()
+main (void)
 {
 
           (void)db_create((DB**)0, (DB_ENV*)0, 0);
@@ -28579,7 +31027,8 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
 
           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -28591,17 +31040,18 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1; then :
+  $EGREP "yes" >/dev/null 2>&1
+then :
 
             THIS_LIBS=$LIB
             lib_found=1
 
 fi
-rm -f conftest*
+rm -rf conftest*
 
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 
   LDFLAGS=$old_LDFLAGS
@@ -28614,13 +31064,13 @@
     fi
   done
   if test -z "$THIS_LIBS"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DB3 major version" >&5
-$as_echo_n "checking for DB3 major version... " >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for DB3 major version" >&5
+printf %s "checking for DB3 major version... " >&6; }
     as_fn_error $? "Header contains different version" "$LINENO" 5
   fi
   if test "3" = "4"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DB4 minor version and patch level" >&5
-$as_echo_n "checking for DB4 minor version and patch level... " >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for DB4 minor version and patch level" >&5
+printf %s "checking for DB4 minor version and patch level... " >&6; }
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -28631,22 +31081,23 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1; then :
+  $EGREP "yes" >/dev/null 2>&1
+then :
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-$as_echo "ok" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+printf "%s\n" "ok" >&6; }
 
-else
+else $as_nop
 
       as_fn_error $? "Version 4.1 requires patch level 25" "$LINENO" 5
 
 fi
-rm -f conftest*
+rm -rf conftest*
 
   fi
   if test "$ext_shared" = "yes"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if dba can be used as shared extension" >&5
-$as_echo_n "checking if dba can be used as shared extension... " >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if dba can be used as shared extension" >&5
+printf %s "checking if dba can be used as shared extension... " >&6; }
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -28657,28 +31108,27 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1; then :
+  $EGREP "yes" >/dev/null 2>&1
+then :
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-else
+else $as_nop
 
       as_fn_error $? "At least version 3.3 is required" "$LINENO" 5
 
 fi
-rm -f conftest*
+rm -rf conftest*
 
   fi
   if test -n "$THIS_LIBS"; then
 
-$as_echo "#define DBA_DB3 1" >>confdefs.h
+printf "%s\n" "#define DBA_DB3 1" >>confdefs.h
 
     if test -n "$THIS_INCLUDE"; then
 
-cat >>confdefs.h <<_ACEOF
-#define DB3_INCLUDE_FILE "$THIS_INCLUDE"
-_ACEOF
+printf "%s\n" "#define DB3_INCLUDE_FILE \"$THIS_INCLUDE\"" >>confdefs.h
 
     fi
   else
@@ -28802,19 +31252,19 @@
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
-$as_echo_n "checking for $THIS_FULL_NAME support... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
+printf %s "checking for $THIS_FULL_NAME support... " >&6; }
   if test -n ""; then
     as_fn_error $? "" "$LINENO" 5
   fi
   if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then
     HAVE_DBA=1
     eval HAVE_$THIS_NAME=1
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
-$as_echo "$THIS_RESULT" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
+printf "%s\n" "$THIS_RESULT" >&6; }
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
@@ -28831,19 +31281,19 @@
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
-$as_echo_n "checking for $THIS_FULL_NAME support... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
+printf %s "checking for $THIS_FULL_NAME support... " >&6; }
   if test -n "You cannot combine --with-db2 with --with-db3 or --with-db4"; then
     as_fn_error $? "You cannot combine --with-db2 with --with-db3 or --with-db4" "$LINENO" 5
   fi
   if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then
     HAVE_DBA=1
     eval HAVE_$THIS_NAME=1
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
-$as_echo "$THIS_RESULT" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
+printf "%s\n" "$THIS_RESULT" >&6; }
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
@@ -28890,7 +31340,7 @@
 #include "$THIS_INCLUDE"
 
 int
-main ()
+main (void)
 {
 
           (void)db_appinit("", NULL, (DB_ENV*)0, 0);
@@ -28899,7 +31349,8 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
 
           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -28911,17 +31362,18 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1; then :
+  $EGREP "yes" >/dev/null 2>&1
+then :
 
             THIS_LIBS=$LIB
             lib_found=1
 
 fi
-rm -f conftest*
+rm -rf conftest*
 
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 
   LDFLAGS=$old_LDFLAGS
@@ -28934,13 +31386,13 @@
     fi
   done
   if test -z "$THIS_LIBS"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DB2 major version" >&5
-$as_echo_n "checking for DB2 major version... " >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for DB2 major version" >&5
+printf %s "checking for DB2 major version... " >&6; }
     as_fn_error $? "Header contains different version" "$LINENO" 5
   fi
   if test "2" = "4"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DB4 minor version and patch level" >&5
-$as_echo_n "checking for DB4 minor version and patch level... " >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for DB4 minor version and patch level" >&5
+printf %s "checking for DB4 minor version and patch level... " >&6; }
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -28951,22 +31403,23 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1; then :
+  $EGREP "yes" >/dev/null 2>&1
+then :
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-$as_echo "ok" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+printf "%s\n" "ok" >&6; }
 
-else
+else $as_nop
 
       as_fn_error $? "Version 4.1 requires patch level 25" "$LINENO" 5
 
 fi
-rm -f conftest*
+rm -rf conftest*
 
   fi
   if test "$ext_shared" = "yes"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if dba can be used as shared extension" >&5
-$as_echo_n "checking if dba can be used as shared extension... " >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if dba can be used as shared extension" >&5
+printf %s "checking if dba can be used as shared extension... " >&6; }
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -28977,28 +31430,27 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1; then :
+  $EGREP "yes" >/dev/null 2>&1
+then :
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-else
+else $as_nop
 
       as_fn_error $? "At least version 3.3 is required" "$LINENO" 5
 
 fi
-rm -f conftest*
+rm -rf conftest*
 
   fi
   if test -n "$THIS_LIBS"; then
 
-$as_echo "#define DBA_DB2 1" >>confdefs.h
+printf "%s\n" "#define DBA_DB2 1" >>confdefs.h
 
     if test -n "$THIS_INCLUDE"; then
 
-cat >>confdefs.h <<_ACEOF
-#define DB2_INCLUDE_FILE "$THIS_INCLUDE"
-_ACEOF
+printf "%s\n" "#define DB2_INCLUDE_FILE \"$THIS_INCLUDE\"" >>confdefs.h
 
     fi
   else
@@ -29122,19 +31574,19 @@
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
-$as_echo_n "checking for $THIS_FULL_NAME support... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
+printf %s "checking for $THIS_FULL_NAME support... " >&6; }
   if test -n ""; then
     as_fn_error $? "" "$LINENO" 5
   fi
   if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then
     HAVE_DBA=1
     eval HAVE_$THIS_NAME=1
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
-$as_echo "$THIS_RESULT" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
+printf "%s\n" "$THIS_RESULT" >&6; }
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
@@ -29143,8 +31595,8 @@
 
   unset THIS_INCLUDE THIS_LIBS THIS_LFLAGS THIS_PREFIX THIS_RESULT
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DB1 in library" >&5
-$as_echo_n "checking for DB1 in library... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for DB1 in library" >&5
+printf %s "checking for DB1 in library... " >&6; }
   if test "$HAVE_DB4" = "1"; then
     THIS_VERSION=4
     THIS_LIBS=$DB4_LIBS
@@ -29159,9 +31611,7 @@
   fi
   if test "$HAVE_DB4" = "1" || test "$HAVE_DB3" = "1" || test "$HAVE_DB2" = "1"; then
 
-cat >>confdefs.h <<_ACEOF
-#define DB1_VERSION "Berkeley DB 1.85 emulation in DB$THIS_VERSION"
-_ACEOF
+printf "%s\n" "#define DB1_VERSION \"Berkeley DB 1.85 emulation in DB$THIS_VERSION\"" >>confdefs.h
 
     for i in db$THIS_VERSION/db_185.h include/db$THIS_VERSION/db_185.h include/db/db_185.h; do
       if test -f "$THIS_PREFIX/$i"; then
@@ -29171,9 +31621,7 @@
     done
   else
 
-cat >>confdefs.h <<_ACEOF
-#define DB1_VERSION "Unknown DB1"
-_ACEOF
+printf "%s\n" "#define DB1_VERSION \"Unknown DB1\"" >>confdefs.h
 
     for i in $PHP_DB1 /usr/local /usr; do
       if test -f "$i/db1/db.h"; then
@@ -29192,12 +31640,12 @@
     done
     THIS_LIBS=db
   fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_LIBS" >&5
-$as_echo "$THIS_LIBS" >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DB1 in header" >&5
-$as_echo_n "checking for DB1 in header... " >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_INCLUDE" >&5
-$as_echo "$THIS_INCLUDE" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THIS_LIBS" >&5
+printf "%s\n" "$THIS_LIBS" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for DB1 in header" >&5
+printf %s "checking for DB1 in header... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THIS_INCLUDE" >&5
+printf "%s\n" "$THIS_INCLUDE" >&6; }
   if test -n "$THIS_INCLUDE"; then
 
   old_LDFLAGS=$LDFLAGS
@@ -29211,7 +31659,7 @@
 #include "$THIS_INCLUDE"
 
 int
-main ()
+main (void)
 {
 
         DB * dbp = dbopen("", 0, 0, DB_HASH, 0);
@@ -29220,24 +31668,23 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
 
 
-cat >>confdefs.h <<_ACEOF
-#define DB1_INCLUDE_FILE "$THIS_INCLUDE"
-_ACEOF
+printf "%s\n" "#define DB1_INCLUDE_FILE \"$THIS_INCLUDE\"" >>confdefs.h
 
 
-$as_echo "#define DBA_DB1 1" >>confdefs.h
+printf "%s\n" "#define DBA_DB1 1" >>confdefs.h
 
         THIS_RESULT=yes
 
-else
+else $as_nop
 
         THIS_RESULT=no
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 
   LDFLAGS=$old_LDFLAGS
@@ -29366,19 +31813,19 @@
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
-$as_echo_n "checking for $THIS_FULL_NAME support... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
+printf %s "checking for $THIS_FULL_NAME support... " >&6; }
   if test -n ""; then
     as_fn_error $? "" "$LINENO" 5
   fi
   if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then
     HAVE_DBA=1
     eval HAVE_$THIS_NAME=1
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
-$as_echo "$THIS_RESULT" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
+printf "%s\n" "$THIS_RESULT" >&6; }
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
@@ -29395,19 +31842,19 @@
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
-$as_echo_n "checking for $THIS_FULL_NAME support... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
+printf %s "checking for $THIS_FULL_NAME support... " >&6; }
   if test -n "You cannot combine --with-dbm with --with-qdbm"; then
     as_fn_error $? "You cannot combine --with-dbm with --with-qdbm" "$LINENO" 5
   fi
   if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then
     HAVE_DBA=1
     eval HAVE_$THIS_NAME=1
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
-$as_echo "$THIS_RESULT" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
+printf "%s\n" "$THIS_RESULT" >&6; }
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
@@ -29531,12 +31978,13 @@
     esac
   done
 
-  as_ac_Lib=`$as_echo "ac_cv_lib_$LIB''_dbminit" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbminit in -l$LIB" >&5
-$as_echo_n "checking for dbminit in -l$LIB... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  as_ac_Lib=`printf "%s\n" "ac_cv_lib_$LIB""_dbminit" | $as_tr_sh`
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dbminit in -l$LIB" >&5
+printf %s "checking for dbminit in -l$LIB... " >&6; }
+if eval test \${$as_ac_Lib+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$LIB  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -29545,66 +31993,59 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char dbminit ();
 int
-main ()
+main (void)
 {
 return dbminit ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   eval "$as_ac_Lib=yes"
-else
+else $as_nop
   eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"
+then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBM using GDBM" >&5
-$as_echo_n "checking for DBM using GDBM... " >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for DBM using GDBM" >&5
+printf %s "checking for DBM using GDBM... " >&6; }
 
-cat >>confdefs.h <<_ACEOF
-#define DBM_INCLUDE_FILE "$THIS_INCLUDE"
-_ACEOF
+printf "%s\n" "#define DBM_INCLUDE_FILE \"$THIS_INCLUDE\"" >>confdefs.h
 
         if test "$LIB" = "gdbm"; then
 
-cat >>confdefs.h <<_ACEOF
-#define DBM_VERSION "GDBM"
-_ACEOF
+printf "%s\n" "#define DBM_VERSION \"GDBM\"" >>confdefs.h
 
-          { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+          { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
         else
 
-cat >>confdefs.h <<_ACEOF
-#define DBM_VERSION "DBM"
-_ACEOF
+printf "%s\n" "#define DBM_VERSION \"DBM\"" >>confdefs.h
 
-          { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+          { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
         fi
 
-$as_echo "#define DBA_DBM 1" >>confdefs.h
+printf "%s\n" "#define DBA_DBM 1" >>confdefs.h
 
         THIS_LIBS=$LIB
 
 
-else
+else $as_nop
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -29741,19 +32182,19 @@
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
-$as_echo_n "checking for $THIS_FULL_NAME support... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
+printf %s "checking for $THIS_FULL_NAME support... " >&6; }
   if test -n ""; then
     as_fn_error $? "" "$LINENO" 5
   fi
   if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then
     HAVE_DBA=1
     eval HAVE_$THIS_NAME=1
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
-$as_echo "$THIS_RESULT" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
+printf "%s\n" "$THIS_RESULT" >&6; }
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
@@ -29770,9 +32211,10 @@
 
 
 # Check whether --with-cdb was given.
-if test "${with_cdb+set}" = set; then :
+if test ${with_cdb+y}
+then :
   withval=$with_cdb; PHP_CDB=$withval
-else
+else $as_nop
 
   PHP_CDB=$php_dba_enable
 
@@ -29791,9 +32233,10 @@
 
 
 # Check whether --enable-inifile was given.
-if test "${enable_inifile+set}" = set; then :
+if test ${enable_inifile+y}
+then :
   enableval=$enable_inifile; PHP_INIFILE=$enableval
-else
+else $as_nop
 
   PHP_INIFILE=$php_dba_enable
 
@@ -29812,9 +32255,10 @@
 
 
 # Check whether --enable-flatfile was given.
-if test "${enable_flatfile+set}" = set; then :
+if test ${enable_flatfile+y}
+then :
   enableval=$enable_flatfile; PHP_FLATFILE=$enableval
-else
+else $as_nop
 
   PHP_FLATFILE=$php_dba_enable
 
@@ -29830,13 +32274,13 @@
 
 if test "$PHP_CDB" = "yes"; then
 
-$as_echo "#define DBA_CDB_BUILTIN 1" >>confdefs.h
+printf "%s\n" "#define DBA_CDB_BUILTIN 1" >>confdefs.h
 
 
-$as_echo "#define DBA_CDB_MAKE 1" >>confdefs.h
+printf "%s\n" "#define DBA_CDB_MAKE 1" >>confdefs.h
 
 
-$as_echo "#define DBA_CDB 1" >>confdefs.h
+printf "%s\n" "#define DBA_CDB 1" >>confdefs.h
 
   cdb_sources="libcdb/cdb.c libcdb/cdb_make.c libcdb/uint32.c"
   THIS_RESULT="builtin"
@@ -29959,12 +32403,13 @@
     esac
   done
 
-  as_ac_Lib=`$as_echo "ac_cv_lib_$LIB''_cdb_read" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cdb_read in -l$LIB" >&5
-$as_echo_n "checking for cdb_read in -l$LIB... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  as_ac_Lib=`printf "%s\n" "ac_cv_lib_$LIB""_cdb_read" | $as_tr_sh`
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for cdb_read in -l$LIB" >&5
+printf %s "checking for cdb_read in -l$LIB... " >&6; }
+if eval test \${$as_ac_Lib+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$LIB  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -29973,47 +32418,44 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char cdb_read ();
 int
-main ()
+main (void)
 {
 return cdb_read ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   eval "$as_ac_Lib=yes"
-else
+else $as_nop
   eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"
+then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-cat >>confdefs.h <<_ACEOF
-#define CDB_INCLUDE_FILE "$THIS_INCLUDE"
-_ACEOF
+printf "%s\n" "#define CDB_INCLUDE_FILE \"$THIS_INCLUDE\"" >>confdefs.h
 
 
-$as_echo "#define DBA_CDB 1" >>confdefs.h
+printf "%s\n" "#define DBA_CDB 1" >>confdefs.h
 
         THIS_LIBS=$LIB
 
 
-else
+else $as_nop
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -30150,26 +32592,26 @@
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
-$as_echo_n "checking for $THIS_FULL_NAME support... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
+printf %s "checking for $THIS_FULL_NAME support... " >&6; }
   if test -n ""; then
     as_fn_error $? "" "$LINENO" 5
   fi
   if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then
     HAVE_DBA=1
     eval HAVE_$THIS_NAME=1
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
-$as_echo "$THIS_RESULT" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
+printf "%s\n" "$THIS_RESULT" >&6; }
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
 
 if test "$PHP_INIFILE" != "no"; then
 
-$as_echo "#define DBA_INIFILE 1" >>confdefs.h
+printf "%s\n" "#define DBA_INIFILE 1" >>confdefs.h
 
   ini_sources="libinifile/inifile.c"
   THIS_RESULT="builtin"
@@ -30181,26 +32623,26 @@
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
-$as_echo_n "checking for $THIS_FULL_NAME support... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
+printf %s "checking for $THIS_FULL_NAME support... " >&6; }
   if test -n ""; then
     as_fn_error $? "" "$LINENO" 5
   fi
   if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then
     HAVE_DBA=1
     eval HAVE_$THIS_NAME=1
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
-$as_echo "$THIS_RESULT" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
+printf "%s\n" "$THIS_RESULT" >&6; }
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
 
 if test "$PHP_FLATFILE" != "no"; then
 
-$as_echo "#define DBA_FLATFILE 1" >>confdefs.h
+printf "%s\n" "#define DBA_FLATFILE 1" >>confdefs.h
 
   flat_sources="libflatfile/flatfile.c"
   THIS_RESULT="builtin"
@@ -30212,35 +32654,35 @@
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
-$as_echo_n "checking for $THIS_FULL_NAME support... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
+printf %s "checking for $THIS_FULL_NAME support... " >&6; }
   if test -n ""; then
     as_fn_error $? "" "$LINENO" 5
   fi
   if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then
     HAVE_DBA=1
     eval HAVE_$THIS_NAME=1
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
-$as_echo "$THIS_RESULT" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
+printf "%s\n" "$THIS_RESULT" >&6; }
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable DBA interface" >&5
-$as_echo_n "checking whether to enable DBA interface... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable DBA interface" >&5
+printf %s "checking whether to enable DBA interface... " >&6; }
 if test "$HAVE_DBA" = "1"; then
   if test "$ext_shared" = "yes"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, shared" >&5
-$as_echo "yes, shared" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes, shared" >&5
+printf "%s\n" "yes, shared" >&6; }
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
   fi
 
-$as_echo "#define HAVE_DBA 1" >>confdefs.h
+printf "%s\n" "#define HAVE_DBA 1" >>confdefs.h
 
 
   ext_builddir=ext/dba
@@ -30376,9 +32818,7 @@
 EOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define COMPILE_DL_DBA 1
-_ACEOF
+printf "%s\n" "#define COMPILE_DL_DBA 1" >>confdefs.h
 
     fi
   fi
@@ -30518,8 +32958,8 @@
   PHP_VAR_SUBST="$PHP_VAR_SUBST DBA_SHARED_LIBADD"
 
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -30528,12 +32968,13 @@
 
 php_enable_dl_test=no
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable dl-test extension" >&5
-$as_echo_n "checking whether to enable dl-test extension... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable dl-test extension" >&5
+printf %s "checking whether to enable dl-test extension... " >&6; }
 # Check whether --enable-dl-test was given.
-if test "${enable_dl_test+set}" = set; then :
+if test ${enable_dl_test+y}
+then :
   enableval=$enable_dl_test; PHP_DL_TEST=$enableval
-else
+else $as_nop
 
   PHP_DL_TEST=no
   test "$PHP_ENABLE_ALL" && PHP_DL_TEST=$PHP_ENABLE_ALL
@@ -30563,8 +33004,8 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -30704,9 +33145,7 @@
 EOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define COMPILE_DL_DL_TEST 1
-_ACEOF
+printf "%s\n" "#define COMPILE_DL_DL_TEST 1" >>confdefs.h
 
     fi
   fi
@@ -30835,12 +33274,13 @@
 
 php_enable_dom=yes
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable DOM support" >&5
-$as_echo_n "checking whether to enable DOM support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable DOM support" >&5
+printf %s "checking whether to enable DOM support... " >&6; }
 # Check whether --enable-dom was given.
-if test "${enable_dom+set}" = set; then :
+if test ${enable_dom+y}
+then :
   enableval=$enable_dom; PHP_DOM=$enableval
-else
+else $as_nop
 
   PHP_DOM=yes
   test "$PHP_ENABLE_ALL" && PHP_DOM=$PHP_ENABLE_ALL
@@ -30870,8 +33310,8 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -30885,17 +33325,17 @@
 
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 >= 2.9.0" >&5
-$as_echo_n "checking for libxml-2.0 >= 2.9.0... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 >= 2.9.0" >&5
+printf %s "checking for libxml-2.0 >= 2.9.0... " >&6; }
 
 if test -n "$LIBXML_CFLAGS"; then
     pkg_cv_LIBXML_CFLAGS="$LIBXML_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.9.0") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBXML_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 >= 2.9.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -30909,10 +33349,10 @@
     pkg_cv_LIBXML_LIBS="$LIBXML_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.9.0") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBXML_LIBS=`$PKG_CONFIG --libs "libxml-2.0 >= 2.9.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -30926,8 +33366,8 @@
 
 
 if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -30953,10 +33393,10 @@
 and LIBXML_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -30970,8 +33410,8 @@
 else
 	LIBXML_CFLAGS=$pkg_cv_LIBXML_CFLAGS
 	LIBXML_LIBS=$pkg_cv_LIBXML_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
 fi
 
@@ -31116,12 +33556,12 @@
 
 
 
-$as_echo "#define HAVE_LIBXML 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBXML 1" >>confdefs.h
 
 
 
 
-$as_echo "#define HAVE_DOM 1" >>confdefs.h
+printf "%s\n" "#define HAVE_DOM 1" >>confdefs.h
 
 
   ext_builddir=ext/dom
@@ -31275,9 +33715,7 @@
 EOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define COMPILE_DL_DOM 1
-_ACEOF
+printf "%s\n" "#define COMPILE_DL_DOM 1" >>confdefs.h
 
     fi
   fi
@@ -31466,13 +33904,14 @@
 
 php_with_enchant=no
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build with Enchant support" >&5
-$as_echo_n "checking whether to build with Enchant support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build with Enchant support" >&5
+printf %s "checking whether to build with Enchant support... " >&6; }
 
 # Check whether --with-enchant was given.
-if test "${with_enchant+set}" = set; then :
+if test ${with_enchant+y}
+then :
   withval=$with_enchant; PHP_ENCHANT=$withval
-else
+else $as_nop
 
   PHP_ENCHANT=no
   test "$PHP_ENABLE_ALL" && PHP_ENCHANT=$PHP_ENABLE_ALL
@@ -31502,8 +33941,8 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -31511,17 +33950,17 @@
 if test "$PHP_ENCHANT" != "no"; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for enchant-2" >&5
-$as_echo_n "checking for enchant-2... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for enchant-2" >&5
+printf %s "checking for enchant-2... " >&6; }
 
 if test -n "$ENCHANT2_CFLAGS"; then
     pkg_cv_ENCHANT2_CFLAGS="$ENCHANT2_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"enchant-2\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"enchant-2\""; } >&5
   ($PKG_CONFIG --exists --print-errors "enchant-2") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_ENCHANT2_CFLAGS=`$PKG_CONFIG --cflags "enchant-2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -31535,10 +33974,10 @@
     pkg_cv_ENCHANT2_LIBS="$ENCHANT2_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"enchant-2\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"enchant-2\""; } >&5
   ($PKG_CONFIG --exists --print-errors "enchant-2") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_ENCHANT2_LIBS=`$PKG_CONFIG --libs "enchant-2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -31552,8 +33991,8 @@
 
 
 if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -31570,14 +34009,14 @@
 
 	found_enchant_2=no
 elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 	found_enchant_2=no
 else
 	ENCHANT2_CFLAGS=$pkg_cv_ENCHANT2_CFLAGS
 	ENCHANT2_LIBS=$pkg_cv_ENCHANT2_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 	found_enchant_2=yes
 fi
 
@@ -31724,25 +34163,25 @@
 
 
 
-$as_echo "#define HAVE_ENCHANT_GET_VERSION 1" >>confdefs.h
+printf "%s\n" "#define HAVE_ENCHANT_GET_VERSION 1" >>confdefs.h
 
 
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libenchant-2 not found trying with old libenchant" >&5
-$as_echo "$as_me: WARNING: libenchant-2 not found trying with old libenchant" >&2;}
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: libenchant-2 not found trying with old libenchant" >&5
+printf "%s\n" "$as_me: WARNING: libenchant-2 not found trying with old libenchant" >&2;}
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for enchant >= 1.4.2" >&5
-$as_echo_n "checking for enchant >= 1.4.2... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for enchant >= 1.4.2" >&5
+printf %s "checking for enchant >= 1.4.2... " >&6; }
 
 if test -n "$ENCHANT_CFLAGS"; then
     pkg_cv_ENCHANT_CFLAGS="$ENCHANT_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"enchant >= 1.4.2\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"enchant >= 1.4.2\""; } >&5
   ($PKG_CONFIG --exists --print-errors "enchant >= 1.4.2") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_ENCHANT_CFLAGS=`$PKG_CONFIG --cflags "enchant >= 1.4.2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -31756,10 +34195,10 @@
     pkg_cv_ENCHANT_LIBS="$ENCHANT_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"enchant >= 1.4.2\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"enchant >= 1.4.2\""; } >&5
   ($PKG_CONFIG --exists --print-errors "enchant >= 1.4.2") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_ENCHANT_LIBS=`$PKG_CONFIG --libs "enchant >= 1.4.2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -31773,8 +34212,8 @@
 
 
 if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -31800,10 +34239,10 @@
 and ENCHANT_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -31817,8 +34256,8 @@
 else
 	ENCHANT_CFLAGS=$pkg_cv_ENCHANT_CFLAGS
 	ENCHANT_LIBS=$pkg_cv_ENCHANT_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
 fi
 
@@ -32069,11 +34508,12 @@
     esac
   done
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for enchant_get_version in -lenchant" >&5
-$as_echo_n "checking for enchant_get_version in -lenchant... " >&6; }
-if ${ac_cv_lib_enchant_enchant_get_version+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for enchant_get_version in -lenchant" >&5
+printf %s "checking for enchant_get_version in -lenchant... " >&6; }
+if test ${ac_cv_lib_enchant_enchant_get_version+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lenchant  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -32082,40 +34522,39 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char enchant_get_version ();
 int
-main ()
+main (void)
 {
 return enchant_get_version ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_enchant_enchant_get_version=yes
-else
+else $as_nop
   ac_cv_lib_enchant_enchant_get_version=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_enchant_enchant_get_version" >&5
-$as_echo "$ac_cv_lib_enchant_enchant_get_version" >&6; }
-if test "x$ac_cv_lib_enchant_enchant_get_version" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_enchant_enchant_get_version" >&5
+printf "%s\n" "$ac_cv_lib_enchant_enchant_get_version" >&6; }
+if test "x$ac_cv_lib_enchant_enchant_get_version" = xyes
+then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-$as_echo "#define HAVE_ENCHANT_GET_VERSION 1" >>confdefs.h
+printf "%s\n" "#define HAVE_ENCHANT_GET_VERSION 1" >>confdefs.h
 
 
 
-else
+else $as_nop
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -32232,11 +34671,12 @@
     esac
   done
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for enchant_broker_set_param in -lenchant" >&5
-$as_echo_n "checking for enchant_broker_set_param in -lenchant... " >&6; }
-if ${ac_cv_lib_enchant_enchant_broker_set_param+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for enchant_broker_set_param in -lenchant" >&5
+printf %s "checking for enchant_broker_set_param in -lenchant... " >&6; }
+if test ${ac_cv_lib_enchant_enchant_broker_set_param+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lenchant  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -32245,40 +34685,39 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char enchant_broker_set_param ();
 int
-main ()
+main (void)
 {
 return enchant_broker_set_param ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_enchant_enchant_broker_set_param=yes
-else
+else $as_nop
   ac_cv_lib_enchant_enchant_broker_set_param=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_enchant_enchant_broker_set_param" >&5
-$as_echo "$ac_cv_lib_enchant_enchant_broker_set_param" >&6; }
-if test "x$ac_cv_lib_enchant_enchant_broker_set_param" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_enchant_enchant_broker_set_param" >&5
+printf "%s\n" "$ac_cv_lib_enchant_enchant_broker_set_param" >&6; }
+if test "x$ac_cv_lib_enchant_enchant_broker_set_param" = xyes
+then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-$as_echo "#define HAVE_ENCHANT_BROKER_SET_PARAM 1" >>confdefs.h
+printf "%s\n" "#define HAVE_ENCHANT_BROKER_SET_PARAM 1" >>confdefs.h
 
 
 
-else
+else $as_nop
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -32290,7 +34729,7 @@
   fi
 
 
-$as_echo "#define HAVE_ENCHANT 1" >>confdefs.h
+printf "%s\n" "#define HAVE_ENCHANT 1" >>confdefs.h
 
 
 
@@ -32427,9 +34866,7 @@
 EOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define COMPILE_DL_ENCHANT 1
-_ACEOF
+printf "%s\n" "#define COMPILE_DL_ENCHANT 1" >>confdefs.h
 
     fi
   fi
@@ -32561,12 +34998,13 @@
 
 php_enable_exif=no
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable EXIF (metadata from images) support" >&5
-$as_echo_n "checking whether to enable EXIF (metadata from images) support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable EXIF (metadata from images) support" >&5
+printf %s "checking whether to enable EXIF (metadata from images) support... " >&6; }
 # Check whether --enable-exif was given.
-if test "${enable_exif+set}" = set; then :
+if test ${enable_exif+y}
+then :
   enableval=$enable_exif; PHP_EXIF=$enableval
-else
+else $as_nop
 
   PHP_EXIF=no
   test "$PHP_ENABLE_ALL" && PHP_EXIF=$PHP_ENABLE_ALL
@@ -32596,15 +35034,15 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
 
 if test "$PHP_EXIF" != "no"; then
 
-$as_echo "#define HAVE_EXIF 1" >>confdefs.h
+printf "%s\n" "#define HAVE_EXIF 1" >>confdefs.h
 
 
   ext_builddir=ext/exif
@@ -32740,9 +35178,7 @@
 EOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define COMPILE_DL_EXIF 1
-_ACEOF
+printf "%s\n" "#define COMPILE_DL_EXIF 1" >>confdefs.h
 
     fi
   fi
@@ -32871,13 +35307,14 @@
 
 php_with_ffi=no
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FFI support" >&5
-$as_echo_n "checking for FFI support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for FFI support" >&5
+printf %s "checking for FFI support... " >&6; }
 
 # Check whether --with-ffi was given.
-if test "${with_ffi+set}" = set; then :
+if test ${with_ffi+y}
+then :
   withval=$with_ffi; PHP_FFI=$withval
-else
+else $as_nop
 
   PHP_FFI=no
   test "$PHP_ENABLE_ALL" && PHP_FFI=$PHP_ENABLE_ALL
@@ -32907,8 +35344,8 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -32916,17 +35353,17 @@
 if test "$PHP_FFI" != "no"; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libffi >= 3.0.11" >&5
-$as_echo_n "checking for libffi >= 3.0.11... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libffi >= 3.0.11" >&5
+printf %s "checking for libffi >= 3.0.11... " >&6; }
 
 if test -n "$FFI_CFLAGS"; then
     pkg_cv_FFI_CFLAGS="$FFI_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libffi >= 3.0.11\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libffi >= 3.0.11\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libffi >= 3.0.11") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_FFI_CFLAGS=`$PKG_CONFIG --cflags "libffi >= 3.0.11" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -32940,10 +35377,10 @@
     pkg_cv_FFI_LIBS="$FFI_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libffi >= 3.0.11\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libffi >= 3.0.11\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libffi >= 3.0.11") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_FFI_LIBS=`$PKG_CONFIG --libs "libffi >= 3.0.11" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -32957,8 +35394,8 @@
 
 
 if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -32984,10 +35421,10 @@
 and FFI_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -33001,8 +35438,8 @@
 else
 	FFI_CFLAGS=$pkg_cv_FFI_CFLAGS
 	FFI_LIBS=$pkg_cv_FFI_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
 fi
 
@@ -33147,31 +35584,31 @@
 
 
 
-$as_echo "#define HAVE_FFI 1" >>confdefs.h
+printf "%s\n" "#define HAVE_FFI 1" >>confdefs.h
 
 
   ac_fn_c_check_type "$LINENO" "long double" "ac_cv_type_long_double" "$ac_includes_default"
-if test "x$ac_cv_type_long_double" = xyes; then :
+if test "x$ac_cv_type_long_double" = xyes
+then :
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_LONG_DOUBLE 1
-_ACEOF
+printf "%s\n" "#define HAVE_LONG_DOUBLE 1" >>confdefs.h
 
 
 fi
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fastcall calling convention" >&5
-$as_echo_n "checking for fastcall calling convention... " >&6; }
-if ${ac_cv_ffi_fastcall+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fastcall calling convention" >&5
+printf %s "checking for fastcall calling convention... " >&6; }
+if test ${ac_cv_ffi_fastcall+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ffi.h>
 int
-main ()
+main (void)
 {
 return FFI_FASTCALL
   ;
@@ -33179,34 +35616,36 @@
 }
 
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_ffi_fastcall=yes
-else
+else $as_nop
   ac_cv_ffi_fastcall=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ffi_fastcall" >&5
-$as_echo "$ac_cv_ffi_fastcall" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ffi_fastcall" >&5
+printf "%s\n" "$ac_cv_ffi_fastcall" >&6; }
 
   if test "$ac_cv_ffi_fastcall" = yes; then
 
-$as_echo "#define HAVE_FFI_FASTCALL 1" >>confdefs.h
+printf "%s\n" "#define HAVE_FFI_FASTCALL 1" >>confdefs.h
 
   fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for thiscall calling convention" >&5
-$as_echo_n "checking for thiscall calling convention... " >&6; }
-if ${ac_cv_ffi_thiscall+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for thiscall calling convention" >&5
+printf %s "checking for thiscall calling convention... " >&6; }
+if test ${ac_cv_ffi_thiscall+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ffi.h>
 int
-main ()
+main (void)
 {
 return FFI_THISCALL
   ;
@@ -33214,34 +35653,36 @@
 }
 
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_ffi_thiscall=yes
-else
+else $as_nop
   ac_cv_ffi_thiscall=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ffi_thiscall" >&5
-$as_echo "$ac_cv_ffi_thiscall" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ffi_thiscall" >&5
+printf "%s\n" "$ac_cv_ffi_thiscall" >&6; }
 
   if test "$ac_cv_ffi_thiscall" = yes; then
 
-$as_echo "#define HAVE_FFI_THISCALL 1" >>confdefs.h
+printf "%s\n" "#define HAVE_FFI_THISCALL 1" >>confdefs.h
 
   fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdcall calling convention" >&5
-$as_echo_n "checking for stdcall calling convention... " >&6; }
-if ${ac_cv_ffi_stdcall+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for stdcall calling convention" >&5
+printf %s "checking for stdcall calling convention... " >&6; }
+if test ${ac_cv_ffi_stdcall+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ffi.h>
 int
-main ()
+main (void)
 {
 return FFI_STDCALL
   ;
@@ -33249,34 +35690,36 @@
 }
 
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_ffi_stdcall=yes
-else
+else $as_nop
   ac_cv_ffi_stdcall=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ffi_stdcall" >&5
-$as_echo "$ac_cv_ffi_stdcall" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ffi_stdcall" >&5
+printf "%s\n" "$ac_cv_ffi_stdcall" >&6; }
 
   if test "$ac_cv_ffi_stdcall" = yes; then
 
-$as_echo "#define HAVE_FFI_STDCALL 1" >>confdefs.h
+printf "%s\n" "#define HAVE_FFI_STDCALL 1" >>confdefs.h
 
   fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pascal calling convention" >&5
-$as_echo_n "checking for pascal calling convention... " >&6; }
-if ${ac_cv_ffi_pascal+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pascal calling convention" >&5
+printf %s "checking for pascal calling convention... " >&6; }
+if test ${ac_cv_ffi_pascal+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ffi.h>
 int
-main ()
+main (void)
 {
 return FFI_PASCAL
   ;
@@ -33284,34 +35727,36 @@
 }
 
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_ffi_pascal=yes
-else
+else $as_nop
   ac_cv_ffi_pascal=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ffi_pascal" >&5
-$as_echo "$ac_cv_ffi_pascal" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ffi_pascal" >&5
+printf "%s\n" "$ac_cv_ffi_pascal" >&6; }
 
   if test "$ac_cv_ffi_pascal" = yes; then
 
-$as_echo "#define HAVE_FFI_PASCAL 1" >>confdefs.h
+printf "%s\n" "#define HAVE_FFI_PASCAL 1" >>confdefs.h
 
   fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for register calling convention" >&5
-$as_echo_n "checking for register calling convention... " >&6; }
-if ${ac_cv_ffi_register+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for register calling convention" >&5
+printf %s "checking for register calling convention... " >&6; }
+if test ${ac_cv_ffi_register+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ffi.h>
 int
-main ()
+main (void)
 {
 return FFI_REGISTER
   ;
@@ -33319,34 +35764,36 @@
 }
 
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_ffi_register=yes
-else
+else $as_nop
   ac_cv_ffi_register=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ffi_register" >&5
-$as_echo "$ac_cv_ffi_register" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ffi_register" >&5
+printf "%s\n" "$ac_cv_ffi_register" >&6; }
 
   if test "$ac_cv_ffi_register" = yes; then
 
-$as_echo "#define HAVE_FFI_REGISTER 1" >>confdefs.h
+printf "%s\n" "#define HAVE_FFI_REGISTER 1" >>confdefs.h
 
   fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ms_cdecl calling convention" >&5
-$as_echo_n "checking for ms_cdecl calling convention... " >&6; }
-if ${ac_cv_ffi_ms_cdecl+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ms_cdecl calling convention" >&5
+printf %s "checking for ms_cdecl calling convention... " >&6; }
+if test ${ac_cv_ffi_ms_cdecl+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ffi.h>
 int
-main ()
+main (void)
 {
 return FFI_MS_CDECL
   ;
@@ -33354,34 +35801,36 @@
 }
 
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_ffi_ms_cdecl=yes
-else
+else $as_nop
   ac_cv_ffi_ms_cdecl=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ffi_ms_cdecl" >&5
-$as_echo "$ac_cv_ffi_ms_cdecl" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ffi_ms_cdecl" >&5
+printf "%s\n" "$ac_cv_ffi_ms_cdecl" >&6; }
 
   if test "$ac_cv_ffi_ms_cdecl" = yes; then
 
-$as_echo "#define HAVE_FFI_MS_CDECL 1" >>confdefs.h
+printf "%s\n" "#define HAVE_FFI_MS_CDECL 1" >>confdefs.h
 
   fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysv calling convention" >&5
-$as_echo_n "checking for sysv calling convention... " >&6; }
-if ${ac_cv_ffi_sysv+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sysv calling convention" >&5
+printf %s "checking for sysv calling convention... " >&6; }
+if test ${ac_cv_ffi_sysv+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ffi.h>
 int
-main ()
+main (void)
 {
 return FFI_SYSV
   ;
@@ -33389,20 +35838,21 @@
 }
 
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_ffi_sysv=yes
-else
+else $as_nop
   ac_cv_ffi_sysv=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ffi_sysv" >&5
-$as_echo "$ac_cv_ffi_sysv" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ffi_sysv" >&5
+printf "%s\n" "$ac_cv_ffi_sysv" >&6; }
 
   if test "$ac_cv_ffi_sysv" = yes; then
 
-$as_echo "#define HAVE_FFI_SYSV 1" >>confdefs.h
+printf "%s\n" "#define HAVE_FFI_SYSV 1" >>confdefs.h
 
   fi
 
@@ -33540,9 +35990,7 @@
 EOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define COMPILE_DL_FFI 1
-_ACEOF
+printf "%s\n" "#define COMPILE_DL_FFI 1" >>confdefs.h
 
     fi
   fi
@@ -33674,12 +36122,13 @@
 
 php_enable_fileinfo=yes
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fileinfo support" >&5
-$as_echo_n "checking for fileinfo support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fileinfo support" >&5
+printf %s "checking for fileinfo support... " >&6; }
 # Check whether --enable-fileinfo was given.
-if test "${enable_fileinfo+set}" = set; then :
+if test ${enable_fileinfo+y}
+then :
   enableval=$enable_fileinfo; PHP_FILEINFO=$enableval
-else
+else $as_nop
 
   PHP_FILEINFO=yes
   test "$PHP_ENABLE_ALL" && PHP_FILEINFO=$PHP_ENABLE_ALL
@@ -33709,8 +36158,8 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -33725,12 +36174,13 @@
     libmagic/readcdf.c libmagic/softmagic.c libmagic/der.c \
     libmagic/buffer.c libmagic/is_csv.c"
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for strcasestr" >&5
-$as_echo_n "checking for strcasestr... " >&6; }
-  if test "$cross_compiling" = yes; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: skipped, cross-compiling" >&5
-$as_echo "skipped, cross-compiling" >&6; }
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for strcasestr" >&5
+printf %s "checking for strcasestr... " >&6; }
+  if test "$cross_compiling" = yes
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: skipped, cross-compiling" >&5
+printf "%s\n" "skipped, cross-compiling" >&6; }
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -33760,17 +36210,18 @@
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
 
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-else
+else $as_nop
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: using libmagic strcasestr implementation" >&5
-$as_echo "$as_me: using libmagic strcasestr implementation" >&6;}
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: using libmagic strcasestr implementation" >&5
+printf "%s\n" "$as_me: using libmagic strcasestr implementation" >&6;}
     libmagic_sources="$libmagic_sources libmagic/strcasestr.c"
 
 fi
@@ -33913,9 +36364,7 @@
 EOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define COMPILE_DL_FILEINFO 1
-_ACEOF
+printf "%s\n" "#define COMPILE_DL_FILEINFO 1" >>confdefs.h
 
     fi
   fi
@@ -34042,17 +36491,18 @@
 
 
 
-  for ac_func in utimes strndup
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
+  ac_fn_c_check_func "$LINENO" "utimes" "ac_cv_func_utimes"
+if test "x$ac_cv_func_utimes" = xyes
+then :
+  printf "%s\n" "#define HAVE_UTIMES 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "strndup" "ac_cv_func_strndup"
+if test "x$ac_cv_func_strndup" = xyes
+then :
+  printf "%s\n" "#define HAVE_STRNDUP 1" >>confdefs.h
 
 fi
-done
 
 
 
@@ -34069,12 +36519,13 @@
 
 php_enable_filter=yes
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable input filter support" >&5
-$as_echo_n "checking whether to enable input filter support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable input filter support" >&5
+printf %s "checking whether to enable input filter support... " >&6; }
 # Check whether --enable-filter was given.
-if test "${enable_filter+set}" = set; then :
+if test ${enable_filter+y}
+then :
   enableval=$enable_filter; PHP_FILTER=$enableval
-else
+else $as_nop
 
   PHP_FILTER=yes
   test "$PHP_ENABLE_ALL" && PHP_FILTER=$PHP_ENABLE_ALL
@@ -34104,8 +36555,8 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -34245,9 +36696,7 @@
 EOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define COMPILE_DL_FILTER 1
-_ACEOF
+printf "%s\n" "#define COMPILE_DL_FILTER 1" >>confdefs.h
 
     fi
   fi
@@ -34417,12 +36866,13 @@
 
 php_enable_ftp=no
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable FTP support" >&5
-$as_echo_n "checking whether to enable FTP support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable FTP support" >&5
+printf %s "checking whether to enable FTP support... " >&6; }
 # Check whether --enable-ftp was given.
-if test "${enable_ftp+set}" = set; then :
+if test ${enable_ftp+y}
+then :
   enableval=$enable_ftp; PHP_FTP=$enableval
-else
+else $as_nop
 
   PHP_FTP=no
   test "$PHP_ENABLE_ALL" && PHP_FTP=$PHP_ENABLE_ALL
@@ -34452,8 +36902,8 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -34461,13 +36911,14 @@
 
 php_with_openssl_dir=no
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to explicitly enable FTP SSL support" >&5
-$as_echo_n "checking whether to explicitly enable FTP SSL support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to explicitly enable FTP SSL support" >&5
+printf %s "checking whether to explicitly enable FTP SSL support... " >&6; }
 
 # Check whether --with-openssl-dir was given.
-if test "${with_openssl_dir+set}" = set; then :
+if test ${with_openssl_dir+y}
+then :
   withval=$with_openssl_dir; PHP_OPENSSL_DIR=$withval
-else
+else $as_nop
 
   PHP_OPENSSL_DIR=no
 
@@ -34476,15 +36927,15 @@
 
 
 ext_output=$PHP_OPENSSL_DIR
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
 
 if test "$PHP_FTP" = "yes"; then
 
-$as_echo "#define HAVE_FTP 1" >>confdefs.h
+printf "%s\n" "#define HAVE_FTP 1" >>confdefs.h
 
 
   ext_builddir=ext/ftp
@@ -34620,9 +37071,7 @@
 EOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define COMPILE_DL_FTP 1
-_ACEOF
+printf "%s\n" "#define COMPILE_DL_FTP 1" >>confdefs.h
 
     fi
   fi
@@ -34752,17 +37201,17 @@
 
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for openssl >= 1.0.2" >&5
-$as_echo_n "checking for openssl >= 1.0.2... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for openssl >= 1.0.2" >&5
+printf %s "checking for openssl >= 1.0.2... " >&6; }
 
 if test -n "$OPENSSL_CFLAGS"; then
     pkg_cv_OPENSSL_CFLAGS="$OPENSSL_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 1.0.2\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 1.0.2\""; } >&5
   ($PKG_CONFIG --exists --print-errors "openssl >= 1.0.2") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_OPENSSL_CFLAGS=`$PKG_CONFIG --cflags "openssl >= 1.0.2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -34776,10 +37225,10 @@
     pkg_cv_OPENSSL_LIBS="$OPENSSL_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 1.0.2\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 1.0.2\""; } >&5
   ($PKG_CONFIG --exists --print-errors "openssl >= 1.0.2") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_OPENSSL_LIBS=`$PKG_CONFIG --libs "openssl >= 1.0.2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -34793,8 +37242,8 @@
 
 
 if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -34820,10 +37269,10 @@
 and OPENSSL_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -34837,8 +37286,8 @@
 else
 	OPENSSL_CFLAGS=$pkg_cv_OPENSSL_CFLAGS
 	OPENSSL_LIBS=$pkg_cv_OPENSSL_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 	found_openssl=yes
 fi
 
@@ -34990,7 +37439,7 @@
   PHP_VAR_SUBST="$PHP_VAR_SUBST FTP_SHARED_LIBADD"
 
 
-$as_echo "#define HAVE_FTP_SSL 1" >>confdefs.h
+printf "%s\n" "#define HAVE_FTP_SSL 1" >>confdefs.h
 
   fi
 fi
@@ -35001,12 +37450,13 @@
 
 php_enable_gd=no
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GD support" >&5
-$as_echo_n "checking for GD support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GD support" >&5
+printf %s "checking for GD support... " >&6; }
 # Check whether --enable-gd was given.
-if test "${enable_gd+set}" = set; then :
+if test ${enable_gd+y}
+then :
   enableval=$enable_gd; PHP_GD=$enableval
-else
+else $as_nop
 
   PHP_GD=no
   test "$PHP_ENABLE_ALL" && PHP_GD=$PHP_ENABLE_ALL
@@ -35036,8 +37486,8 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -35045,13 +37495,14 @@
 
 php_with_external_gd=no
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for external libgd" >&5
-$as_echo_n "checking for external libgd... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for external libgd" >&5
+printf %s "checking for external libgd... " >&6; }
 
 # Check whether --with-external-gd was given.
-if test "${with_external_gd+set}" = set; then :
+if test ${with_external_gd+y}
+then :
   withval=$with_external_gd; PHP_EXTERNAL_GD=$withval
-else
+else $as_nop
 
   PHP_EXTERNAL_GD=no
 
@@ -35060,8 +37511,8 @@
 
 
 ext_output=$PHP_EXTERNAL_GD
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -35070,13 +37521,14 @@
 
 php_with_avif=no
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libavif" >&5
-$as_echo_n "checking for libavif... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libavif" >&5
+printf %s "checking for libavif... " >&6; }
 
 # Check whether --with-avif was given.
-if test "${with_avif+set}" = set; then :
+if test ${with_avif+y}
+then :
   withval=$with_avif; PHP_AVIF=$withval
-else
+else $as_nop
 
   PHP_AVIF=no
 
@@ -35085,8 +37537,8 @@
 
 
 ext_output=$PHP_AVIF
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -35096,13 +37548,14 @@
 
 php_with_webp=no
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libwebp" >&5
-$as_echo_n "checking for libwebp... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libwebp" >&5
+printf %s "checking for libwebp... " >&6; }
 
 # Check whether --with-webp was given.
-if test "${with_webp+set}" = set; then :
+if test ${with_webp+y}
+then :
   withval=$with_webp; PHP_WEBP=$withval
-else
+else $as_nop
 
   PHP_WEBP=no
 
@@ -35111,8 +37564,8 @@
 
 
 ext_output=$PHP_WEBP
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -35122,13 +37575,14 @@
 
 php_with_jpeg=no
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libjpeg" >&5
-$as_echo_n "checking for libjpeg... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libjpeg" >&5
+printf %s "checking for libjpeg... " >&6; }
 
 # Check whether --with-jpeg was given.
-if test "${with_jpeg+set}" = set; then :
+if test ${with_jpeg+y}
+then :
   withval=$with_jpeg; PHP_JPEG=$withval
-else
+else $as_nop
 
   PHP_JPEG=no
 
@@ -35137,8 +37591,8 @@
 
 
 ext_output=$PHP_JPEG
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -35147,13 +37601,14 @@
 
 php_with_xpm=no
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libXpm" >&5
-$as_echo_n "checking for libXpm... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libXpm" >&5
+printf %s "checking for libXpm... " >&6; }
 
 # Check whether --with-xpm was given.
-if test "${with_xpm+set}" = set; then :
+if test ${with_xpm+y}
+then :
   withval=$with_xpm; PHP_XPM=$withval
-else
+else $as_nop
 
   PHP_XPM=no
 
@@ -35162,8 +37617,8 @@
 
 
 ext_output=$PHP_XPM
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -35171,13 +37626,14 @@
 
 php_with_freetype=no
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FreeType 2" >&5
-$as_echo_n "checking for FreeType 2... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for FreeType 2" >&5
+printf %s "checking for FreeType 2... " >&6; }
 
 # Check whether --with-freetype was given.
-if test "${with_freetype+set}" = set; then :
+if test ${with_freetype+y}
+then :
   withval=$with_freetype; PHP_FREETYPE=$withval
-else
+else $as_nop
 
   PHP_FREETYPE=no
 
@@ -35186,8 +37642,8 @@
 
 
 ext_output=$PHP_FREETYPE
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -35195,12 +37651,13 @@
 
 php_enable_gd_jis_conv=no
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable JIS-mapped Japanese font support in GD" >&5
-$as_echo_n "checking whether to enable JIS-mapped Japanese font support in GD... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable JIS-mapped Japanese font support in GD" >&5
+printf %s "checking whether to enable JIS-mapped Japanese font support in GD... " >&6; }
 # Check whether --enable-gd-jis-conv was given.
-if test "${enable_gd_jis_conv+set}" = set; then :
+if test ${enable_gd_jis_conv+y}
+then :
   enableval=$enable_gd_jis_conv; PHP_GD_JIS_CONV=$enableval
-else
+else $as_nop
 
   PHP_GD_JIS_CONV=no
 
@@ -35209,8 +37666,8 @@
 
 
 ext_output=$PHP_GD_JIS_CONV
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -35250,46 +37707,47 @@
                   libgd/gd_transform.c libgd/gd_crop.c libgd/gd_interpolation.c libgd/gd_matrix.c \
                   libgd/gd_bmp.c libgd/gd_tga.c"
 
-    for ac_func in fabsf floorf
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
+    ac_fn_c_check_func "$LINENO" "fabsf" "ac_cv_func_fabsf"
+if test "x$ac_cv_func_fabsf" = xyes
+then :
+  printf "%s\n" "#define HAVE_FABSF 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "floorf" "ac_cv_func_floorf"
+if test "x$ac_cv_func_floorf" = xyes
+then :
+  printf "%s\n" "#define HAVE_FLOORF 1" >>confdefs.h
 
 fi
-done
 
 
 
-$as_echo "#define HAVE_GD_BUNDLED 1" >>confdefs.h
+printf "%s\n" "#define HAVE_GD_BUNDLED 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_GD_PNG 1" >>confdefs.h
+printf "%s\n" "#define HAVE_GD_PNG 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_GD_BMP 1" >>confdefs.h
+printf "%s\n" "#define HAVE_GD_BMP 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_GD_TGA 1" >>confdefs.h
+printf "%s\n" "#define HAVE_GD_TGA 1" >>confdefs.h
 
 
 
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for zlib" >&5
-$as_echo_n "checking for zlib... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for zlib" >&5
+printf %s "checking for zlib... " >&6; }
 
 if test -n "$ZLIB_CFLAGS"; then
     pkg_cv_ZLIB_CFLAGS="$ZLIB_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zlib\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zlib\""; } >&5
   ($PKG_CONFIG --exists --print-errors "zlib") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_ZLIB_CFLAGS=`$PKG_CONFIG --cflags "zlib" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -35303,10 +37761,10 @@
     pkg_cv_ZLIB_LIBS="$ZLIB_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zlib\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zlib\""; } >&5
   ($PKG_CONFIG --exists --print-errors "zlib") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_ZLIB_LIBS=`$PKG_CONFIG --libs "zlib" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -35320,8 +37778,8 @@
 
 
 if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -35347,10 +37805,10 @@
 and ZLIB_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -35364,8 +37822,8 @@
 else
 	ZLIB_CFLAGS=$pkg_cv_ZLIB_CFLAGS
 	ZLIB_LIBS=$pkg_cv_ZLIB_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
 fi
 
@@ -35511,17 +37969,17 @@
 
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpng" >&5
-$as_echo_n "checking for libpng... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libpng" >&5
+printf %s "checking for libpng... " >&6; }
 
 if test -n "$PNG_CFLAGS"; then
     pkg_cv_PNG_CFLAGS="$PNG_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpng\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpng\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libpng") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_PNG_CFLAGS=`$PKG_CONFIG --cflags "libpng" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -35535,10 +37993,10 @@
     pkg_cv_PNG_LIBS="$PNG_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpng\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpng\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libpng") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_PNG_LIBS=`$PKG_CONFIG --libs "libpng" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -35552,8 +38010,8 @@
 
 
 if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -35579,10 +38037,10 @@
 and PNG_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -35596,8 +38054,8 @@
 else
 	PNG_CFLAGS=$pkg_cv_PNG_CFLAGS
 	PNG_LIBS=$pkg_cv_PNG_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
 fi
 
@@ -35740,24 +38198,24 @@
   done
 
 
-$as_echo "#define HAVE_LIBPNG 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBPNG 1" >>confdefs.h
 
 
 
   if test "$PHP_AVIF" != "no"; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libavif >= 0.8.2" >&5
-$as_echo_n "checking for libavif >= 0.8.2... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libavif >= 0.8.2" >&5
+printf %s "checking for libavif >= 0.8.2... " >&6; }
 
 if test -n "$AVIF_CFLAGS"; then
     pkg_cv_AVIF_CFLAGS="$AVIF_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavif >= 0.8.2\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavif >= 0.8.2\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libavif >= 0.8.2") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_AVIF_CFLAGS=`$PKG_CONFIG --cflags "libavif >= 0.8.2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -35771,10 +38229,10 @@
     pkg_cv_AVIF_LIBS="$AVIF_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavif >= 0.8.2\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavif >= 0.8.2\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libavif >= 0.8.2") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_AVIF_LIBS=`$PKG_CONFIG --libs "libavif >= 0.8.2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -35788,8 +38246,8 @@
 
 
 if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -35815,10 +38273,10 @@
 and AVIF_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -35832,8 +38290,8 @@
 else
 	AVIF_CFLAGS=$pkg_cv_AVIF_CFLAGS
 	AVIF_LIBS=$pkg_cv_AVIF_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
 fi
 
@@ -35976,10 +38434,10 @@
   done
 
 
-$as_echo "#define HAVE_LIBAVIF 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBAVIF 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_GD_AVIF 1" >>confdefs.h
+printf "%s\n" "#define HAVE_GD_AVIF 1" >>confdefs.h
 
   fi
 
@@ -35987,17 +38445,17 @@
   if test "$PHP_WEBP" != "no"; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libwebp >= 0.2.0" >&5
-$as_echo_n "checking for libwebp >= 0.2.0... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libwebp >= 0.2.0" >&5
+printf %s "checking for libwebp >= 0.2.0... " >&6; }
 
 if test -n "$WEBP_CFLAGS"; then
     pkg_cv_WEBP_CFLAGS="$WEBP_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwebp >= 0.2.0\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwebp >= 0.2.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libwebp >= 0.2.0") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_WEBP_CFLAGS=`$PKG_CONFIG --cflags "libwebp >= 0.2.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -36011,10 +38469,10 @@
     pkg_cv_WEBP_LIBS="$WEBP_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwebp >= 0.2.0\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwebp >= 0.2.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libwebp >= 0.2.0") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_WEBP_LIBS=`$PKG_CONFIG --libs "libwebp >= 0.2.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -36028,8 +38486,8 @@
 
 
 if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -36055,10 +38513,10 @@
 and WEBP_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -36072,8 +38530,8 @@
 else
 	WEBP_CFLAGS=$pkg_cv_WEBP_CFLAGS
 	WEBP_LIBS=$pkg_cv_WEBP_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
 fi
 
@@ -36216,10 +38674,10 @@
   done
 
 
-$as_echo "#define HAVE_LIBWEBP 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBWEBP 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_GD_WEBP 1" >>confdefs.h
+printf "%s\n" "#define HAVE_GD_WEBP 1" >>confdefs.h
 
   fi
 
@@ -36227,17 +38685,17 @@
   if test "$PHP_JPEG" != "no"; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libjpeg" >&5
-$as_echo_n "checking for libjpeg... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libjpeg" >&5
+printf %s "checking for libjpeg... " >&6; }
 
 if test -n "$JPEG_CFLAGS"; then
     pkg_cv_JPEG_CFLAGS="$JPEG_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libjpeg\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libjpeg\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libjpeg") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_JPEG_CFLAGS=`$PKG_CONFIG --cflags "libjpeg" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -36251,10 +38709,10 @@
     pkg_cv_JPEG_LIBS="$JPEG_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libjpeg\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libjpeg\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libjpeg") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_JPEG_LIBS=`$PKG_CONFIG --libs "libjpeg" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -36268,8 +38726,8 @@
 
 
 if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -36295,10 +38753,10 @@
 and JPEG_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -36312,8 +38770,8 @@
 else
 	JPEG_CFLAGS=$pkg_cv_JPEG_CFLAGS
 	JPEG_LIBS=$pkg_cv_JPEG_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
 fi
 
@@ -36456,10 +38914,10 @@
   done
 
 
-$as_echo "#define HAVE_LIBJPEG 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBJPEG 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_GD_JPG 1" >>confdefs.h
+printf "%s\n" "#define HAVE_GD_JPG 1" >>confdefs.h
 
   fi
 
@@ -36467,17 +38925,17 @@
   if test "$PHP_XPM" != "no"; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xpm" >&5
-$as_echo_n "checking for xpm... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for xpm" >&5
+printf %s "checking for xpm... " >&6; }
 
 if test -n "$XPM_CFLAGS"; then
     pkg_cv_XPM_CFLAGS="$XPM_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xpm\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xpm\""; } >&5
   ($PKG_CONFIG --exists --print-errors "xpm") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_XPM_CFLAGS=`$PKG_CONFIG --cflags "xpm" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -36491,10 +38949,10 @@
     pkg_cv_XPM_LIBS="$XPM_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xpm\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xpm\""; } >&5
   ($PKG_CONFIG --exists --print-errors "xpm") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_XPM_LIBS=`$PKG_CONFIG --libs "xpm" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -36508,8 +38966,8 @@
 
 
 if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -36535,10 +38993,10 @@
 and XPM_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -36552,8 +39010,8 @@
 else
 	XPM_CFLAGS=$pkg_cv_XPM_CFLAGS
 	XPM_LIBS=$pkg_cv_XPM_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
 fi
 
@@ -36696,10 +39154,10 @@
   done
 
 
-$as_echo "#define HAVE_XPM 1" >>confdefs.h
+printf "%s\n" "#define HAVE_XPM 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_GD_XPM 1" >>confdefs.h
+printf "%s\n" "#define HAVE_GD_XPM 1" >>confdefs.h
 
   fi
 
@@ -36707,17 +39165,17 @@
   if test "$PHP_FREETYPE" != "no"; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype2" >&5
-$as_echo_n "checking for freetype2... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for freetype2" >&5
+printf %s "checking for freetype2... " >&6; }
 
 if test -n "$FREETYPE2_CFLAGS"; then
     pkg_cv_FREETYPE2_CFLAGS="$FREETYPE2_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"freetype2\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"freetype2\""; } >&5
   ($PKG_CONFIG --exists --print-errors "freetype2") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_FREETYPE2_CFLAGS=`$PKG_CONFIG --cflags "freetype2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -36731,10 +39189,10 @@
     pkg_cv_FREETYPE2_LIBS="$FREETYPE2_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"freetype2\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"freetype2\""; } >&5
   ($PKG_CONFIG --exists --print-errors "freetype2") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_FREETYPE2_LIBS=`$PKG_CONFIG --libs "freetype2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -36748,8 +39206,8 @@
 
 
 if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -36775,10 +39233,10 @@
 and FREETYPE2_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -36792,8 +39250,8 @@
 else
 	FREETYPE2_CFLAGS=$pkg_cv_FREETYPE2_CFLAGS
 	FREETYPE2_LIBS=$pkg_cv_FREETYPE2_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 	FREETYPE2_FOUND=true
 fi
 
@@ -36937,20 +39395,20 @@
   done
 
 
-$as_echo "#define HAVE_LIBFREETYPE 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBFREETYPE 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_GD_FREETYPE 1" >>confdefs.h
+printf "%s\n" "#define HAVE_GD_FREETYPE 1" >>confdefs.h
 
   fi
 
 
   if test "$PHP_GD_JIS_CONV" = "yes"; then
 
-$as_echo "#define USE_GD_JISX0208 1" >>confdefs.h
+printf "%s\n" "#define USE_GD_JISX0208 1" >>confdefs.h
 
 
-$as_echo "#define JISX0208 1" >>confdefs.h
+printf "%s\n" "#define JISX0208 1" >>confdefs.h
 
   fi
 
@@ -37089,9 +39547,7 @@
 EOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define COMPILE_DL_GD 1
-_ACEOF
+printf "%s\n" "#define COMPILE_DL_GD 1" >>confdefs.h
 
     fi
   fi
@@ -37234,12 +39690,13 @@
     }
 
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
 
     LIBS=$old_LIBS
 
 
-else
+else $as_nop
 
     LIBS=$old_LIBS
 
@@ -37247,7 +39704,7 @@
 
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 
 
@@ -37255,17 +39712,17 @@
     extra_sources="gd_compat.c"
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdlib >= 2.1.0" >&5
-$as_echo_n "checking for gdlib >= 2.1.0... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gdlib >= 2.1.0" >&5
+printf %s "checking for gdlib >= 2.1.0... " >&6; }
 
 if test -n "$GDLIB_CFLAGS"; then
     pkg_cv_GDLIB_CFLAGS="$GDLIB_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gdlib >= 2.1.0\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gdlib >= 2.1.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gdlib >= 2.1.0") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_GDLIB_CFLAGS=`$PKG_CONFIG --cflags "gdlib >= 2.1.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -37279,10 +39736,10 @@
     pkg_cv_GDLIB_LIBS="$GDLIB_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gdlib >= 2.1.0\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gdlib >= 2.1.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gdlib >= 2.1.0") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_GDLIB_LIBS=`$PKG_CONFIG --libs "gdlib >= 2.1.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -37296,8 +39753,8 @@
 
 
 if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -37323,10 +39780,10 @@
 and GDLIB_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -37340,8 +39797,8 @@
 else
 	GDLIB_CFLAGS=$pkg_cv_GDLIB_CFLAGS
 	GDLIB_LIBS=$pkg_cv_GDLIB_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
 fi
 
@@ -37484,7 +39941,7 @@
   done
 
 
-$as_echo "#define HAVE_LIBGD 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBGD 1" >>confdefs.h
 
 
 
@@ -37492,20 +39949,21 @@
   LIBS="${LIBS} ${GD_SHARED_LIBADD}"
   old_CFLAGS="${CFLAGS}"
   CFLAGS="${CFLAGS} ${GDLIB_CFLAGS}"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working gdImageCreateFromPng in libgd" >&5
-$as_echo_n "checking for working gdImageCreateFromPng in libgd... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working gdImageCreateFromPng in libgd" >&5
+printf %s "checking for working gdImageCreateFromPng in libgd... " >&6; }
   ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-  if test "$cross_compiling" = yes; then :
+  if test "$cross_compiling" = yes
+then :
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -37527,18 +39985,19 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-$as_echo "#define HAVE_GD_PNG 1" >>confdefs.h
+printf "%s\n" "#define HAVE_GD_PNG 1" >>confdefs.h
 
 
-else
+else $as_nop
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -37559,20 +40018,21 @@
   LIBS="${LIBS} ${GD_SHARED_LIBADD}"
   old_CFLAGS="${CFLAGS}"
   CFLAGS="${CFLAGS} ${GDLIB_CFLAGS}"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working gdImageCreateFromAvif in libgd" >&5
-$as_echo_n "checking for working gdImageCreateFromAvif in libgd... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working gdImageCreateFromAvif in libgd" >&5
+printf %s "checking for working gdImageCreateFromAvif in libgd... " >&6; }
   ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-  if test "$cross_compiling" = yes; then :
+  if test "$cross_compiling" = yes
+then :
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -37594,18 +40054,19 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-$as_echo "#define HAVE_GD_AVIF 1" >>confdefs.h
+printf "%s\n" "#define HAVE_GD_AVIF 1" >>confdefs.h
 
 
-else
+else $as_nop
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -37626,20 +40087,21 @@
   LIBS="${LIBS} ${GD_SHARED_LIBADD}"
   old_CFLAGS="${CFLAGS}"
   CFLAGS="${CFLAGS} ${GDLIB_CFLAGS}"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working gdImageCreateFromWebp in libgd" >&5
-$as_echo_n "checking for working gdImageCreateFromWebp in libgd... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working gdImageCreateFromWebp in libgd" >&5
+printf %s "checking for working gdImageCreateFromWebp in libgd... " >&6; }
   ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-  if test "$cross_compiling" = yes; then :
+  if test "$cross_compiling" = yes
+then :
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -37661,18 +40123,19 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-$as_echo "#define HAVE_GD_WEBP 1" >>confdefs.h
+printf "%s\n" "#define HAVE_GD_WEBP 1" >>confdefs.h
 
 
-else
+else $as_nop
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -37693,20 +40156,21 @@
   LIBS="${LIBS} ${GD_SHARED_LIBADD}"
   old_CFLAGS="${CFLAGS}"
   CFLAGS="${CFLAGS} ${GDLIB_CFLAGS}"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working gdImageCreateFromJpeg in libgd" >&5
-$as_echo_n "checking for working gdImageCreateFromJpeg in libgd... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working gdImageCreateFromJpeg in libgd" >&5
+printf %s "checking for working gdImageCreateFromJpeg in libgd... " >&6; }
   ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-  if test "$cross_compiling" = yes; then :
+  if test "$cross_compiling" = yes
+then :
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -37728,18 +40192,19 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-$as_echo "#define HAVE_GD_JPG 1" >>confdefs.h
+printf "%s\n" "#define HAVE_GD_JPG 1" >>confdefs.h
 
 
-else
+else $as_nop
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -37760,20 +40225,21 @@
   LIBS="${LIBS} ${GD_SHARED_LIBADD}"
   old_CFLAGS="${CFLAGS}"
   CFLAGS="${CFLAGS} ${GDLIB_CFLAGS}"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working gdImageCreateFromXpm in libgd" >&5
-$as_echo_n "checking for working gdImageCreateFromXpm in libgd... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working gdImageCreateFromXpm in libgd" >&5
+printf %s "checking for working gdImageCreateFromXpm in libgd... " >&6; }
   ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-  if test "$cross_compiling" = yes; then :
+  if test "$cross_compiling" = yes
+then :
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -37795,18 +40261,19 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-$as_echo "#define HAVE_GD_XPM 1" >>confdefs.h
+printf "%s\n" "#define HAVE_GD_XPM 1" >>confdefs.h
 
 
-else
+else $as_nop
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -37827,20 +40294,21 @@
   LIBS="${LIBS} ${GD_SHARED_LIBADD}"
   old_CFLAGS="${CFLAGS}"
   CFLAGS="${CFLAGS} ${GDLIB_CFLAGS}"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working gdImageCreateFromBmp in libgd" >&5
-$as_echo_n "checking for working gdImageCreateFromBmp in libgd... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working gdImageCreateFromBmp in libgd" >&5
+printf %s "checking for working gdImageCreateFromBmp in libgd... " >&6; }
   ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-  if test "$cross_compiling" = yes; then :
+  if test "$cross_compiling" = yes
+then :
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -37862,18 +40330,19 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-$as_echo "#define HAVE_GD_BMP 1" >>confdefs.h
+printf "%s\n" "#define HAVE_GD_BMP 1" >>confdefs.h
 
 
-else
+else $as_nop
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -37894,20 +40363,21 @@
   LIBS="${LIBS} ${GD_SHARED_LIBADD}"
   old_CFLAGS="${CFLAGS}"
   CFLAGS="${CFLAGS} ${GDLIB_CFLAGS}"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working gdImageCreateFromTga in libgd" >&5
-$as_echo_n "checking for working gdImageCreateFromTga in libgd... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working gdImageCreateFromTga in libgd" >&5
+printf %s "checking for working gdImageCreateFromTga in libgd... " >&6; }
   ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-  if test "$cross_compiling" = yes; then :
+  if test "$cross_compiling" = yes
+then :
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -37929,18 +40399,19 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-$as_echo "#define HAVE_GD_TGA 1" >>confdefs.h
+printf "%s\n" "#define HAVE_GD_TGA 1" >>confdefs.h
 
 
-else
+else $as_nop
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -38061,11 +40532,12 @@
     esac
   done
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdFontCacheShutdown in -lgd" >&5
-$as_echo_n "checking for gdFontCacheShutdown in -lgd... " >&6; }
-if ${ac_cv_lib_gd_gdFontCacheShutdown+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gdFontCacheShutdown in -lgd" >&5
+printf %s "checking for gdFontCacheShutdown in -lgd... " >&6; }
+if test ${ac_cv_lib_gd_gdFontCacheShutdown+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgd  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -38074,38 +40546,37 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char gdFontCacheShutdown ();
 int
-main ()
+main (void)
 {
 return gdFontCacheShutdown ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_gd_gdFontCacheShutdown=yes
-else
+else $as_nop
   ac_cv_lib_gd_gdFontCacheShutdown=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdFontCacheShutdown" >&5
-$as_echo "$ac_cv_lib_gd_gdFontCacheShutdown" >&6; }
-if test "x$ac_cv_lib_gd_gdFontCacheShutdown" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdFontCacheShutdown" >&5
+printf "%s\n" "$ac_cv_lib_gd_gdFontCacheShutdown" >&6; }
+if test "x$ac_cv_lib_gd_gdFontCacheShutdown" = xyes
+then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
-$as_echo "#define HAVE_GD_FREETYPE 1" >>confdefs.h
+printf "%s\n" "#define HAVE_GD_FREETYPE 1" >>confdefs.h
 
 
-else
+else $as_nop
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -38219,11 +40690,12 @@
     esac
   done
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdVersionString in -lgd" >&5
-$as_echo_n "checking for gdVersionString in -lgd... " >&6; }
-if ${ac_cv_lib_gd_gdVersionString+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gdVersionString in -lgd" >&5
+printf %s "checking for gdVersionString in -lgd... " >&6; }
+if test ${ac_cv_lib_gd_gdVersionString+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgd  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -38232,38 +40704,37 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char gdVersionString ();
 int
-main ()
+main (void)
 {
 return gdVersionString ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_gd_gdVersionString=yes
-else
+else $as_nop
   ac_cv_lib_gd_gdVersionString=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdVersionString" >&5
-$as_echo "$ac_cv_lib_gd_gdVersionString" >&6; }
-if test "x$ac_cv_lib_gd_gdVersionString" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdVersionString" >&5
+printf "%s\n" "$ac_cv_lib_gd_gdVersionString" >&6; }
+if test "x$ac_cv_lib_gd_gdVersionString" = xyes
+then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
-$as_echo "#define HAVE_GD_LIBVERSION 1" >>confdefs.h
+printf "%s\n" "#define HAVE_GD_LIBVERSION 1" >>confdefs.h
 
 
-else
+else $as_nop
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -38377,11 +40848,12 @@
     esac
   done
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImageGetInterpolationMethod in -lgd" >&5
-$as_echo_n "checking for gdImageGetInterpolationMethod in -lgd... " >&6; }
-if ${ac_cv_lib_gd_gdImageGetInterpolationMethod+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gdImageGetInterpolationMethod in -lgd" >&5
+printf %s "checking for gdImageGetInterpolationMethod in -lgd... " >&6; }
+if test ${ac_cv_lib_gd_gdImageGetInterpolationMethod+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgd  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -38390,38 +40862,37 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char gdImageGetInterpolationMethod ();
 int
-main ()
+main (void)
 {
 return gdImageGetInterpolationMethod ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_gd_gdImageGetInterpolationMethod=yes
-else
+else $as_nop
   ac_cv_lib_gd_gdImageGetInterpolationMethod=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdImageGetInterpolationMethod" >&5
-$as_echo "$ac_cv_lib_gd_gdImageGetInterpolationMethod" >&6; }
-if test "x$ac_cv_lib_gd_gdImageGetInterpolationMethod" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdImageGetInterpolationMethod" >&5
+printf "%s\n" "$ac_cv_lib_gd_gdImageGetInterpolationMethod" >&6; }
+if test "x$ac_cv_lib_gd_gdImageGetInterpolationMethod" = xyes
+then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
-$as_echo "#define HAVE_GD_GET_INTERPOLATION 1" >>confdefs.h
+printf "%s\n" "#define HAVE_GD_GET_INTERPOLATION 1" >>confdefs.h
 
 
-else
+else $as_nop
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -38566,9 +41037,7 @@
 EOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define COMPILE_DL_GD 1
-_ACEOF
+printf "%s\n" "#define COMPILE_DL_GD 1" >>confdefs.h
 
     fi
   fi
@@ -38795,11 +41264,12 @@
     esac
   done
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImageCreate in -lgd" >&5
-$as_echo_n "checking for gdImageCreate in -lgd... " >&6; }
-if ${ac_cv_lib_gd_gdImageCreate+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gdImageCreate in -lgd" >&5
+printf %s "checking for gdImageCreate in -lgd... " >&6; }
+if test ${ac_cv_lib_gd_gdImageCreate+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgd  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -38808,36 +41278,35 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char gdImageCreate ();
 int
-main ()
+main (void)
 {
 return gdImageCreate ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_gd_gdImageCreate=yes
-else
+else $as_nop
   ac_cv_lib_gd_gdImageCreate=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdImageCreate" >&5
-$as_echo "$ac_cv_lib_gd_gdImageCreate" >&6; }
-if test "x$ac_cv_lib_gd_gdImageCreate" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdImageCreate" >&5
+printf "%s\n" "$ac_cv_lib_gd_gdImageCreate" >&6; }
+if test "x$ac_cv_lib_gd_gdImageCreate" = xyes
+then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-else
+else $as_nop
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -38888,13 +41357,14 @@
 
 php_with_gettext=no
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext support" >&5
-$as_echo_n "checking for GNU gettext support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU gettext support" >&5
+printf %s "checking for GNU gettext support... " >&6; }
 
 # Check whether --with-gettext was given.
-if test "${with_gettext+set}" = set; then :
+if test ${with_gettext+y}
+then :
   withval=$with_gettext; PHP_GETTEXT=$withval
-else
+else $as_nop
 
   PHP_GETTEXT=no
   test "$PHP_ENABLE_ALL" && PHP_GETTEXT=$PHP_ENABLE_ALL
@@ -38924,8 +41394,8 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -38944,11 +41414,12 @@
 
   O_LDFLAGS=$LDFLAGS
   LDFLAGS="$LDFLAGS -L$GETTEXT_LIBDIR"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5
-$as_echo_n "checking for bindtextdomain in -lintl... " >&6; }
-if ${ac_cv_lib_intl_bindtextdomain+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5
+printf %s "checking for bindtextdomain in -lintl... " >&6; }
+if test ${ac_cv_lib_intl_bindtextdomain+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lintl  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -38957,41 +41428,41 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char bindtextdomain ();
 int
-main ()
+main (void)
 {
 return bindtextdomain ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_intl_bindtextdomain=yes
-else
+else $as_nop
   ac_cv_lib_intl_bindtextdomain=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5
-$as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; }
-if test "x$ac_cv_lib_intl_bindtextdomain" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5
+printf "%s\n" "$ac_cv_lib_intl_bindtextdomain" >&6; }
+if test "x$ac_cv_lib_intl_bindtextdomain" = xyes
+then :
 
     GETTEXT_LIBS=intl
     GETTEXT_CHECK_IN_LIB=intl
 
-else
+else $as_nop
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lc" >&5
-$as_echo_n "checking for bindtextdomain in -lc... " >&6; }
-if ${ac_cv_lib_c_bindtextdomain+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lc" >&5
+printf %s "checking for bindtextdomain in -lc... " >&6; }
+if test ${ac_cv_lib_c_bindtextdomain+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lc  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -39000,35 +41471,44 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char bindtextdomain ();
 int
-main ()
+main (void)
 {
 return bindtextdomain ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_c_bindtextdomain=yes
-else
+else $as_nop
   ac_cv_lib_c_bindtextdomain=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_bindtextdomain" >&5
-$as_echo "$ac_cv_lib_c_bindtextdomain" >&6; }
-if test "x$ac_cv_lib_c_bindtextdomain" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_bindtextdomain" >&5
+printf "%s\n" "$ac_cv_lib_c_bindtextdomain" >&6; }
+if test "x$ac_cv_lib_c_bindtextdomain" = xyes
+then :
 
       GETTEXT_LIBS=
       GETTEXT_CHECK_IN_LIB=c
 
-else
+                                    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: symlinking en_US.UTF-8 messages to en_US in case you are on musl" >&5
+printf "%s\n" "$as_me: symlinking en_US.UTF-8 messages to en_US in case you are on musl" >&6;}
+      _linkdest="${srcdir%/}"/ext/gettext/tests/locale/en_US
+      if test ! -e "${_linkdest}"
+then :
+
+        ln -s en_US.UTF-8 "${_linkdest}"
+
+fi
+
+else $as_nop
 
       as_fn_error $? "Unable to find required gettext library" "$LINENO" 5
 
@@ -39040,7 +41520,7 @@
 
 
 
-$as_echo "#define HAVE_LIBINTL 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBINTL 1" >>confdefs.h
 
 
   ext_builddir=ext/gettext
@@ -39176,9 +41656,7 @@
 EOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define COMPILE_DL_GETTEXT 1
-_ACEOF
+printf "%s\n" "#define COMPILE_DL_GETTEXT 1" >>confdefs.h
 
     fi
   fi
@@ -39335,12 +41813,13 @@
   fi
 
 
-  as_ac_Lib=`$as_echo "ac_cv_lib_$GETTEXT_CHECK_IN_LIB''_ngettext" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -l$GETTEXT_CHECK_IN_LIB" >&5
-$as_echo_n "checking for ngettext in -l$GETTEXT_CHECK_IN_LIB... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  as_ac_Lib=`printf "%s\n" "ac_cv_lib_$GETTEXT_CHECK_IN_LIB""_ngettext" | $as_tr_sh`
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ngettext in -l$GETTEXT_CHECK_IN_LIB" >&5
+printf %s "checking for ngettext in -l$GETTEXT_CHECK_IN_LIB... " >&6; }
+if eval test \${$as_ac_Lib+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$GETTEXT_CHECK_IN_LIB  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -39349,42 +41828,42 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char ngettext ();
 int
-main ()
+main (void)
 {
 return ngettext ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   eval "$as_ac_Lib=yes"
-else
+else $as_nop
   eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
-
-$as_echo "#define HAVE_NGETTEXT 1" >>confdefs.h
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"
+then :
+
+printf "%s\n" "#define HAVE_NGETTEXT 1" >>confdefs.h
 
 fi
 
-  as_ac_Lib=`$as_echo "ac_cv_lib_$GETTEXT_CHECK_IN_LIB''_dngettext" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dngettext in -l$GETTEXT_CHECK_IN_LIB" >&5
-$as_echo_n "checking for dngettext in -l$GETTEXT_CHECK_IN_LIB... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  as_ac_Lib=`printf "%s\n" "ac_cv_lib_$GETTEXT_CHECK_IN_LIB""_dngettext" | $as_tr_sh`
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dngettext in -l$GETTEXT_CHECK_IN_LIB" >&5
+printf %s "checking for dngettext in -l$GETTEXT_CHECK_IN_LIB... " >&6; }
+if eval test \${$as_ac_Lib+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$GETTEXT_CHECK_IN_LIB  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -39393,42 +41872,42 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char dngettext ();
 int
-main ()
+main (void)
 {
 return dngettext ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   eval "$as_ac_Lib=yes"
-else
+else $as_nop
   eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
-
-$as_echo "#define HAVE_DNGETTEXT 1" >>confdefs.h
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"
+then :
+
+printf "%s\n" "#define HAVE_DNGETTEXT 1" >>confdefs.h
 
 fi
 
-  as_ac_Lib=`$as_echo "ac_cv_lib_$GETTEXT_CHECK_IN_LIB''_dcngettext" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcngettext in -l$GETTEXT_CHECK_IN_LIB" >&5
-$as_echo_n "checking for dcngettext in -l$GETTEXT_CHECK_IN_LIB... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  as_ac_Lib=`printf "%s\n" "ac_cv_lib_$GETTEXT_CHECK_IN_LIB""_dcngettext" | $as_tr_sh`
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dcngettext in -l$GETTEXT_CHECK_IN_LIB" >&5
+printf %s "checking for dcngettext in -l$GETTEXT_CHECK_IN_LIB... " >&6; }
+if eval test \${$as_ac_Lib+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$GETTEXT_CHECK_IN_LIB  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -39437,42 +41916,42 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char dcngettext ();
 int
-main ()
+main (void)
 {
 return dcngettext ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   eval "$as_ac_Lib=yes"
-else
+else $as_nop
   eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
-
-$as_echo "#define HAVE_DCNGETTEXT 1" >>confdefs.h
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"
+then :
+
+printf "%s\n" "#define HAVE_DCNGETTEXT 1" >>confdefs.h
 
 fi
 
-  as_ac_Lib=`$as_echo "ac_cv_lib_$GETTEXT_CHECK_IN_LIB''_bind_textdomain_codeset" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for bind_textdomain_codeset in -l$GETTEXT_CHECK_IN_LIB" >&5
-$as_echo_n "checking for bind_textdomain_codeset in -l$GETTEXT_CHECK_IN_LIB... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  as_ac_Lib=`printf "%s\n" "ac_cv_lib_$GETTEXT_CHECK_IN_LIB""_bind_textdomain_codeset" | $as_tr_sh`
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for bind_textdomain_codeset in -l$GETTEXT_CHECK_IN_LIB" >&5
+printf %s "checking for bind_textdomain_codeset in -l$GETTEXT_CHECK_IN_LIB... " >&6; }
+if eval test \${$as_ac_Lib+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$GETTEXT_CHECK_IN_LIB  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -39481,33 +41960,32 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char bind_textdomain_codeset ();
 int
-main ()
+main (void)
 {
 return bind_textdomain_codeset ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   eval "$as_ac_Lib=yes"
-else
+else $as_nop
   eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"
+then :
 
-$as_echo "#define HAVE_BIND_TEXTDOMAIN_CODESET 1" >>confdefs.h
+printf "%s\n" "#define HAVE_BIND_TEXTDOMAIN_CODESET 1" >>confdefs.h
 
 fi
 
@@ -39620,13 +42098,14 @@
 
 php_with_gmp=no
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU MP support" >&5
-$as_echo_n "checking for GNU MP support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU MP support" >&5
+printf %s "checking for GNU MP support... " >&6; }
 
 # Check whether --with-gmp was given.
-if test "${with_gmp+set}" = set; then :
+if test ${with_gmp+y}
+then :
   withval=$with_gmp; PHP_GMP=$withval
-else
+else $as_nop
 
   PHP_GMP=no
   test "$PHP_ENABLE_ALL" && PHP_GMP=$PHP_ENABLE_ALL
@@ -39656,8 +42135,8 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -39769,11 +42248,12 @@
     esac
   done
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __gmpz_rootrem in -lgmp" >&5
-$as_echo_n "checking for __gmpz_rootrem in -lgmp... " >&6; }
-if ${ac_cv_lib_gmp___gmpz_rootrem+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __gmpz_rootrem in -lgmp" >&5
+printf %s "checking for __gmpz_rootrem in -lgmp... " >&6; }
+if test ${ac_cv_lib_gmp___gmpz_rootrem+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgmp  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -39782,36 +42262,35 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char __gmpz_rootrem ();
 int
-main ()
+main (void)
 {
 return __gmpz_rootrem ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_gmp___gmpz_rootrem=yes
-else
+else $as_nop
   ac_cv_lib_gmp___gmpz_rootrem=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gmp___gmpz_rootrem" >&5
-$as_echo "$ac_cv_lib_gmp___gmpz_rootrem" >&6; }
-if test "x$ac_cv_lib_gmp___gmpz_rootrem" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gmp___gmpz_rootrem" >&5
+printf "%s\n" "$ac_cv_lib_gmp___gmpz_rootrem" >&6; }
+if test "x$ac_cv_lib_gmp___gmpz_rootrem" = xyes
+then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-else
+else $as_nop
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -39958,11 +42437,12 @@
     esac
   done
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __gmpz_rootrem in -lgmp" >&5
-$as_echo_n "checking for __gmpz_rootrem in -lgmp... " >&6; }
-if ${ac_cv_lib_gmp___gmpz_rootrem+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __gmpz_rootrem in -lgmp" >&5
+printf %s "checking for __gmpz_rootrem in -lgmp... " >&6; }
+if test ${ac_cv_lib_gmp___gmpz_rootrem+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgmp  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -39971,36 +42451,35 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char __gmpz_rootrem ();
 int
-main ()
+main (void)
 {
 return __gmpz_rootrem ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_gmp___gmpz_rootrem=yes
-else
+else $as_nop
   ac_cv_lib_gmp___gmpz_rootrem=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gmp___gmpz_rootrem" >&5
-$as_echo "$ac_cv_lib_gmp___gmpz_rootrem" >&6; }
-if test "x$ac_cv_lib_gmp___gmpz_rootrem" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gmp___gmpz_rootrem" >&5
+printf "%s\n" "$ac_cv_lib_gmp___gmpz_rootrem" >&6; }
+if test "x$ac_cv_lib_gmp___gmpz_rootrem" = xyes
+then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-else
+else $as_nop
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -40295,9 +42774,7 @@
 EOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define COMPILE_DL_GMP 1
-_ACEOF
+printf "%s\n" "#define COMPILE_DL_GMP 1" >>confdefs.h
 
     fi
   fi
@@ -40422,7 +42899,7 @@
   PHP_VAR_SUBST="$PHP_VAR_SUBST GMP_SHARED_LIBADD"
 
 
-$as_echo "#define HAVE_GMP 1" >>confdefs.h
+printf "%s\n" "#define HAVE_GMP 1" >>confdefs.h
 
 fi
 
@@ -40432,13 +42909,14 @@
 
 php_with_mhash=no
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mhash support" >&5
-$as_echo_n "checking for mhash support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mhash support" >&5
+printf %s "checking for mhash support... " >&6; }
 
 # Check whether --with-mhash was given.
-if test "${with_mhash+set}" = set; then :
+if test ${with_mhash+y}
+then :
   withval=$with_mhash; PHP_MHASH=$withval
-else
+else $as_nop
 
   PHP_MHASH=no
   test "$PHP_ENABLE_ALL" && PHP_MHASH=$PHP_ENABLE_ALL
@@ -40468,41 +42946,43 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
 
 if test "$PHP_MHASH" != "no"; then
 
-$as_echo "#define PHP_MHASH_BC 1" >>confdefs.h
+printf "%s\n" "#define PHP_MHASH_BC 1" >>confdefs.h
 
 fi
 
 if test $ac_cv_c_bigendian_php = yes; then
   EXT_HASH_SHA3_SOURCES="hash_sha3.c"
 
-$as_echo "#define HAVE_SLOW_HASH3 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SLOW_HASH3 1" >>confdefs.h
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"Use SHA3 slow implementation on bigendian\"" >&5
-$as_echo "$as_me: WARNING: \"Use SHA3 slow implementation on bigendian\"" >&2;}
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: \"Use SHA3 slow implementation on bigendian\"" >&5
+printf "%s\n" "$as_me: WARNING: \"Use SHA3 slow implementation on bigendian\"" >&2;}
 else
   # The cast to long int works around a bug in the HP C Compiler
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 # declarations like `int a3(sizeof (unsigned char)) >= 0;'.
 # This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
-$as_echo_n "checking size of long... " >&6; }
-if ${ac_cv_sizeof_long+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
+printf %s "checking size of long... " >&6; }
+if test ${ac_cv_sizeof_long+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"
+then :
 
-else
+else $as_nop
   if test "$ac_cv_type_long" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (long)
 See \`config.log' for more details" "$LINENO" 5; }
    else
@@ -40511,35 +42991,74 @@
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
-$as_echo "$ac_cv_sizeof_long" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
+printf "%s\n" "$ac_cv_sizeof_long" >&6; }
 
 
 
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_LONG $ac_cv_sizeof_long
-_ACEOF
+printf "%s\n" "#define SIZEOF_LONG $ac_cv_sizeof_long" >>confdefs.h
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we're at 64-bit platform" >&5
-$as_echo_n "checking if we're at 64-bit platform... " >&6; }
-  if test "$ac_cv_sizeof_long" -eq 4; then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we're at 64-bit platform" >&5
+printf %s "checking if we're at 64-bit platform... " >&6; }
+  if test "$ac_cv_sizeof_long" -eq 4
+then :
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
     SHA3_DIR="sha3/generic32lc"
     SHA3_OPT_SRC="$SHA3_DIR/KeccakP-1600-inplace32BI.c"
 
-else
+else $as_nop
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
     SHA3_DIR="sha3/generic64lc"
     SHA3_OPT_SRC="$SHA3_DIR/KeccakP-1600-opt64.c"
 
 fi
   EXT_HASH_SHA3_SOURCES="$SHA3_OPT_SRC $SHA3_DIR/KeccakHash.c $SHA3_DIR/KeccakSponge.c hash_sha3.c"
-    PHP_HASH_CFLAGS="-Wno-implicit-fallthrough -I@ext_srcdir@/$SHA3_DIR -DKeccakP200_excluded -DKeccakP400_excluded -DKeccakP800_excluded -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"
+
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wno-implicit-fallthrough" >&5
+printf %s "checking whether C compiler accepts -Wno-implicit-fallthrough... " >&6; }
+if test ${ax_cv_check_cflags__Werror__Wno_implicit_fallthrough+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+
+  ax_check_save_flags=$CFLAGS
+  CFLAGS="$CFLAGS -Werror -Wno-implicit-fallthrough"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main (void)
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  ax_cv_check_cflags__Werror__Wno_implicit_fallthrough=yes
+else $as_nop
+  ax_cv_check_cflags__Werror__Wno_implicit_fallthrough=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wno_implicit_fallthrough" >&5
+printf "%s\n" "$ax_cv_check_cflags__Werror__Wno_implicit_fallthrough" >&6; }
+if test "x$ax_cv_check_cflags__Werror__Wno_implicit_fallthrough" = xyes
+then :
+  PHP_HASH_CFLAGS="$PHP_HASH_CFLAGS -Wno-implicit-fallthrough"
+else $as_nop
+  :
+fi
+
+
+  PHP_HASH_CFLAGS="$PHP_HASH_CFLAGS -I@ext_srcdir@/$SHA3_DIR -DKeccakP200_excluded -DKeccakP400_excluded -DKeccakP800_excluded -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"
 
 
 
@@ -40699,9 +43218,7 @@
 EOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define COMPILE_DL_HASH 1
-_ACEOF
+printf "%s\n" "#define COMPILE_DL_HASH 1" >>confdefs.h
 
     fi
   fi
@@ -40849,13 +43366,14 @@
 
 php_with_iconv=yes
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv support" >&5
-$as_echo_n "checking for iconv support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for iconv support" >&5
+printf %s "checking for iconv support... " >&6; }
 
 # Check whether --with-iconv was given.
-if test "${with_iconv+set}" = set; then :
+if test ${with_iconv+y}
+then :
   withval=$with_iconv; PHP_ICONV=$withval
-else
+else $as_nop
 
   PHP_ICONV=yes
   test "$PHP_ENABLE_ALL" && PHP_ICONV=$PHP_ENABLE_ALL
@@ -40885,8 +43403,8 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -40901,17 +43419,19 @@
         LIBS_save="$LIBS"
     LIBS=
     ac_fn_c_check_func "$LINENO" "iconv" "ac_cv_func_iconv"
-if test "x$ac_cv_func_iconv" = xyes; then :
+if test "x$ac_cv_func_iconv" = xyes
+then :
 
       found_iconv=yes
 
-else
+else $as_nop
 
       ac_fn_c_check_func "$LINENO" "libiconv" "ac_cv_func_libiconv"
-if test "x$ac_cv_func_libiconv" = xyes; then :
+if test "x$ac_cv_func_libiconv" = xyes
+then :
 
 
-$as_echo "#define HAVE_LIBICONV 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBICONV 1" >>confdefs.h
 
         found_iconv=yes
 
@@ -41054,12 +43574,13 @@
     esac
   done
 
-  as_ac_Lib=`$as_echo "ac_cv_lib_$iconv_lib_name''_libiconv" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libiconv in -l$iconv_lib_name" >&5
-$as_echo_n "checking for libiconv in -l$iconv_lib_name... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  as_ac_Lib=`printf "%s\n" "ac_cv_lib_$iconv_lib_name""_libiconv" | $as_tr_sh`
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libiconv in -l$iconv_lib_name" >&5
+printf %s "checking for libiconv in -l$iconv_lib_name... " >&6; }
+if eval test \${$as_ac_Lib+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$iconv_lib_name  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -41068,45 +43589,44 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char libiconv ();
 int
-main ()
+main (void)
 {
 return libiconv ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   eval "$as_ac_Lib=yes"
-else
+else $as_nop
   eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"
+then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
         found_iconv=yes
 
-$as_echo "#define HAVE_LIBICONV 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBICONV 1" >>confdefs.h
 
 
-$as_echo "#define ICONV_ALIASED_LIBICONV 1" >>confdefs.h
+printf "%s\n" "#define ICONV_ALIASED_LIBICONV 1" >>confdefs.h
 
 
 
-else
+else $as_nop
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -41219,12 +43739,13 @@
     esac
   done
 
-  as_ac_Lib=`$as_echo "ac_cv_lib_$iconv_lib_name''_iconv" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv in -l$iconv_lib_name" >&5
-$as_echo_n "checking for iconv in -l$iconv_lib_name... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  as_ac_Lib=`printf "%s\n" "ac_cv_lib_$iconv_lib_name""_iconv" | $as_tr_sh`
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for iconv in -l$iconv_lib_name" >&5
+printf %s "checking for iconv in -l$iconv_lib_name... " >&6; }
+if eval test \${$as_ac_Lib+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$iconv_lib_name  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -41233,31 +43754,30 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char iconv ();
 int
-main ()
+main (void)
 {
 return iconv ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   eval "$as_ac_Lib=yes"
-else
+else $as_nop
   eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"
+then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -41265,7 +43785,7 @@
           found_iconv=yes
 
 
-else
+else $as_nop
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -41283,7 +43803,7 @@
 
   if test "$found_iconv" = "yes"; then
 
-$as_echo "#define HAVE_ICONV 1" >>confdefs.h
+printf "%s\n" "#define HAVE_ICONV 1" >>confdefs.h
 
     if test -n "$ICONV_DIR"; then
 
@@ -41430,43 +43950,45 @@
     LDFLAGS="$ICONV_SHARED_LIBADD $LDFLAGS"
     CFLAGS="$INCLUDES $CFLAGS"
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if iconv is glibc's" >&5
-$as_echo_n "checking if iconv is glibc's... " >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if iconv is glibc's" >&5
+printf %s "checking if iconv is glibc's... " >&6; }
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <gnu/libc-version.h>
 int
-main ()
+main (void)
 {
 gnu_get_libc_version();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
       iconv_impl_name="glibc"
 
-else
+else $as_nop
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 
     if test -z "$iconv_impl_name"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking if using GNU libiconv" >&5
-$as_echo_n "checking if using GNU libiconv... " >&6; }
-      if test "$cross_compiling" = yes; then :
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if using GNU libiconv" >&5
+printf %s "checking if using GNU libiconv... " >&6; }
+      if test "$cross_compiling" = yes
+then :
 
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, cross-compiling" >&5
-$as_echo "no, cross-compiling" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no, cross-compiling" >&5
+printf "%s\n" "no, cross-compiling" >&6; }
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -41478,16 +44000,17 @@
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
 
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
         iconv_impl_name="gnu_libiconv"
 
-else
+else $as_nop
 
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -41497,110 +44020,113 @@
     fi
 
     if test -z "$iconv_impl_name"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking if iconv is Konstantin Chuguev's" >&5
-$as_echo_n "checking if iconv is Konstantin Chuguev's... " >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if iconv is Konstantin Chuguev's" >&5
+printf %s "checking if iconv is Konstantin Chuguev's... " >&6; }
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <iconv.h>
 int
-main ()
+main (void)
 {
 iconv_ccs_init(NULL, NULL);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
 
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
         iconv_impl_name="bsd"
 
-else
+else $as_nop
 
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
     fi
 
     if test -z "$iconv_impl_name"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking if using IBM iconv" >&5
-$as_echo_n "checking if using IBM iconv... " >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if using IBM iconv" >&5
+printf %s "checking if using IBM iconv... " >&6; }
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <iconv.h>
 int
-main ()
+main (void)
 {
 cstoccsid("");
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
 
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
         iconv_impl_name="ibm"
 
-else
+else $as_nop
 
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
     fi
 
     case "$iconv_impl_name" in
       gnu_libiconv )
 
-$as_echo "#define PHP_ICONV_IMPL \"libiconv\"" >>confdefs.h
+printf "%s\n" "#define PHP_ICONV_IMPL \"libiconv\"" >>confdefs.h
 
 
-$as_echo "#define HAVE_LIBICONV 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBICONV 1" >>confdefs.h
 
         ;;
 
       bsd )
 
-$as_echo "#define HAVE_BSD_ICONV 1" >>confdefs.h
+printf "%s\n" "#define HAVE_BSD_ICONV 1" >>confdefs.h
 
 
-$as_echo "#define PHP_ICONV_IMPL \"BSD iconv\"" >>confdefs.h
+printf "%s\n" "#define PHP_ICONV_IMPL \"BSD iconv\"" >>confdefs.h
 
         ;;
 
       glibc )
 
-$as_echo "#define HAVE_GLIBC_ICONV 1" >>confdefs.h
+printf "%s\n" "#define HAVE_GLIBC_ICONV 1" >>confdefs.h
 
 
-$as_echo "#define PHP_ICONV_IMPL \"glibc\"" >>confdefs.h
+printf "%s\n" "#define PHP_ICONV_IMPL \"glibc\"" >>confdefs.h
 
         ;;
       ibm )
 
-$as_echo "#define HAVE_IBM_ICONV 1" >>confdefs.h
+printf "%s\n" "#define HAVE_IBM_ICONV 1" >>confdefs.h
 
 
-$as_echo "#define PHP_ICONV_IMPL \"IBM iconv\"" >>confdefs.h
+printf "%s\n" "#define PHP_ICONV_IMPL \"IBM iconv\"" >>confdefs.h
 
         ;;
     esac
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if iconv supports errno" >&5
-$as_echo_n "checking if iconv supports errno... " >&6; }
-    if test "$cross_compiling" = yes; then :
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if iconv supports errno" >&5
+printf %s "checking if iconv supports errno... " >&6; }
+    if test "$cross_compiling" = yes
+then :
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -41622,15 +44148,16 @@
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-else
+else $as_nop
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
       as_fn_error $? "iconv does not support errno" "$LINENO" 5
 
 fi
@@ -41639,17 +44166,18 @@
 fi
 
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if iconv supports //IGNORE" >&5
-$as_echo_n "checking if iconv supports //IGNORE... " >&6; }
-    if test "$cross_compiling" = yes; then :
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if iconv supports //IGNORE" >&5
+printf %s "checking if iconv supports //IGNORE... " >&6; }
+    if test "$cross_compiling" = yes
+then :
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
-$as_echo "#define ICONV_BROKEN_IGNORE 0" >>confdefs.h
+printf "%s\n" "#define ICONV_BROKEN_IGNORE 0" >>confdefs.h
 
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -41673,20 +44201,21 @@
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-$as_echo "#define ICONV_BROKEN_IGNORE 0" >>confdefs.h
+printf "%s\n" "#define ICONV_BROKEN_IGNORE 0" >>confdefs.h
 
 
-else
+else $as_nop
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
-$as_echo "#define ICONV_BROKEN_IGNORE 1" >>confdefs.h
+printf "%s\n" "#define ICONV_BROKEN_IGNORE 1" >>confdefs.h
 
 
 fi
@@ -41832,9 +44361,7 @@
 EOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define COMPILE_DL_ICONV 1
-_ACEOF
+printf "%s\n" "#define COMPILE_DL_ICONV 1" >>confdefs.h
 
     fi
   fi
@@ -41997,13 +44524,14 @@
 
 php_with_imap=no
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for IMAP support" >&5
-$as_echo_n "checking for IMAP support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for IMAP support" >&5
+printf %s "checking for IMAP support... " >&6; }
 
 # Check whether --with-imap was given.
-if test "${with_imap+set}" = set; then :
+if test ${with_imap+y}
+then :
   withval=$with_imap; PHP_IMAP=$withval
-else
+else $as_nop
 
   PHP_IMAP=no
   test "$PHP_ENABLE_ALL" && PHP_IMAP=$PHP_ENABLE_ALL
@@ -42033,8 +44561,8 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -42042,13 +44570,14 @@
 
 php_with_kerberos=no
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for IMAP Kerberos support" >&5
-$as_echo_n "checking for IMAP Kerberos support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for IMAP Kerberos support" >&5
+printf %s "checking for IMAP Kerberos support... " >&6; }
 
 # Check whether --with-kerberos was given.
-if test "${with_kerberos+set}" = set; then :
+if test ${with_kerberos+y}
+then :
   withval=$with_kerberos; PHP_KERBEROS=$withval
-else
+else $as_nop
 
   PHP_KERBEROS=no
 
@@ -42057,8 +44586,8 @@
 
 
 ext_output=$PHP_KERBEROS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -42066,13 +44595,14 @@
 
 php_with_imap_ssl=no
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for IMAP SSL support" >&5
-$as_echo_n "checking for IMAP SSL support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for IMAP SSL support" >&5
+printf %s "checking for IMAP SSL support... " >&6; }
 
 # Check whether --with-imap-ssl was given.
-if test "${with_imap_ssl+set}" = set; then :
+if test ${with_imap_ssl+y}
+then :
   withval=$with_imap_ssl; PHP_IMAP_SSL=$withval
-else
+else $as_nop
 
   PHP_IMAP_SSL=no
 
@@ -42081,8 +44611,8 @@
 
 
 ext_output=$PHP_IMAP_SSL
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -42225,9 +44755,7 @@
 EOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define COMPILE_DL_IMAP 1
-_ACEOF
+printf "%s\n" "#define COMPILE_DL_IMAP 1" >>confdefs.h
 
     fi
   fi
@@ -42349,13 +44877,13 @@
   fi
 
 
-$as_echo "#define HAVE_IMAP 1" >>confdefs.h
+printf "%s\n" "#define HAVE_IMAP 1" >>confdefs.h
 
 
     for i in $PHP_IMAP /usr/local /usr; do
       if test -r "$i/c-client.h"; then
 
-$as_echo "#define HAVE_IMAP2000 1" >>confdefs.h
+printf "%s\n" "#define HAVE_IMAP2000 1" >>confdefs.h
 
     IMAP_DIR=$i
     IMAP_INC_DIR=$i
@@ -42367,7 +44895,7 @@
 
       elif test -r "$i/include/c-client/c-client.h"; then
 
-$as_echo "#define HAVE_IMAP2000 1" >>confdefs.h
+printf "%s\n" "#define HAVE_IMAP2000 1" >>confdefs.h
 
     IMAP_DIR=$i
     IMAP_INC_DIR=$i/include/c-client
@@ -42379,7 +44907,7 @@
 
       elif test -r "$i/include/imap/c-client.h"; then
 
-$as_echo "#define HAVE_IMAP2000 1" >>confdefs.h
+printf "%s\n" "#define HAVE_IMAP2000 1" >>confdefs.h
 
     IMAP_DIR=$i
     IMAP_INC_DIR=$i/include/imap
@@ -42391,7 +44919,7 @@
 
       elif test -r "$i/include/c-client.h"; then
 
-$as_echo "#define HAVE_IMAP2000 1" >>confdefs.h
+printf "%s\n" "#define HAVE_IMAP2000 1" >>confdefs.h
 
     IMAP_DIR=$i
     IMAP_INC_DIR=$i/include
@@ -42403,7 +44931,7 @@
 
       elif test -r "$i/imap/c-client.h"; then
 
-$as_echo "#define HAVE_IMAP2000 1" >>confdefs.h
+printf "%s\n" "#define HAVE_IMAP2000 1" >>confdefs.h
 
     IMAP_DIR=$i
     IMAP_INC_DIR=$i/imap
@@ -42415,7 +44943,7 @@
 
       elif test -r "$i/c-client/c-client.h"; then
 
-$as_echo "#define HAVE_IMAP2000 1" >>confdefs.h
+printf "%s\n" "#define HAVE_IMAP2000 1" >>confdefs.h
 
     IMAP_DIR=$i
     IMAP_INC_DIR=$i/c-client
@@ -42434,23 +44962,25 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "mail_fetch_overview_sequence" >/dev/null 2>&1; then :
+  $EGREP "mail_fetch_overview_sequence" >/dev/null 2>&1
+then :
 
 
-$as_echo "#define HAVE_IMAP2004 1" >>confdefs.h
+printf "%s\n" "#define HAVE_IMAP2004 1" >>confdefs.h
 
 
 fi
-rm -f conftest*
+rm -rf conftest*
 
 
         old_CFLAGS=$CFLAGS
     CFLAGS="-I$IMAP_INC_DIR"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for utf8_mime2text signature" >&5
-$as_echo_n "checking for utf8_mime2text signature... " >&6; }
-if ${ac_cv_utf8_mime2text+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for utf8_mime2text signature" >&5
+printf %s "checking for utf8_mime2text signature... " >&6; }
+if test ${ac_cv_utf8_mime2text+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -42458,7 +44988,7 @@
 #include <c-client.h>
 
 int
-main ()
+main (void)
 {
 
         SIZEDTEXT *src, *dst;
@@ -42468,41 +44998,43 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
         ac_cv_utf8_mime2text=old
 
-else
+else $as_nop
 
         ac_cv_utf8_mime2text=new
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_utf8_mime2text" >&5
-$as_echo "$ac_cv_utf8_mime2text" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_utf8_mime2text" >&5
+printf "%s\n" "$ac_cv_utf8_mime2text" >&6; }
     if test "$ac_cv_utf8_mime2text" = "new"; then
 
-$as_echo "#define HAVE_NEW_MIME2TEXT 1" >>confdefs.h
+printf "%s\n" "#define HAVE_NEW_MIME2TEXT 1" >>confdefs.h
 
     fi
     CFLAGS=$old_CFLAGS
 
     old_CFLAGS=$CFLAGS
     CFLAGS="-I$IMAP_INC_DIR"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for U8T_DECOMPOSE" >&5
-$as_echo_n "checking for U8T_DECOMPOSE... " >&6; }
-if ${ac_cv_u8t_decompose+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for U8T_DECOMPOSE" >&5
+printf %s "checking for U8T_DECOMPOSE... " >&6; }
+if test ${ac_cv_u8t_decompose+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <c-client.h>
 
 int
-main ()
+main (void)
 {
 
          int i = U8T_CANONICAL;
@@ -42511,20 +45043,21 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
          ac_cv_u8t_decompose=yes
 
-else
+else $as_nop
 
          ac_cv_u8t_decompose=no
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_u8t_decompose" >&5
-$as_echo "$ac_cv_u8t_decompose" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_u8t_decompose" >&5
+printf "%s\n" "$ac_cv_u8t_decompose" >&6; }
     CFLAGS=$old_CFLAGS
 
     if test "$ac_cv_u8t_decompose" = "no" && test "$ac_cv_utf8_mime2text" = "new"; then
@@ -42546,14 +45079,15 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "this_is_true" >/dev/null 2>&1; then :
+  $EGREP "this_is_true" >/dev/null 2>&1
+then :
 
 
-$as_echo "#define HAVE_IMAP2001 1" >>confdefs.h
+printf "%s\n" "#define HAVE_IMAP2001 1" >>confdefs.h
 
 
 fi
-rm -f conftest*
+rm -rf conftest*
 
     CPPFLAGS=$old_CPPFLAGS
 
@@ -42662,11 +45196,12 @@
     esac
   done
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pam_start in -lpam" >&5
-$as_echo_n "checking for pam_start in -lpam... " >&6; }
-if ${ac_cv_lib_pam_pam_start+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pam_start in -lpam" >&5
+printf %s "checking for pam_start in -lpam... " >&6; }
+if test ${ac_cv_lib_pam_pam_start+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpam  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -42675,30 +45210,29 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char pam_start ();
 int
-main ()
+main (void)
 {
 return pam_start ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_pam_pam_start=yes
-else
+else $as_nop
   ac_cv_lib_pam_pam_start=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pam_pam_start" >&5
-$as_echo "$ac_cv_lib_pam_pam_start" >&6; }
-if test "x$ac_cv_lib_pam_pam_start" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pam_pam_start" >&5
+printf "%s\n" "$ac_cv_lib_pam_pam_start" >&6; }
+if test "x$ac_cv_lib_pam_pam_start" = xyes
+then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -42727,11 +45261,11 @@
 
 
 
-$as_echo "#define HAVE_LIBPAM 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBPAM 1" >>confdefs.h
 
 
 
-else
+else $as_nop
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -42846,11 +45380,12 @@
     esac
   done
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for crypt in -lcrypt" >&5
-$as_echo_n "checking for crypt in -lcrypt... " >&6; }
-if ${ac_cv_lib_crypt_crypt+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for crypt in -lcrypt" >&5
+printf %s "checking for crypt in -lcrypt... " >&6; }
+if test ${ac_cv_lib_crypt_crypt+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcrypt  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -42859,30 +45394,29 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char crypt ();
 int
-main ()
+main (void)
 {
 return crypt ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_crypt_crypt=yes
-else
+else $as_nop
   ac_cv_lib_crypt_crypt=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypt_crypt" >&5
-$as_echo "$ac_cv_lib_crypt_crypt" >&6; }
-if test "x$ac_cv_lib_crypt_crypt" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypt_crypt" >&5
+printf "%s\n" "$ac_cv_lib_crypt_crypt" >&6; }
+if test "x$ac_cv_lib_crypt_crypt" = xyes
+then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -42911,11 +45445,11 @@
 
 
 
-$as_echo "#define HAVE_LIBCRYPT 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBCRYPT 1" >>confdefs.h
 
 
 
-else
+else $as_nop
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -43063,17 +45597,17 @@
   if test "$PHP_KERBEROS" != "no"; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5-gssapi krb5" >&5
-$as_echo_n "checking for krb5-gssapi krb5... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for krb5-gssapi krb5" >&5
+printf %s "checking for krb5-gssapi krb5... " >&6; }
 
 if test -n "$KERBEROS_CFLAGS"; then
     pkg_cv_KERBEROS_CFLAGS="$KERBEROS_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"krb5-gssapi krb5\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"krb5-gssapi krb5\""; } >&5
   ($PKG_CONFIG --exists --print-errors "krb5-gssapi krb5") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_KERBEROS_CFLAGS=`$PKG_CONFIG --cflags "krb5-gssapi krb5" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -43087,10 +45621,10 @@
     pkg_cv_KERBEROS_LIBS="$KERBEROS_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"krb5-gssapi krb5\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"krb5-gssapi krb5\""; } >&5
   ($PKG_CONFIG --exists --print-errors "krb5-gssapi krb5") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_KERBEROS_LIBS=`$PKG_CONFIG --libs "krb5-gssapi krb5" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -43104,8 +45638,8 @@
 
 
 if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -43131,10 +45665,10 @@
 and KERBEROS_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -43148,8 +45682,8 @@
 else
 	KERBEROS_CFLAGS=$pkg_cv_KERBEROS_CFLAGS
 	KERBEROS_LIBS=$pkg_cv_KERBEROS_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
 fi
 
@@ -43294,7 +45828,7 @@
 
 
 
-$as_echo "#define HAVE_IMAP_KRB 1" >>confdefs.h
+printf "%s\n" "#define HAVE_IMAP_KRB 1" >>confdefs.h
 
   else
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -43303,7 +45837,8 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "auth_gss" >/dev/null 2>&1; then :
+  $EGREP "auth_gss" >/dev/null 2>&1
+then :
 
       as_fn_error $? "This c-client library is built with Kerberos support.
 
@@ -43311,7 +45846,7 @@
       " "$LINENO" 5
 
 fi
-rm -f conftest*
+rm -rf conftest*
 
   fi
 
@@ -43325,17 +45860,17 @@
 
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for openssl >= 1.0.2" >&5
-$as_echo_n "checking for openssl >= 1.0.2... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for openssl >= 1.0.2" >&5
+printf %s "checking for openssl >= 1.0.2... " >&6; }
 
 if test -n "$OPENSSL_CFLAGS"; then
     pkg_cv_OPENSSL_CFLAGS="$OPENSSL_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 1.0.2\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 1.0.2\""; } >&5
   ($PKG_CONFIG --exists --print-errors "openssl >= 1.0.2") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_OPENSSL_CFLAGS=`$PKG_CONFIG --cflags "openssl >= 1.0.2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -43349,10 +45884,10 @@
     pkg_cv_OPENSSL_LIBS="$OPENSSL_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 1.0.2\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 1.0.2\""; } >&5
   ($PKG_CONFIG --exists --print-errors "openssl >= 1.0.2") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_OPENSSL_LIBS=`$PKG_CONFIG --libs "openssl >= 1.0.2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -43366,8 +45901,8 @@
 
 
 if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -43393,10 +45928,10 @@
 and OPENSSL_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -43410,8 +45945,8 @@
 else
 	OPENSSL_CFLAGS=$pkg_cv_OPENSSL_CFLAGS
 	OPENSSL_LIBS=$pkg_cv_OPENSSL_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 	found_openssl=yes
 fi
 
@@ -43557,7 +46092,7 @@
 
 
 
-$as_echo "#define HAVE_IMAP_SSL 1" >>confdefs.h
+printf "%s\n" "#define HAVE_IMAP_SSL 1" >>confdefs.h
 
 
 else
@@ -43575,7 +46110,8 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "ssl_onceonlyinit" >/dev/null 2>&1; then :
+  $EGREP "ssl_onceonlyinit" >/dev/null 2>&1
+then :
 
       as_fn_error $? "This c-client library is built with SSL support.
 
@@ -43583,7 +46119,7 @@
       " "$LINENO" 5
 
 fi
-rm -f conftest*
+rm -rf conftest*
 
   fi
 
@@ -43628,22 +46164,23 @@
     }
 
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
 
     LIBS=$old_LIBS
 
 
-$as_echo "#define HAVE_IMAP_AUTH_GSS 1" >>confdefs.h
+printf "%s\n" "#define HAVE_IMAP_AUTH_GSS 1" >>confdefs.h
 
 
 
-else
+else $as_nop
 
     LIBS=$old_LIBS
 
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 
 
@@ -43656,16 +46193,17 @@
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for utf8_to_mutf7" >&5
-$as_echo_n "checking for utf8_to_mutf7... " >&6; }
-if ${ac_cv_utf8_to_mutf7+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for utf8_to_mutf7" >&5
+printf %s "checking for utf8_to_mutf7... " >&6; }
+if test ${ac_cv_utf8_to_mutf7+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <c-client.h>
 int
-main ()
+main (void)
 {
 
         unsigned char c = '\0';
@@ -43675,23 +46213,24 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
 
-$as_echo "#define HAVE_IMAP_MUTF7 1" >>confdefs.h
+printf "%s\n" "#define HAVE_IMAP_MUTF7 1" >>confdefs.h
 
         ac_cv_utf8_to_mutf7=yes
 
-else
+else $as_nop
 
         ac_cv_utf8_to_mutf7=no
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_utf8_to_mutf7" >&5
-$as_echo "$ac_cv_utf8_to_mutf7" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_utf8_to_mutf7" >&5
+printf "%s\n" "$ac_cv_utf8_to_mutf7" >&6; }
     ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -43700,8 +46239,8 @@
 
 
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether rfc822_output_address_list function present" >&5
-$as_echo_n "checking whether rfc822_output_address_list function present... " >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether rfc822_output_address_list function present" >&5
+printf %s "checking whether rfc822_output_address_list function present... " >&6; }
 
   old_LIBS=$LIBS
   LIBS="
@@ -43743,32 +46282,33 @@
     }
 
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
 
     LIBS=$old_LIBS
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-$as_echo "#define HAVE_RFC822_OUTPUT_ADDRESS_LIST 1" >>confdefs.h
+printf "%s\n" "#define HAVE_RFC822_OUTPUT_ADDRESS_LIST 1" >>confdefs.h
 
 
 
-else
+else $as_nop
 
     LIBS=$old_LIBS
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build with IMAP works" >&5
-$as_echo_n "checking whether build with IMAP works... " >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether build with IMAP works" >&5
+printf %s "checking whether build with IMAP works... " >&6; }
 
 
   old_LIBS=$LIBS
@@ -43807,25 +46347,26 @@
     }
 
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
 
     LIBS=$old_LIBS
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
 
-else
+else $as_nop
 
     LIBS=$old_LIBS
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
       as_fn_error $? "build test failed. Please check the config.log for details." "$LINENO" 5
 
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 
 
@@ -43837,12 +46378,13 @@
 
 php_enable_intl=no
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable internationalization support" >&5
-$as_echo_n "checking whether to enable internationalization support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable internationalization support" >&5
+printf %s "checking whether to enable internationalization support... " >&6; }
 # Check whether --enable-intl was given.
-if test "${enable_intl+set}" = set; then :
+if test ${enable_intl+y}
+then :
   enableval=$enable_intl; PHP_INTL=$enableval
-else
+else $as_nop
 
   PHP_INTL=no
   test "$PHP_ENABLE_ALL" && PHP_INTL=$PHP_ENABLE_ALL
@@ -43872,8 +46414,8 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -43882,17 +46424,17 @@
 
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for icu-uc >= 50.1 icu-io icu-i18n" >&5
-$as_echo_n "checking for icu-uc >= 50.1 icu-io icu-i18n... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for icu-uc >= 50.1 icu-io icu-i18n" >&5
+printf %s "checking for icu-uc >= 50.1 icu-io icu-i18n... " >&6; }
 
 if test -n "$ICU_CFLAGS"; then
     pkg_cv_ICU_CFLAGS="$ICU_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"icu-uc >= 50.1 icu-io icu-i18n\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"icu-uc >= 50.1 icu-io icu-i18n\""; } >&5
   ($PKG_CONFIG --exists --print-errors "icu-uc >= 50.1 icu-io icu-i18n") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_ICU_CFLAGS=`$PKG_CONFIG --cflags "icu-uc >= 50.1 icu-io icu-i18n" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -43906,10 +46448,10 @@
     pkg_cv_ICU_LIBS="$ICU_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"icu-uc >= 50.1 icu-io icu-i18n\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"icu-uc >= 50.1 icu-io icu-i18n\""; } >&5
   ($PKG_CONFIG --exists --print-errors "icu-uc >= 50.1 icu-io icu-i18n") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_ICU_LIBS=`$PKG_CONFIG --libs "icu-uc >= 50.1 icu-io icu-i18n" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -43923,8 +46465,8 @@
 
 
 if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -43950,10 +46492,10 @@
 and ICU_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -43967,8 +46509,8 @@
 else
 	ICU_CFLAGS=$pkg_cv_ICU_CFLAGS
 	ICU_LIBS=$pkg_cv_ICU_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
 fi
 
@@ -44115,9 +46657,10 @@
   ICU_CFLAGS="$ICU_CFLAGS -DU_NO_DEFAULT_INCLUDE_UTF_HEADERS=1"
   ICU_CXXFLAGS="$ICU_CXXFLAGS -DUNISTR_FROM_CHAR_EXPLICIT=explicit -DUNISTR_FROM_STRING_EXPLICIT=explicit"
 
-  if test "$PKG_CONFIG icu-io --atleast-version=60"; then
-    ICU_CFLAGS="$ICU_CFLAGS -DU_HIDE_OBSOLETE_UTF_OLD_H=1"
-  fi
+  if $PKG_CONFIG icu-io --atleast-version=60
+then :
+  ICU_CFLAGS="$ICU_CFLAGS -DU_HIDE_OBSOLETE_UTF_OLD_H=1"
+fi
 
 
   PHP_VAR_SUBST="$PHP_VAR_SUBST INTL_SHARED_LIBADD"
@@ -44353,9 +46896,7 @@
 EOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define COMPILE_DL_INTL 1
-_ACEOF
+printf "%s\n" "#define COMPILE_DL_INTL 1" >>confdefs.h
 
     fi
   fi
@@ -44607,15 +47148,16 @@
     CXX=$CCC
   else
     if test -n "$ac_tool_prefix"; then
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC clang++
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CXX+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$CXX"; then
   ac_cv_prog_CXX="$CXX" # Let the user override the test.
 else
@@ -44623,11 +47165,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -44638,11 +47184,11 @@
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
-$as_echo "$CXX" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
+printf "%s\n" "$CXX" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -44651,15 +47197,16 @@
 fi
 if test -z "$CXX"; then
   ac_ct_CXX=$CXX
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC clang++
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_CXX+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ac_ct_CXX"; then
   ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
 else
@@ -44667,11 +47214,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CXX="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -44682,11 +47233,11 @@
 fi
 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
 if test -n "$ac_ct_CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
-$as_echo "$ac_ct_CXX" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
+printf "%s\n" "$ac_ct_CXX" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -44698,8 +47249,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CXX=$ac_ct_CXX
@@ -44709,7 +47260,7 @@
   fi
 fi
 # Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
+printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
 set X $ac_compile
 ac_compiler=$2
 for ac_option in --version -v -V -qversion; do
@@ -44719,7 +47270,7 @@
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_compiler $ac_option >&5") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -44729,20 +47280,21 @@
     cat conftest.er1 >&5
   fi
   rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 done
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
-$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
-if ${ac_cv_cxx_compiler_gnu+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C++" >&5
+printf %s "checking whether the compiler supports GNU C++... " >&6; }
+if test ${ac_cv_cxx_compiler_gnu+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 #ifndef __GNUC__
        choke me
@@ -44752,29 +47304,33 @@
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+if ac_fn_cxx_try_compile "$LINENO"
+then :
   ac_compiler_gnu=yes
-else
+else $as_nop
   ac_compiler_gnu=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
-$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
+printf "%s\n" "$ac_cv_cxx_compiler_gnu" >&6; }
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
 if test $ac_compiler_gnu = yes; then
   GXX=yes
 else
   GXX=
 fi
-ac_test_CXXFLAGS=${CXXFLAGS+set}
+ac_test_CXXFLAGS=${CXXFLAGS+y}
 ac_save_CXXFLAGS=$CXXFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
-$as_echo_n "checking whether $CXX accepts -g... " >&6; }
-if ${ac_cv_prog_cxx_g+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
+printf %s "checking whether $CXX accepts -g... " >&6; }
+if test ${ac_cv_prog_cxx_g+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_save_cxx_werror_flag=$ac_cxx_werror_flag
    ac_cxx_werror_flag=yes
    ac_cv_prog_cxx_g=no
@@ -44783,57 +47339,60 @@
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+if ac_fn_cxx_try_compile "$LINENO"
+then :
   ac_cv_prog_cxx_g=yes
-else
+else $as_nop
   CXXFLAGS=""
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+if ac_fn_cxx_try_compile "$LINENO"
+then :
 
-else
+else $as_nop
   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 	 CXXFLAGS="-g"
 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+if ac_fn_cxx_try_compile "$LINENO"
+then :
   ac_cv_prog_cxx_g=yes
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
    ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
-$as_echo "$ac_cv_prog_cxx_g" >&6; }
-if test "$ac_test_CXXFLAGS" = set; then
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
+printf "%s\n" "$ac_cv_prog_cxx_g" >&6; }
+if test $ac_test_CXXFLAGS; then
   CXXFLAGS=$ac_save_CXXFLAGS
 elif test $ac_cv_prog_cxx_g = yes; then
   if test "$GXX" = yes; then
@@ -44848,6 +47407,100 @@
     CXXFLAGS=
   fi
 fi
+ac_prog_cxx_stdcxx=no
+if test x$ac_prog_cxx_stdcxx = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
+printf %s "checking for $CXX option to enable C++11 features... " >&6; }
+if test ${ac_cv_prog_cxx_11+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_cv_prog_cxx_11=no
+ac_save_CXX=$CXX
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_cxx_conftest_cxx11_program
+_ACEOF
+for ac_arg in '' -std=gnu++11 -std=gnu++0x -std=c++11 -std=c++0x -qlanglvl=extended0x -AA
+do
+  CXX="$ac_save_CXX $ac_arg"
+  if ac_fn_cxx_try_compile "$LINENO"
+then :
+  ac_cv_prog_cxx_cxx11=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam
+  test "x$ac_cv_prog_cxx_cxx11" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CXX=$ac_save_CXX
+fi
+
+if test "x$ac_cv_prog_cxx_cxx11" = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf "%s\n" "unsupported" >&6; }
+else $as_nop
+  if test "x$ac_cv_prog_cxx_cxx11" = x
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf "%s\n" "none needed" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx11" >&5
+printf "%s\n" "$ac_cv_prog_cxx_cxx11" >&6; }
+     CXX="$CXX $ac_cv_prog_cxx_cxx11"
+fi
+  ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx11
+  ac_prog_cxx_stdcxx=cxx11
+fi
+fi
+if test x$ac_prog_cxx_stdcxx = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
+printf %s "checking for $CXX option to enable C++98 features... " >&6; }
+if test ${ac_cv_prog_cxx_98+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_cv_prog_cxx_98=no
+ac_save_CXX=$CXX
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_cxx_conftest_cxx98_program
+_ACEOF
+for ac_arg in '' -std=gnu++98 -std=c++98 -qlanglvl=extended -AA
+do
+  CXX="$ac_save_CXX $ac_arg"
+  if ac_fn_cxx_try_compile "$LINENO"
+then :
+  ac_cv_prog_cxx_cxx98=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam
+  test "x$ac_cv_prog_cxx_cxx98" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CXX=$ac_save_CXX
+fi
+
+if test "x$ac_cv_prog_cxx_cxx98" = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf "%s\n" "unsupported" >&6; }
+else $as_nop
+  if test "x$ac_cv_prog_cxx_cxx98" = x
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf "%s\n" "none needed" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx98" >&5
+printf "%s\n" "$ac_cv_prog_cxx_cxx98" >&6; }
+     CXX="$CXX $ac_cv_prog_cxx_cxx98"
+fi
+  ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx98
+  ac_prog_cxx_stdcxx=cxx98
+fi
+fi
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -44859,36 +47512,32 @@
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
-$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
+printf %s "checking how to run the C++ preprocessor... " >&6; }
 if test -z "$CXXCPP"; then
-  if ${ac_cv_prog_CXXCPP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-      # Double quotes because CXXCPP needs to be expanded
-    for CXXCPP in "$CXX -E" "/lib/cpp"
+  if test ${ac_cv_prog_CXXCPP+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+      # Double quotes because $CXX needs to be expanded
+    for CXXCPP in "$CXX -E" cpp /lib/cpp
     do
       ac_preproc_ok=false
 for ac_cxx_preproc_warn_flag in '' yes
 do
   # Use a header file that comes with gcc, so configuring glibc
   # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
+#include <limits.h>
 		     Syntax error
 _ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
+if ac_fn_cxx_try_cpp "$LINENO"
+then :
 
-else
+else $as_nop
   # Broken: fails on valid input.
 continue
 fi
@@ -44900,10 +47549,11 @@
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
+if ac_fn_cxx_try_cpp "$LINENO"
+then :
   # Broken: success on invalid input.
 continue
-else
+else $as_nop
   # Passes both tests.
 ac_preproc_ok=:
 break
@@ -44913,7 +47563,8 @@
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
+if $ac_preproc_ok
+then :
   break
 fi
 
@@ -44925,29 +47576,24 @@
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
-$as_echo "$CXXCPP" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
+printf "%s\n" "$CXXCPP" >&6; }
 ac_preproc_ok=false
 for ac_cxx_preproc_warn_flag in '' yes
 do
   # Use a header file that comes with gcc, so configuring glibc
   # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
+#include <limits.h>
 		     Syntax error
 _ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
+if ac_fn_cxx_try_cpp "$LINENO"
+then :
 
-else
+else $as_nop
   # Broken: fails on valid input.
 continue
 fi
@@ -44959,10 +47605,11 @@
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
+if ac_fn_cxx_try_cpp "$LINENO"
+then :
   # Broken: success on invalid input.
 continue
-else
+else $as_nop
   # Passes both tests.
 ac_preproc_ok=:
 break
@@ -44972,11 +47619,12 @@
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
+if $ac_preproc_ok
+then :
 
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+else $as_nop
+  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
 See \`config.log' for more details" "$LINENO" 5; }
 fi
@@ -45001,13 +47649,14 @@
   fi
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if intl requires -std=gnu++17" >&5
-$as_echo_n "checking if intl requires -std=gnu++17... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if intl requires -std=gnu++17" >&5
+printf %s "checking if intl requires -std=gnu++17... " >&6; }
 
-if test "$PKG_CONFIG icu-uc --atleast-version=74"; then :
+if $PKG_CONFIG icu-uc --atleast-version=74
+then :
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
       ax_cxx_compile_alternatives="17 1z"  ax_cxx_compile_cxx17_required=true  ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -45017,12 +47666,13 @@
 
         for alternative in ${ax_cxx_compile_alternatives}; do
     for switch in -std=c++${alternative} +std=c++${alternative} "-h std=c++${alternative}"; do
-      cachevar=`$as_echo "ax_cv_cxx_compile_cxx17_$switch" | $as_tr_sh`
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++17 features with $switch" >&5
-$as_echo_n "checking whether $CXX supports C++17 features with $switch... " >&6; }
-if eval \${$cachevar+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      cachevar=`printf "%s\n" "ax_cv_cxx_compile_cxx17_$switch" | $as_tr_sh`
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++17 features with $switch" >&5
+printf %s "checking whether $CXX supports C++17 features with $switch... " >&6; }
+if eval test \${$cachevar+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_save_CXX="$CXX"
            CXX="$CXX $switch"
            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -45814,17 +48464,18 @@
 
 
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+if ac_fn_cxx_try_compile "$LINENO"
+then :
   eval $cachevar=yes
-else
+else $as_nop
   eval $cachevar=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
            CXX="$ac_save_CXX"
 fi
 eval ac_res=\$$cachevar
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
       if eval test x\$$cachevar = xyes; then
         eval PHP_INTL_STDCXX="$switch"
         ac_success=yes
@@ -45848,16 +48499,16 @@
     fi
   fi
   if test x$ac_success = xno; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: No compiler with C++17 support was found" >&5
-$as_echo "$as_me: No compiler with C++17 support was found" >&6;}
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: No compiler with C++17 support was found" >&5
+printf "%s\n" "$as_me: No compiler with C++17 support was found" >&6;}
   fi
 
 
 
-else
+else $as_nop
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
       ax_cxx_compile_alternatives="11 0x"  ax_cxx_compile_cxx11_required=true  ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -45867,12 +48518,13 @@
 
         for alternative in ${ax_cxx_compile_alternatives}; do
     for switch in -std=c++${alternative} +std=c++${alternative} "-h std=c++${alternative}"; do
-      cachevar=`$as_echo "ax_cv_cxx_compile_cxx11_$switch" | $as_tr_sh`
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++11 features with $switch" >&5
-$as_echo_n "checking whether $CXX supports C++11 features with $switch... " >&6; }
-if eval \${$cachevar+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      cachevar=`printf "%s\n" "ax_cv_cxx_compile_cxx11_$switch" | $as_tr_sh`
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++11 features with $switch" >&5
+printf %s "checking whether $CXX supports C++11 features with $switch... " >&6; }
+if eval test \${$cachevar+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_save_CXX="$CXX"
            CXX="$CXX $switch"
            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -46166,17 +48818,18 @@
 
 
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+if ac_fn_cxx_try_compile "$LINENO"
+then :
   eval $cachevar=yes
-else
+else $as_nop
   eval $cachevar=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
            CXX="$ac_save_CXX"
 fi
 eval ac_res=\$$cachevar
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
       if eval test x\$$cachevar = xyes; then
         eval PHP_INTL_STDCXX="$switch"
         ac_success=yes
@@ -46200,8 +48853,8 @@
     fi
   fi
   if test x$ac_success = xno; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: No compiler with C++11 support was found" >&5
-$as_echo "$as_me: No compiler with C++11 support was found" >&6;}
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: No compiler with C++11 support was found" >&5
+printf "%s\n" "$as_me: No compiler with C++11 support was found" >&6;}
   fi
 
 
@@ -46397,7 +49050,7 @@
 
 
 
-$as_echo "#define HAVE_JSON 1 " >>confdefs.h
+printf "%s\n" "#define HAVE_JSON 1 " >>confdefs.h
 
 
   ext_builddir=ext/json
@@ -46539,9 +49192,7 @@
 EOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define COMPILE_DL_JSON 1
-_ACEOF
+printf "%s\n" "#define COMPILE_DL_JSON 1" >>confdefs.h
 
     fi
   fi
@@ -46703,13 +49354,14 @@
 
 php_with_ldap=no
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LDAP support" >&5
-$as_echo_n "checking for LDAP support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LDAP support" >&5
+printf %s "checking for LDAP support... " >&6; }
 
 # Check whether --with-ldap was given.
-if test "${with_ldap+set}" = set; then :
+if test ${with_ldap+y}
+then :
   withval=$with_ldap; PHP_LDAP=$withval
-else
+else $as_nop
 
   PHP_LDAP=no
   test "$PHP_ENABLE_ALL" && PHP_LDAP=$PHP_ENABLE_ALL
@@ -46739,8 +49391,8 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -46748,13 +49400,14 @@
 
 php_with_ldap_sasl=no
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build with LDAP Cyrus SASL support" >&5
-$as_echo_n "checking whether to build with LDAP Cyrus SASL support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build with LDAP Cyrus SASL support" >&5
+printf %s "checking whether to build with LDAP Cyrus SASL support... " >&6; }
 
 # Check whether --with-ldap-sasl was given.
-if test "${with_ldap_sasl+set}" = set; then :
+if test ${with_ldap_sasl+y}
+then :
   withval=$with_ldap_sasl; PHP_LDAP_SASL=$withval
-else
+else $as_nop
 
   PHP_LDAP_SASL=no
 
@@ -46763,8 +49416,8 @@
 
 
 ext_output=$PHP_LDAP_SASL
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -46905,9 +49558,7 @@
 EOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define COMPILE_DL_LDAP 1
-_ACEOF
+printf "%s\n" "#define COMPILE_DL_LDAP 1" >>confdefs.h
 
     fi
   fi
@@ -47046,17 +49697,19 @@
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 # declarations like `int a3(sizeof (unsigned char)) >= 0;'.
 # This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
-$as_echo_n "checking size of long... " >&6; }
-if ${ac_cv_sizeof_long+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
+printf %s "checking size of long... " >&6; }
+if test ${ac_cv_sizeof_long+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"
+then :
 
-else
+else $as_nop
   if test "$ac_cv_type_long" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (long)
 See \`config.log' for more details" "$LINENO" 5; }
    else
@@ -47065,28 +49718,27 @@
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
-$as_echo "$ac_cv_sizeof_long" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
+printf "%s\n" "$ac_cv_sizeof_long" >&6; }
 
 
 
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_LONG $ac_cv_sizeof_long
-_ACEOF
+printf "%s\n" "#define SIZEOF_LONG $ac_cv_sizeof_long" >>confdefs.h
 
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we're at 64-bit platform" >&5
-$as_echo_n "checking if we're at 64-bit platform... " >&6; }
-    if test "$ac_cv_sizeof_long" -eq 4; then :
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we're at 64-bit platform" >&5
+printf %s "checking if we're at 64-bit platform... " >&6; }
+    if test "$ac_cv_sizeof_long" -eq 4
+then :
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
       PHP_OCI8_IC_LIBDIR_SUFFIX=""
 
-else
+else $as_nop
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
       PHP_OCI8_IC_LIBDIR_SUFFIX=64
 
 fi
@@ -47121,17 +49773,19 @@
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 # declarations like `int a3(sizeof (unsigned char)) >= 0;'.
 # This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
-$as_echo_n "checking size of long... " >&6; }
-if ${ac_cv_sizeof_long+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
+printf %s "checking size of long... " >&6; }
+if test ${ac_cv_sizeof_long+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"
+then :
 
-else
+else $as_nop
   if test "$ac_cv_type_long" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (long)
 See \`config.log' for more details" "$LINENO" 5; }
    else
@@ -47140,28 +49794,27 @@
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
-$as_echo "$ac_cv_sizeof_long" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
+printf "%s\n" "$ac_cv_sizeof_long" >&6; }
 
 
 
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_LONG $ac_cv_sizeof_long
-_ACEOF
+printf "%s\n" "#define SIZEOF_LONG $ac_cv_sizeof_long" >>confdefs.h
 
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we're at 64-bit platform" >&5
-$as_echo_n "checking if we're at 64-bit platform... " >&6; }
-    if test "$ac_cv_sizeof_long" -eq 4; then :
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we're at 64-bit platform" >&5
+printf %s "checking if we're at 64-bit platform... " >&6; }
+    if test "$ac_cv_sizeof_long" -eq 4
+then :
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
       PHP_OCI8_IC_LIBDIR_SUFFIX=""
 
-else
+else $as_nop
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
       PHP_OCI8_IC_LIBDIR_SUFFIX=64
 
 fi
@@ -47581,7 +50234,7 @@
 
 
 
-$as_echo "#define HAVE_ORALDAP 1" >>confdefs.h
+printf "%s\n" "#define HAVE_ORALDAP 1" >>confdefs.h
 
 
   elif test -f $LDAP_LIBDIR/libclntsh.$SHLIB_SUFFIX_NAME.11.1 || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/libclntsh.$SHLIB_SUFFIX_NAME.11.1; then
@@ -47683,7 +50336,7 @@
 
 
 
-$as_echo "#define HAVE_ORALDAP 1" >>confdefs.h
+printf "%s\n" "#define HAVE_ORALDAP 1" >>confdefs.h
 
 
   elif test -f $LDAP_LIBDIR/libclntsh.$SHLIB_SUFFIX_NAME || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/libclntsh.$SHLIB_SUFFIX_NAME; then
@@ -47785,7 +50438,7 @@
 
 
 
-$as_echo "#define HAVE_ORALDAP 1" >>confdefs.h
+printf "%s\n" "#define HAVE_ORALDAP 1" >>confdefs.h
 
 
   else
@@ -47827,7 +50480,7 @@
   PHP_VAR_SUBST="$PHP_VAR_SUBST LDAP_SHARED_LIBADD"
 
 
-$as_echo "#define HAVE_LDAP 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LDAP 1" >>confdefs.h
 
 
     _SAVE_CPPFLAGS=$CPPFLAGS
@@ -47835,64 +50488,115 @@
   CPPFLAGS="$CPPFLAGS -I$LDAP_INCDIR"
   LIBS="$LIBS $LDAP_SHARED_LIBADD"
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 3 arg ldap_set_rebind_proc" >&5
-$as_echo_n "checking for 3 arg ldap_set_rebind_proc... " >&6; }
-if ${ac_cv_3arg_setrebindproc+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for 3 arg ldap_set_rebind_proc" >&5
+printf %s "checking for 3 arg ldap_set_rebind_proc... " >&6; }
+if test ${ac_cv_3arg_setrebindproc+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ldap.h>
 int
-main ()
+main (void)
 {
 ldap_set_rebind_proc(0,0,0)
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_3arg_setrebindproc=yes
-else
+else $as_nop
   ac_cv_3arg_setrebindproc=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_3arg_setrebindproc" >&5
-$as_echo "$ac_cv_3arg_setrebindproc" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_3arg_setrebindproc" >&5
+printf "%s\n" "$ac_cv_3arg_setrebindproc" >&6; }
   if test "$ac_cv_3arg_setrebindproc" = yes; then
 
-$as_echo "#define HAVE_3ARG_SETREBINDPROC 1" >>confdefs.h
+printf "%s\n" "#define HAVE_3ARG_SETREBINDPROC 1" >>confdefs.h
 
   fi
 
-      for ac_func in ldap_parse_result ldap_parse_reference ldap_start_tls_s ldap_control_find ldap_parse_extended_result ldap_extended_operation ldap_extended_operation_s ldap_passwd ldap_whoami_s ldap_refresh_s
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
+      ac_fn_c_check_func "$LINENO" "ldap_parse_result" "ac_cv_func_ldap_parse_result"
+if test "x$ac_cv_func_ldap_parse_result" = xyes
+then :
+  printf "%s\n" "#define HAVE_LDAP_PARSE_RESULT 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "ldap_parse_reference" "ac_cv_func_ldap_parse_reference"
+if test "x$ac_cv_func_ldap_parse_reference" = xyes
+then :
+  printf "%s\n" "#define HAVE_LDAP_PARSE_REFERENCE 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "ldap_start_tls_s" "ac_cv_func_ldap_start_tls_s"
+if test "x$ac_cv_func_ldap_start_tls_s" = xyes
+then :
+  printf "%s\n" "#define HAVE_LDAP_START_TLS_S 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "ldap_control_find" "ac_cv_func_ldap_control_find"
+if test "x$ac_cv_func_ldap_control_find" = xyes
+then :
+  printf "%s\n" "#define HAVE_LDAP_CONTROL_FIND 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "ldap_parse_extended_result" "ac_cv_func_ldap_parse_extended_result"
+if test "x$ac_cv_func_ldap_parse_extended_result" = xyes
+then :
+  printf "%s\n" "#define HAVE_LDAP_PARSE_EXTENDED_RESULT 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "ldap_extended_operation" "ac_cv_func_ldap_extended_operation"
+if test "x$ac_cv_func_ldap_extended_operation" = xyes
+then :
+  printf "%s\n" "#define HAVE_LDAP_EXTENDED_OPERATION 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "ldap_extended_operation_s" "ac_cv_func_ldap_extended_operation_s"
+if test "x$ac_cv_func_ldap_extended_operation_s" = xyes
+then :
+  printf "%s\n" "#define HAVE_LDAP_EXTENDED_OPERATION_S 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "ldap_passwd" "ac_cv_func_ldap_passwd"
+if test "x$ac_cv_func_ldap_passwd" = xyes
+then :
+  printf "%s\n" "#define HAVE_LDAP_PASSWD 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "ldap_whoami_s" "ac_cv_func_ldap_whoami_s"
+if test "x$ac_cv_func_ldap_whoami_s" = xyes
+then :
+  printf "%s\n" "#define HAVE_LDAP_WHOAMI_S 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "ldap_refresh_s" "ac_cv_func_ldap_refresh_s"
+if test "x$ac_cv_func_ldap_refresh_s" = xyes
+then :
+  printf "%s\n" "#define HAVE_LDAP_REFRESH_S 1" >>confdefs.h
 
 fi
-done
 
 
     if test "$PHP_LDAP_SASL" != "no"; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libsasl2" >&5
-$as_echo_n "checking for libsasl2... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libsasl2" >&5
+printf %s "checking for libsasl2... " >&6; }
 
 if test -n "$SASL_CFLAGS"; then
     pkg_cv_SASL_CFLAGS="$SASL_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsasl2\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsasl2\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libsasl2") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_SASL_CFLAGS=`$PKG_CONFIG --cflags "libsasl2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -47906,10 +50610,10 @@
     pkg_cv_SASL_LIBS="$SASL_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsasl2\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsasl2\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libsasl2") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_SASL_LIBS=`$PKG_CONFIG --libs "libsasl2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -47923,8 +50627,8 @@
 
 
 if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -47950,10 +50654,10 @@
 and SASL_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -47967,8 +50671,8 @@
 else
 	SASL_CFLAGS=$pkg_cv_SASL_CFLAGS
 	SASL_LIBS=$pkg_cv_SASL_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
 fi
 
@@ -48113,14 +50817,15 @@
 
 
 
-$as_echo "#define HAVE_LDAP_SASL 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LDAP_SASL 1" >>confdefs.h
 
   fi
 
     ac_fn_c_check_func "$LINENO" "ldap_bind_s" "ac_cv_func_ldap_bind_s"
-if test "x$ac_cv_func_ldap_bind_s" = xyes; then :
+if test "x$ac_cv_func_ldap_bind_s" = xyes
+then :
 
-else
+else $as_nop
 
     as_fn_error $? "LDAP build check failed. Please check config.log for more information." "$LINENO" 5
 
@@ -48156,12 +50861,13 @@
 
 php_enable_mbstring=no
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable multibyte string support" >&5
-$as_echo_n "checking whether to enable multibyte string support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable multibyte string support" >&5
+printf %s "checking whether to enable multibyte string support... " >&6; }
 # Check whether --enable-mbstring was given.
-if test "${enable_mbstring+set}" = set; then :
+if test ${enable_mbstring+y}
+then :
   enableval=$enable_mbstring; PHP_MBSTRING=$enableval
-else
+else $as_nop
 
   PHP_MBSTRING=no
   test "$PHP_ENABLE_ALL" && PHP_MBSTRING=$PHP_ENABLE_ALL
@@ -48191,8 +50897,8 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -48200,12 +50906,13 @@
 
 php_enable_mbregex=yes
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable multibyte regex support (requires oniguruma)" >&5
-$as_echo_n "checking whether to enable multibyte regex support (requires oniguruma)... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable multibyte regex support (requires oniguruma)" >&5
+printf %s "checking whether to enable multibyte regex support (requires oniguruma)... " >&6; }
 # Check whether --enable-mbregex was given.
-if test "${enable_mbregex+set}" = set; then :
+if test ${enable_mbregex+y}
+then :
   enableval=$enable_mbregex; PHP_MBREGEX=$enableval
-else
+else $as_nop
 
   PHP_MBREGEX=yes
 
@@ -48214,15 +50921,15 @@
 
 
 ext_output=$PHP_MBREGEX
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
 
 if test "$PHP_MBSTRING" != "no"; then
 
-$as_echo "#define HAVE_MBSTRING 1" >>confdefs.h
+printf "%s\n" "#define HAVE_MBSTRING 1" >>confdefs.h
 
 
 
@@ -48234,17 +50941,17 @@
   if test "$PHP_MBREGEX" = "yes"; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for oniguruma" >&5
-$as_echo_n "checking for oniguruma... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for oniguruma" >&5
+printf %s "checking for oniguruma... " >&6; }
 
 if test -n "$ONIG_CFLAGS"; then
     pkg_cv_ONIG_CFLAGS="$ONIG_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"oniguruma\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"oniguruma\""; } >&5
   ($PKG_CONFIG --exists --print-errors "oniguruma") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_ONIG_CFLAGS=`$PKG_CONFIG --cflags "oniguruma" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -48258,10 +50965,10 @@
     pkg_cv_ONIG_LIBS="$ONIG_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"oniguruma\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"oniguruma\""; } >&5
   ($PKG_CONFIG --exists --print-errors "oniguruma") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_ONIG_LIBS=`$PKG_CONFIG --libs "oniguruma" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -48275,8 +50982,8 @@
 
 
 if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -48302,10 +51009,10 @@
 and ONIG_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -48319,8 +51026,8 @@
 else
 	ONIG_CFLAGS=$pkg_cv_ONIG_CFLAGS
 	ONIG_LIBS=$pkg_cv_ONIG_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
 fi
 
@@ -48563,15 +51270,15 @@
     esac
   done
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if oniguruma has an invalid entry for KOI8 encoding" >&5
-$as_echo_n "checking if oniguruma has an invalid entry for KOI8 encoding... " >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if oniguruma has an invalid entry for KOI8 encoding" >&5
+printf %s "checking if oniguruma has an invalid entry for KOI8 encoding... " >&6; }
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <oniguruma.h>
 
 int
-main ()
+main (void)
 {
 
 return (int)(ONIG_ENCODING_KOI8 + 1);
@@ -48580,21 +51287,22 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
-else
+else $as_nop
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-$as_echo "#define PHP_ONIG_BAD_KOI8_ENTRY 1" >>confdefs.h
+printf "%s\n" "#define PHP_ONIG_BAD_KOI8_ENTRY 1" >>confdefs.h
 
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
     LDFLAGS=$save_old_LDFLAGS
 
@@ -48606,7 +51314,7 @@
 
 
 
-$as_echo "#define HAVE_MBREGEX 1" >>confdefs.h
+printf "%s\n" "#define HAVE_MBREGEX 1" >>confdefs.h
 
 
 
@@ -48819,9 +51527,7 @@
 EOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define COMPILE_DL_MBSTRING 1
-_ACEOF
+printf "%s\n" "#define COMPILE_DL_MBSTRING 1" >>confdefs.h
 
     fi
   fi
@@ -49063,13 +51769,14 @@
 
 php_with_mysqli=no
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MySQLi support" >&5
-$as_echo_n "checking for MySQLi support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MySQLi support" >&5
+printf %s "checking for MySQLi support... " >&6; }
 
 # Check whether --with-mysqli was given.
-if test "${with_mysqli+set}" = set; then :
+if test ${with_mysqli+y}
+then :
   withval=$with_mysqli; PHP_MYSQLI=$withval
-else
+else $as_nop
 
   PHP_MYSQLI=no
   test "$PHP_ENABLE_ALL" && PHP_MYSQLI=$PHP_ENABLE_ALL
@@ -49099,8 +51806,8 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -49108,13 +51815,14 @@
 
 php_with_mysql_sock=no
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for specified location of the MySQL UNIX socket" >&5
-$as_echo_n "checking for specified location of the MySQL UNIX socket... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for specified location of the MySQL UNIX socket" >&5
+printf %s "checking for specified location of the MySQL UNIX socket... " >&6; }
 
 # Check whether --with-mysql-sock was given.
-if test "${with_mysql_sock+set}" = set; then :
+if test ${with_mysql_sock+y}
+then :
   withval=$with_mysql_sock; PHP_MYSQL_SOCK=$withval
-else
+else $as_nop
 
   PHP_MYSQL_SOCK=no
 
@@ -49123,8 +51831,8 @@
 
 
 ext_output=$PHP_MYSQL_SOCK
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -49137,17 +51845,15 @@
 fi
 
 if test "$PHP_MYSQLI" != "no"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MySQL UNIX socket location" >&5
-$as_echo_n "checking for MySQL UNIX socket location... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MySQL UNIX socket location" >&5
+printf %s "checking for MySQL UNIX socket location... " >&6; }
   if test "$PHP_MYSQL_SOCK" != "no" && test "$PHP_MYSQL_SOCK" != "yes"; then
     MYSQL_SOCK=$PHP_MYSQL_SOCK
 
-cat >>confdefs.h <<_ACEOF
-#define PHP_MYSQL_UNIX_SOCK_ADDR "$MYSQL_SOCK"
-_ACEOF
+printf "%s\n" "#define PHP_MYSQL_UNIX_SOCK_ADDR \"$MYSQL_SOCK\"" >>confdefs.h
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MYSQL_SOCK" >&5
-$as_echo "$MYSQL_SOCK" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MYSQL_SOCK" >&5
+printf "%s\n" "$MYSQL_SOCK" >&6; }
   elif test "$PHP_MYSQL_SOCK" = "yes"; then
 
   for i in  \
@@ -49169,20 +51875,18 @@
 
   if test -n "$MYSQL_SOCK"; then
 
-cat >>confdefs.h <<_ACEOF
-#define PHP_MYSQL_UNIX_SOCK_ADDR "$MYSQL_SOCK"
-_ACEOF
+printf "%s\n" "#define PHP_MYSQL_UNIX_SOCK_ADDR \"$MYSQL_SOCK\"" >>confdefs.h
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MYSQL_SOCK" >&5
-$as_echo "$MYSQL_SOCK" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MYSQL_SOCK" >&5
+printf "%s\n" "$MYSQL_SOCK" >&6; }
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
   fi
 
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
   fi
 
   mysqli_sources="mysqli.c mysqli_api.c mysqli_prop.c mysqli_nonapi.c \
@@ -49322,9 +52026,7 @@
 EOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define COMPILE_DL_MYSQLI 1
-_ACEOF
+printf "%s\n" "#define COMPILE_DL_MYSQLI 1" >>confdefs.h
 
     fi
   fi
@@ -49535,13 +52237,14 @@
 
 php_with_oci8=no
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Oracle Database OCI8 support" >&5
-$as_echo_n "checking for Oracle Database OCI8 support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Oracle Database OCI8 support" >&5
+printf %s "checking for Oracle Database OCI8 support... " >&6; }
 
 # Check whether --with-oci8 was given.
-if test "${with_oci8+set}" = set; then :
+if test ${with_oci8+y}
+then :
   withval=$with_oci8; PHP_OCI8=$withval
-else
+else $as_nop
 
   PHP_OCI8=no
   test "$PHP_ENABLE_ALL" && PHP_OCI8=$PHP_ENABLE_ALL
@@ -49571,8 +52274,8 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -49583,8 +52286,8 @@
             as_fn_error $? "Empty parameter value passed to --with-oci8" "$LINENO" 5
   fi
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking PHP version" >&5
-$as_echo_n "checking PHP version... " >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking PHP version" >&5
+printf %s "checking PHP version... " >&6; }
 
   tmp_version=$PHP_VERSION
   if test -z "$tmp_version"; then
@@ -49615,26 +52318,25 @@
   elif test "$oci8_php_version" -lt "8001000"; then
     as_fn_error $? "You need at least PHP 8.1.0 to be able to use this version of OCI8. Use OCI8 3.0 for PHP $php_version" "$LINENO" 5
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_version, ok" >&5
-$as_echo "$php_version, ok" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_version, ok" >&5
+printf "%s\n" "$php_version, ok" >&6; }
   fi
 
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking OCI8 DTrace support" >&5
-$as_echo_n "checking OCI8 DTrace support... " >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking OCI8 DTrace support" >&5
+printf %s "checking OCI8 DTrace support... " >&6; }
   oci8_do_dtrace="`echo $PHP_OCI8 | cut -d, -f3`"
   if test "$PHP_DTRACE" = "yes" -o "$oci8_do_dtrace" = "dtrace" ; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
     if test "$ext_shared" = "no"; then
       as_fn_error $? "For DTrace support OCI8 must be configured as a shared extension" "$LINENO" 5
     else
-      for ac_header in sys/sdt.h
+             for ac_header in sys/sdt.h
 do :
-  ac_fn_c_check_header_mongrel "$LINENO" "sys/sdt.h" "ac_cv_header_sys_sdt_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_sdt_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_SYS_SDT_H 1
-_ACEOF
+  ac_fn_c_check_header_compile "$LINENO" "sys/sdt.h" "ac_cv_header_sys_sdt_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_sdt_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_SDT_H 1" >>confdefs.h
 
 
   ac_srcdir=$abs_srcdir/ext/oci8/
@@ -49697,8 +52399,8 @@
 EOF
     ;;
   *)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OCI8 extension: OCI8 DTrace support is not confirmed on this platform" >&5
-$as_echo "$as_me: WARNING: OCI8 extension: OCI8 DTrace support is not confirmed on this platform" >&2;}
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: OCI8 extension: OCI8 DTrace support is not confirmed on this platform" >&5
+printf "%s\n" "$as_me: WARNING: OCI8 extension: OCI8 DTrace support is not confirmed on this platform" >&2;}
 cat>>Makefile.objects<<EOF
 $ac_bdir$ac_provsrc.o: \$(OCI8_DTRACE_OBJS)
 	CC="\$(CC)" CFLAGS="\$(CFLAGS_CLEAN)" dtrace -G -o \$@ -s $ac_srcdir$ac_provsrc $dtrace_oci8_objs
@@ -49709,7 +52411,7 @@
 
 
 
-else
+else $as_nop
 
 	 as_fn_error $? "Cannot find sys/sdt.h which is required for DTrace support" "$LINENO" 5
 
@@ -49717,34 +52419,35 @@
 
 done
 
-
   PHP_VAR_SUBST="$PHP_VAR_SUBST OCI8_DTRACE_OBJS"
 
 
-$as_echo "#define HAVE_OCI8_DTRACE 1" >>confdefs.h
+printf "%s\n" "#define HAVE_OCI8_DTRACE 1" >>confdefs.h
 
                   shared_objects_oci8="$shared_objects_oci8 ext/oci8/oci8_dtrace.d.lo"
     fi
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
   fi
 
     # The cast to long int works around a bug in the HP C Compiler
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 # declarations like `int a3(sizeof (unsigned char)) >= 0;'.
 # This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
-$as_echo_n "checking size of long... " >&6; }
-if ${ac_cv_sizeof_long+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
+printf %s "checking size of long... " >&6; }
+if test ${ac_cv_sizeof_long+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"
+then :
 
-else
+else $as_nop
   if test "$ac_cv_type_long" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (long)
 See \`config.log' for more details" "$LINENO" 5; }
    else
@@ -49753,29 +52456,28 @@
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
-$as_echo "$ac_cv_sizeof_long" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
+printf "%s\n" "$ac_cv_sizeof_long" >&6; }
 
 
 
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_LONG $ac_cv_sizeof_long
-_ACEOF
+printf "%s\n" "#define SIZEOF_LONG $ac_cv_sizeof_long" >>confdefs.h
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we're at 64-bit platform" >&5
-$as_echo_n "checking if we're at 64-bit platform... " >&6; }
-  if test "$ac_cv_sizeof_long" -eq 4; then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we're at 64-bit platform" >&5
+printf %s "checking if we're at 64-bit platform... " >&6; }
+  if test "$ac_cv_sizeof_long" -eq 4
+then :
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
     PHP_OCI8_OH_LIBDIR=lib32
     PHP_OCI8_IC_LIBDIR_SUFFIX=""
 
-else
+else $as_nop
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
     PHP_OCI8_OH_LIBDIR=lib
     PHP_OCI8_IC_LIBDIR_SUFFIX=64
 
@@ -49785,8 +52487,8 @@
   PHP_OCI8_INSTANT_CLIENT="no"
 
             if test "$PHP_OCI8" = "yes" && test -z "$ORACLE_HOME"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OCI8 extension: ORACLE_HOME is not set, looking for default Oracle Instant Client instead" >&5
-$as_echo "$as_me: WARNING: OCI8 extension: ORACLE_HOME is not set, looking for default Oracle Instant Client instead" >&2;}
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: OCI8 extension: ORACLE_HOME is not set, looking for default Oracle Instant Client instead" >&5
+printf "%s\n" "$as_me: WARNING: OCI8 extension: ORACLE_HOME is not set, looking for default Oracle Instant Client instead" >&2;}
     PHP_OCI8=instantclient
   fi
 
@@ -49814,20 +52516,20 @@
 
   if test "$PHP_OCI8_INSTANT_CLIENT" = "no"; then
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking Oracle ORACLE_HOME install directory" >&5
-$as_echo_n "checking Oracle ORACLE_HOME install directory... " >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Oracle ORACLE_HOME install directory" >&5
+printf %s "checking Oracle ORACLE_HOME install directory... " >&6; }
 
     if test "$PHP_OCI8" = "yes"; then
       OCI8_DIR=$ORACLE_HOME
     else
       OCI8_DIR=$PHP_OCI8
     fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCI8_DIR" >&5
-$as_echo "$OCI8_DIR" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OCI8_DIR" >&5
+printf "%s\n" "$OCI8_DIR" >&6; }
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking ORACLE_HOME library validity" >&5
-$as_echo_n "checking ORACLE_HOME library validity... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking ORACLE_HOME library validity" >&5
+printf %s "checking ORACLE_HOME library validity... " >&6; }
   if test ! -d "$OCI8_DIR"; then
     as_fn_error $? "${OCI8_DIR} is not a directory" "$LINENO" 5
   fi
@@ -49844,8 +52546,8 @@
       as_fn_error $? "Oracle library directory not found in ${OCI8_DIR}" "$LINENO" 5
     fi
   fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCI8_LIB_DIR" >&5
-$as_echo "$OCI8_LIB_DIR" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OCI8_LIB_DIR" >&5
+printf "%s\n" "$OCI8_LIB_DIR" >&6; }
 
 
     if test -d "$OCI8_DIR/rdbms/public"; then
@@ -50188,8 +52890,8 @@
     fi
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking Oracle library version compatibility" >&5
-$as_echo_n "checking Oracle library version compatibility... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Oracle library version compatibility" >&5
+printf %s "checking Oracle library version compatibility... " >&6; }
   OCI8_LCS_BASE=$OCI8_DIR/$OCI8_LIB_DIR/libclntsh.$SHLIB_SUFFIX_NAME
     OCI8_LCS=`ls $OCI8_LCS_BASE.*.1 2> /dev/null | $PHP_OCI8_TAIL1`
   if test -s "$OCI8_DIR/orainst/unix.rgs"; then
@@ -50212,8 +52914,8 @@
   else
     as_fn_error $? "Oracle libclntsh.$SHLIB_SUFFIX_NAME client library not found" "$LINENO" 5
   fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCI8_ORACLE_VERSION" >&5
-$as_echo "$OCI8_ORACLE_VERSION" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OCI8_ORACLE_VERSION" >&5
+printf "%s\n" "$OCI8_ORACLE_VERSION" >&6; }
 
 
     case $OCI8_ORACLE_VERSION in
@@ -50417,9 +53119,7 @@
 EOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define COMPILE_DL_OCI8 1
-_ACEOF
+printf "%s\n" "#define COMPILE_DL_OCI8 1" >>confdefs.h
 
     fi
   fi
@@ -50541,7 +53241,7 @@
   fi
 
 
-$as_echo "#define HAVE_OCI8 1" >>confdefs.h
+printf "%s\n" "#define HAVE_OCI8 1" >>confdefs.h
 
 
 
@@ -50564,20 +53264,16 @@
 
 
 
-cat >>confdefs.h <<_ACEOF
-#define PHP_OCI8_DEF_DIR "$OCI8_DIR"
-_ACEOF
+printf "%s\n" "#define PHP_OCI8_DEF_DIR \"$OCI8_DIR\"" >>confdefs.h
 
 
-cat >>confdefs.h <<_ACEOF
-#define PHP_OCI8_DEF_SHARED_LIBADD "$OCI8_SHARED_LIBADD"
-_ACEOF
+printf "%s\n" "#define PHP_OCI8_DEF_SHARED_LIBADD \"$OCI8_SHARED_LIBADD\"" >>confdefs.h
 
 
   else
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking Oracle Instant Client directory" >&5
-$as_echo_n "checking Oracle Instant Client directory... " >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Oracle Instant Client directory" >&5
+printf %s "checking Oracle Instant Client directory... " >&6; }
 
     if test "$PHP_OCI8_INSTANT_CLIENT" = "yes"; then
                                     PHP_OCI8_INSTANT_CLIENT=`ls -d /usr/lib/oracle/*/client${PHP_OCI8_IC_LIBDIR_SUFFIX}/lib/libclntsh.* 2> /dev/null | $PHP_OCI8_TAIL1 | $PHP_OCI8_SED -e 's#/libclntsh^/*##'`
@@ -50585,13 +53281,13 @@
 	as_fn_error $? "Oracle Instant Client directory /usr/lib/oracle/.../client${PHP_OCI8_IC_LIBDIR_SUFFIX}/lib libraries not found. Try --with-oci8=instantclient,DIR" "$LINENO" 5
       fi
     fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PHP_OCI8_INSTANT_CLIENT" >&5
-$as_echo "$PHP_OCI8_INSTANT_CLIENT" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PHP_OCI8_INSTANT_CLIENT" >&5
+printf "%s\n" "$PHP_OCI8_INSTANT_CLIENT" >&6; }
 
     OCI8_DIR=$PHP_OCI8_INSTANT_CLIENT
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking Oracle Instant Client SDK header directory" >&5
-$as_echo_n "checking Oracle Instant Client SDK header directory... " >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Oracle Instant Client SDK header directory" >&5
+printf %s "checking Oracle Instant Client SDK header directory... " >&6; }
 
         OCISDKRPMINC=`echo "$PHP_OCI8_INSTANT_CLIENT" | $PHP_OCI8_SED -e 's!^/usr/lib/oracle/$.*$/client$'${PHP_OCI8_IC_LIBDIR_SUFFIX}'$*/lib/*$!/usr/include/oracle/\1/client\2!'`
 
@@ -50600,8 +53296,8 @@
         OCISDKMANINC=`echo "$PHP_OCI8_INSTANT_CLIENT" | $PHP_OCI8_SED -e 's!$.*$/lib/*$!\1/include!'`
 
     if test -f "$OCISDKRPMINC/oci.h"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCISDKRPMINC" >&5
-$as_echo "$OCISDKRPMINC" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OCISDKRPMINC" >&5
+printf "%s\n" "$OCISDKRPMINC" >&6; }
 
   if test "$OCISDKRPMINC" != "/usr/include"; then
 
@@ -50635,8 +53331,8 @@
 
       OCI8INCDIR=$OCISDKRPMINC
     elif test -f "$OCISDKZIPINC/oci.h"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCISDKZIPINC" >&5
-$as_echo "$OCISDKZIPINC" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OCISDKZIPINC" >&5
+printf "%s\n" "$OCISDKZIPINC" >&6; }
 
   if test "$OCISDKZIPINC" != "/usr/include"; then
 
@@ -50670,8 +53366,8 @@
 
       OCI8INCDIR=$OCISDKZIPINC
     elif test -f "$OCISDKMANINC/oci.h"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCISDKMANINC" >&5
-$as_echo "$OCISDKMANINC" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OCISDKMANINC" >&5
+printf "%s\n" "$OCISDKMANINC" >&6; }
 
   if test "$OCISDKMANINC" != "/usr/include"; then
 
@@ -50812,8 +53508,8 @@
     fi
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking Oracle Instant Client library version compatibility" >&5
-$as_echo_n "checking Oracle Instant Client library version compatibility... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Oracle Instant Client library version compatibility" >&5
+printf %s "checking Oracle Instant Client library version compatibility... " >&6; }
   OCI8_LCS_BASE=$PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME
     OCI8_LCS=`ls $OCI8_LCS_BASE.*.1 2> /dev/null | $PHP_OCI8_TAIL1`
   OCI8_NNZ=`ls $PHP_OCI8_INSTANT_CLIENT/libnnz*.$SHLIB_SUFFIX_NAME 2> /dev/null | $PHP_OCI8_TAIL1`
@@ -50825,8 +53521,8 @@
   else
     as_fn_error $? "Oracle Instant Client libraries libnnz.$SHLIB_SUFFIX_NAME and libclntsh.$SHLIB_SUFFIX_NAME not found" "$LINENO" 5
   fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCI8_ORACLE_VERSION" >&5
-$as_echo "$OCI8_ORACLE_VERSION" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OCI8_ORACLE_VERSION" >&5
+printf "%s\n" "$OCI8_ORACLE_VERSION" >&6; }
 
     case $OCI8_ORACLE_VERSION in
       10.1)
@@ -50896,7 +53592,7 @@
 
 
 
-$as_echo "#define HAVE_OCI_INSTANT_CLIENT 1" >>confdefs.h
+printf "%s\n" "#define HAVE_OCI_INSTANT_CLIENT 1" >>confdefs.h
 
 
 
@@ -51033,9 +53729,7 @@
 EOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define COMPILE_DL_OCI8 1
-_ACEOF
+printf "%s\n" "#define COMPILE_DL_OCI8 1" >>confdefs.h
 
     fi
   fi
@@ -51157,7 +53851,7 @@
   fi
 
 
-$as_echo "#define HAVE_OCI8 1" >>confdefs.h
+printf "%s\n" "#define HAVE_OCI8 1" >>confdefs.h
 
 
 
@@ -51202,9 +53896,10 @@
 
 
 # Check whether --with-odbcver was given.
-if test "${with_odbcver+set}" = set; then :
+if test ${with_odbcver+y}
+then :
   withval=$with_odbcver; PHP_ODBCVER=$withval
-else
+else $as_nop
 
   PHP_ODBCVER=0x0350
   test "$PHP_ENABLE_ALL" && PHP_ODBCVER=$PHP_ENABLE_ALL
@@ -51246,9 +53941,10 @@
 
 
 # Check whether --with-adabas was given.
-if test "${with_adabas+set}" = set; then :
+if test ${with_adabas+y}
+then :
   withval=$with_adabas; PHP_ADABAS=$withval
-else
+else $as_nop
 
   PHP_ADABAS=no
   test "$PHP_ENABLE_ALL" && PHP_ADABAS=$PHP_ENABLE_ALL
@@ -51283,8 +53979,8 @@
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Adabas support" >&5
-$as_echo_n "checking for Adabas support... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Adabas support" >&5
+printf %s "checking for Adabas support... " >&6; }
   if test "$PHP_ADABAS" != "no"; then
     if test "$PHP_ADABAS" = "yes"; then
       PHP_ADABAS=/usr/local
@@ -51435,13 +54131,13 @@
 fi
 
 
-$as_echo "#define HAVE_ADABAS 1" >>confdefs.h
+printf "%s\n" "#define HAVE_ADABAS 1" >>confdefs.h
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
   fi
 fi
 
@@ -51452,9 +54148,10 @@
 
 
 # Check whether --with-sapdb was given.
-if test "${with_sapdb+set}" = set; then :
+if test ${with_sapdb+y}
+then :
   withval=$with_sapdb; PHP_SAPDB=$withval
-else
+else $as_nop
 
   PHP_SAPDB=no
   test "$PHP_ENABLE_ALL" && PHP_SAPDB=$PHP_ENABLE_ALL
@@ -51489,8 +54186,8 @@
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SAP DB support" >&5
-$as_echo_n "checking for SAP DB support... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SAP DB support" >&5
+printf %s "checking for SAP DB support... " >&6; }
   if test "$PHP_SAPDB" != "no"; then
     if test "$PHP_SAPDB" = "yes"; then
       PHP_SAPDB=/usr/local
@@ -51571,13 +54268,13 @@
 
     ODBC_TYPE=sapdb
 
-$as_echo "#define HAVE_SAPDB 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SAPDB 1" >>confdefs.h
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
   fi
 fi
 
@@ -51588,9 +54285,10 @@
 
 
 # Check whether --with-solid was given.
-if test "${with_solid+set}" = set; then :
+if test ${with_solid+y}
+then :
   withval=$with_solid; PHP_SOLID=$withval
-else
+else $as_nop
 
   PHP_SOLID=no
   test "$PHP_ENABLE_ALL" && PHP_SOLID=$PHP_ENABLE_ALL
@@ -51625,8 +54323,8 @@
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Solid support" >&5
-$as_echo_n "checking for Solid support... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Solid support" >&5
+printf %s "checking for Solid support... " >&6; }
   if test "$PHP_SOLID" != "no"; then
     if test "$PHP_SOLID" = "yes"; then
       PHP_SOLID=/usr/local/solid
@@ -51637,22 +54335,22 @@
     ODBC_TYPE=solid
     if test -f $ODBC_LIBDIR/soc*35.a; then
 
-$as_echo "#define HAVE_SOLID_35 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SOLID_35 1" >>confdefs.h
 
     elif test -f $ODBC_LIBDIR/scl*30.a; then
 
-$as_echo "#define HAVE_SOLID_30 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SOLID_30 1" >>confdefs.h
 
     elif test -f $ODBC_LIBDIR/scl*23.a; then
 
-$as_echo "#define HAVE_SOLID 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SOLID 1" >>confdefs.h
 
     fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking Solid library file" >&5
-$as_echo_n "checking Solid library file... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Solid library file" >&5
+printf %s "checking Solid library file... " >&6; }
   ac_solid_uname_r=`uname -r 2>/dev/null`
   ac_solid_uname_s=`uname -s 2>/dev/null`
   case $ac_solid_uname_s in
@@ -51662,12 +54360,12 @@
     Linux)
       if ldd -v /bin/sh | grep GLIBC > /dev/null; then
 
-$as_echo "#define SS_LINUX 1" >>confdefs.h
+printf "%s\n" "#define SS_LINUX 1" >>confdefs.h
 
         ac_solid_os=l2x
       else
 
-$as_echo "#define SS_LINUX 1" >>confdefs.h
+printf "%s\n" "#define SS_LINUX 1" >>confdefs.h
 
         ac_solid_os=lux
       fi;;
@@ -51676,12 +54374,12 @@
     FreeBSD)
       if test `expr $ac_solid_uname_r : '$.$'` -gt "2"; then
 
-$as_echo "#define SS_FBX 1" >>confdefs.h
+printf "%s\n" "#define SS_FBX 1" >>confdefs.h
 
         ac_solid_os=fex
       else
 
-$as_echo "#define SS_FBX 1" >>confdefs.h
+printf "%s\n" "#define SS_FBX 1" >>confdefs.h
 
         ac_solid_os=fbx
       fi;;
@@ -51712,12 +54410,12 @@
   ODBC_LIBS=-l${ac_solid_prefix}${ac_solid_os}${ac_solid_version}
 fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: \`echo $ODBC_LIBS | sed -e 's!.*/!!'\`" >&5
-$as_echo "\`echo $ODBC_LIBS | sed -e 's!.*/!!'\`" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \`echo $ODBC_LIBS | sed -e 's!.*/!!'\`" >&5
+printf "%s\n" "\`echo $ODBC_LIBS | sed -e 's!.*/!!'\`" >&6; }
 
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
   fi
 fi
 
@@ -51728,9 +54426,10 @@
 
 
 # Check whether --with-ibm-db2 was given.
-if test "${with_ibm_db2+set}" = set; then :
+if test ${with_ibm_db2+y}
+then :
   withval=$with_ibm_db2; PHP_IBM_DB2=$withval
-else
+else $as_nop
 
   PHP_IBM_DB2=no
   test "$PHP_ENABLE_ALL" && PHP_IBM_DB2=$PHP_ENABLE_ALL
@@ -51765,8 +54464,8 @@
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IBM DB2 support" >&5
-$as_echo_n "checking for IBM DB2 support... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for IBM DB2 support" >&5
+printf %s "checking for IBM DB2 support... " >&6; }
   if test "$PHP_IBM_DB2" != "no"; then
     if test "$PHP_IBM_DB2" = "yes"; then
       ODBC_INCDIR=/home/db2inst1/sqllib/include
@@ -51803,23 +54502,24 @@
     }
 
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
 
     LIBS=$old_LIBS
 
 
-$as_echo "#define HAVE_IBMDB2 1" >>confdefs.h
+printf "%s\n" "#define HAVE_IBMDB2 1" >>confdefs.h
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
-else
+else $as_nop
 
     LIBS=$old_LIBS
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
       as_fn_error $? "
 build test failed. Please check the config.log for details.
 You need to source your DB2 environment before running PHP configure:
@@ -51828,12 +54528,12 @@
 
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
   fi
 fi
 
@@ -51844,9 +54544,10 @@
 
 
 # Check whether --with-empress was given.
-if test "${with_empress+set}" = set; then :
+if test ${with_empress+y}
+then :
   withval=$with_empress; PHP_EMPRESS=$withval
-else
+else $as_nop
 
   PHP_EMPRESS=no
   test "$PHP_ENABLE_ALL" && PHP_EMPRESS=$PHP_ENABLE_ALL
@@ -51881,8 +54582,8 @@
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Empress support" >&5
-$as_echo_n "checking for Empress support... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Empress support" >&5
+printf %s "checking for Empress support... " >&6; }
   if test "$PHP_EMPRESS" != "no"; then
     if test "$PHP_EMPRESS" = "yes"; then
       ODBC_INCDIR=$EMPRESSPATH/include/odbc
@@ -51895,23 +54596,23 @@
     ODBC_LFLAGS=-L$ODBC_LIBDIR
     ODBC_TYPE=empress
 
-$as_echo "#define HAVE_EMPRESS 1" >>confdefs.h
+printf "%s\n" "#define HAVE_EMPRESS 1" >>confdefs.h
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking Empress library file" >&5
-$as_echo_n "checking Empress library file... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Empress library file" >&5
+printf %s "checking Empress library file... " >&6; }
   ODBC_LIBS=`echo $ODBC_LIBDIR/libempodbccl.so | cut -d' ' -f1`
   if test ! -f $ODBC_LIBS; then
     ODBC_LIBS=`echo $ODBC_LIBDIR/libempodbccl.so | cut -d' ' -f1`
   fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: \`echo $ODBC_LIBS | sed -e 's!.*/!!'\`" >&5
-$as_echo "\`echo $ODBC_LIBS | sed -e 's!.*/!!'\`" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \`echo $ODBC_LIBS | sed -e 's!.*/!!'\`" >&5
+printf "%s\n" "\`echo $ODBC_LIBS | sed -e 's!.*/!!'\`" >&6; }
 
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
   fi
 fi
 
@@ -51922,9 +54623,10 @@
 
 
 # Check whether --with-empress-bcs was given.
-if test "${with_empress_bcs+set}" = set; then :
+if test ${with_empress_bcs+y}
+then :
   withval=$with_empress_bcs; PHP_EMPRESS_BCS=$withval
-else
+else $as_nop
 
   PHP_EMPRESS_BCS=no
   test "$PHP_ENABLE_ALL" && PHP_EMPRESS_BCS=$PHP_ENABLE_ALL
@@ -51959,8 +54661,8 @@
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Empress local access support" >&5
-$as_echo_n "checking for Empress local access support... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Empress local access support" >&5
+printf %s "checking for Empress local access support... " >&6; }
   if test "$PHP_EMPRESS_BCS" != "no"; then
     if test "$PHP_EMPRESS_BCS" = "yes"; then
       ODBC_INCDIR=$EMPRESSPATH/include/odbc
@@ -51989,23 +54691,23 @@
     ODBC_LIBS="-lempphpbcs -lms -lmscfg -lbasic -lbasic_os -lnlscstab -lnlsmsgtab -lm -ldl -lcrypt"
     ODBC_TYPE=empress-bcs
 
-$as_echo "#define HAVE_EMPRESS 1" >>confdefs.h
+printf "%s\n" "#define HAVE_EMPRESS 1" >>confdefs.h
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking Empress local access library file" >&5
-$as_echo_n "checking Empress local access library file... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Empress local access library file" >&5
+printf %s "checking Empress local access library file... " >&6; }
   ODBCBCS_LIBS=`echo $ODBC_LIBDIR/libempodbcbcs.a | cut -d' ' -f1`
   if test ! -f $ODBCBCS_LIBS; then
     ODBCBCS_LIBS=`echo $ODBC_LIBDIR/libempodbcbcs.a | cut -d' ' -f1`
   fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: \`echo $ODBCBCS_LIBS | sed -e 's!.*/!!'\`" >&5
-$as_echo "\`echo $ODBCBCS_LIBS | sed -e 's!.*/!!'\`" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \`echo $ODBCBCS_LIBS | sed -e 's!.*/!!'\`" >&5
+printf "%s\n" "\`echo $ODBCBCS_LIBS | sed -e 's!.*/!!'\`" >&6; }
 
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
   fi
 fi
 
@@ -52016,9 +54718,10 @@
 
 
 # Check whether --with-custom-odbc was given.
-if test "${with_custom_odbc+set}" = set; then :
+if test ${with_custom_odbc+y}
+then :
   withval=$with_custom_odbc; PHP_CUSTOM_ODBC=$withval
-else
+else $as_nop
 
   PHP_CUSTOM_ODBC=no
   test "$PHP_ENABLE_ALL" && PHP_CUSTOM_ODBC=$PHP_ENABLE_ALL
@@ -52053,8 +54756,8 @@
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a custom ODBC support" >&5
-$as_echo_n "checking for a custom ODBC support... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a custom ODBC support" >&5
+printf %s "checking for a custom ODBC support... " >&6; }
   if test "$PHP_CUSTOM_ODBC" != "no"; then
     if test "$PHP_CUSTOM_ODBC" = "yes"; then
       PHP_CUSTOM_ODBC=/usr/local
@@ -52066,13 +54769,13 @@
     ODBC_LIBS=$CUSTOM_ODBC_LIBS
     ODBC_TYPE=custom-odbc
 
-$as_echo "#define HAVE_CODBC 1" >>confdefs.h
+printf "%s\n" "#define HAVE_CODBC 1" >>confdefs.h
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
   fi
 fi
 
@@ -52083,9 +54786,10 @@
 
 
 # Check whether --with-iodbc was given.
-if test "${with_iodbc+set}" = set; then :
+if test ${with_iodbc+y}
+then :
   withval=$with_iodbc; PHP_IODBC=$withval
-else
+else $as_nop
 
   PHP_IODBC=no
   test "$PHP_ENABLE_ALL" && PHP_IODBC=$PHP_ENABLE_ALL
@@ -52120,24 +54824,24 @@
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build with iODBC support" >&5
-$as_echo_n "checking whether to build with iODBC support... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build with iODBC support" >&5
+printf %s "checking whether to build with iODBC support... " >&6; }
   if test "$PHP_IODBC" != "no"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libiodbc" >&5
-$as_echo_n "checking for libiodbc... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libiodbc" >&5
+printf %s "checking for libiodbc... " >&6; }
 
 if test -n "$ODBC_CFLAGS"; then
     pkg_cv_ODBC_CFLAGS="$ODBC_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libiodbc\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libiodbc\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libiodbc") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_ODBC_CFLAGS=`$PKG_CONFIG --cflags "libiodbc" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -52151,10 +54855,10 @@
     pkg_cv_ODBC_LIBS="$ODBC_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libiodbc\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libiodbc\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libiodbc") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_ODBC_LIBS=`$PKG_CONFIG --libs "libiodbc" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -52168,8 +54872,8 @@
 
 
 if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -52195,10 +54899,10 @@
 and ODBC_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -52212,8 +54916,8 @@
 else
 	ODBC_CFLAGS=$pkg_cv_ODBC_CFLAGS
 	ODBC_LIBS=$pkg_cv_ODBC_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
 fi
 
@@ -52258,14 +54962,14 @@
 
     ODBC_TYPE=iodbc
 
-$as_echo "#define HAVE_IODBC 1" >>confdefs.h
+printf "%s\n" "#define HAVE_IODBC 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_ODBC2 1" >>confdefs.h
+printf "%s\n" "#define HAVE_ODBC2 1" >>confdefs.h
 
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
   fi
 fi
 
@@ -52276,9 +54980,10 @@
 
 
 # Check whether --with-esoob was given.
-if test "${with_esoob+set}" = set; then :
+if test ${with_esoob+y}
+then :
   withval=$with_esoob; PHP_ESOOB=$withval
-else
+else $as_nop
 
   PHP_ESOOB=no
   test "$PHP_ENABLE_ALL" && PHP_ESOOB=$PHP_ENABLE_ALL
@@ -52313,8 +55018,8 @@
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Easysoft ODBC-ODBC Bridge support" >&5
-$as_echo_n "checking for Easysoft ODBC-ODBC Bridge support... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Easysoft ODBC-ODBC Bridge support" >&5
+printf %s "checking for Easysoft ODBC-ODBC Bridge support... " >&6; }
   if test "$PHP_ESOOB" != "no"; then
     if test "$PHP_ESOOB" = "yes"; then
       PHP_ESOOB=/usr/local/easysoft/oob/client
@@ -52326,13 +55031,13 @@
     ODBC_LIBS=-lesoobclient
     ODBC_TYPE=esoob
 
-$as_echo "#define HAVE_ESOOB 1" >>confdefs.h
+printf "%s\n" "#define HAVE_ESOOB 1" >>confdefs.h
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
   fi
 fi
 
@@ -52343,9 +55048,10 @@
 
 
 # Check whether --with-unixODBC was given.
-if test "${with_unixODBC+set}" = set; then :
+if test ${with_unixODBC+y}
+then :
   withval=$with_unixODBC; PHP_UNIXODBC=$withval
-else
+else $as_nop
 
   PHP_UNIXODBC=no
   test "$PHP_ENABLE_ALL" && PHP_UNIXODBC=$PHP_ENABLE_ALL
@@ -52380,25 +55086,25 @@
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build with unixODBC support" >&5
-$as_echo_n "checking whether to build with unixODBC support... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build with unixODBC support" >&5
+printf %s "checking whether to build with unixODBC support... " >&6; }
   if test "$PHP_UNIXODBC" != "no"; then
     if test "$PHP_UNIXODBC" = "yes"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes from pkgconfig" >&5
-$as_echo "yes from pkgconfig" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes from pkgconfig" >&5
+printf "%s\n" "yes from pkgconfig" >&6; }
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for odbc" >&5
-$as_echo_n "checking for odbc... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for odbc" >&5
+printf %s "checking for odbc... " >&6; }
 
 if test -n "$ODBC_CFLAGS"; then
     pkg_cv_ODBC_CFLAGS="$ODBC_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"odbc\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"odbc\""; } >&5
   ($PKG_CONFIG --exists --print-errors "odbc") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_ODBC_CFLAGS=`$PKG_CONFIG --cflags "odbc" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -52412,10 +55118,10 @@
     pkg_cv_ODBC_LIBS="$ODBC_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"odbc\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"odbc\""; } >&5
   ($PKG_CONFIG --exists --print-errors "odbc") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_ODBC_LIBS=`$PKG_CONFIG --libs "odbc" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -52429,8 +55135,8 @@
 
 
 if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -52456,10 +55162,10 @@
 and ODBC_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -52473,8 +55179,8 @@
 else
 	ODBC_CFLAGS=$pkg_cv_ODBC_CFLAGS
 	ODBC_LIBS=$pkg_cv_ODBC_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
 fi
 
@@ -52528,16 +55234,16 @@
   as_fn_error $? "ODBC header file '$ODBC_INCDIR/sqlext.h' not found!" "$LINENO" 5
 fi
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes in $PHP_UNIXODBC" >&5
-$as_echo "yes in $PHP_UNIXODBC" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes in $PHP_UNIXODBC" >&5
+printf "%s\n" "yes in $PHP_UNIXODBC" >&6; }
     fi
     ODBC_TYPE=unixODBC
 
-$as_echo "#define HAVE_UNIXODBC 1" >>confdefs.h
+printf "%s\n" "#define HAVE_UNIXODBC 1" >>confdefs.h
 
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
   fi
 fi
 
@@ -52548,9 +55254,10 @@
 
 
 # Check whether --with-dbmaker was given.
-if test "${with_dbmaker+set}" = set; then :
+if test ${with_dbmaker+y}
+then :
   withval=$with_dbmaker; PHP_DBMAKER=$withval
-else
+else $as_nop
 
   PHP_DBMAKER=no
   test "$PHP_ENABLE_ALL" && PHP_DBMAKER=$PHP_ENABLE_ALL
@@ -52585,8 +55292,8 @@
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBMaker support" >&5
-$as_echo_n "checking for DBMaker support... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for DBMaker support" >&5
+printf %s "checking for DBMaker support... " >&6; }
   if test "$PHP_DBMAKER" != "no"; then
     if test "$PHP_DBMAKER" = "yes"; then
             DBMAKER_HOME=`grep "^dbmaker:" /etc/passwd | $AWK -F: '{print $6}'`
@@ -52615,17 +55322,17 @@
     ODBC_TYPE=dbmaker
 
 
-$as_echo "#define HAVE_DBMAKER 1" >>confdefs.h
+printf "%s\n" "#define HAVE_DBMAKER 1" >>confdefs.h
 
 
     if test "$ext_shared" = "yes"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (shared)" >&5
-$as_echo "yes (shared)" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes (shared)" >&5
+printf "%s\n" "yes (shared)" >&6; }
       ODBC_LIBS="-ldmapic -lc -lm"
       ODBC_SHARED="odbc.la"
     else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (static)" >&5
-$as_echo "yes (static)" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes (static)" >&5
+printf "%s\n" "yes (static)" >&6; }
 
 
   if test -n "$ODBC_LIBDIR"; then
@@ -52709,22 +55416,20 @@
       ODBC_STATIC="libphpext_odbc.la"
     fi
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
   fi
 fi
 
 if test "no" != "$PHP_ODBCVER"; then
   if test "$PHP_ODBCVER" != "0"; then
 
-cat >>confdefs.h <<_ACEOF
-#define ODBCVER $PHP_ODBCVER
-_ACEOF
+printf "%s\n" "#define ODBCVER $PHP_ODBCVER" >>confdefs.h
 
   fi
 else
 
-$as_echo "#define ODBCVER 0x0300" >>confdefs.h
+printf "%s\n" "#define ODBCVER 0x0300" >>confdefs.h
 
 fi
 
@@ -52831,13 +55536,13 @@
 
     if test "$ODBC_TYPE" != "solid"; then
 
-$as_echo "#define HAVE_SQLDATASOURCES 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SQLDATASOURCES 1" >>confdefs.h
 
     fi
   fi
 
 
-$as_echo "#define HAVE_UODBC 1" >>confdefs.h
+printf "%s\n" "#define HAVE_UODBC 1" >>confdefs.h
 
 
   PHP_VAR_SUBST="$PHP_VAR_SUBST ODBC_SHARED_LIBADD"
@@ -53007,9 +55712,7 @@
 EOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define COMPILE_DL_ODBC 1
-_ACEOF
+printf "%s\n" "#define COMPILE_DL_ODBC 1" >>confdefs.h
 
     fi
   fi
@@ -53131,10 +55834,10 @@
   fi
 
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for any ODBC driver support" >&5
-$as_echo_n "checking for any ODBC driver support... " >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for any ODBC driver support" >&5
+printf %s "checking for any ODBC driver support... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -53143,12 +55846,13 @@
 
 php_enable_opcache=yes
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable Zend OPcache support" >&5
-$as_echo_n "checking whether to enable Zend OPcache support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable Zend OPcache support" >&5
+printf %s "checking whether to enable Zend OPcache support... " >&6; }
 # Check whether --enable-opcache was given.
-if test "${enable_opcache+set}" = set; then :
+if test ${enable_opcache+y}
+then :
   enableval=$enable_opcache; PHP_OPCACHE=$enableval
-else
+else $as_nop
 
   PHP_OPCACHE=yes
   test "$PHP_ENABLE_ALL" && PHP_OPCACHE=$PHP_ENABLE_ALL
@@ -53178,8 +55882,8 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -53187,12 +55891,13 @@
 
 php_enable_huge_code_pages=yes
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable copying PHP CODE pages into HUGE PAGES" >&5
-$as_echo_n "checking whether to enable copying PHP CODE pages into HUGE PAGES... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable copying PHP CODE pages into HUGE PAGES" >&5
+printf %s "checking whether to enable copying PHP CODE pages into HUGE PAGES... " >&6; }
 # Check whether --enable-huge-code-pages was given.
-if test "${enable_huge_code_pages+set}" = set; then :
+if test ${enable_huge_code_pages+y}
+then :
   enableval=$enable_huge_code_pages; PHP_HUGE_CODE_PAGES=$enableval
-else
+else $as_nop
 
   PHP_HUGE_CODE_PAGES=yes
 
@@ -53201,8 +55906,8 @@
 
 
 ext_output=$PHP_HUGE_CODE_PAGES
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -53210,12 +55915,13 @@
 
 php_enable_opcache_jit=yes
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable JIT" >&5
-$as_echo_n "checking whether to enable JIT... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable JIT" >&5
+printf %s "checking whether to enable JIT... " >&6; }
 # Check whether --enable-opcache-jit was given.
-if test "${enable_opcache_jit+set}" = set; then :
+if test ${enable_opcache_jit+y}
+then :
   enableval=$enable_opcache_jit; PHP_OPCACHE_JIT=$enableval
-else
+else $as_nop
 
   PHP_OPCACHE_JIT=yes
 
@@ -53224,8 +55930,8 @@
 
 
 ext_output=$PHP_OPCACHE_JIT
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -53236,9 +55942,10 @@
 
 
 # Check whether --with-capstone was given.
-if test "${with_capstone+set}" = set; then :
+if test ${with_capstone+y}
+then :
   withval=$with_capstone; PHP_CAPSTONE=$withval
-else
+else $as_nop
 
   PHP_CAPSTONE=no
 
@@ -53258,7 +55965,7 @@
 
   if test "$PHP_HUGE_CODE_PAGES" = "yes"; then
 
-$as_echo "#define HAVE_HUGE_CODE_PAGES 1" >>confdefs.h
+printf "%s\n" "#define HAVE_HUGE_CODE_PAGES 1" >>confdefs.h
 
   fi
 
@@ -53267,21 +55974,21 @@
       i3456786*|x86*|aarch64|amd64)
         ;;
       *)
-        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: JIT not supported by host architecture" >&5
-$as_echo "$as_me: WARNING: JIT not supported by host architecture" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: JIT not supported by host architecture" >&5
+printf "%s\n" "$as_me: WARNING: JIT not supported by host architecture" >&2;}
         PHP_OPCACHE_JIT=no
         ;;
     esac
     if test "$host_vendor" = "apple" && test "$host_cpu" = "aarch64" && test "$PHP_THREAD_SAFETY" = "yes"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: JIT not supported on Apple Silicon with ZTS" >&5
-$as_echo "$as_me: WARNING: JIT not supported on Apple Silicon with ZTS" >&2;}
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: JIT not supported on Apple Silicon with ZTS" >&5
+printf "%s\n" "$as_me: WARNING: JIT not supported on Apple Silicon with ZTS" >&2;}
       PHP_OPCACHE_JIT=no
     fi
   fi
 
   if test "$PHP_OPCACHE_JIT" = "yes"; then
 
-$as_echo "#define HAVE_JIT 1" >>confdefs.h
+printf "%s\n" "#define HAVE_JIT 1" >>confdefs.h
 
     ZEND_JIT_SRC="jit/zend_jit.c jit/zend_jit_gdb.c jit/zend_jit_vm_helpers.c"
 
@@ -53311,21 +56018,22 @@
       DASM_FLAGS="$DASM_FLAGS -D ZTS=1"
     fi
 
-    if test x"$with_capstone" = "xyes"; then :
+    if test x"$with_capstone" = "xyes"
+then :
 
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for capstone >= 3.0.0" >&5
-$as_echo_n "checking for capstone >= 3.0.0... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for capstone >= 3.0.0" >&5
+printf %s "checking for capstone >= 3.0.0... " >&6; }
 
 if test -n "$CAPSTONE_CFLAGS"; then
     pkg_cv_CAPSTONE_CFLAGS="$CAPSTONE_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"capstone >= 3.0.0\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"capstone >= 3.0.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "capstone >= 3.0.0") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_CAPSTONE_CFLAGS=`$PKG_CONFIG --cflags "capstone >= 3.0.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -53339,10 +56047,10 @@
     pkg_cv_CAPSTONE_LIBS="$CAPSTONE_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"capstone >= 3.0.0\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"capstone >= 3.0.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "capstone >= 3.0.0") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_CAPSTONE_LIBS=`$PKG_CONFIG --libs "capstone >= 3.0.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -53356,8 +56064,8 @@
 
 
 if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -53376,19 +56084,19 @@
         as_fn_error $? "capstone >= 3.0 required but not found" "$LINENO" 5
 
 elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
         as_fn_error $? "capstone >= 3.0 required but not found" "$LINENO" 5
 
 else
 	CAPSTONE_CFLAGS=$pkg_cv_CAPSTONE_CFLAGS
 	CAPSTONE_LIBS=$pkg_cv_CAPSTONE_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
 
-$as_echo "#define HAVE_CAPSTONE 1" >>confdefs.h
+printf "%s\n" "#define HAVE_CAPSTONE 1" >>confdefs.h
 
 
   for ac_i in $CAPSTONE_LIBS; do
@@ -53542,24 +56250,26 @@
 
   fi
 
-  for ac_func in mprotect memfd_create
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
+  ac_fn_c_check_func "$LINENO" "mprotect" "ac_cv_func_mprotect"
+if test "x$ac_cv_func_mprotect" = xyes
+then :
+  printf "%s\n" "#define HAVE_MPROTECT 1" >>confdefs.h
 
 fi
-done
+ac_fn_c_check_func "$LINENO" "memfd_create" "ac_cv_func_memfd_create"
+if test "x$ac_cv_func_memfd_create" = xyes
+then :
+  printf "%s\n" "#define HAVE_MEMFD_CREATE 1" >>confdefs.h
 
+fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysvipc shared memory support" >&5
-$as_echo_n "checking for sysvipc shared memory support... " >&6; }
-  if test "$cross_compiling" = yes; then :
+
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sysvipc shared memory support" >&5
+printf %s "checking for sysvipc shared memory support... " >&6; }
+  if test "$cross_compiling" = yes
+then :
   have_shm_ipc=no
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -53628,9 +56338,10 @@
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   have_shm_ipc=yes
-else
+else $as_nop
   have_shm_ipc=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -53639,15 +56350,16 @@
 
   if test "$have_shm_ipc" = "yes"; then
 
-$as_echo "#define HAVE_SHM_IPC 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SHM_IPC 1" >>confdefs.h
 
   fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_shm_ipc" >&5
-$as_echo "$have_shm_ipc" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $have_shm_ipc" >&5
+printf "%s\n" "$have_shm_ipc" >&6; }
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mmap() using MAP_ANON shared memory support" >&5
-$as_echo_n "checking for mmap() using MAP_ANON shared memory support... " >&6; }
-  if test "$cross_compiling" = yes; then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mmap() using MAP_ANON shared memory support" >&5
+printf %s "checking for mmap() using MAP_ANON shared memory support... " >&6; }
+  if test "$cross_compiling" = yes
+then :
 
   case $host_alias in
     *linux*)
@@ -53658,7 +56370,7 @@
       ;;
   esac
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -53709,9 +56421,10 @@
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   have_shm_mmap_anon=yes
-else
+else $as_nop
   have_shm_mmap_anon=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -53720,22 +56433,23 @@
 
   if test "$have_shm_mmap_anon" = "yes"; then
 
-$as_echo "#define HAVE_SHM_MMAP_ANON 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SHM_MMAP_ANON 1" >>confdefs.h
 
   fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_shm_mmap_anon" >&5
-$as_echo "$have_shm_mmap_anon" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $have_shm_mmap_anon" >&5
+printf "%s\n" "$have_shm_mmap_anon" >&6; }
 
 
 
   unset ac_cv_lib_rt_shm_open
   unset ac_cv_lib_rt___shm_open
   unset found
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shm_open in -lrt" >&5
-$as_echo_n "checking for shm_open in -lrt... " >&6; }
-if ${ac_cv_lib_rt_shm_open+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shm_open in -lrt" >&5
+printf %s "checking for shm_open in -lrt... " >&6; }
+if test ${ac_cv_lib_rt_shm_open+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lrt  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -53744,38 +56458,38 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char shm_open ();
 int
-main ()
+main (void)
 {
 return shm_open ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_rt_shm_open=yes
-else
+else $as_nop
   ac_cv_lib_rt_shm_open=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_shm_open" >&5
-$as_echo "$ac_cv_lib_rt_shm_open" >&6; }
-if test "x$ac_cv_lib_rt_shm_open" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_shm_open" >&5
+printf "%s\n" "$ac_cv_lib_rt_shm_open" >&6; }
+if test "x$ac_cv_lib_rt_shm_open" = xyes
+then :
   found=yes
-else
+else $as_nop
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __shm_open in -lrt" >&5
-$as_echo_n "checking for __shm_open in -lrt... " >&6; }
-if ${ac_cv_lib_rt___shm_open+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __shm_open in -lrt" >&5
+printf %s "checking for __shm_open in -lrt... " >&6; }
+if test ${ac_cv_lib_rt___shm_open+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lrt  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -53784,32 +56498,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char __shm_open ();
 int
-main ()
+main (void)
 {
 return __shm_open ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_rt___shm_open=yes
-else
+else $as_nop
   ac_cv_lib_rt___shm_open=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt___shm_open" >&5
-$as_echo "$ac_cv_lib_rt___shm_open" >&6; }
-if test "x$ac_cv_lib_rt___shm_open" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt___shm_open" >&5
+printf "%s\n" "$ac_cv_lib_rt___shm_open" >&6; }
+if test "x$ac_cv_lib_rt___shm_open" = xyes
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 
@@ -53820,18 +56533,20 @@
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lrt"
-    if test "$cross_compiling" = yes; then :
+    if test "$cross_compiling" = yes
+then :
 
             found=yes
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int main(void) { return (0); }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -53853,10 +56568,10 @@
 
 
 
-$as_echo "#define HAVE_SHM_OPEN 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SHM_OPEN 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_LIBRT 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBRT 1" >>confdefs.h
 
     ac_cv_func_shm_open=yes
   else
@@ -53865,11 +56580,12 @@
   unset ac_cv_lib_root_shm_open
   unset ac_cv_lib_root___shm_open
   unset found
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shm_open in -lroot" >&5
-$as_echo_n "checking for shm_open in -lroot... " >&6; }
-if ${ac_cv_lib_root_shm_open+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shm_open in -lroot" >&5
+printf %s "checking for shm_open in -lroot... " >&6; }
+if test ${ac_cv_lib_root_shm_open+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lroot  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -53878,38 +56594,38 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char shm_open ();
 int
-main ()
+main (void)
 {
 return shm_open ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_root_shm_open=yes
-else
+else $as_nop
   ac_cv_lib_root_shm_open=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_root_shm_open" >&5
-$as_echo "$ac_cv_lib_root_shm_open" >&6; }
-if test "x$ac_cv_lib_root_shm_open" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_root_shm_open" >&5
+printf "%s\n" "$ac_cv_lib_root_shm_open" >&6; }
+if test "x$ac_cv_lib_root_shm_open" = xyes
+then :
   found=yes
-else
+else $as_nop
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __shm_open in -lroot" >&5
-$as_echo_n "checking for __shm_open in -lroot... " >&6; }
-if ${ac_cv_lib_root___shm_open+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __shm_open in -lroot" >&5
+printf %s "checking for __shm_open in -lroot... " >&6; }
+if test ${ac_cv_lib_root___shm_open+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lroot  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -53918,32 +56634,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char __shm_open ();
 int
-main ()
+main (void)
 {
 return __shm_open ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_root___shm_open=yes
-else
+else $as_nop
   ac_cv_lib_root___shm_open=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_root___shm_open" >&5
-$as_echo "$ac_cv_lib_root___shm_open" >&6; }
-if test "x$ac_cv_lib_root___shm_open" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_root___shm_open" >&5
+printf "%s\n" "$ac_cv_lib_root___shm_open" >&6; }
+if test "x$ac_cv_lib_root___shm_open" = xyes
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 
@@ -53954,18 +56669,20 @@
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lroot"
-    if test "$cross_compiling" = yes; then :
+    if test "$cross_compiling" = yes
+then :
 
             found=yes
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int main(void) { return (0); }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -53987,10 +56704,10 @@
 
 
 
-$as_echo "#define HAVE_SHM_OPEN 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SHM_OPEN 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_LIBROOT 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBROOT 1" >>confdefs.h
 
     ac_cv_func_shm_open=yes
   else
@@ -54003,11 +56720,12 @@
   fi
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mmap() using shm_open() shared memory support" >&5
-$as_echo_n "checking for mmap() using shm_open() shared memory support... " >&6; }
-  if test "$cross_compiling" = yes; then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mmap() using shm_open() shared memory support" >&5
+printf %s "checking for mmap() using shm_open() shared memory support... " >&6; }
+  if test "$cross_compiling" = yes
+then :
   have_shm_mmap_posix=no
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -54075,9 +56793,10 @@
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   have_shm_mmap_posix=yes
-else
+else $as_nop
   have_shm_mmap_posix=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -54086,7 +56805,7 @@
 
   if test "$have_shm_mmap_posix" = "yes"; then
 
-$as_echo "#define HAVE_SHM_MMAP_POSIX 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SHM_MMAP_POSIX 1" >>confdefs.h
 
 
   save_old_LDFLAGS=$LDFLAGS
@@ -54193,11 +56912,12 @@
     esac
   done
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shm_unlink in -lrt" >&5
-$as_echo_n "checking for shm_unlink in -lrt... " >&6; }
-if ${ac_cv_lib_rt_shm_unlink+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shm_unlink in -lrt" >&5
+printf %s "checking for shm_unlink in -lrt... " >&6; }
+if test ${ac_cv_lib_rt_shm_unlink+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lrt  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -54206,30 +56926,29 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char shm_unlink ();
 int
-main ()
+main (void)
 {
 return shm_unlink ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_rt_shm_unlink=yes
-else
+else $as_nop
   ac_cv_lib_rt_shm_unlink=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_shm_unlink" >&5
-$as_echo "$ac_cv_lib_rt_shm_unlink" >&6; }
-if test "x$ac_cv_lib_rt_shm_unlink" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_shm_unlink" >&5
+printf "%s\n" "$ac_cv_lib_rt_shm_unlink" >&6; }
+if test "x$ac_cv_lib_rt_shm_unlink" = xyes
+then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -54257,7 +56976,7 @@
 
 
 
-else
+else $as_nop
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -54267,15 +56986,54 @@
 fi
 
   fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_shm_mmap_posix" >&5
-$as_echo "$have_shm_mmap_posix" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $have_shm_mmap_posix" >&5
+printf "%s\n" "$have_shm_mmap_posix" >&6; }
+
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wno-implicit-fallthrough" >&5
+printf %s "checking whether C compiler accepts -Wno-implicit-fallthrough... " >&6; }
+if test ${ax_cv_check_cflags__Werror__Wno_implicit_fallthrough+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+
+  ax_check_save_flags=$CFLAGS
+  CFLAGS="$CFLAGS -Werror -Wno-implicit-fallthrough"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main (void)
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  ax_cv_check_cflags__Werror__Wno_implicit_fallthrough=yes
+else $as_nop
+  ax_cv_check_cflags__Werror__Wno_implicit_fallthrough=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wno_implicit_fallthrough" >&5
+printf "%s\n" "$ax_cv_check_cflags__Werror__Wno_implicit_fallthrough" >&6; }
+if test "x$ax_cv_check_cflags__Werror__Wno_implicit_fallthrough" = xyes
+then :
+  PHP_OPCACHE_CFLAGS="$PHP_OPCACHE_CFLAGS -Wno-implicit-fallthrough"
+else $as_nop
+  :
+fi
+
 
 
   ext_builddir=ext/opcache
   ext_srcdir=$abs_srcdir/ext/opcache
   ext_dir=ext/opcache
 
-  ac_extra=`echo ""-Wno-implicit-fallthrough -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1""|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g`
+  ac_extra=`echo ""$PHP_OPCACHE_CFLAGS -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1""|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g`
 
   if test "shared" != "shared" && test "shared" != "yes" && test "" != "cli"; then
     PHP_OPCACHE_SHARED=no
@@ -54430,9 +57188,7 @@
 EOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define COMPILE_DL_OPCACHE 1
-_ACEOF
+printf "%s\n" "#define COMPILE_DL_OPCACHE 1" >>confdefs.h
 
     fi
   fi
@@ -54628,12 +57384,13 @@
 
 php_enable_pcntl=no
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable pcntl support" >&5
-$as_echo_n "checking whether to enable pcntl support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable pcntl support" >&5
+printf %s "checking whether to enable pcntl support... " >&6; }
 # Check whether --enable-pcntl was given.
-if test "${enable_pcntl+set}" = set; then :
+if test ${enable_pcntl+y}
+then :
   enableval=$enable_pcntl; PHP_PCNTL=$enableval
-else
+else $as_nop
 
   PHP_PCNTL=no
   test "$PHP_ENABLE_ALL" && PHP_PCNTL=$PHP_ENABLE_ALL
@@ -54663,67 +57420,110 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
 
 if test "$PHP_PCNTL" != "no"; then
+
   for ac_func in fork
 do :
   ac_fn_c_check_func "$LINENO" "fork" "ac_cv_func_fork"
-if test "x$ac_cv_func_fork" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_FORK 1
-_ACEOF
+if test "x$ac_cv_func_fork" = xyes
+then :
+  printf "%s\n" "#define HAVE_FORK 1" >>confdefs.h
 
-else
+else $as_nop
   as_fn_error $? "pcntl: fork() not supported by this platform" "$LINENO" 5
 fi
+
 done
 
   for ac_func in waitpid
 do :
   ac_fn_c_check_func "$LINENO" "waitpid" "ac_cv_func_waitpid"
-if test "x$ac_cv_func_waitpid" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_WAITPID 1
-_ACEOF
+if test "x$ac_cv_func_waitpid" = xyes
+then :
+  printf "%s\n" "#define HAVE_WAITPID 1" >>confdefs.h
 
-else
+else $as_nop
   as_fn_error $? "pcntl: waitpid() not supported by this platform" "$LINENO" 5
 fi
+
 done
 
   for ac_func in sigaction
 do :
   ac_fn_c_check_func "$LINENO" "sigaction" "ac_cv_func_sigaction"
-if test "x$ac_cv_func_sigaction" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_SIGACTION 1
-_ACEOF
+if test "x$ac_cv_func_sigaction" = xyes
+then :
+  printf "%s\n" "#define HAVE_SIGACTION 1" >>confdefs.h
 
-else
+else $as_nop
   as_fn_error $? "pcntl: sigaction() not supported by this platform" "$LINENO" 5
 fi
+
 done
+  ac_fn_c_check_func "$LINENO" "getpriority" "ac_cv_func_getpriority"
+if test "x$ac_cv_func_getpriority" = xyes
+then :
+  printf "%s\n" "#define HAVE_GETPRIORITY 1" >>confdefs.h
 
-  for ac_func in getpriority setpriority wait3 wait4 sigwaitinfo sigtimedwait unshare rfork forkx
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
+fi
+ac_fn_c_check_func "$LINENO" "setpriority" "ac_cv_func_setpriority"
+if test "x$ac_cv_func_setpriority" = xyes
+then :
+  printf "%s\n" "#define HAVE_SETPRIORITY 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "wait3" "ac_cv_func_wait3"
+if test "x$ac_cv_func_wait3" = xyes
+then :
+  printf "%s\n" "#define HAVE_WAIT3 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "wait4" "ac_cv_func_wait4"
+if test "x$ac_cv_func_wait4" = xyes
+then :
+  printf "%s\n" "#define HAVE_WAIT4 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "sigwaitinfo" "ac_cv_func_sigwaitinfo"
+if test "x$ac_cv_func_sigwaitinfo" = xyes
+then :
+  printf "%s\n" "#define HAVE_SIGWAITINFO 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "sigtimedwait" "ac_cv_func_sigtimedwait"
+if test "x$ac_cv_func_sigtimedwait" = xyes
+then :
+  printf "%s\n" "#define HAVE_SIGTIMEDWAIT 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "unshare" "ac_cv_func_unshare"
+if test "x$ac_cv_func_unshare" = xyes
+then :
+  printf "%s\n" "#define HAVE_UNSHARE 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "rfork" "ac_cv_func_rfork"
+if test "x$ac_cv_func_rfork" = xyes
+then :
+  printf "%s\n" "#define HAVE_RFORK 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "forkx" "ac_cv_func_forkx"
+if test "x$ac_cv_func_forkx" = xyes
+then :
+  printf "%s\n" "#define HAVE_FORKX 1" >>confdefs.h
 
 fi
-done
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for siginfo_t" >&5
-$as_echo_n "checking for siginfo_t... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for siginfo_t" >&5
+printf %s "checking for siginfo_t... " >&6; }
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -54733,7 +57533,7 @@
     #endif
 
 int
-main ()
+main (void)
 {
 
     siginfo_t info;
@@ -54742,19 +57542,20 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
     PCNTL_CFLAGS="-DHAVE_STRUCT_SIGINFO_T"
 
-else
+else $as_nop
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 
   ext_builddir=ext/pcntl
@@ -54890,9 +57691,7 @@
 EOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define COMPILE_DL_PCNTL 1
-_ACEOF
+printf "%s\n" "#define COMPILE_DL_PCNTL 1" >>confdefs.h
 
     fi
   fi
@@ -55021,12 +57820,13 @@
 
 php_enable_pdo=yes
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable PDO support" >&5
-$as_echo_n "checking whether to enable PDO support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable PDO support" >&5
+printf %s "checking whether to enable PDO support... " >&6; }
 # Check whether --enable-pdo was given.
-if test "${enable_pdo+set}" = set; then :
+if test ${enable_pdo+y}
+then :
   enableval=$enable_pdo; PHP_PDO=$enableval
-else
+else $as_nop
 
   PHP_PDO=yes
   test "$PHP_ENABLE_ALL" && PHP_PDO=$PHP_ENABLE_ALL
@@ -55056,8 +57856,8 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -55200,9 +58000,7 @@
 EOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define COMPILE_DL_PDO 1
-_ACEOF
+printf "%s\n" "#define COMPILE_DL_PDO 1" >>confdefs.h
 
     fi
   fi
@@ -55377,13 +58175,14 @@
 
 php_with_pdo_dblib=no
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PDO_DBLIB support via FreeTDS" >&5
-$as_echo_n "checking for PDO_DBLIB support via FreeTDS... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PDO_DBLIB support via FreeTDS" >&5
+printf %s "checking for PDO_DBLIB support via FreeTDS... " >&6; }
 
 # Check whether --with-pdo-dblib was given.
-if test "${with_pdo_dblib+set}" = set; then :
+if test ${with_pdo_dblib+y}
+then :
   withval=$with_pdo_dblib; PHP_PDO_DBLIB=$withval
-else
+else $as_nop
 
   PHP_PDO_DBLIB=no
   test "$PHP_ENABLE_ALL" && PHP_PDO_DBLIB=$PHP_ENABLE_ALL
@@ -55413,8 +58212,8 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -55531,11 +58330,12 @@
     esac
   done
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbsqlexec in -lsybdb" >&5
-$as_echo_n "checking for dbsqlexec in -lsybdb... " >&6; }
-if ${ac_cv_lib_sybdb_dbsqlexec+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dbsqlexec in -lsybdb" >&5
+printf %s "checking for dbsqlexec in -lsybdb... " >&6; }
+if test ${ac_cv_lib_sybdb_dbsqlexec+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsybdb  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -55544,36 +58344,35 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char dbsqlexec ();
 int
-main ()
+main (void)
 {
 return dbsqlexec ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_sybdb_dbsqlexec=yes
-else
+else $as_nop
   ac_cv_lib_sybdb_dbsqlexec=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sybdb_dbsqlexec" >&5
-$as_echo "$ac_cv_lib_sybdb_dbsqlexec" >&6; }
-if test "x$ac_cv_lib_sybdb_dbsqlexec" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sybdb_dbsqlexec" >&5
+printf "%s\n" "$ac_cv_lib_sybdb_dbsqlexec" >&6; }
+if test "x$ac_cv_lib_sybdb_dbsqlexec" = xyes
+then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-else
+else $as_nop
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -55758,11 +58557,12 @@
   fi
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5
-$as_echo_n "checking for PDO includes... " >&6; }
-if ${pdo_cv_inc_path+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5
+printf %s "checking for PDO includes... " >&6; }
+if test ${pdo_cv_inc_path+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
     if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
       pdo_cv_inc_path=$abs_srcdir/ext
@@ -55773,8 +58573,8 @@
     fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pdo_cv_inc_path" >&5
-$as_echo "$pdo_cv_inc_path" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $pdo_cv_inc_path" >&5
+printf "%s\n" "$pdo_cv_inc_path" >&6; }
   if test -n "$pdo_cv_inc_path"; then
 :
   else
@@ -55917,9 +58717,7 @@
 EOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define COMPILE_DL_PDO_DBLIB 1
-_ACEOF
+printf "%s\n" "#define COMPILE_DL_PDO_DBLIB 1" >>confdefs.h
 
     fi
   fi
@@ -56040,11 +58838,12 @@
 
   fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_addr in -ldnet_stub" >&5
-$as_echo_n "checking for dnet_addr in -ldnet_stub... " >&6; }
-if ${ac_cv_lib_dnet_stub_dnet_addr+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dnet_addr in -ldnet_stub" >&5
+printf %s "checking for dnet_addr in -ldnet_stub... " >&6; }
+if test ${ac_cv_lib_dnet_stub_dnet_addr+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -56053,30 +58852,29 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char dnet_addr ();
 int
-main ()
+main (void)
 {
 return dnet_addr ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_dnet_stub_dnet_addr=yes
-else
+else $as_nop
   ac_cv_lib_dnet_stub_dnet_addr=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_addr" >&5
-$as_echo "$ac_cv_lib_dnet_stub_dnet_addr" >&6; }
-if test "x$ac_cv_lib_dnet_stub_dnet_addr" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_addr" >&5
+printf "%s\n" "$ac_cv_lib_dnet_stub_dnet_addr" >&6; }
+if test "x$ac_cv_lib_dnet_stub_dnet_addr" = xyes
+then :
 
 
 
@@ -56179,7 +58977,7 @@
 fi
 
 
-$as_echo "#define HAVE_PDO_DBLIB 1" >>confdefs.h
+printf "%s\n" "#define HAVE_PDO_DBLIB 1" >>confdefs.h
 
 
   PHP_VAR_SUBST="$PHP_VAR_SUBST PDO_DBLIB_SHARED_LIBADD"
@@ -56212,13 +59010,14 @@
 
 php_with_pdo_firebird=no
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Firebird support for PDO" >&5
-$as_echo_n "checking for Firebird support for PDO... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Firebird support for PDO" >&5
+printf %s "checking for Firebird support for PDO... " >&6; }
 
 # Check whether --with-pdo-firebird was given.
-if test "${with_pdo_firebird+set}" = set; then :
+if test ${with_pdo_firebird+y}
+then :
   withval=$with_pdo_firebird; PHP_PDO_FIREBIRD=$withval
-else
+else $as_nop
 
   PHP_PDO_FIREBIRD=no
   test "$PHP_ENABLE_ALL" && PHP_PDO_FIREBIRD=$PHP_ENABLE_ALL
@@ -56248,8 +59047,8 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -56262,11 +59061,12 @@
 
   # Extract the first word of "fb_config", so it can be a program name with args.
 set dummy fb_config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_FB_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_FB_CONFIG+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $FB_CONFIG in
   \\/* | ?:\\/*)
   ac_cv_path_FB_CONFIG="$FB_CONFIG" # Let the user override the test with a path.
@@ -56276,11 +59076,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_FB_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_FB_CONFIG="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -56293,23 +59097,23 @@
 fi
 FB_CONFIG=$ac_cv_path_FB_CONFIG
 if test -n "$FB_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FB_CONFIG" >&5
-$as_echo "$FB_CONFIG" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $FB_CONFIG" >&5
+printf "%s\n" "$FB_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
 
   if test -x "$FB_CONFIG" && test "$PHP_PDO_FIREBIRD" = "yes"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libfbconfig" >&5
-$as_echo_n "checking for libfbconfig... " >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libfbconfig" >&5
+printf %s "checking for libfbconfig... " >&6; }
     FB_CFLAGS=`$FB_CONFIG --cflags`
     FB_LIBDIR=`$FB_CONFIG --libs`
     FB_VERSION=`$FB_CONFIG --version`
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: version $FB_VERSION" >&5
-$as_echo "version $FB_VERSION" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: version $FB_VERSION" >&5
+printf "%s\n" "version $FB_VERSION" >&6; }
 
   for ac_i in $FB_LIBDIR; do
     case $ac_i in
@@ -56568,11 +59372,12 @@
     esac
   done
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for isc_detach_database in -lfbclient" >&5
-$as_echo_n "checking for isc_detach_database in -lfbclient... " >&6; }
-if ${ac_cv_lib_fbclient_isc_detach_database+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for isc_detach_database in -lfbclient" >&5
+printf %s "checking for isc_detach_database in -lfbclient... " >&6; }
+if test ${ac_cv_lib_fbclient_isc_detach_database+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lfbclient  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -56581,30 +59386,29 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char isc_detach_database ();
 int
-main ()
+main (void)
 {
 return isc_detach_database ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_fbclient_isc_detach_database=yes
-else
+else $as_nop
   ac_cv_lib_fbclient_isc_detach_database=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_fbclient_isc_detach_database" >&5
-$as_echo "$ac_cv_lib_fbclient_isc_detach_database" >&6; }
-if test "x$ac_cv_lib_fbclient_isc_detach_database" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_fbclient_isc_detach_database" >&5
+printf "%s\n" "$ac_cv_lib_fbclient_isc_detach_database" >&6; }
+if test "x$ac_cv_lib_fbclient_isc_detach_database" = xyes
+then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -56612,7 +59416,7 @@
       FIREBIRD_LIBNAME=fbclient
 
 
-else
+else $as_nop
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -56725,11 +59529,12 @@
     esac
   done
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for isc_detach_database in -lgds" >&5
-$as_echo_n "checking for isc_detach_database in -lgds... " >&6; }
-if ${ac_cv_lib_gds_isc_detach_database+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for isc_detach_database in -lgds" >&5
+printf %s "checking for isc_detach_database in -lgds... " >&6; }
+if test ${ac_cv_lib_gds_isc_detach_database+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgds  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -56738,30 +59543,29 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char isc_detach_database ();
 int
-main ()
+main (void)
 {
 return isc_detach_database ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_gds_isc_detach_database=yes
-else
+else $as_nop
   ac_cv_lib_gds_isc_detach_database=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gds_isc_detach_database" >&5
-$as_echo "$ac_cv_lib_gds_isc_detach_database" >&6; }
-if test "x$ac_cv_lib_gds_isc_detach_database" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gds_isc_detach_database" >&5
+printf "%s\n" "$ac_cv_lib_gds_isc_detach_database" >&6; }
+if test "x$ac_cv_lib_gds_isc_detach_database" = xyes
+then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -56769,7 +59573,7 @@
         FIREBIRD_LIBNAME=gds
 
 
-else
+else $as_nop
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -56882,11 +59686,12 @@
     esac
   done
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for isc_detach_database in -lib_util" >&5
-$as_echo_n "checking for isc_detach_database in -lib_util... " >&6; }
-if ${ac_cv_lib_ib_util_isc_detach_database+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for isc_detach_database in -lib_util" >&5
+printf %s "checking for isc_detach_database in -lib_util... " >&6; }
+if test ${ac_cv_lib_ib_util_isc_detach_database+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lib_util  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -56895,30 +59700,29 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char isc_detach_database ();
 int
-main ()
+main (void)
 {
 return isc_detach_database ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_ib_util_isc_detach_database=yes
-else
+else $as_nop
   ac_cv_lib_ib_util_isc_detach_database=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ib_util_isc_detach_database" >&5
-$as_echo "$ac_cv_lib_ib_util_isc_detach_database" >&6; }
-if test "x$ac_cv_lib_ib_util_isc_detach_database" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ib_util_isc_detach_database" >&5
+printf "%s\n" "$ac_cv_lib_ib_util_isc_detach_database" >&6; }
+if test "x$ac_cv_lib_ib_util_isc_detach_database" = xyes
+then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -56926,7 +59730,7 @@
           FIREBIRD_LIBNAME=ib_util
 
 
-else
+else $as_nop
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -57076,11 +59880,12 @@
   fi
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5
-$as_echo_n "checking for PDO includes... " >&6; }
-if ${pdo_cv_inc_path+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5
+printf %s "checking for PDO includes... " >&6; }
+if test ${pdo_cv_inc_path+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
     if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
       pdo_cv_inc_path=$abs_srcdir/ext
@@ -57091,8 +59896,8 @@
     fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pdo_cv_inc_path" >&5
-$as_echo "$pdo_cv_inc_path" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $pdo_cv_inc_path" >&5
+printf "%s\n" "$pdo_cv_inc_path" >&6; }
   if test -n "$pdo_cv_inc_path"; then
 :
   else
@@ -57101,7 +59906,7 @@
 
 
 
-$as_echo "#define HAVE_PDO_FIREBIRD 1" >>confdefs.h
+printf "%s\n" "#define HAVE_PDO_FIREBIRD 1" >>confdefs.h
 
 
   ext_builddir=ext/pdo_firebird
@@ -57237,9 +60042,7 @@
 EOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define COMPILE_DL_PDO_FIREBIRD 1
-_ACEOF
+printf "%s\n" "#define COMPILE_DL_PDO_FIREBIRD 1" >>confdefs.h
 
     fi
   fi
@@ -57390,13 +60193,14 @@
 
 php_with_pdo_mysql=no
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MySQL support for PDO" >&5
-$as_echo_n "checking for MySQL support for PDO... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MySQL support for PDO" >&5
+printf %s "checking for MySQL support for PDO... " >&6; }
 
 # Check whether --with-pdo-mysql was given.
-if test "${with_pdo_mysql+set}" = set; then :
+if test ${with_pdo_mysql+y}
+then :
   withval=$with_pdo_mysql; PHP_PDO_MYSQL=$withval
-else
+else $as_nop
 
   PHP_PDO_MYSQL=no
   test "$PHP_ENABLE_ALL" && PHP_PDO_MYSQL=$PHP_ENABLE_ALL
@@ -57426,8 +60230,8 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -57436,13 +60240,14 @@
 
 php_with_zlib_dir=no
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the location of libz" >&5
-$as_echo_n "checking for the location of libz... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for the location of libz" >&5
+printf %s "checking for the location of libz... " >&6; }
 
 # Check whether --with-zlib-dir was given.
-if test "${with_zlib_dir+set}" = set; then :
+if test ${with_zlib_dir+y}
+then :
   withval=$with_zlib_dir; PHP_ZLIB_DIR=$withval
-else
+else $as_nop
 
   PHP_ZLIB_DIR=no
 
@@ -57451,25 +60256,23 @@
 
 
 ext_output=$PHP_ZLIB_DIR
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
 fi
 
 if test "$PHP_PDO_MYSQL" != "no"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MySQL UNIX socket location" >&5
-$as_echo_n "checking for MySQL UNIX socket location... " >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MySQL UNIX socket location" >&5
+printf %s "checking for MySQL UNIX socket location... " >&6; }
   if test "$PHP_MYSQL_SOCK" != "no" && test "$PHP_MYSQL_SOCK" != "yes"; then
     MYSQL_SOCK=$PHP_MYSQL_SOCK
 
-cat >>confdefs.h <<_ACEOF
-#define PHP_MYSQL_UNIX_SOCK_ADDR "$MYSQL_SOCK"
-_ACEOF
+printf "%s\n" "#define PHP_MYSQL_UNIX_SOCK_ADDR \"$MYSQL_SOCK\"" >>confdefs.h
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MYSQL_SOCK" >&5
-$as_echo "$MYSQL_SOCK" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MYSQL_SOCK" >&5
+printf "%s\n" "$MYSQL_SOCK" >&6; }
   elif test "$PHP_MYSQL_SOCK" = "yes"; then
 
   for i in  \
@@ -57491,20 +60294,18 @@
 
   if test -n "$MYSQL_SOCK"; then
 
-cat >>confdefs.h <<_ACEOF
-#define PHP_MYSQL_UNIX_SOCK_ADDR "$MYSQL_SOCK"
-_ACEOF
+printf "%s\n" "#define PHP_MYSQL_UNIX_SOCK_ADDR \"$MYSQL_SOCK\"" >>confdefs.h
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MYSQL_SOCK" >&5
-$as_echo "$MYSQL_SOCK" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MYSQL_SOCK" >&5
+printf "%s\n" "$MYSQL_SOCK" >&6; }
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
   fi
 
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
   fi
 
   if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then
@@ -57528,26 +60329,27 @@
   if test "$PHP_PDO_MYSQL" = "yes" || test "$PHP_PDO_MYSQL" = "mysqlnd"; then
         PHP_MYSQLND_ENABLED=yes
 
-$as_echo "#define PDO_USE_MYSQLND 1" >>confdefs.h
+printf "%s\n" "#define PDO_USE_MYSQLND 1" >>confdefs.h
 
   else
 
-$as_echo "#define HAVE_MYSQL 1" >>confdefs.h
+printf "%s\n" "#define HAVE_MYSQL 1" >>confdefs.h
 
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysql_config" >&5
-$as_echo_n "checking for mysql_config... " >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mysql_config" >&5
+printf %s "checking for mysql_config... " >&6; }
     if test -n "$PDO_MYSQL_CONFIG"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PDO_MYSQL_CONFIG" >&5
-$as_echo "$PDO_MYSQL_CONFIG" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PDO_MYSQL_CONFIG" >&5
+printf "%s\n" "$PDO_MYSQL_CONFIG" >&6; }
       if test "x$SED" = "x"; then
         # Extract the first word of "sed", so it can be a program name with args.
 set dummy sed; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_SED+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_SED+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $SED in
   \\/* | ?:\\/*)
   ac_cv_path_SED="$SED" # Let the user override the test with a path.
@@ -57557,11 +60359,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_SED="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_SED="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -57573,11 +60379,11 @@
 fi
 SED=$ac_cv_path_SED
 if test -n "$SED"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SED" >&5
-$as_echo "$SED" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $SED" >&5
+printf "%s\n" "$SED" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -57585,10 +60391,10 @@
       PDO_MYSQL_LIBS=`$PDO_MYSQL_CONFIG --libs | $SED -e "s/'//g"`
       PDO_MYSQL_INCLUDE=`$PDO_MYSQL_CONFIG --cflags | $SED -e "s/'//g"`
     elif test -n "$PDO_MYSQL_DIR"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
-$as_echo "not found" >&6; }
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysql install under $PDO_MYSQL_DIR" >&5
-$as_echo_n "checking for mysql install under $PDO_MYSQL_DIR... " >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+printf "%s\n" "not found" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mysql install under $PDO_MYSQL_DIR" >&5
+printf %s "checking for mysql install under $PDO_MYSQL_DIR... " >&6; }
       if test -r $PDO_MYSQL_DIR/include/mysql; then
         PDO_MYSQL_INC_DIR=$PDO_MYSQL_DIR/include/mysql
       else
@@ -57601,11 +60407,11 @@
       fi
 
       if test -r "$PDO_MYSQL_LIB_DIR"; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: libs under $PDO_MYSQL_LIB_DIR; seems promising" >&5
-$as_echo "libs under $PDO_MYSQL_LIB_DIR; seems promising" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: libs under $PDO_MYSQL_LIB_DIR; seems promising" >&5
+printf "%s\n" "libs under $PDO_MYSQL_LIB_DIR; seems promising" >&6; }
       else
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: can not find it" >&5
-$as_echo "can not find it" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: can not find it" >&5
+printf "%s\n" "can not find it" >&6; }
         as_fn_error $? "Unable to find your mysql installation" "$LINENO" 5
       fi
 
@@ -57642,8 +60448,8 @@
 
       PDO_MYSQL_INCLUDE=-I$PDO_MYSQL_INC_DIR
     else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
-$as_echo "not found" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+printf "%s\n" "not found" >&6; }
       as_fn_error $? "Unable to find your mysql installation" "$LINENO" 5
     fi
 
@@ -57789,11 +60595,12 @@
   fi
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5
-$as_echo_n "checking for PDO includes... " >&6; }
-if ${pdo_cv_inc_path+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5
+printf %s "checking for PDO includes... " >&6; }
+if test ${pdo_cv_inc_path+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
     if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
       pdo_cv_inc_path=$abs_srcdir/ext
@@ -57804,8 +60611,8 @@
     fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pdo_cv_inc_path" >&5
-$as_echo "$pdo_cv_inc_path" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $pdo_cv_inc_path" >&5
+printf "%s\n" "$pdo_cv_inc_path" >&6; }
   if test -n "$pdo_cv_inc_path"; then
 :
   else
@@ -57816,9 +60623,7 @@
   if test -n "$PDO_MYSQL_CONFIG"; then
     PDO_MYSQL_SOCKET=`$PDO_MYSQL_CONFIG --socket`
 
-cat >>confdefs.h <<_ACEOF
-#define PDO_MYSQL_UNIX_ADDR "$PDO_MYSQL_SOCKET"
-_ACEOF
+printf "%s\n" "#define PDO_MYSQL_UNIX_ADDR \"$PDO_MYSQL_SOCKET\"" >>confdefs.h
 
   fi
 
@@ -57956,9 +60761,7 @@
 EOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define COMPILE_DL_PDO_MYSQL 1
-_ACEOF
+printf "%s\n" "#define COMPILE_DL_PDO_MYSQL 1" >>confdefs.h
 
     fi
   fi
@@ -58158,13 +60961,14 @@
 
 php_with_pdo_oci=no
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Oracle OCI support for PDO" >&5
-$as_echo_n "checking Oracle OCI support for PDO... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Oracle OCI support for PDO" >&5
+printf %s "checking Oracle OCI support for PDO... " >&6; }
 
 # Check whether --with-pdo-oci was given.
-if test "${with_pdo_oci+set}" = set; then :
+if test ${with_pdo_oci+y}
+then :
   withval=$with_pdo_oci; PHP_PDO_OCI=$withval
-else
+else $as_nop
 
   PHP_PDO_OCI=no
   test "$PHP_ENABLE_ALL" && PHP_PDO_OCI=$PHP_ENABLE_ALL
@@ -58194,8 +60998,8 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -58206,23 +61010,23 @@
     as_fn_error $? "PDO is not enabled! Add --enable-pdo to your configure line." "$LINENO" 5
   fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking Oracle Install-Dir" >&5
-$as_echo_n "checking Oracle Install-Dir... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Oracle Install-Dir" >&5
+printf %s "checking Oracle Install-Dir... " >&6; }
   if test "$PHP_PDO_OCI" = "yes" || test -z "$PHP_PDO_OCI"; then
     PDO_OCI_DIR=$ORACLE_HOME
   else
     PDO_OCI_DIR=$PHP_PDO_OCI
   fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PHP_PDO_OCI" >&5
-$as_echo "$PHP_PDO_OCI" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PHP_PDO_OCI" >&5
+printf "%s\n" "$PHP_PDO_OCI" >&6; }
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if that is sane" >&5
-$as_echo_n "checking if that is sane... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if that is sane" >&5
+printf %s "checking if that is sane... " >&6; }
   if test -z "$PDO_OCI_DIR"; then
     as_fn_error $? "You need to tell me where to find your Oracle Instant Client SDK, or set ORACLE_HOME." "$LINENO" 5
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
   fi
 
   if test "instantclient" = "`echo $PDO_OCI_DIR | cut -d, -f1`" ; then
@@ -58230,17 +61034,19 @@
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 # declarations like `int a3(sizeof (unsigned char)) >= 0;'.
 # This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
-$as_echo_n "checking size of long... " >&6; }
-if ${ac_cv_sizeof_long+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
+printf %s "checking size of long... " >&6; }
+if test ${ac_cv_sizeof_long+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"
+then :
 
-else
+else $as_nop
   if test "$ac_cv_type_long" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (long)
 See \`config.log' for more details" "$LINENO" 5; }
    else
@@ -58249,36 +61055,35 @@
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
-$as_echo "$ac_cv_sizeof_long" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
+printf "%s\n" "$ac_cv_sizeof_long" >&6; }
 
 
 
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_LONG $ac_cv_sizeof_long
-_ACEOF
+printf "%s\n" "#define SIZEOF_LONG $ac_cv_sizeof_long" >>confdefs.h
 
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we're at 64-bit platform" >&5
-$as_echo_n "checking if we're at 64-bit platform... " >&6; }
-    if test "$ac_cv_sizeof_long" -eq 4; then :
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we're at 64-bit platform" >&5
+printf %s "checking if we're at 64-bit platform... " >&6; }
+    if test "$ac_cv_sizeof_long" -eq 4
+then :
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
       PDO_OCI_CLIENT_DIR="client"
 
-else
+else $as_nop
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
       PDO_OCI_CLIENT_DIR="client64"
 
 fi
 
     PDO_OCI_LIB_DIR="`echo $PDO_OCI_DIR | cut -d, -f2`"
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking Oracle version" >&5
-$as_echo_n "checking Oracle version... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Oracle version" >&5
+printf %s "checking Oracle version... " >&6; }
   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`
   if test -f "$PDO_OCI_LCS"; then
@@ -58288,12 +61093,12 @@
   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; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PDO_OCI_VERSION" >&5
+printf "%s\n" "$PDO_OCI_VERSION" >&6; }
 
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for oci.h" >&5
-$as_echo_n "checking for oci.h... " >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for oci.h" >&5
+printf %s "checking for oci.h... " >&6; }
         OCISDKRPMINC=`echo "$PDO_OCI_LIB_DIR" | $PHP_PDO_OCI_SED -e 's!^$.*$/lib/oracle/$.*$/$'${PDO_OCI_CLIENT_DIR}'$/lib/*$!\1/include/oracle/\2/\3!'`
 
         OCISDKMANINC=`echo "$PDO_OCI_LIB_DIR" | $PHP_PDO_OCI_SED -e 's!^$.*$/lib/*$!\1/include!'`
@@ -58333,8 +61138,8 @@
 
   fi
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCISDKRPMINC" >&5
-$as_echo "$OCISDKRPMINC" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OCISDKRPMINC" >&5
+printf "%s\n" "$OCISDKRPMINC" >&6; }
     elif test -f "$OCISDKMANINC/oci.h" ; then
 
   if test "$OCISDKMANINC" != "/usr/include"; then
@@ -58367,8 +61172,8 @@
 
   fi
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCISDKMANINC" >&5
-$as_echo "$OCISDKMANINC" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OCISDKMANINC" >&5
+printf "%s\n" "$OCISDKMANINC" >&6; }
     elif test -f "$OCISDKZIPINC/oci.h" ; then
 
   if test "$OCISDKZIPINC" != "/usr/include"; then
@@ -58401,8 +61206,8 @@
 
   fi
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCISDKZIPINC" >&5
-$as_echo "$OCISDKZIPINC" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OCISDKZIPINC" >&5
+printf "%s\n" "$OCISDKZIPINC" >&6; }
     else
       as_fn_error $? "I'm too dumb to figure out where the include dir is in your Instant Client install" "$LINENO" 5
     fi
@@ -58412,17 +61217,19 @@
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 # declarations like `int a3(sizeof (unsigned char)) >= 0;'.
 # This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
-$as_echo_n "checking size of long... " >&6; }
-if ${ac_cv_sizeof_long+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
+printf %s "checking size of long... " >&6; }
+if test ${ac_cv_sizeof_long+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"
+then :
 
-else
+else $as_nop
   if test "$ac_cv_type_long" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (long)
 See \`config.log' for more details" "$LINENO" 5; }
    else
@@ -58431,34 +61238,33 @@
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
-$as_echo "$ac_cv_sizeof_long" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
+printf "%s\n" "$ac_cv_sizeof_long" >&6; }
 
 
 
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_LONG $ac_cv_sizeof_long
-_ACEOF
+printf "%s\n" "#define SIZEOF_LONG $ac_cv_sizeof_long" >>confdefs.h
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we're at 64-bit platform" >&5
-$as_echo_n "checking if we're at 64-bit platform... " >&6; }
-  if test "$ac_cv_sizeof_long" -eq 4; then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we're at 64-bit platform" >&5
+printf %s "checking if we're at 64-bit platform... " >&6; }
+  if test "$ac_cv_sizeof_long" -eq 4
+then :
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
     TMP_PDO_OCI_LIB_DIR="$PDO_OCI_DIR/lib32"
 
-else
+else $as_nop
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
     TMP_PDO_OCI_LIB_DIR="$PDO_OCI_DIR/lib"
 
 fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking OCI8 libraries dir" >&5
-$as_echo_n "checking OCI8 libraries dir... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking OCI8 libraries dir" >&5
+printf %s "checking OCI8 libraries dir... " >&6; }
   if test -d "$PDO_OCI_DIR/lib" && test ! -d "$PDO_OCI_DIR/lib32"; then
     PDO_OCI_LIB_DIR="$PDO_OCI_DIR/lib"
   elif test ! -d "$PDO_OCI_DIR/lib" && test -d "$PDO_OCI_DIR/lib32"; then
@@ -58468,8 +61274,8 @@
   else
     as_fn_error $? "Oracle required OCI8 libraries not found" "$LINENO" 5
   fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PDO_OCI_LIB_DIR" >&5
-$as_echo "$PDO_OCI_LIB_DIR" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PDO_OCI_LIB_DIR" >&5
+printf "%s\n" "$PDO_OCI_LIB_DIR" >&6; }
 
 
     if test -d "$PDO_OCI_DIR/rdbms/public"; then
@@ -58845,8 +61651,8 @@
 
     fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking Oracle version" >&5
-$as_echo_n "checking Oracle version... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Oracle version" >&5
+printf %s "checking Oracle version... " >&6; }
   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`
   if test -f "$PDO_OCI_LCS"; then
@@ -58856,8 +61662,8 @@
   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; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PDO_OCI_VERSION" >&5
+printf "%s\n" "$PDO_OCI_VERSION" >&6; }
 
   fi
 
@@ -59036,11 +61842,12 @@
     esac
   done
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OCIEnvCreate in -lclntsh" >&5
-$as_echo_n "checking for OCIEnvCreate in -lclntsh... " >&6; }
-if ${ac_cv_lib_clntsh_OCIEnvCreate+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for OCIEnvCreate in -lclntsh" >&5
+printf %s "checking for OCIEnvCreate in -lclntsh... " >&6; }
+if test ${ac_cv_lib_clntsh_OCIEnvCreate+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lclntsh  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -59049,40 +61856,39 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char OCIEnvCreate ();
 int
-main ()
+main (void)
 {
 return OCIEnvCreate ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_clntsh_OCIEnvCreate=yes
-else
+else $as_nop
   ac_cv_lib_clntsh_OCIEnvCreate=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_clntsh_OCIEnvCreate" >&5
-$as_echo "$ac_cv_lib_clntsh_OCIEnvCreate" >&6; }
-if test "x$ac_cv_lib_clntsh_OCIEnvCreate" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_clntsh_OCIEnvCreate" >&5
+printf "%s\n" "$ac_cv_lib_clntsh_OCIEnvCreate" >&6; }
+if test "x$ac_cv_lib_clntsh_OCIEnvCreate" = xyes
+then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-$as_echo "#define HAVE_OCIENVCREATE 1" >>confdefs.h
+printf "%s\n" "#define HAVE_OCIENVCREATE 1" >>confdefs.h
 
 
 
-else
+else $as_nop
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -59199,11 +62005,12 @@
     esac
   done
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OCIEnvNlsCreate in -lclntsh" >&5
-$as_echo_n "checking for OCIEnvNlsCreate in -lclntsh... " >&6; }
-if ${ac_cv_lib_clntsh_OCIEnvNlsCreate+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for OCIEnvNlsCreate in -lclntsh" >&5
+printf %s "checking for OCIEnvNlsCreate in -lclntsh... " >&6; }
+if test ${ac_cv_lib_clntsh_OCIEnvNlsCreate+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lclntsh  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -59212,40 +62019,39 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char OCIEnvNlsCreate ();
 int
-main ()
+main (void)
 {
 return OCIEnvNlsCreate ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_clntsh_OCIEnvNlsCreate=yes
-else
+else $as_nop
   ac_cv_lib_clntsh_OCIEnvNlsCreate=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_clntsh_OCIEnvNlsCreate" >&5
-$as_echo "$ac_cv_lib_clntsh_OCIEnvNlsCreate" >&6; }
-if test "x$ac_cv_lib_clntsh_OCIEnvNlsCreate" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_clntsh_OCIEnvNlsCreate" >&5
+printf "%s\n" "$ac_cv_lib_clntsh_OCIEnvNlsCreate" >&6; }
+if test "x$ac_cv_lib_clntsh_OCIEnvNlsCreate" = xyes
+then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-$as_echo "#define HAVE_OCIENVNLSCREATE 1" >>confdefs.h
+printf "%s\n" "#define HAVE_OCIENVNLSCREATE 1" >>confdefs.h
 
 
 
-else
+else $as_nop
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -59362,11 +62168,12 @@
     esac
   done
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OCIStmtFetch2 in -lclntsh" >&5
-$as_echo_n "checking for OCIStmtFetch2 in -lclntsh... " >&6; }
-if ${ac_cv_lib_clntsh_OCIStmtFetch2+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for OCIStmtFetch2 in -lclntsh" >&5
+printf %s "checking for OCIStmtFetch2 in -lclntsh... " >&6; }
+if test ${ac_cv_lib_clntsh_OCIStmtFetch2+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lclntsh  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -59375,40 +62182,39 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char OCIStmtFetch2 ();
 int
-main ()
+main (void)
 {
 return OCIStmtFetch2 ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_clntsh_OCIStmtFetch2=yes
-else
+else $as_nop
   ac_cv_lib_clntsh_OCIStmtFetch2=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_clntsh_OCIStmtFetch2" >&5
-$as_echo "$ac_cv_lib_clntsh_OCIStmtFetch2" >&6; }
-if test "x$ac_cv_lib_clntsh_OCIStmtFetch2" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_clntsh_OCIStmtFetch2" >&5
+printf "%s\n" "$ac_cv_lib_clntsh_OCIStmtFetch2" >&6; }
+if test "x$ac_cv_lib_clntsh_OCIStmtFetch2" = xyes
+then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-$as_echo "#define HAVE_OCISTMTFETCH2 1" >>confdefs.h
+printf "%s\n" "#define HAVE_OCISTMTFETCH2 1" >>confdefs.h
 
 
 
-else
+else $as_nop
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -59525,11 +62331,12 @@
     esac
   done
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OCILobRead2 in -lclntsh" >&5
-$as_echo_n "checking for OCILobRead2 in -lclntsh... " >&6; }
-if ${ac_cv_lib_clntsh_OCILobRead2+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for OCILobRead2 in -lclntsh" >&5
+printf %s "checking for OCILobRead2 in -lclntsh... " >&6; }
+if test ${ac_cv_lib_clntsh_OCILobRead2+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lclntsh  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -59538,40 +62345,39 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char OCILobRead2 ();
 int
-main ()
+main (void)
 {
 return OCILobRead2 ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_clntsh_OCILobRead2=yes
-else
+else $as_nop
   ac_cv_lib_clntsh_OCILobRead2=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_clntsh_OCILobRead2" >&5
-$as_echo "$ac_cv_lib_clntsh_OCILobRead2" >&6; }
-if test "x$ac_cv_lib_clntsh_OCILobRead2" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_clntsh_OCILobRead2" >&5
+printf "%s\n" "$ac_cv_lib_clntsh_OCILobRead2" >&6; }
+if test "x$ac_cv_lib_clntsh_OCILobRead2" = xyes
+then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-$as_echo "#define HAVE_OCILOBREAD2 1" >>confdefs.h
+printf "%s\n" "#define HAVE_OCILOBREAD2 1" >>confdefs.h
 
 
 
-else
+else $as_nop
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -59582,11 +62388,12 @@
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5
-$as_echo_n "checking for PDO includes... " >&6; }
-if ${pdo_cv_inc_path+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5
+printf %s "checking for PDO includes... " >&6; }
+if test ${pdo_cv_inc_path+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
     if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
       pdo_cv_inc_path=$abs_srcdir/ext
@@ -59597,8 +62404,8 @@
     fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pdo_cv_inc_path" >&5
-$as_echo "$pdo_cv_inc_path" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $pdo_cv_inc_path" >&5
+printf "%s\n" "$pdo_cv_inc_path" >&6; }
   if test -n "$pdo_cv_inc_path"; then
 :
   else
@@ -59740,9 +62547,7 @@
 EOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define COMPILE_DL_PDO_OCI 1
-_ACEOF
+printf "%s\n" "#define COMPILE_DL_PDO_OCI 1" >>confdefs.h
 
     fi
   fi
@@ -59904,9 +62709,7 @@
 
 
 
-cat >>confdefs.h <<_ACEOF
-#define PHP_PDO_OCI_CLIENT_VERSION "$PDO_OCI_VERSION"
-_ACEOF
+printf "%s\n" "#define PHP_PDO_OCI_CLIENT_VERSION \"$PDO_OCI_VERSION\"" >>confdefs.h
 
 fi
 
@@ -59918,13 +62721,14 @@
 
 php_with_pdo_odbc=no
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ODBC v3 support for PDO" >&5
-$as_echo_n "checking for ODBC v3 support for PDO... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ODBC v3 support for PDO" >&5
+printf %s "checking for ODBC v3 support for PDO... " >&6; }
 
 # Check whether --with-pdo-odbc was given.
-if test "${with_pdo_odbc+set}" = set; then :
+if test ${with_pdo_odbc+y}
+then :
   withval=$with_pdo_odbc; PHP_PDO_ODBC=$withval
-else
+else $as_nop
 
   PHP_PDO_ODBC=no
   test "$PHP_ENABLE_ALL" && PHP_PDO_ODBC=$PHP_ENABLE_ALL
@@ -59954,8 +62758,8 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -59969,11 +62773,12 @@
   fi
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5
-$as_echo_n "checking for PDO includes... " >&6; }
-if ${pdo_cv_inc_path+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5
+printf %s "checking for PDO includes... " >&6; }
+if test ${pdo_cv_inc_path+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
     if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
       pdo_cv_inc_path=$abs_srcdir/ext
@@ -59984,8 +62789,8 @@
     fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pdo_cv_inc_path" >&5
-$as_echo "$pdo_cv_inc_path" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $pdo_cv_inc_path" >&5
+printf "%s\n" "$pdo_cv_inc_path" >&6; }
   if test -n "$pdo_cv_inc_path"; then
 :
   else
@@ -59993,8 +62798,8 @@
   fi
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for selected PDO ODBC flavour" >&5
-$as_echo_n "checking for selected PDO ODBC flavour... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for selected PDO ODBC flavour" >&5
+printf %s "checking for selected PDO ODBC flavour... " >&6; }
 
   pdo_odbc_flavour="`echo $PHP_PDO_ODBC | cut -d, -f1`"
   pdo_odbc_dir="`echo $PHP_PDO_ODBC | cut -d, -f2`"
@@ -60055,286 +62860,286 @@
     PDO_ODBC_LIBDIR="$pdo_odbc_def_libdir"
   fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pdo_odbc_flavour
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $pdo_odbc_flavour
           libs       $PDO_ODBC_LIBDIR,
           headers    $PDO_ODBC_INCDIR" >&5
-$as_echo "$pdo_odbc_flavour
+printf "%s\n" "$pdo_odbc_flavour
           libs       $PDO_ODBC_LIBDIR,
           headers    $PDO_ODBC_INCDIR" >&6; }
 
   if test ! -d "$PDO_ODBC_LIBDIR" ; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: library dir $PDO_ODBC_LIBDIR does not exist" >&5
-$as_echo "$as_me: WARNING: library dir $PDO_ODBC_LIBDIR does not exist" >&2;}
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: library dir $PDO_ODBC_LIBDIR does not exist" >&5
+printf "%s\n" "$as_me: WARNING: library dir $PDO_ODBC_LIBDIR does not exist" >&2;}
   fi
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for odbc.h in $PDO_ODBC_INCDIR" >&5
-$as_echo_n "checking for odbc.h in $PDO_ODBC_INCDIR... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for odbc.h in $PDO_ODBC_INCDIR" >&5
+printf %s "checking for odbc.h in $PDO_ODBC_INCDIR... " >&6; }
   if test -f "$PDO_ODBC_INCDIR/odbc.h"; then
     php_pdo_have_header=yes
 
-$as_echo "#define HAVE_ODBC_H 1" >>confdefs.h
+printf "%s\n" "#define HAVE_ODBC_H 1" >>confdefs.h
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
   fi
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for odbcsdk.h in $PDO_ODBC_INCDIR" >&5
-$as_echo_n "checking for odbcsdk.h in $PDO_ODBC_INCDIR... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for odbcsdk.h in $PDO_ODBC_INCDIR" >&5
+printf %s "checking for odbcsdk.h in $PDO_ODBC_INCDIR... " >&6; }
   if test -f "$PDO_ODBC_INCDIR/odbcsdk.h"; then
     php_pdo_have_header=yes
 
-$as_echo "#define HAVE_ODBCSDK_H 1" >>confdefs.h
+printf "%s\n" "#define HAVE_ODBCSDK_H 1" >>confdefs.h
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
   fi
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iodbc.h in $PDO_ODBC_INCDIR" >&5
-$as_echo_n "checking for iodbc.h in $PDO_ODBC_INCDIR... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for iodbc.h in $PDO_ODBC_INCDIR" >&5
+printf %s "checking for iodbc.h in $PDO_ODBC_INCDIR... " >&6; }
   if test -f "$PDO_ODBC_INCDIR/iodbc.h"; then
     php_pdo_have_header=yes
 
-$as_echo "#define HAVE_IODBC_H 1" >>confdefs.h
+printf "%s\n" "#define HAVE_IODBC_H 1" >>confdefs.h
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
   fi
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlunix.h in $PDO_ODBC_INCDIR" >&5
-$as_echo_n "checking for sqlunix.h in $PDO_ODBC_INCDIR... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sqlunix.h in $PDO_ODBC_INCDIR" >&5
+printf %s "checking for sqlunix.h in $PDO_ODBC_INCDIR... " >&6; }
   if test -f "$PDO_ODBC_INCDIR/sqlunix.h"; then
     php_pdo_have_header=yes
 
-$as_echo "#define HAVE_SQLUNIX_H 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SQLUNIX_H 1" >>confdefs.h
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
   fi
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqltypes.h in $PDO_ODBC_INCDIR" >&5
-$as_echo_n "checking for sqltypes.h in $PDO_ODBC_INCDIR... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sqltypes.h in $PDO_ODBC_INCDIR" >&5
+printf %s "checking for sqltypes.h in $PDO_ODBC_INCDIR... " >&6; }
   if test -f "$PDO_ODBC_INCDIR/sqltypes.h"; then
     php_pdo_have_header=yes
 
-$as_echo "#define HAVE_SQLTYPES_H 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SQLTYPES_H 1" >>confdefs.h
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
   fi
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlucode.h in $PDO_ODBC_INCDIR" >&5
-$as_echo_n "checking for sqlucode.h in $PDO_ODBC_INCDIR... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sqlucode.h in $PDO_ODBC_INCDIR" >&5
+printf %s "checking for sqlucode.h in $PDO_ODBC_INCDIR... " >&6; }
   if test -f "$PDO_ODBC_INCDIR/sqlucode.h"; then
     php_pdo_have_header=yes
 
-$as_echo "#define HAVE_SQLUCODE_H 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SQLUCODE_H 1" >>confdefs.h
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
   fi
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sql.h in $PDO_ODBC_INCDIR" >&5
-$as_echo_n "checking for sql.h in $PDO_ODBC_INCDIR... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sql.h in $PDO_ODBC_INCDIR" >&5
+printf %s "checking for sql.h in $PDO_ODBC_INCDIR... " >&6; }
   if test -f "$PDO_ODBC_INCDIR/sql.h"; then
     php_pdo_have_header=yes
 
-$as_echo "#define HAVE_SQL_H 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SQL_H 1" >>confdefs.h
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
   fi
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for isql.h in $PDO_ODBC_INCDIR" >&5
-$as_echo_n "checking for isql.h in $PDO_ODBC_INCDIR... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for isql.h in $PDO_ODBC_INCDIR" >&5
+printf %s "checking for isql.h in $PDO_ODBC_INCDIR... " >&6; }
   if test -f "$PDO_ODBC_INCDIR/isql.h"; then
     php_pdo_have_header=yes
 
-$as_echo "#define HAVE_ISQL_H 1" >>confdefs.h
+printf "%s\n" "#define HAVE_ISQL_H 1" >>confdefs.h
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
   fi
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlext.h in $PDO_ODBC_INCDIR" >&5
-$as_echo_n "checking for sqlext.h in $PDO_ODBC_INCDIR... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sqlext.h in $PDO_ODBC_INCDIR" >&5
+printf %s "checking for sqlext.h in $PDO_ODBC_INCDIR... " >&6; }
   if test -f "$PDO_ODBC_INCDIR/sqlext.h"; then
     php_pdo_have_header=yes
 
-$as_echo "#define HAVE_SQLEXT_H 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SQLEXT_H 1" >>confdefs.h
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
   fi
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for isqlext.h in $PDO_ODBC_INCDIR" >&5
-$as_echo_n "checking for isqlext.h in $PDO_ODBC_INCDIR... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for isqlext.h in $PDO_ODBC_INCDIR" >&5
+printf %s "checking for isqlext.h in $PDO_ODBC_INCDIR... " >&6; }
   if test -f "$PDO_ODBC_INCDIR/isqlext.h"; then
     php_pdo_have_header=yes
 
-$as_echo "#define HAVE_ISQLEXT_H 1" >>confdefs.h
+printf "%s\n" "#define HAVE_ISQLEXT_H 1" >>confdefs.h
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
   fi
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for udbcext.h in $PDO_ODBC_INCDIR" >&5
-$as_echo_n "checking for udbcext.h in $PDO_ODBC_INCDIR... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for udbcext.h in $PDO_ODBC_INCDIR" >&5
+printf %s "checking for udbcext.h in $PDO_ODBC_INCDIR... " >&6; }
   if test -f "$PDO_ODBC_INCDIR/udbcext.h"; then
     php_pdo_have_header=yes
 
-$as_echo "#define HAVE_UDBCEXT_H 1" >>confdefs.h
+printf "%s\n" "#define HAVE_UDBCEXT_H 1" >>confdefs.h
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
   fi
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlcli1.h in $PDO_ODBC_INCDIR" >&5
-$as_echo_n "checking for sqlcli1.h in $PDO_ODBC_INCDIR... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sqlcli1.h in $PDO_ODBC_INCDIR" >&5
+printf %s "checking for sqlcli1.h in $PDO_ODBC_INCDIR... " >&6; }
   if test -f "$PDO_ODBC_INCDIR/sqlcli1.h"; then
     php_pdo_have_header=yes
 
-$as_echo "#define HAVE_SQLCLI1_H 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SQLCLI1_H 1" >>confdefs.h
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
   fi
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LibraryManager.h in $PDO_ODBC_INCDIR" >&5
-$as_echo_n "checking for LibraryManager.h in $PDO_ODBC_INCDIR... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LibraryManager.h in $PDO_ODBC_INCDIR" >&5
+printf %s "checking for LibraryManager.h in $PDO_ODBC_INCDIR... " >&6; }
   if test -f "$PDO_ODBC_INCDIR/LibraryManager.h"; then
     php_pdo_have_header=yes
 
-$as_echo "#define HAVE_LIBRARYMANAGER_H 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBRARYMANAGER_H 1" >>confdefs.h
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
   fi
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cli0core.h in $PDO_ODBC_INCDIR" >&5
-$as_echo_n "checking for cli0core.h in $PDO_ODBC_INCDIR... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for cli0core.h in $PDO_ODBC_INCDIR" >&5
+printf %s "checking for cli0core.h in $PDO_ODBC_INCDIR... " >&6; }
   if test -f "$PDO_ODBC_INCDIR/cli0core.h"; then
     php_pdo_have_header=yes
 
-$as_echo "#define HAVE_CLI0CORE_H 1" >>confdefs.h
+printf "%s\n" "#define HAVE_CLI0CORE_H 1" >>confdefs.h
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
   fi
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cli0ext.h in $PDO_ODBC_INCDIR" >&5
-$as_echo_n "checking for cli0ext.h in $PDO_ODBC_INCDIR... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for cli0ext.h in $PDO_ODBC_INCDIR" >&5
+printf %s "checking for cli0ext.h in $PDO_ODBC_INCDIR... " >&6; }
   if test -f "$PDO_ODBC_INCDIR/cli0ext.h"; then
     php_pdo_have_header=yes
 
-$as_echo "#define HAVE_CLI0EXT_H 1" >>confdefs.h
+printf "%s\n" "#define HAVE_CLI0EXT_H 1" >>confdefs.h
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
   fi
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cli0cli.h in $PDO_ODBC_INCDIR" >&5
-$as_echo_n "checking for cli0cli.h in $PDO_ODBC_INCDIR... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for cli0cli.h in $PDO_ODBC_INCDIR" >&5
+printf %s "checking for cli0cli.h in $PDO_ODBC_INCDIR... " >&6; }
   if test -f "$PDO_ODBC_INCDIR/cli0cli.h"; then
     php_pdo_have_header=yes
 
-$as_echo "#define HAVE_CLI0CLI_H 1" >>confdefs.h
+printf "%s\n" "#define HAVE_CLI0CLI_H 1" >>confdefs.h
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
   fi
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cli0defs.h in $PDO_ODBC_INCDIR" >&5
-$as_echo_n "checking for cli0defs.h in $PDO_ODBC_INCDIR... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for cli0defs.h in $PDO_ODBC_INCDIR" >&5
+printf %s "checking for cli0defs.h in $PDO_ODBC_INCDIR... " >&6; }
   if test -f "$PDO_ODBC_INCDIR/cli0defs.h"; then
     php_pdo_have_header=yes
 
-$as_echo "#define HAVE_CLI0DEFS_H 1" >>confdefs.h
+printf "%s\n" "#define HAVE_CLI0DEFS_H 1" >>confdefs.h
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
   fi
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cli0env.h in $PDO_ODBC_INCDIR" >&5
-$as_echo_n "checking for cli0env.h in $PDO_ODBC_INCDIR... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for cli0env.h in $PDO_ODBC_INCDIR" >&5
+printf %s "checking for cli0env.h in $PDO_ODBC_INCDIR... " >&6; }
   if test -f "$PDO_ODBC_INCDIR/cli0env.h"; then
     php_pdo_have_header=yes
 
-$as_echo "#define HAVE_CLI0ENV_H 1" >>confdefs.h
+printf "%s\n" "#define HAVE_CLI0ENV_H 1" >>confdefs.h
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
   fi
 
 
@@ -60550,12 +63355,13 @@
     esac
   done
 
-  as_ac_Lib=`$as_echo "ac_cv_lib_$pdo_odbc_def_lib''_SQLBindCol" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SQLBindCol in -l$pdo_odbc_def_lib" >&5
-$as_echo_n "checking for SQLBindCol in -l$pdo_odbc_def_lib... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  as_ac_Lib=`printf "%s\n" "ac_cv_lib_$pdo_odbc_def_lib""_SQLBindCol" | $as_tr_sh`
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SQLBindCol in -l$pdo_odbc_def_lib" >&5
+printf %s "checking for SQLBindCol in -l$pdo_odbc_def_lib... " >&6; }
+if eval test \${$as_ac_Lib+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$pdo_odbc_def_lib  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -60564,31 +63370,30 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char SQLBindCol ();
 int
-main ()
+main (void)
 {
 return SQLBindCol ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   eval "$as_ac_Lib=yes"
-else
+else $as_nop
   eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"
+then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -60698,12 +63503,13 @@
     esac
   done
 
-  as_ac_Lib=`$as_echo "ac_cv_lib_$pdo_odbc_def_lib''_SQLAllocHandle" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SQLAllocHandle in -l$pdo_odbc_def_lib" >&5
-$as_echo_n "checking for SQLAllocHandle in -l$pdo_odbc_def_lib... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  as_ac_Lib=`printf "%s\n" "ac_cv_lib_$pdo_odbc_def_lib""_SQLAllocHandle" | $as_tr_sh`
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SQLAllocHandle in -l$pdo_odbc_def_lib" >&5
+printf %s "checking for SQLAllocHandle in -l$pdo_odbc_def_lib... " >&6; }
+if eval test \${$as_ac_Lib+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$pdo_odbc_def_lib  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -60712,37 +63518,36 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char SQLAllocHandle ();
 int
-main ()
+main (void)
 {
 return SQLAllocHandle ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   eval "$as_ac_Lib=yes"
-else
+else $as_nop
   eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"
+then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-else
+else $as_nop
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -60759,7 +63564,7 @@
 
 
 
-else
+else $as_nop
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -60905,9 +63710,7 @@
 EOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define COMPILE_DL_PDO_ODBC 1
-_ACEOF
+printf "%s\n" "#define COMPILE_DL_PDO_ODBC 1" >>confdefs.h
 
     fi
   fi
@@ -61058,13 +63861,14 @@
 
 php_with_pdo_pgsql=no
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PostgreSQL support for PDO" >&5
-$as_echo_n "checking for PostgreSQL support for PDO... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PostgreSQL support for PDO" >&5
+printf %s "checking for PostgreSQL support for PDO... " >&6; }
 
 # Check whether --with-pdo-pgsql was given.
-if test "${with_pdo_pgsql+set}" = set; then :
+if test ${with_pdo_pgsql+y}
+then :
   withval=$with_pdo_pgsql; PHP_PDO_PGSQL=$withval
-else
+else $as_nop
 
   PHP_PDO_PGSQL=no
   test "$PHP_ENABLE_ALL" && PHP_PDO_PGSQL=$PHP_ENABLE_ALL
@@ -61094,8 +63898,8 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -61118,8 +63922,8 @@
   fi
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pg_config" >&5
-$as_echo_n "checking for pg_config... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pg_config" >&5
+printf %s "checking for pg_config... " >&6; }
   for i in $PHP_PDO_PGSQL $PHP_PDO_PGSQL/bin /usr/local/pgsql/bin /usr/local/bin /usr/bin ""; do
     if test -x $i/pg_config; then
       PG_CONFIG="$i/pg_config"
@@ -61128,13 +63932,13 @@
   done
 
   if test -n "$PG_CONFIG"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5
-$as_echo "$PG_CONFIG" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5
+printf "%s\n" "$PG_CONFIG" >&6; }
     PGSQL_INCLUDE=`$PG_CONFIG --includedir`
     PGSQL_LIBDIR=`$PG_CONFIG --libdir`
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
-$as_echo "not found" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+printf "%s\n" "not found" >&6; }
     if test "$PHP_PDO_PGSQL" = "yes"; then
       PGSQL_SEARCH_PATHS="/usr /usr/local /usr/local/pgsql"
     else
@@ -61170,18 +63974,19 @@
   fi
 
 
-$as_echo "#define HAVE_PDO_PGSQL 1" >>confdefs.h
+printf "%s\n" "#define HAVE_PDO_PGSQL 1" >>confdefs.h
 
 
   old_LIBS=$LIBS
   old_LDFLAGS=$LDFLAGS
   LDFLAGS="-L$PGSQL_LIBDIR $LDFLAGS"
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQlibVersion in -lpq" >&5
-$as_echo_n "checking for PQlibVersion in -lpq... " >&6; }
-if ${ac_cv_lib_pq_PQlibVersion+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PQlibVersion in -lpq" >&5
+printf %s "checking for PQlibVersion in -lpq... " >&6; }
+if test ${ac_cv_lib_pq_PQlibVersion+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpq  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -61190,37 +63995,34 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char PQlibVersion ();
 int
-main ()
+main (void)
 {
 return PQlibVersion ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_pq_PQlibVersion=yes
-else
+else $as_nop
   ac_cv_lib_pq_PQlibVersion=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQlibVersion" >&5
-$as_echo "$ac_cv_lib_pq_PQlibVersion" >&6; }
-if test "x$ac_cv_lib_pq_PQlibVersion" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBPQ 1
-_ACEOF
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQlibVersion" >&5
+printf "%s\n" "$ac_cv_lib_pq_PQlibVersion" >&6; }
+if test "x$ac_cv_lib_pq_PQlibVersion" = xyes
+then :
+  printf "%s\n" "#define HAVE_LIBPQ 1" >>confdefs.h
 
   LIBS="-lpq $LIBS"
 
-else
+else $as_nop
   as_fn_error $? "Unable to build the PDO PostgreSQL driver: at least libpq 9.1 is required" "$LINENO" 5
 fi
 
@@ -61362,11 +64164,12 @@
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5
-$as_echo_n "checking for PDO includes... " >&6; }
-if ${pdo_cv_inc_path+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5
+printf %s "checking for PDO includes... " >&6; }
+if test ${pdo_cv_inc_path+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
     if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
       pdo_cv_inc_path=$abs_srcdir/ext
@@ -61377,8 +64180,8 @@
     fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pdo_cv_inc_path" >&5
-$as_echo "$pdo_cv_inc_path" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $pdo_cv_inc_path" >&5
+printf "%s\n" "$pdo_cv_inc_path" >&6; }
   if test -n "$pdo_cv_inc_path"; then
 :
   else
@@ -61520,9 +64323,7 @@
 EOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define COMPILE_DL_PDO_PGSQL 1
-_ACEOF
+printf "%s\n" "#define COMPILE_DL_PDO_PGSQL 1" >>confdefs.h
 
     fi
   fi
@@ -61670,13 +64471,14 @@
 
 php_with_pdo_sqlite=$PHP_PDO
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite 3 support for PDO" >&5
-$as_echo_n "checking for sqlite 3 support for PDO... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sqlite 3 support for PDO" >&5
+printf %s "checking for sqlite 3 support for PDO... " >&6; }
 
 # Check whether --with-pdo-sqlite was given.
-if test "${with_pdo_sqlite+set}" = set; then :
+if test ${with_pdo_sqlite+y}
+then :
   withval=$with_pdo_sqlite; PHP_PDO_SQLITE=$withval
-else
+else $as_nop
 
   PHP_PDO_SQLITE=$PHP_PDO
   test "$PHP_ENABLE_ALL" && PHP_PDO_SQLITE=$PHP_ENABLE_ALL
@@ -61706,8 +64508,8 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -61719,11 +64521,12 @@
   fi
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5
-$as_echo_n "checking for PDO includes... " >&6; }
-if ${pdo_cv_inc_path+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5
+printf %s "checking for PDO includes... " >&6; }
+if test ${pdo_cv_inc_path+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
     if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
       pdo_cv_inc_path=$abs_srcdir/ext
@@ -61734,8 +64537,8 @@
     fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pdo_cv_inc_path" >&5
-$as_echo "$pdo_cv_inc_path" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $pdo_cv_inc_path" >&5
+printf "%s\n" "$pdo_cv_inc_path" >&6; }
   if test -n "$pdo_cv_inc_path"; then
 :
   else
@@ -61745,17 +64548,17 @@
 
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3 >= 3.7.7" >&5
-$as_echo_n "checking for sqlite3 >= 3.7.7... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sqlite3 >= 3.7.7" >&5
+printf %s "checking for sqlite3 >= 3.7.7... " >&6; }
 
 if test -n "$SQLITE_CFLAGS"; then
     pkg_cv_SQLITE_CFLAGS="$SQLITE_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sqlite3 >= 3.7.7\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sqlite3 >= 3.7.7\""; } >&5
   ($PKG_CONFIG --exists --print-errors "sqlite3 >= 3.7.7") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_SQLITE_CFLAGS=`$PKG_CONFIG --cflags "sqlite3 >= 3.7.7" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -61769,10 +64572,10 @@
     pkg_cv_SQLITE_LIBS="$SQLITE_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sqlite3 >= 3.7.7\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sqlite3 >= 3.7.7\""; } >&5
   ($PKG_CONFIG --exists --print-errors "sqlite3 >= 3.7.7") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_SQLITE_LIBS=`$PKG_CONFIG --libs "sqlite3 >= 3.7.7" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -61786,8 +64589,8 @@
 
 
 if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -61813,10 +64616,10 @@
 and SQLITE_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -61830,8 +64633,8 @@
 else
 	SQLITE_CFLAGS=$pkg_cv_SQLITE_CFLAGS
 	SQLITE_LIBS=$pkg_cv_SQLITE_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
 fi
 
@@ -61975,7 +64778,7 @@
   done
 
 
-$as_echo "#define HAVE_PDO_SQLITELIB 1" >>confdefs.h
+printf "%s\n" "#define HAVE_PDO_SQLITELIB 1" >>confdefs.h
 
 
 
@@ -62083,11 +64886,12 @@
     esac
   done
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_close_v2 in -lsqlite3" >&5
-$as_echo_n "checking for sqlite3_close_v2 in -lsqlite3... " >&6; }
-if ${ac_cv_lib_sqlite3_sqlite3_close_v2+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sqlite3_close_v2 in -lsqlite3" >&5
+printf %s "checking for sqlite3_close_v2 in -lsqlite3... " >&6; }
+if test ${ac_cv_lib_sqlite3_sqlite3_close_v2+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsqlite3  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -62096,40 +64900,39 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char sqlite3_close_v2 ();
 int
-main ()
+main (void)
 {
 return sqlite3_close_v2 ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_sqlite3_sqlite3_close_v2=yes
-else
+else $as_nop
   ac_cv_lib_sqlite3_sqlite3_close_v2=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_close_v2" >&5
-$as_echo "$ac_cv_lib_sqlite3_sqlite3_close_v2" >&6; }
-if test "x$ac_cv_lib_sqlite3_sqlite3_close_v2" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_close_v2" >&5
+printf "%s\n" "$ac_cv_lib_sqlite3_sqlite3_close_v2" >&6; }
+if test "x$ac_cv_lib_sqlite3_sqlite3_close_v2" = xyes
+then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-$as_echo "#define HAVE_SQLITE3_CLOSE_V2 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SQLITE3_CLOSE_V2 1" >>confdefs.h
 
 
 
-else
+else $as_nop
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -62244,11 +65047,12 @@
     esac
   done
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_column_table_name in -lsqlite3" >&5
-$as_echo_n "checking for sqlite3_column_table_name in -lsqlite3... " >&6; }
-if ${ac_cv_lib_sqlite3_sqlite3_column_table_name+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sqlite3_column_table_name in -lsqlite3" >&5
+printf %s "checking for sqlite3_column_table_name in -lsqlite3... " >&6; }
+if test ${ac_cv_lib_sqlite3_sqlite3_column_table_name+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsqlite3  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -62257,40 +65061,39 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char sqlite3_column_table_name ();
 int
-main ()
+main (void)
 {
 return sqlite3_column_table_name ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_sqlite3_sqlite3_column_table_name=yes
-else
+else $as_nop
   ac_cv_lib_sqlite3_sqlite3_column_table_name=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_column_table_name" >&5
-$as_echo "$ac_cv_lib_sqlite3_sqlite3_column_table_name" >&6; }
-if test "x$ac_cv_lib_sqlite3_sqlite3_column_table_name" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_column_table_name" >&5
+printf "%s\n" "$ac_cv_lib_sqlite3_sqlite3_column_table_name" >&6; }
+if test "x$ac_cv_lib_sqlite3_sqlite3_column_table_name" = xyes
+then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-$as_echo "#define HAVE_SQLITE3_COLUMN_TABLE_NAME 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SQLITE3_COLUMN_TABLE_NAME 1" >>confdefs.h
 
 
 
-else
+else $as_nop
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -62437,9 +65240,7 @@
 EOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define COMPILE_DL_PDO_SQLITE 1
-_ACEOF
+printf "%s\n" "#define COMPILE_DL_PDO_SQLITE 1" >>confdefs.h
 
     fi
   fi
@@ -62588,13 +65389,14 @@
 
 php_with_pgsql=no
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PostgreSQL support" >&5
-$as_echo_n "checking for PostgreSQL support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PostgreSQL support" >&5
+printf %s "checking for PostgreSQL support... " >&6; }
 
 # Check whether --with-pgsql was given.
-if test "${with_pgsql+set}" = set; then :
+if test ${with_pgsql+y}
+then :
   withval=$with_pgsql; PHP_PGSQL=$withval
-else
+else $as_nop
 
   PHP_PGSQL=no
   test "$PHP_ENABLE_ALL" && PHP_PGSQL=$PHP_ENABLE_ALL
@@ -62624,8 +65426,8 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -62644,8 +65446,8 @@
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pg_config" >&5
-$as_echo_n "checking for pg_config... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pg_config" >&5
+printf %s "checking for pg_config... " >&6; }
   for i in $PHP_PGSQL $PHP_PGSQL/bin /usr/local/pgsql/bin /usr/local/bin /usr/bin ""; do
 	if test -x $i/pg_config; then
       PG_CONFIG="$i/pg_config"
@@ -62654,13 +65456,13 @@
   done
 
   if test -n "$PG_CONFIG"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5
-$as_echo "$PG_CONFIG" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5
+printf "%s\n" "$PG_CONFIG" >&6; }
     PGSQL_INCLUDE=`$PG_CONFIG --includedir`
     PGSQL_LIBDIR=`$PG_CONFIG --libdir`
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
-$as_echo "not found" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+printf "%s\n" "not found" >&6; }
     if test "$PHP_PGSQL" = "yes"; then
       PGSQL_SEARCH_PATHS="/usr /usr/local /usr/local/pgsql"
     else
@@ -62696,16 +65498,17 @@
   fi
 
 
-$as_echo "#define HAVE_PGSQL 1" >>confdefs.h
+printf "%s\n" "#define HAVE_PGSQL 1" >>confdefs.h
 
   old_LIBS=$LIBS
   old_LDFLAGS=$LDFLAGS
   LDFLAGS="-L$PGSQL_LIBDIR $LDFLAGS"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQlibVersion in -lpq" >&5
-$as_echo_n "checking for PQlibVersion in -lpq... " >&6; }
-if ${ac_cv_lib_pq_PQlibVersion+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PQlibVersion in -lpq" >&5
+printf %s "checking for PQlibVersion in -lpq... " >&6; }
+if test ${ac_cv_lib_pq_PQlibVersion+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpq  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -62714,45 +65517,43 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char PQlibVersion ();
 int
-main ()
+main (void)
 {
 return PQlibVersion ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_pq_PQlibVersion=yes
-else
+else $as_nop
   ac_cv_lib_pq_PQlibVersion=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQlibVersion" >&5
-$as_echo "$ac_cv_lib_pq_PQlibVersion" >&6; }
-if test "x$ac_cv_lib_pq_PQlibVersion" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBPQ 1
-_ACEOF
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQlibVersion" >&5
+printf "%s\n" "$ac_cv_lib_pq_PQlibVersion" >&6; }
+if test "x$ac_cv_lib_pq_PQlibVersion" = xyes
+then :
+  printf "%s\n" "#define HAVE_LIBPQ 1" >>confdefs.h
 
   LIBS="-lpq $LIBS"
 
-else
+else $as_nop
   as_fn_error $? "Unable to build the PostgreSQL extension: at least libpq 9.1 is required" "$LINENO" 5
 fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pg_encoding_to_char in -lpq" >&5
-$as_echo_n "checking for pg_encoding_to_char in -lpq... " >&6; }
-if ${ac_cv_lib_pq_pg_encoding_to_char+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pg_encoding_to_char in -lpq" >&5
+printf %s "checking for pg_encoding_to_char in -lpq... " >&6; }
+if test ${ac_cv_lib_pq_pg_encoding_to_char+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpq  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -62761,40 +65562,40 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char pg_encoding_to_char ();
 int
-main ()
+main (void)
 {
 return pg_encoding_to_char ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_pq_pg_encoding_to_char=yes
-else
+else $as_nop
   ac_cv_lib_pq_pg_encoding_to_char=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_pg_encoding_to_char" >&5
-$as_echo "$ac_cv_lib_pq_pg_encoding_to_char" >&6; }
-if test "x$ac_cv_lib_pq_pg_encoding_to_char" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_pg_encoding_to_char" >&5
+printf "%s\n" "$ac_cv_lib_pq_pg_encoding_to_char" >&6; }
+if test "x$ac_cv_lib_pq_pg_encoding_to_char" = xyes
+then :
 
-$as_echo "#define HAVE_PGSQL_WITH_MULTIBYTE_SUPPORT 1" >>confdefs.h
+printf "%s\n" "#define HAVE_PGSQL_WITH_MULTIBYTE_SUPPORT 1" >>confdefs.h
 
 fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lo_truncate64 in -lpq" >&5
-$as_echo_n "checking for lo_truncate64 in -lpq... " >&6; }
-if ${ac_cv_lib_pq_lo_truncate64+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for lo_truncate64 in -lpq" >&5
+printf %s "checking for lo_truncate64 in -lpq... " >&6; }
+if test ${ac_cv_lib_pq_lo_truncate64+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpq  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -62803,40 +65604,40 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char lo_truncate64 ();
 int
-main ()
+main (void)
 {
 return lo_truncate64 ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_pq_lo_truncate64=yes
-else
+else $as_nop
   ac_cv_lib_pq_lo_truncate64=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_lo_truncate64" >&5
-$as_echo "$ac_cv_lib_pq_lo_truncate64" >&6; }
-if test "x$ac_cv_lib_pq_lo_truncate64" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_lo_truncate64" >&5
+printf "%s\n" "$ac_cv_lib_pq_lo_truncate64" >&6; }
+if test "x$ac_cv_lib_pq_lo_truncate64" = xyes
+then :
 
-$as_echo "#define HAVE_PG_LO64 1" >>confdefs.h
+printf "%s\n" "#define HAVE_PG_LO64 1" >>confdefs.h
 
 fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQsetErrorContextVisibility in -lpq" >&5
-$as_echo_n "checking for PQsetErrorContextVisibility in -lpq... " >&6; }
-if ${ac_cv_lib_pq_PQsetErrorContextVisibility+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PQsetErrorContextVisibility in -lpq" >&5
+printf %s "checking for PQsetErrorContextVisibility in -lpq... " >&6; }
+if test ${ac_cv_lib_pq_PQsetErrorContextVisibility+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpq  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -62845,32 +65646,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char PQsetErrorContextVisibility ();
 int
-main ()
+main (void)
 {
 return PQsetErrorContextVisibility ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_pq_PQsetErrorContextVisibility=yes
-else
+else $as_nop
   ac_cv_lib_pq_PQsetErrorContextVisibility=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQsetErrorContextVisibility" >&5
-$as_echo "$ac_cv_lib_pq_PQsetErrorContextVisibility" >&6; }
-if test "x$ac_cv_lib_pq_PQsetErrorContextVisibility" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQsetErrorContextVisibility" >&5
+printf "%s\n" "$ac_cv_lib_pq_PQsetErrorContextVisibility" >&6; }
+if test "x$ac_cv_lib_pq_PQsetErrorContextVisibility" = xyes
+then :
 
-$as_echo "#define HAVE_PG_CONTEXT_VISIBILITY 1" >>confdefs.h
+printf "%s\n" "#define HAVE_PG_CONTEXT_VISIBILITY 1" >>confdefs.h
 
 fi
 
@@ -63144,9 +65944,7 @@
 EOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define COMPILE_DL_PGSQL 1
-_ACEOF
+printf "%s\n" "#define COMPILE_DL_PGSQL 1" >>confdefs.h
 
     fi
   fi
@@ -63275,12 +66073,13 @@
 
 php_enable_phar=yes
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for phar archive support" >&5
-$as_echo_n "checking for phar archive support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for phar archive support" >&5
+printf %s "checking for phar archive support... " >&6; }
 # Check whether --enable-phar was given.
-if test "${enable_phar+set}" = set; then :
+if test ${enable_phar+y}
+then :
   enableval=$enable_phar; PHP_PHAR=$enableval
-else
+else $as_nop
 
   PHP_PHAR=yes
   test "$PHP_ENABLE_ALL" && PHP_PHAR=$PHP_ENABLE_ALL
@@ -63310,8 +66109,8 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -63451,9 +66250,7 @@
 EOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define COMPILE_DL_PHAR 1
-_ACEOF
+printf "%s\n" "#define COMPILE_DL_PHAR 1" >>confdefs.h
 
     fi
   fi
@@ -63574,21 +66371,21 @@
 
   fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for phar openssl support" >&5
-$as_echo_n "checking for phar openssl support... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for phar openssl support" >&5
+printf %s "checking for phar openssl support... " >&6; }
   if test "$PHP_OPENSSL_SHARED" = "yes"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no (shared openssl)" >&5
-$as_echo "no (shared openssl)" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no (shared openssl)" >&5
+printf "%s\n" "no (shared openssl)" >&6; }
   else
     if test "$PHP_OPENSSL" = "yes"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-$as_echo "#define PHAR_HAVE_OPENSSL 1" >>confdefs.h
+printf "%s\n" "#define PHAR_HAVE_OPENSSL 1" >>confdefs.h
 
     else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
     fi
   fi
 
@@ -63668,12 +66465,13 @@
 
 php_enable_posix=yes
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable POSIX-like functions" >&5
-$as_echo_n "checking whether to enable POSIX-like functions... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable POSIX-like functions" >&5
+printf %s "checking whether to enable POSIX-like functions... " >&6; }
 # Check whether --enable-posix was given.
-if test "${enable_posix+set}" = set; then :
+if test ${enable_posix+y}
+then :
   enableval=$enable_posix; PHP_POSIX=$enableval
-else
+else $as_nop
 
   PHP_POSIX=yes
   test "$PHP_ENABLE_ALL" && PHP_POSIX=$PHP_ENABLE_ALL
@@ -63703,15 +66501,15 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
 
 if test "$PHP_POSIX" = "yes"; then
 
-$as_echo "#define HAVE_POSIX 1" >>confdefs.h
+printf "%s\n" "#define HAVE_POSIX 1" >>confdefs.h
 
 
   ext_builddir=ext/posix
@@ -63847,9 +66645,7 @@
 EOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define COMPILE_DL_POSIX 1
-_ACEOF
+printf "%s\n" "#define COMPILE_DL_POSIX 1" >>confdefs.h
 
     fi
   fi
@@ -63971,58 +66767,140 @@
   fi
 
 
-  for ac_header in sys/mkdev.h sys/sysmacros.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
+  ac_fn_c_check_header_compile "$LINENO" "sys/mkdev.h" "ac_cv_header_sys_mkdev_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_mkdev_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_MKDEV_H 1" >>confdefs.h
 
 fi
+ac_fn_c_check_header_compile "$LINENO" "sys/sysmacros.h" "ac_cv_header_sys_sysmacros_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_sysmacros_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_SYSMACROS_H 1" >>confdefs.h
 
-done
+fi
 
 
-  for ac_func in seteuid setegid setsid getsid getpgid ctermid mkfifo mknod setrlimit getrlimit getgroups makedev initgroups getgrgid_r eaccess
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
+  ac_fn_c_check_func "$LINENO" "seteuid" "ac_cv_func_seteuid"
+if test "x$ac_cv_func_seteuid" = xyes
+then :
+  printf "%s\n" "#define HAVE_SETEUID 1" >>confdefs.h
 
 fi
-done
+ac_fn_c_check_func "$LINENO" "setegid" "ac_cv_func_setegid"
+if test "x$ac_cv_func_setegid" = xyes
+then :
+  printf "%s\n" "#define HAVE_SETEGID 1" >>confdefs.h
 
+fi
+ac_fn_c_check_func "$LINENO" "setsid" "ac_cv_func_setsid"
+if test "x$ac_cv_func_setsid" = xyes
+then :
+  printf "%s\n" "#define HAVE_SETSID 1" >>confdefs.h
 
-  if command -v ldd >/dev/null && ldd --version 2>&1 | grep -q "^musl"; then :
+fi
+ac_fn_c_check_func "$LINENO" "getsid" "ac_cv_func_getsid"
+if test "x$ac_cv_func_getsid" = xyes
+then :
+  printf "%s\n" "#define HAVE_GETSID 1" >>confdefs.h
 
-else
-  for ac_func in pathconf fpathconf
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
+fi
+ac_fn_c_check_func "$LINENO" "getpgid" "ac_cv_func_getpgid"
+if test "x$ac_cv_func_getpgid" = xyes
+then :
+  printf "%s\n" "#define HAVE_GETPGID 1" >>confdefs.h
 
 fi
-done
+ac_fn_c_check_func "$LINENO" "ctermid" "ac_cv_func_ctermid"
+if test "x$ac_cv_func_ctermid" = xyes
+then :
+  printf "%s\n" "#define HAVE_CTERMID 1" >>confdefs.h
 
 fi
+ac_fn_c_check_func "$LINENO" "mkfifo" "ac_cv_func_mkfifo"
+if test "x$ac_cv_func_mkfifo" = xyes
+then :
+  printf "%s\n" "#define HAVE_MKFIFO 1" >>confdefs.h
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working ttyname_r() implementation" >&5
-$as_echo_n "checking for working ttyname_r() implementation... " >&6; }
-  if test "$cross_compiling" = yes; then :
+fi
+ac_fn_c_check_func "$LINENO" "mknod" "ac_cv_func_mknod"
+if test "x$ac_cv_func_mknod" = xyes
+then :
+  printf "%s\n" "#define HAVE_MKNOD 1" >>confdefs.h
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, cannot detect working ttyname_r() when cross compiling. posix_ttyname() will be thread-unsafe" >&5
-$as_echo "no, cannot detect working ttyname_r() when cross compiling. posix_ttyname() will be thread-unsafe" >&6; }
+fi
+ac_fn_c_check_func "$LINENO" "setrlimit" "ac_cv_func_setrlimit"
+if test "x$ac_cv_func_setrlimit" = xyes
+then :
+  printf "%s\n" "#define HAVE_SETRLIMIT 1" >>confdefs.h
 
-else
+fi
+ac_fn_c_check_func "$LINENO" "getrlimit" "ac_cv_func_getrlimit"
+if test "x$ac_cv_func_getrlimit" = xyes
+then :
+  printf "%s\n" "#define HAVE_GETRLIMIT 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "getgroups" "ac_cv_func_getgroups"
+if test "x$ac_cv_func_getgroups" = xyes
+then :
+  printf "%s\n" "#define HAVE_GETGROUPS 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "makedev" "ac_cv_func_makedev"
+if test "x$ac_cv_func_makedev" = xyes
+then :
+  printf "%s\n" "#define HAVE_MAKEDEV 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "initgroups" "ac_cv_func_initgroups"
+if test "x$ac_cv_func_initgroups" = xyes
+then :
+  printf "%s\n" "#define HAVE_INITGROUPS 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "getgrgid_r" "ac_cv_func_getgrgid_r"
+if test "x$ac_cv_func_getgrgid_r" = xyes
+then :
+  printf "%s\n" "#define HAVE_GETGRGID_R 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "eaccess" "ac_cv_func_eaccess"
+if test "x$ac_cv_func_eaccess" = xyes
+then :
+  printf "%s\n" "#define HAVE_EACCESS 1" >>confdefs.h
+
+fi
+
+
+  if command -v ldd >/dev/null && ldd --version 2>&1 | grep ^musl >/dev/null 2>&1
+then :
+
+else $as_nop
+  ac_fn_c_check_func "$LINENO" "pathconf" "ac_cv_func_pathconf"
+if test "x$ac_cv_func_pathconf" = xyes
+then :
+  printf "%s\n" "#define HAVE_PATHCONF 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "fpathconf" "ac_cv_func_fpathconf"
+if test "x$ac_cv_func_fpathconf" = xyes
+then :
+  printf "%s\n" "#define HAVE_FPATHCONF 1" >>confdefs.h
+
+fi
+
+fi
+
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working ttyname_r() implementation" >&5
+printf %s "checking for working ttyname_r() implementation... " >&6; }
+  if test "$cross_compiling" = yes
+then :
+
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no, cannot detect working ttyname_r() when cross compiling. posix_ttyname() will be thread-unsafe" >&5
+printf "%s\n" "no, cannot detect working ttyname_r() when cross compiling. posix_ttyname() will be thread-unsafe" >&6; }
+
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -64036,18 +66914,19 @@
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-$as_echo "#define HAVE_TTYNAME_R 1" >>confdefs.h
+printf "%s\n" "#define HAVE_TTYNAME_R 1" >>confdefs.h
 
 
-else
+else $as_nop
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, posix_ttyname() will be thread-unsafe" >&5
-$as_echo "no, posix_ttyname() will be thread-unsafe" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no, posix_ttyname() will be thread-unsafe" >&5
+printf "%s\n" "no, posix_ttyname() will be thread-unsafe" >&6; }
 
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -64055,11 +66934,12 @@
 fi
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for utsname.domainname" >&5
-$as_echo_n "checking for utsname.domainname... " >&6; }
-if ${ac_cv_have_utsname_domainname+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for utsname.domainname" >&5
+printf %s "checking for utsname.domainname... " >&6; }
+if test ${ac_cv_have_utsname_domainname+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -64068,7 +66948,7 @@
       #include <sys/utsname.h>
 
 int
-main ()
+main (void)
 {
 
       return sizeof(((struct utsname *)0)->domainname);
@@ -64077,23 +66957,24 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
       ac_cv_have_utsname_domainname=yes
 
-else
+else $as_nop
 
       ac_cv_have_utsname_domainname=no
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_utsname_domainname" >&5
-$as_echo "$ac_cv_have_utsname_domainname" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_utsname_domainname" >&5
+printf "%s\n" "$ac_cv_have_utsname_domainname" >&6; }
   if test "$ac_cv_have_utsname_domainname" = yes; then
 
-$as_echo "#define HAVE_UTSNAME_DOMAINNAME 1" >>confdefs.h
+printf "%s\n" "#define HAVE_UTSNAME_DOMAINNAME 1" >>confdefs.h
 
   fi
 fi
@@ -64104,13 +66985,14 @@
 
 php_with_pspell=no
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PSPELL support" >&5
-$as_echo_n "checking for PSPELL support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PSPELL support" >&5
+printf %s "checking for PSPELL support... " >&6; }
 
 # Check whether --with-pspell was given.
-if test "${with_pspell+set}" = set; then :
+if test ${with_pspell+y}
+then :
   withval=$with_pspell; PHP_PSPELL=$withval
-else
+else $as_nop
 
   PHP_PSPELL=no
   test "$PHP_ENABLE_ALL" && PHP_PSPELL=$PHP_ENABLE_ALL
@@ -64140,8 +67022,8 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -64281,9 +67163,7 @@
 EOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define COMPILE_DL_PSPELL 1
-_ACEOF
+printf "%s\n" "#define COMPILE_DL_PSPELL 1" >>confdefs.h
 
     fi
   fi
@@ -64630,11 +67510,12 @@
     esac
   done
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for new_aspell_config in -laspell" >&5
-$as_echo_n "checking for new_aspell_config in -laspell... " >&6; }
-if ${ac_cv_lib_aspell_new_aspell_config+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for new_aspell_config in -laspell" >&5
+printf %s "checking for new_aspell_config in -laspell... " >&6; }
+if test ${ac_cv_lib_aspell_new_aspell_config+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-laspell  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -64643,30 +67524,29 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char new_aspell_config ();
 int
-main ()
+main (void)
 {
 return new_aspell_config ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_aspell_new_aspell_config=yes
-else
+else $as_nop
   ac_cv_lib_aspell_new_aspell_config=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_aspell_new_aspell_config" >&5
-$as_echo "$ac_cv_lib_aspell_new_aspell_config" >&6; }
-if test "x$ac_cv_lib_aspell_new_aspell_config" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_aspell_new_aspell_config" >&5
+printf "%s\n" "$ac_cv_lib_aspell_new_aspell_config" >&6; }
+if test "x$ac_cv_lib_aspell_new_aspell_config" = xyes
+then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -64770,7 +67650,7 @@
 
 
 
-else
+else $as_nop
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -64815,41 +67695,42 @@
   PHP_VAR_SUBST="$PHP_VAR_SUBST PSPELL_SHARED_LIBADD"
 
 
-$as_echo "#define HAVE_PSPELL 1" >>confdefs.h
+printf "%s\n" "#define HAVE_PSPELL 1" >>confdefs.h
 
 fi
 
 
 
 
-ac_fn_c_check_decl "$LINENO" "arc4random_buf" "ac_cv_have_decl_arc4random_buf" "$ac_includes_default"
-if test "x$ac_cv_have_decl_arc4random_buf" = xyes; then :
+ac_fn_check_decl "$LINENO" "arc4random_buf" "ac_cv_have_decl_arc4random_buf" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+if test "x$ac_cv_have_decl_arc4random_buf" = xyes
+then :
   ac_have_decl=1
-else
+else $as_nop
   ac_have_decl=0
 fi
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_ARC4RANDOM_BUF $ac_have_decl
-_ACEOF
+printf "%s\n" "#define HAVE_DECL_ARC4RANDOM_BUF $ac_have_decl" >>confdefs.h
 
 
-for ac_header in CommonCrypto/CommonRandom.h
-do :
-  ac_fn_c_check_header_compile "$LINENO" "CommonCrypto/CommonRandom.h" "ac_cv_header_CommonCrypto_CommonRandom_h" "
+ac_fn_c_check_header_compile "$LINENO" "CommonCrypto/CommonRandom.h" "ac_cv_header_CommonCrypto_CommonRandom_h" "
 	#include <sys/types.h>
 	#include <Availability.h>
 	#include <CommonCrypto/CommonCryptoError.h>
 
 "
-if test "x$ac_cv_header_CommonCrypto_CommonRandom_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_COMMONCRYPTO_COMMONRANDOM_H 1
-_ACEOF
+if test "x$ac_cv_header_CommonCrypto_CommonRandom_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_COMMONCRYPTO_COMMONRANDOM_H 1" >>confdefs.h
 
 fi
 
-done
+
+ac_fn_c_check_func "$LINENO" "getrandom" "ac_cv_func_getrandom"
+if test "x$ac_cv_func_getrandom" = xyes
+then :
+  printf "%s\n" "#define HAVE_GETRANDOM 1" >>confdefs.h
+
+fi
 
 
 
@@ -65004,9 +67885,7 @@
 EOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define COMPILE_DL_RANDOM 1
-_ACEOF
+printf "%s\n" "#define COMPILE_DL_RANDOM 1" >>confdefs.h
 
     fi
   fi
@@ -65172,13 +68051,14 @@
 
 php_with_libedit=no
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libedit readline replacement" >&5
-$as_echo_n "checking for libedit readline replacement... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libedit readline replacement" >&5
+printf %s "checking for libedit readline replacement... " >&6; }
 
 # Check whether --with-libedit was given.
-if test "${with_libedit+set}" = set; then :
+if test ${with_libedit+y}
+then :
   withval=$with_libedit; PHP_LIBEDIT=$withval
-else
+else $as_nop
 
   PHP_LIBEDIT=no
   test "$PHP_ENABLE_ALL" && PHP_LIBEDIT=$PHP_ENABLE_ALL
@@ -65208,8 +68088,8 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -65218,13 +68098,14 @@
 
 php_with_readline=no
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline support" >&5
-$as_echo_n "checking for readline support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for readline support" >&5
+printf %s "checking for readline support... " >&6; }
 
 # Check whether --with-readline was given.
-if test "${with_readline+set}" = set; then :
+if test ${with_readline+y}
+then :
   withval=$with_readline; PHP_READLINE=$withval
-else
+else $as_nop
 
   PHP_READLINE=no
   test "$PHP_ENABLE_ALL" && PHP_READLINE=$PHP_ENABLE_ALL
@@ -65254,8 +68135,8 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -65305,11 +68186,12 @@
 
 
   PHP_READLINE_LIBS=""
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lncurses" >&5
-$as_echo_n "checking for tgetent in -lncurses... " >&6; }
-if ${ac_cv_lib_ncurses_tgetent+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lncurses" >&5
+printf %s "checking for tgetent in -lncurses... " >&6; }
+if test ${ac_cv_lib_ncurses_tgetent+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lncurses  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -65318,30 +68200,29 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char tgetent ();
 int
-main ()
+main (void)
 {
 return tgetent ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_ncurses_tgetent=yes
-else
+else $as_nop
   ac_cv_lib_ncurses_tgetent=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_tgetent" >&5
-$as_echo "$ac_cv_lib_ncurses_tgetent" >&6; }
-if test "x$ac_cv_lib_ncurses_tgetent" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_tgetent" >&5
+printf "%s\n" "$ac_cv_lib_ncurses_tgetent" >&6; }
+if test "x$ac_cv_lib_ncurses_tgetent" = xyes
+then :
 
 
 
@@ -65368,13 +68249,14 @@
 
     PHP_READLINE_LIBS="$PHP_READLINE_LIBS -lncurses"
 
-else
+else $as_nop
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltermcap" >&5
-$as_echo_n "checking for tgetent in -ltermcap... " >&6; }
-if ${ac_cv_lib_termcap_tgetent+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltermcap" >&5
+printf %s "checking for tgetent in -ltermcap... " >&6; }
+if test ${ac_cv_lib_termcap_tgetent+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltermcap  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -65383,30 +68265,29 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char tgetent ();
 int
-main ()
+main (void)
 {
 return tgetent ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_termcap_tgetent=yes
-else
+else $as_nop
   ac_cv_lib_termcap_tgetent=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_termcap_tgetent" >&5
-$as_echo "$ac_cv_lib_termcap_tgetent" >&6; }
-if test "x$ac_cv_lib_termcap_tgetent" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_termcap_tgetent" >&5
+printf "%s\n" "$ac_cv_lib_termcap_tgetent" >&6; }
+if test "x$ac_cv_lib_termcap_tgetent" = xyes
+then :
 
 
 
@@ -65546,11 +68427,12 @@
     esac
   done
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -lreadline" >&5
-$as_echo_n "checking for readline in -lreadline... " >&6; }
-if ${ac_cv_lib_readline_readline+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for readline in -lreadline" >&5
+printf %s "checking for readline in -lreadline... " >&6; }
+if test ${ac_cv_lib_readline_readline+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lreadline  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -65559,30 +68441,29 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char readline ();
 int
-main ()
+main (void)
 {
 return readline ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_readline_readline=yes
-else
+else $as_nop
   ac_cv_lib_readline_readline=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_readline" >&5
-$as_echo "$ac_cv_lib_readline_readline" >&6; }
-if test "x$ac_cv_lib_readline_readline" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_readline" >&5
+printf "%s\n" "$ac_cv_lib_readline_readline" >&6; }
+if test "x$ac_cv_lib_readline_readline" = xyes
+then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -65686,7 +68567,7 @@
 
 
 
-else
+else $as_nop
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -65805,11 +68686,12 @@
     esac
   done
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_pending_input in -lreadline" >&5
-$as_echo_n "checking for rl_pending_input in -lreadline... " >&6; }
-if ${ac_cv_lib_readline_rl_pending_input+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for rl_pending_input in -lreadline" >&5
+printf %s "checking for rl_pending_input in -lreadline... " >&6; }
+if test ${ac_cv_lib_readline_rl_pending_input+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lreadline  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -65818,36 +68700,35 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char rl_pending_input ();
 int
-main ()
+main (void)
 {
 return rl_pending_input ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_readline_rl_pending_input=yes
-else
+else $as_nop
   ac_cv_lib_readline_rl_pending_input=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_rl_pending_input" >&5
-$as_echo "$ac_cv_lib_readline_rl_pending_input" >&6; }
-if test "x$ac_cv_lib_readline_rl_pending_input" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_rl_pending_input" >&5
+printf "%s\n" "$ac_cv_lib_readline_rl_pending_input" >&6; }
+if test "x$ac_cv_lib_readline_rl_pending_input" = xyes
+then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-else
+else $as_nop
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -65966,11 +68847,12 @@
     esac
   done
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_callback_read_char in -lreadline" >&5
-$as_echo_n "checking for rl_callback_read_char in -lreadline... " >&6; }
-if ${ac_cv_lib_readline_rl_callback_read_char+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for rl_callback_read_char in -lreadline" >&5
+printf %s "checking for rl_callback_read_char in -lreadline... " >&6; }
+if test ${ac_cv_lib_readline_rl_callback_read_char+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lreadline  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -65979,40 +68861,39 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char rl_callback_read_char ();
 int
-main ()
+main (void)
 {
 return rl_callback_read_char ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_readline_rl_callback_read_char=yes
-else
+else $as_nop
   ac_cv_lib_readline_rl_callback_read_char=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_rl_callback_read_char" >&5
-$as_echo "$ac_cv_lib_readline_rl_callback_read_char" >&6; }
-if test "x$ac_cv_lib_readline_rl_callback_read_char" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_rl_callback_read_char" >&5
+printf "%s\n" "$ac_cv_lib_readline_rl_callback_read_char" >&6; }
+if test "x$ac_cv_lib_readline_rl_callback_read_char" = xyes
+then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-$as_echo "#define HAVE_RL_CALLBACK_READ_CHAR 1" >>confdefs.h
+printf "%s\n" "#define HAVE_RL_CALLBACK_READ_CHAR 1" >>confdefs.h
 
 
 
-else
+else $as_nop
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -66129,11 +69010,12 @@
     esac
   done
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_on_new_line in -lreadline" >&5
-$as_echo_n "checking for rl_on_new_line in -lreadline... " >&6; }
-if ${ac_cv_lib_readline_rl_on_new_line+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for rl_on_new_line in -lreadline" >&5
+printf %s "checking for rl_on_new_line in -lreadline... " >&6; }
+if test ${ac_cv_lib_readline_rl_on_new_line+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lreadline  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -66142,40 +69024,39 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char rl_on_new_line ();
 int
-main ()
+main (void)
 {
 return rl_on_new_line ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_readline_rl_on_new_line=yes
-else
+else $as_nop
   ac_cv_lib_readline_rl_on_new_line=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_rl_on_new_line" >&5
-$as_echo "$ac_cv_lib_readline_rl_on_new_line" >&6; }
-if test "x$ac_cv_lib_readline_rl_on_new_line" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_rl_on_new_line" >&5
+printf "%s\n" "$ac_cv_lib_readline_rl_on_new_line" >&6; }
+if test "x$ac_cv_lib_readline_rl_on_new_line" = xyes
+then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-$as_echo "#define HAVE_RL_ON_NEW_LINE 1" >>confdefs.h
+printf "%s\n" "#define HAVE_RL_ON_NEW_LINE 1" >>confdefs.h
 
 
 
-else
+else $as_nop
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -66292,11 +69173,12 @@
     esac
   done
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_completion_matches in -lreadline" >&5
-$as_echo_n "checking for rl_completion_matches in -lreadline... " >&6; }
-if ${ac_cv_lib_readline_rl_completion_matches+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for rl_completion_matches in -lreadline" >&5
+printf %s "checking for rl_completion_matches in -lreadline... " >&6; }
+if test ${ac_cv_lib_readline_rl_completion_matches+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lreadline  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -66305,40 +69187,39 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char rl_completion_matches ();
 int
-main ()
+main (void)
 {
 return rl_completion_matches ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_readline_rl_completion_matches=yes
-else
+else $as_nop
   ac_cv_lib_readline_rl_completion_matches=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_rl_completion_matches" >&5
-$as_echo "$ac_cv_lib_readline_rl_completion_matches" >&6; }
-if test "x$ac_cv_lib_readline_rl_completion_matches" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_rl_completion_matches" >&5
+printf "%s\n" "$ac_cv_lib_readline_rl_completion_matches" >&6; }
+if test "x$ac_cv_lib_readline_rl_completion_matches" = xyes
+then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-$as_echo "#define HAVE_RL_COMPLETION_MATCHES 1" >>confdefs.h
+printf "%s\n" "#define HAVE_RL_COMPLETION_MATCHES 1" >>confdefs.h
 
 
 
-else
+else $as_nop
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -66349,31 +69230,31 @@
 
 
 
-$as_echo "#define HAVE_HISTORY_LIST 1" >>confdefs.h
+printf "%s\n" "#define HAVE_HISTORY_LIST 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_LIBREADLINE 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBREADLINE 1" >>confdefs.h
 
 
 elif test "$PHP_LIBEDIT" != "no"; then
   if test "$PHP_LIBEDIT" != "yes"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libedit directory ignored, rely on pkg-config" >&5
-$as_echo "$as_me: WARNING: libedit directory ignored, rely on pkg-config" >&2;}
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: libedit directory ignored, rely on pkg-config" >&5
+printf "%s\n" "$as_me: WARNING: libedit directory ignored, rely on pkg-config" >&2;}
   fi
 
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libedit" >&5
-$as_echo_n "checking for libedit... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libedit" >&5
+printf %s "checking for libedit... " >&6; }
 
 if test -n "$EDIT_CFLAGS"; then
     pkg_cv_EDIT_CFLAGS="$EDIT_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libedit\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libedit\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libedit") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_EDIT_CFLAGS=`$PKG_CONFIG --cflags "libedit" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -66387,10 +69268,10 @@
     pkg_cv_EDIT_LIBS="$EDIT_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libedit\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libedit\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libedit") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_EDIT_LIBS=`$PKG_CONFIG --libs "libedit" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -66404,8 +69285,8 @@
 
 
 if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -66431,10 +69312,10 @@
 and EDIT_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -66448,8 +69329,8 @@
 else
 	EDIT_CFLAGS=$pkg_cv_EDIT_CFLAGS
 	EDIT_LIBS=$pkg_cv_EDIT_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
 fi
 
@@ -66592,11 +69473,12 @@
   done
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lncurses" >&5
-$as_echo_n "checking for tgetent in -lncurses... " >&6; }
-if ${ac_cv_lib_ncurses_tgetent+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lncurses" >&5
+printf %s "checking for tgetent in -lncurses... " >&6; }
+if test ${ac_cv_lib_ncurses_tgetent+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lncurses  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -66605,30 +69487,29 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char tgetent ();
 int
-main ()
+main (void)
 {
 return tgetent ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_ncurses_tgetent=yes
-else
+else $as_nop
   ac_cv_lib_ncurses_tgetent=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_tgetent" >&5
-$as_echo "$ac_cv_lib_ncurses_tgetent" >&6; }
-if test "x$ac_cv_lib_ncurses_tgetent" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_tgetent" >&5
+printf "%s\n" "$ac_cv_lib_ncurses_tgetent" >&6; }
+if test "x$ac_cv_lib_ncurses_tgetent" = xyes
+then :
 
 
 
@@ -66654,13 +69535,14 @@
 
 
 
-else
+else $as_nop
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltermcap" >&5
-$as_echo_n "checking for tgetent in -ltermcap... " >&6; }
-if ${ac_cv_lib_termcap_tgetent+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltermcap" >&5
+printf %s "checking for tgetent in -ltermcap... " >&6; }
+if test ${ac_cv_lib_termcap_tgetent+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltermcap  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -66669,30 +69551,29 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char tgetent ();
 int
-main ()
+main (void)
 {
 return tgetent ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_termcap_tgetent=yes
-else
+else $as_nop
   ac_cv_lib_termcap_tgetent=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_termcap_tgetent" >&5
-$as_echo "$ac_cv_lib_termcap_tgetent" >&6; }
-if test "x$ac_cv_lib_termcap_tgetent" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_termcap_tgetent" >&5
+printf "%s\n" "$ac_cv_lib_termcap_tgetent" >&6; }
+if test "x$ac_cv_lib_termcap_tgetent" = xyes
+then :
 
 
 
@@ -66831,11 +69712,12 @@
     esac
   done
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -ledit" >&5
-$as_echo_n "checking for readline in -ledit... " >&6; }
-if ${ac_cv_lib_edit_readline+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for readline in -ledit" >&5
+printf %s "checking for readline in -ledit... " >&6; }
+if test ${ac_cv_lib_edit_readline+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ledit  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -66844,37 +69726,36 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char readline ();
 int
-main ()
+main (void)
 {
 return readline ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_edit_readline=yes
-else
+else $as_nop
   ac_cv_lib_edit_readline=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_edit_readline" >&5
-$as_echo "$ac_cv_lib_edit_readline" >&6; }
-if test "x$ac_cv_lib_edit_readline" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_edit_readline" >&5
+printf "%s\n" "$ac_cv_lib_edit_readline" >&6; }
+if test "x$ac_cv_lib_edit_readline" = xyes
+then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
 
-else
+else $as_nop
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -66993,11 +69874,12 @@
     esac
   done
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_callback_read_char in -ledit" >&5
-$as_echo_n "checking for rl_callback_read_char in -ledit... " >&6; }
-if ${ac_cv_lib_edit_rl_callback_read_char+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for rl_callback_read_char in -ledit" >&5
+printf %s "checking for rl_callback_read_char in -ledit... " >&6; }
+if test ${ac_cv_lib_edit_rl_callback_read_char+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ledit  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -67006,40 +69888,39 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char rl_callback_read_char ();
 int
-main ()
+main (void)
 {
 return rl_callback_read_char ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_edit_rl_callback_read_char=yes
-else
+else $as_nop
   ac_cv_lib_edit_rl_callback_read_char=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_edit_rl_callback_read_char" >&5
-$as_echo "$ac_cv_lib_edit_rl_callback_read_char" >&6; }
-if test "x$ac_cv_lib_edit_rl_callback_read_char" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_edit_rl_callback_read_char" >&5
+printf "%s\n" "$ac_cv_lib_edit_rl_callback_read_char" >&6; }
+if test "x$ac_cv_lib_edit_rl_callback_read_char" = xyes
+then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-$as_echo "#define HAVE_RL_CALLBACK_READ_CHAR 1" >>confdefs.h
+printf "%s\n" "#define HAVE_RL_CALLBACK_READ_CHAR 1" >>confdefs.h
 
 
 
-else
+else $as_nop
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -67156,11 +70037,12 @@
     esac
   done
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_on_new_line in -ledit" >&5
-$as_echo_n "checking for rl_on_new_line in -ledit... " >&6; }
-if ${ac_cv_lib_edit_rl_on_new_line+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for rl_on_new_line in -ledit" >&5
+printf %s "checking for rl_on_new_line in -ledit... " >&6; }
+if test ${ac_cv_lib_edit_rl_on_new_line+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ledit  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -67169,40 +70051,39 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char rl_on_new_line ();
 int
-main ()
+main (void)
 {
 return rl_on_new_line ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_edit_rl_on_new_line=yes
-else
+else $as_nop
   ac_cv_lib_edit_rl_on_new_line=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_edit_rl_on_new_line" >&5
-$as_echo "$ac_cv_lib_edit_rl_on_new_line" >&6; }
-if test "x$ac_cv_lib_edit_rl_on_new_line" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_edit_rl_on_new_line" >&5
+printf "%s\n" "$ac_cv_lib_edit_rl_on_new_line" >&6; }
+if test "x$ac_cv_lib_edit_rl_on_new_line" = xyes
+then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-$as_echo "#define HAVE_RL_ON_NEW_LINE 1" >>confdefs.h
+printf "%s\n" "#define HAVE_RL_ON_NEW_LINE 1" >>confdefs.h
 
 
 
-else
+else $as_nop
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -67319,11 +70200,12 @@
     esac
   done
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_completion_matches in -ledit" >&5
-$as_echo_n "checking for rl_completion_matches in -ledit... " >&6; }
-if ${ac_cv_lib_edit_rl_completion_matches+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for rl_completion_matches in -ledit" >&5
+printf %s "checking for rl_completion_matches in -ledit... " >&6; }
+if test ${ac_cv_lib_edit_rl_completion_matches+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ledit  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -67332,40 +70214,39 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char rl_completion_matches ();
 int
-main ()
+main (void)
 {
 return rl_completion_matches ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_edit_rl_completion_matches=yes
-else
+else $as_nop
   ac_cv_lib_edit_rl_completion_matches=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_edit_rl_completion_matches" >&5
-$as_echo "$ac_cv_lib_edit_rl_completion_matches" >&6; }
-if test "x$ac_cv_lib_edit_rl_completion_matches" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_edit_rl_completion_matches" >&5
+printf "%s\n" "$ac_cv_lib_edit_rl_completion_matches" >&6; }
+if test "x$ac_cv_lib_edit_rl_completion_matches" = xyes
+then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-$as_echo "#define HAVE_RL_COMPLETION_MATCHES 1" >>confdefs.h
+printf "%s\n" "#define HAVE_RL_COMPLETION_MATCHES 1" >>confdefs.h
 
 
 
-else
+else $as_nop
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -67482,11 +70363,12 @@
     esac
   done
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for history_list in -ledit" >&5
-$as_echo_n "checking for history_list in -ledit... " >&6; }
-if ${ac_cv_lib_edit_history_list+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for history_list in -ledit" >&5
+printf %s "checking for history_list in -ledit... " >&6; }
+if test ${ac_cv_lib_edit_history_list+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ledit  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -67495,40 +70377,39 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char history_list ();
 int
-main ()
+main (void)
 {
 return history_list ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_edit_history_list=yes
-else
+else $as_nop
   ac_cv_lib_edit_history_list=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_edit_history_list" >&5
-$as_echo "$ac_cv_lib_edit_history_list" >&6; }
-if test "x$ac_cv_lib_edit_history_list" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_edit_history_list" >&5
+printf "%s\n" "$ac_cv_lib_edit_history_list" >&6; }
+if test "x$ac_cv_lib_edit_history_list" = xyes
+then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-$as_echo "#define HAVE_HISTORY_LIST 1" >>confdefs.h
+printf "%s\n" "#define HAVE_HISTORY_LIST 1" >>confdefs.h
 
 
 
-else
+else $as_nop
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -67539,7 +70420,7 @@
 
 
 
-$as_echo "#define HAVE_LIBEDIT 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBEDIT 1" >>confdefs.h
 
 fi
 
@@ -67678,9 +70559,7 @@
 EOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define COMPILE_DL_READLINE 1
-_ACEOF
+printf "%s\n" "#define COMPILE_DL_READLINE 1" >>confdefs.h
 
     fi
   fi
@@ -67943,9 +70822,7 @@
 EOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define COMPILE_DL_REFLECTION 1
-_ACEOF
+printf "%s\n" "#define COMPILE_DL_REFLECTION 1" >>confdefs.h
 
     fi
   fi
@@ -68073,12 +70950,13 @@
 
 php_enable_session=yes
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable PHP sessions" >&5
-$as_echo_n "checking whether to enable PHP sessions... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable PHP sessions" >&5
+printf %s "checking whether to enable PHP sessions... " >&6; }
 # Check whether --enable-session was given.
-if test "${enable_session+set}" = set; then :
+if test ${enable_session+y}
+then :
   enableval=$enable_session; PHP_SESSION=$enableval
-else
+else $as_nop
 
   PHP_SESSION=yes
   test "$PHP_ENABLE_ALL" && PHP_SESSION=$PHP_ENABLE_ALL
@@ -68108,8 +70986,8 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -68117,13 +70995,14 @@
 
 php_with_mm=no
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mm support" >&5
-$as_echo_n "checking for mm support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mm support" >&5
+printf %s "checking for mm support... " >&6; }
 
 # Check whether --with-mm was given.
-if test "${with_mm+set}" = set; then :
+if test ${with_mm+y}
+then :
   withval=$with_mm; PHP_MM=$withval
-else
+else $as_nop
 
   PHP_MM=no
 
@@ -68132,26 +71011,28 @@
 
 
 ext_output=$PHP_MM
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
 
 if test "$PHP_SESSION" != "no"; then
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pwrite works" >&5
-$as_echo_n "checking whether pwrite works... " >&6; }
-if ${ac_cv_pwrite+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether pwrite works" >&5
+printf %s "checking whether pwrite works... " >&6; }
+if test ${ac_cv_pwrite+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
 
-  if test "$cross_compiling" = yes; then :
+  if test "$cross_compiling" = yes
+then :
 
     ac_cv_pwrite=no
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -68174,11 +71055,12 @@
 
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
 
     ac_cv_pwrite=yes
 
-else
+else $as_nop
 
     ac_cv_pwrite=no
 
@@ -68190,11 +71072,12 @@
 
     if test "$ac_cv_pwrite" = "no"; then
 
-  if test "$cross_compiling" = yes; then :
+  if test "$cross_compiling" = yes
+then :
 
     ac_cv_pwrite=no
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -68217,11 +71100,12 @@
 
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
 
     ac_cv_pwrite=yes
 
-else
+else $as_nop
 
     ac_cv_pwrite=no
 
@@ -68237,34 +71121,36 @@
     fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pwrite" >&5
-$as_echo "$ac_cv_pwrite" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pwrite" >&5
+printf "%s\n" "$ac_cv_pwrite" >&6; }
 
   if test "$ac_cv_pwrite" != "no"; then
 
-$as_echo "#define HAVE_PWRITE 1" >>confdefs.h
+printf "%s\n" "#define HAVE_PWRITE 1" >>confdefs.h
 
     if test "$ac_cv_pwrite" = "64"; then
 
-$as_echo "#define PHP_PWRITE_64 1" >>confdefs.h
+printf "%s\n" "#define PHP_PWRITE_64 1" >>confdefs.h
 
     fi
   fi
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pread works" >&5
-$as_echo_n "checking whether pread works... " >&6; }
-if ${ac_cv_pread+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether pread works" >&5
+printf %s "checking whether pread works... " >&6; }
+if test ${ac_cv_pread+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
 
   echo test > conftest_in
-  if test "$cross_compiling" = yes; then :
+  if test "$cross_compiling" = yes
+then :
 
     ac_cv_pread=no
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -68286,11 +71172,12 @@
     }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
 
     ac_cv_pread=yes
 
-else
+else $as_nop
 
     ac_cv_pread=no
 
@@ -68304,11 +71191,12 @@
     if test "$ac_cv_pread" = "no"; then
 
   echo test > conftest_in
-  if test "$cross_compiling" = yes; then :
+  if test "$cross_compiling" = yes
+then :
 
     ac_cv_pread=no
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -68330,11 +71218,12 @@
     }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
 
     ac_cv_pread=yes
 
-else
+else $as_nop
 
     ac_cv_pread=no
 
@@ -68351,16 +71240,16 @@
     fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pread" >&5
-$as_echo "$ac_cv_pread" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pread" >&5
+printf "%s\n" "$ac_cv_pread" >&6; }
 
   if test "$ac_cv_pread" != "no"; then
 
-$as_echo "#define HAVE_PREAD 1" >>confdefs.h
+printf "%s\n" "#define HAVE_PREAD 1" >>confdefs.h
 
     if test "$ac_cv_pread" = "64"; then
 
-$as_echo "#define PHP_PREAD_64 1" >>confdefs.h
+printf "%s\n" "#define PHP_PREAD_64 1" >>confdefs.h
 
     fi
   fi
@@ -68499,9 +71388,7 @@
 EOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define COMPILE_DL_SESSION 1
-_ACEOF
+printf "%s\n" "#define COMPILE_DL_SESSION 1" >>confdefs.h
 
     fi
   fi
@@ -68684,7 +71571,7 @@
 
 
 
-$as_echo "#define HAVE_PHP_SESSION 1" >>confdefs.h
+printf "%s\n" "#define HAVE_PHP_SESSION 1" >>confdefs.h
 
 fi
 
@@ -68848,7 +71735,7 @@
 
 
 
-$as_echo "#define HAVE_LIBMM 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBMM 1" >>confdefs.h
 
 fi
 
@@ -68858,12 +71745,13 @@
 
 php_enable_shmop=no
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable shmop support" >&5
-$as_echo_n "checking whether to enable shmop support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable shmop support" >&5
+printf %s "checking whether to enable shmop support... " >&6; }
 # Check whether --enable-shmop was given.
-if test "${enable_shmop+set}" = set; then :
+if test ${enable_shmop+y}
+then :
   enableval=$enable_shmop; PHP_SHMOP=$enableval
-else
+else $as_nop
 
   PHP_SHMOP=no
   test "$PHP_ENABLE_ALL" && PHP_SHMOP=$PHP_ENABLE_ALL
@@ -68893,15 +71781,15 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
 
 if test "$PHP_SHMOP" != "no"; then
 
-$as_echo "#define HAVE_SHMOP 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SHMOP 1" >>confdefs.h
 
 
   ext_builddir=ext/shmop
@@ -69037,9 +71925,7 @@
 EOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define COMPILE_DL_SHMOP 1
-_ACEOF
+printf "%s\n" "#define COMPILE_DL_SHMOP 1" >>confdefs.h
 
     fi
   fi
@@ -69168,12 +72054,13 @@
 
 php_enable_simplexml=yes
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable SimpleXML support" >&5
-$as_echo_n "checking whether to enable SimpleXML support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable SimpleXML support" >&5
+printf %s "checking whether to enable SimpleXML support... " >&6; }
 # Check whether --enable-simplexml was given.
-if test "${enable_simplexml+set}" = set; then :
+if test ${enable_simplexml+y}
+then :
   enableval=$enable_simplexml; PHP_SIMPLEXML=$enableval
-else
+else $as_nop
 
   PHP_SIMPLEXML=yes
   test "$PHP_ENABLE_ALL" && PHP_SIMPLEXML=$PHP_ENABLE_ALL
@@ -69203,8 +72090,8 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -69218,17 +72105,17 @@
 
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 >= 2.9.0" >&5
-$as_echo_n "checking for libxml-2.0 >= 2.9.0... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 >= 2.9.0" >&5
+printf %s "checking for libxml-2.0 >= 2.9.0... " >&6; }
 
 if test -n "$LIBXML_CFLAGS"; then
     pkg_cv_LIBXML_CFLAGS="$LIBXML_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.9.0") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBXML_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 >= 2.9.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -69242,10 +72129,10 @@
     pkg_cv_LIBXML_LIBS="$LIBXML_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.9.0") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBXML_LIBS=`$PKG_CONFIG --libs "libxml-2.0 >= 2.9.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -69259,8 +72146,8 @@
 
 
 if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -69286,10 +72173,10 @@
 and LIBXML_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -69303,8 +72190,8 @@
 else
 	LIBXML_CFLAGS=$pkg_cv_LIBXML_CFLAGS
 	LIBXML_LIBS=$pkg_cv_LIBXML_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
 fi
 
@@ -69449,12 +72336,12 @@
 
 
 
-$as_echo "#define HAVE_LIBXML 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBXML 1" >>confdefs.h
 
 
 
 
-$as_echo "#define HAVE_SIMPLEXML 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SIMPLEXML 1" >>confdefs.h
 
 
   ext_builddir=ext/simplexml
@@ -69590,9 +72477,7 @@
 EOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define COMPILE_DL_SIMPLEXML 1
-_ACEOF
+printf "%s\n" "#define COMPILE_DL_SIMPLEXML 1" >>confdefs.h
 
     fi
   fi
@@ -69782,13 +72667,14 @@
 
 php_with_snmp=no
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SNMP support" >&5
-$as_echo_n "checking for SNMP support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SNMP support" >&5
+printf %s "checking for SNMP support... " >&6; }
 
 # Check whether --with-snmp was given.
-if test "${with_snmp+set}" = set; then :
+if test ${with_snmp+y}
+then :
   withval=$with_snmp; PHP_SNMP=$withval
-else
+else $as_nop
 
   PHP_SNMP=no
   test "$PHP_ENABLE_ALL" && PHP_SNMP=$PHP_ENABLE_ALL
@@ -69818,8 +72704,8 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -69829,11 +72715,12 @@
   if test "$PHP_SNMP" = "yes"; then
     # Extract the first word of "net-snmp-config", so it can be a program name with args.
 set dummy net-snmp-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_SNMP_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_SNMP_CONFIG+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $SNMP_CONFIG in
   \\/* | ?:\\/*)
   ac_cv_path_SNMP_CONFIG="$SNMP_CONFIG" # Let the user override the test with a path.
@@ -69844,11 +72731,15 @@
 for as_dir in $as_dummy
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_SNMP_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_SNMP_CONFIG="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -69860,11 +72751,11 @@
 fi
 SNMP_CONFIG=$ac_cv_path_SNMP_CONFIG
 if test -n "$SNMP_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SNMP_CONFIG" >&5
-$as_echo "$SNMP_CONFIG" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $SNMP_CONFIG" >&5
+printf "%s\n" "$SNMP_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -70132,12 +73023,13 @@
     esac
   done
 
-  as_ac_Lib=`$as_echo "ac_cv_lib_$SNMP_LIBNAME''_init_snmp" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for init_snmp in -l$SNMP_LIBNAME" >&5
-$as_echo_n "checking for init_snmp in -l$SNMP_LIBNAME... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  as_ac_Lib=`printf "%s\n" "ac_cv_lib_$SNMP_LIBNAME""_init_snmp" | $as_tr_sh`
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for init_snmp in -l$SNMP_LIBNAME" >&5
+printf %s "checking for init_snmp in -l$SNMP_LIBNAME... " >&6; }
+if eval test \${$as_ac_Lib+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$SNMP_LIBNAME  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -70146,41 +73038,40 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char init_snmp ();
 int
-main ()
+main (void)
 {
 return init_snmp ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   eval "$as_ac_Lib=yes"
-else
+else $as_nop
   eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"
+then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-$as_echo "#define HAVE_SNMP 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SNMP 1" >>confdefs.h
 
 
 
-else
+else $as_nop
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -70299,12 +73190,13 @@
     esac
   done
 
-  as_ac_Lib=`$as_echo "ac_cv_lib_$SNMP_LIBNAME''_shutdown_snmp_logging" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for shutdown_snmp_logging in -l$SNMP_LIBNAME" >&5
-$as_echo_n "checking for shutdown_snmp_logging in -l$SNMP_LIBNAME... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  as_ac_Lib=`printf "%s\n" "ac_cv_lib_$SNMP_LIBNAME""_shutdown_snmp_logging" | $as_tr_sh`
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shutdown_snmp_logging in -l$SNMP_LIBNAME" >&5
+printf %s "checking for shutdown_snmp_logging in -l$SNMP_LIBNAME... " >&6; }
+if eval test \${$as_ac_Lib+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$SNMP_LIBNAME  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -70313,41 +73205,40 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char shutdown_snmp_logging ();
 int
-main ()
+main (void)
 {
 return shutdown_snmp_logging ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   eval "$as_ac_Lib=yes"
-else
+else $as_nop
   eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"
+then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-$as_echo "#define HAVE_SHUTDOWN_SNMP_LOGGING 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SHUTDOWN_SNMP_LOGGING 1" >>confdefs.h
 
 
 
-else
+else $as_nop
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -70464,12 +73355,13 @@
     esac
   done
 
-  as_ac_Lib=`$as_echo "ac_cv_lib_$SNMP_LIBNAME''_usmHMAC192SHA256AuthProtocol" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for usmHMAC192SHA256AuthProtocol in -l$SNMP_LIBNAME" >&5
-$as_echo_n "checking for usmHMAC192SHA256AuthProtocol in -l$SNMP_LIBNAME... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  as_ac_Lib=`printf "%s\n" "ac_cv_lib_$SNMP_LIBNAME""_usmHMAC192SHA256AuthProtocol" | $as_tr_sh`
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for usmHMAC192SHA256AuthProtocol in -l$SNMP_LIBNAME" >&5
+printf %s "checking for usmHMAC192SHA256AuthProtocol in -l$SNMP_LIBNAME... " >&6; }
+if eval test \${$as_ac_Lib+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$SNMP_LIBNAME  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -70478,41 +73370,40 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char usmHMAC192SHA256AuthProtocol ();
 int
-main ()
+main (void)
 {
 return usmHMAC192SHA256AuthProtocol ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   eval "$as_ac_Lib=yes"
-else
+else $as_nop
   eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"
+then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-$as_echo "#define HAVE_SNMP_SHA256 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SNMP_SHA256 1" >>confdefs.h
 
 
 
-else
+else $as_nop
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -70629,12 +73520,13 @@
     esac
   done
 
-  as_ac_Lib=`$as_echo "ac_cv_lib_$SNMP_LIBNAME''_usmHMAC384SHA512AuthProtocol" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for usmHMAC384SHA512AuthProtocol in -l$SNMP_LIBNAME" >&5
-$as_echo_n "checking for usmHMAC384SHA512AuthProtocol in -l$SNMP_LIBNAME... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  as_ac_Lib=`printf "%s\n" "ac_cv_lib_$SNMP_LIBNAME""_usmHMAC384SHA512AuthProtocol" | $as_tr_sh`
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for usmHMAC384SHA512AuthProtocol in -l$SNMP_LIBNAME" >&5
+printf %s "checking for usmHMAC384SHA512AuthProtocol in -l$SNMP_LIBNAME... " >&6; }
+if eval test \${$as_ac_Lib+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$SNMP_LIBNAME  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -70643,41 +73535,40 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char usmHMAC384SHA512AuthProtocol ();
 int
-main ()
+main (void)
 {
 return usmHMAC384SHA512AuthProtocol ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   eval "$as_ac_Lib=yes"
-else
+else $as_nop
   eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"
+then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-$as_echo "#define HAVE_SNMP_SHA512 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SNMP_SHA512 1" >>confdefs.h
 
 
 
-else
+else $as_nop
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -70821,9 +73712,7 @@
 EOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define COMPILE_DL_SNMP 1
-_ACEOF
+printf "%s\n" "#define COMPILE_DL_SNMP 1" >>confdefs.h
 
     fi
   fi
@@ -70955,12 +73844,13 @@
 
 php_enable_soap=no
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable SOAP support" >&5
-$as_echo_n "checking whether to enable SOAP support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable SOAP support" >&5
+printf %s "checking whether to enable SOAP support... " >&6; }
 # Check whether --enable-soap was given.
-if test "${enable_soap+set}" = set; then :
+if test ${enable_soap+y}
+then :
   enableval=$enable_soap; PHP_SOAP=$enableval
-else
+else $as_nop
 
   PHP_SOAP=no
   test "$PHP_ENABLE_ALL" && PHP_SOAP=$PHP_ENABLE_ALL
@@ -70990,8 +73880,8 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -71005,17 +73895,17 @@
 
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 >= 2.9.0" >&5
-$as_echo_n "checking for libxml-2.0 >= 2.9.0... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 >= 2.9.0" >&5
+printf %s "checking for libxml-2.0 >= 2.9.0... " >&6; }
 
 if test -n "$LIBXML_CFLAGS"; then
     pkg_cv_LIBXML_CFLAGS="$LIBXML_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.9.0") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBXML_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 >= 2.9.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -71029,10 +73919,10 @@
     pkg_cv_LIBXML_LIBS="$LIBXML_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.9.0") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBXML_LIBS=`$PKG_CONFIG --libs "libxml-2.0 >= 2.9.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -71046,8 +73936,8 @@
 
 
 if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -71073,10 +73963,10 @@
 and LIBXML_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -71090,8 +73980,8 @@
 else
 	LIBXML_CFLAGS=$pkg_cv_LIBXML_CFLAGS
 	LIBXML_LIBS=$pkg_cv_LIBXML_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
 fi
 
@@ -71236,12 +74126,12 @@
 
 
 
-$as_echo "#define HAVE_LIBXML 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBXML 1" >>confdefs.h
 
 
 
 
-$as_echo "#define HAVE_SOAP 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SOAP 1" >>confdefs.h
 
 
   ext_builddir=ext/soap
@@ -71377,9 +74267,7 @@
 EOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define COMPILE_DL_SOAP 1
-_ACEOF
+printf "%s\n" "#define COMPILE_DL_SOAP 1" >>confdefs.h
 
     fi
   fi
@@ -71513,12 +74401,13 @@
 
 php_enable_sockets=no
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable sockets support" >&5
-$as_echo_n "checking whether to enable sockets support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable sockets support" >&5
+printf %s "checking whether to enable sockets support... " >&6; }
 # Check whether --enable-sockets was given.
-if test "${enable_sockets+set}" = set; then :
+if test ${enable_sockets+y}
+then :
   enableval=$enable_sockets; PHP_SOCKETS=$enableval
-else
+else $as_nop
 
   PHP_SOCKETS=no
   test "$PHP_ENABLE_ALL" && PHP_SOCKETS=$PHP_ENABLE_ALL
@@ -71548,58 +74437,74 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
 
 if test "$PHP_SOCKETS" != "no"; then
-  for ac_func in hstrerror if_nametoindex if_indextoname
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
+  ac_fn_c_check_func "$LINENO" "hstrerror" "ac_cv_func_hstrerror"
+if test "x$ac_cv_func_hstrerror" = xyes
+then :
+  printf "%s\n" "#define HAVE_HSTRERROR 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "if_nametoindex" "ac_cv_func_if_nametoindex"
+if test "x$ac_cv_func_if_nametoindex" = xyes
+then :
+  printf "%s\n" "#define HAVE_IF_NAMETOINDEX 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "if_indextoname" "ac_cv_func_if_indextoname"
+if test "x$ac_cv_func_if_indextoname" = xyes
+then :
+  printf "%s\n" "#define HAVE_IF_INDEXTONAME 1" >>confdefs.h
 
 fi
-done
 
-  for ac_func in sockatmark
-do :
   ac_fn_c_check_func "$LINENO" "sockatmark" "ac_cv_func_sockatmark"
-if test "x$ac_cv_func_sockatmark" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_SOCKATMARK 1
-_ACEOF
+if test "x$ac_cv_func_sockatmark" = xyes
+then :
+  printf "%s\n" "#define HAVE_SOCKATMARK 1" >>confdefs.h
 
 fi
-done
 
-  for ac_header in netinet/tcp.h sys/un.h sys/sockio.h linux/filter.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
+  ac_fn_c_check_header_compile "$LINENO" "netinet/tcp.h" "ac_cv_header_netinet_tcp_h" "$ac_includes_default"
+if test "x$ac_cv_header_netinet_tcp_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_NETINET_TCP_H 1" >>confdefs.h
 
 fi
+ac_fn_c_check_header_compile "$LINENO" "sys/un.h" "ac_cv_header_sys_un_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_un_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_UN_H 1" >>confdefs.h
 
-done
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/sockio.h" "ac_cv_header_sys_sockio_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_sockio_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_SOCKIO_H 1" >>confdefs.h
 
+fi
+ac_fn_c_check_header_compile "$LINENO" "linux/filter.h" "ac_cv_header_linux_filter_h" "$ac_includes_default"
+if test "x$ac_cv_header_linux_filter_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_LINUX_FILTER_H 1" >>confdefs.h
 
-$as_echo "#define HAVE_SOCKETS 1" >>confdefs.h
+fi
 
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for field ss_family in struct sockaddr_storage" >&5
-$as_echo_n "checking for field ss_family in struct sockaddr_storage... " >&6; }
-if ${ac_cv_ss_family+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+printf "%s\n" "#define HAVE_SOCKETS 1" >>confdefs.h
+
+
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for field ss_family in struct sockaddr_storage" >&5
+printf %s "checking for field ss_family in struct sockaddr_storage... " >&6; }
+if test ${ac_cv_ss_family+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -71609,35 +74514,37 @@
 #include <netdb.h>
 
 int
-main ()
+main (void)
 {
 struct sockaddr_storage sa_store; sa_store.ss_family = AF_INET6;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_ss_family=yes
-else
+else $as_nop
   ac_cv_ss_family=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ss_family" >&5
-$as_echo "$ac_cv_ss_family" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ss_family" >&5
+printf "%s\n" "$ac_cv_ss_family" >&6; }
 
   if test "$ac_cv_ss_family" = yes; then
 
-$as_echo "#define HAVE_SA_SS_FAMILY 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SA_SS_FAMILY 1" >>confdefs.h
 
   fi
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if getaddrinfo supports AI_V4MAPPED" >&5
-$as_echo_n "checking if getaddrinfo supports AI_V4MAPPED... " >&6; }
-if ${ac_cv_gai_ai_v4mapped+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if getaddrinfo supports AI_V4MAPPED" >&5
+printf %s "checking if getaddrinfo supports AI_V4MAPPED... " >&6; }
+if test ${ac_cv_gai_ai_v4mapped+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -71645,35 +74552,37 @@
 #include <netdb.h>
 
 int
-main ()
+main (void)
 {
 int flag = AI_V4MAPPED;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_gai_ai_v4mapped=yes
-else
+else $as_nop
   ac_cv_gai_ai_v4mapped=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gai_ai_v4mapped" >&5
-$as_echo "$ac_cv_gai_ai_v4mapped" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gai_ai_v4mapped" >&5
+printf "%s\n" "$ac_cv_gai_ai_v4mapped" >&6; }
 
   if test "$ac_cv_gai_ai_v4mapped" = yes; then
 
-$as_echo "#define HAVE_AI_V4MAPPED 1" >>confdefs.h
+printf "%s\n" "#define HAVE_AI_V4MAPPED 1" >>confdefs.h
 
   fi
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if getaddrinfo supports AI_ALL" >&5
-$as_echo_n "checking if getaddrinfo supports AI_ALL... " >&6; }
-if ${ac_cv_gai_ai_all+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if getaddrinfo supports AI_ALL" >&5
+printf %s "checking if getaddrinfo supports AI_ALL... " >&6; }
+if test ${ac_cv_gai_ai_all+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -71681,35 +74590,37 @@
 #include <netdb.h>
 
 int
-main ()
+main (void)
 {
 int flag = AI_ALL;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_gai_ai_all=yes
-else
+else $as_nop
   ac_cv_gai_ai_all=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gai_ai_all" >&5
-$as_echo "$ac_cv_gai_ai_all" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gai_ai_all" >&5
+printf "%s\n" "$ac_cv_gai_ai_all" >&6; }
 
   if test "$ac_cv_gai_ai_all" = yes; then
 
-$as_echo "#define HAVE_AI_ALL 1" >>confdefs.h
+printf "%s\n" "#define HAVE_AI_ALL 1" >>confdefs.h
 
   fi
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if getaddrinfo supports AI_IDN" >&5
-$as_echo_n "checking if getaddrinfo supports AI_IDN... " >&6; }
-if ${ac_cv_gai_ai_idn+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if getaddrinfo supports AI_IDN" >&5
+printf %s "checking if getaddrinfo supports AI_IDN... " >&6; }
+if test ${ac_cv_gai_ai_idn+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -71717,35 +74628,37 @@
 #include <netdb.h>
 
 int
-main ()
+main (void)
 {
 int flag = AI_IDN;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_gai_ai_idn=yes
-else
+else $as_nop
   ac_cv_gai_ai_idn=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gai_ai_idn" >&5
-$as_echo "$ac_cv_gai_ai_idn" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gai_ai_idn" >&5
+printf "%s\n" "$ac_cv_gai_ai_idn" >&6; }
 
   if test "$ac_cv_gai_ai_idn" = yes; then
 
-$as_echo "#define HAVE_AI_IDN 1" >>confdefs.h
+printf "%s\n" "#define HAVE_AI_IDN 1" >>confdefs.h
 
   fi
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking if ancillary credentials uses ucred" >&5
-$as_echo_n "checking if ancillary credentials uses ucred... " >&6; }
-if ${ac_cv_ucred+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if ancillary credentials uses ucred" >&5
+printf %s "checking if ancillary credentials uses ucred... " >&6; }
+if test ${ac_cv_ucred+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -71756,35 +74669,37 @@
 #include <sys/socket.h>
 
 int
-main ()
+main (void)
 {
 struct ucred u = {.gid = 0};
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_ucred=yes
-else
+else $as_nop
   ac_cv_ucred=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ucred" >&5
-$as_echo "$ac_cv_ucred" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ucred" >&5
+printf "%s\n" "$ac_cv_ucred" >&6; }
 
   if test "$ac_cv_ucred" = yes; then
 
-$as_echo "#define ANC_CREDS_UCRED 1" >>confdefs.h
+printf "%s\n" "#define ANC_CREDS_UCRED 1" >>confdefs.h
 
   fi
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if ancillary credentials uses cmsgcred" >&5
-$as_echo_n "checking if ancillary credentials uses cmsgcred... " >&6; }
-if ${ac_cv_cmsgcred+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if ancillary credentials uses cmsgcred" >&5
+printf %s "checking if ancillary credentials uses cmsgcred... " >&6; }
+if test ${ac_cv_cmsgcred+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -71792,27 +74707,28 @@
 #include <sys/socket.h>
 
 int
-main ()
+main (void)
 {
 struct cmsgcred c = {0};
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_cmsgcred=yes
-else
+else $as_nop
   ac_cv_cmsgcred=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cmsgcred" >&5
-$as_echo "$ac_cv_cmsgcred" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cmsgcred" >&5
+printf "%s\n" "$ac_cv_cmsgcred" >&6; }
 
   if test "$ac_cv_cmsgcred" = yes; then
 
-$as_echo "#define ANC_CREDS_CMSGCRED 1" >>confdefs.h
+printf "%s\n" "#define ANC_CREDS_CMSGCRED 1" >>confdefs.h
 
   fi
 
@@ -71955,9 +74871,7 @@
 EOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define COMPILE_DL_SOCKETS 1
-_ACEOF
+printf "%s\n" "#define COMPILE_DL_SOCKETS 1" >>confdefs.h
 
     fi
   fi
@@ -72106,13 +75020,14 @@
 
 php_with_sodium=no
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sodium support" >&5
-$as_echo_n "checking for sodium support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sodium support" >&5
+printf %s "checking for sodium support... " >&6; }
 
 # Check whether --with-sodium was given.
-if test "${with_sodium+set}" = set; then :
+if test ${with_sodium+y}
+then :
   withval=$with_sodium; PHP_SODIUM=$withval
-else
+else $as_nop
 
   PHP_SODIUM=no
   test "$PHP_ENABLE_ALL" && PHP_SODIUM=$PHP_ENABLE_ALL
@@ -72142,8 +75057,8 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -72151,17 +75066,17 @@
 if test "$PHP_SODIUM" != "no"; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libsodium >= 1.0.8" >&5
-$as_echo_n "checking for libsodium >= 1.0.8... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libsodium >= 1.0.8" >&5
+printf %s "checking for libsodium >= 1.0.8... " >&6; }
 
 if test -n "$LIBSODIUM_CFLAGS"; then
     pkg_cv_LIBSODIUM_CFLAGS="$LIBSODIUM_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsodium >= 1.0.8\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsodium >= 1.0.8\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libsodium >= 1.0.8") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBSODIUM_CFLAGS=`$PKG_CONFIG --cflags "libsodium >= 1.0.8" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -72175,10 +75090,10 @@
     pkg_cv_LIBSODIUM_LIBS="$LIBSODIUM_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsodium >= 1.0.8\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsodium >= 1.0.8\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libsodium >= 1.0.8") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBSODIUM_LIBS=`$PKG_CONFIG --libs "libsodium >= 1.0.8" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -72192,8 +75107,8 @@
 
 
 if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -72219,10 +75134,10 @@
 and LIBSODIUM_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -72236,8 +75151,8 @@
 else
 	LIBSODIUM_CFLAGS=$pkg_cv_LIBSODIUM_CFLAGS
 	LIBSODIUM_LIBS=$pkg_cv_LIBSODIUM_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
 fi
 
@@ -72382,15 +75297,16 @@
 
 
 
-$as_echo "#define HAVE_LIBSODIUMLIB 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBSODIUMLIB 1" >>confdefs.h
 
 
     SODIUM_COMPILER_FLAGS="$LIBSODIUM_CFLAGS -Wno-type-limits"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wno-logical-op" >&5
-$as_echo_n "checking whether C compiler accepts -Wno-logical-op... " >&6; }
-if ${ax_cv_check_cflags__Werror__Wno_logical_op+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wno-logical-op" >&5
+printf %s "checking whether C compiler accepts -Wno-logical-op... " >&6; }
+if test ${ax_cv_check_cflags__Werror__Wno_logical_op+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
   ax_check_save_flags=$CFLAGS
   CFLAGS="$CFLAGS -Werror -Wno-logical-op"
@@ -72398,26 +75314,28 @@
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ax_cv_check_cflags__Werror__Wno_logical_op=yes
-else
+else $as_nop
   ax_cv_check_cflags__Werror__Wno_logical_op=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
   CFLAGS=$ax_check_save_flags
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wno_logical_op" >&5
-$as_echo "$ax_cv_check_cflags__Werror__Wno_logical_op" >&6; }
-if test "x$ax_cv_check_cflags__Werror__Wno_logical_op" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wno_logical_op" >&5
+printf "%s\n" "$ax_cv_check_cflags__Werror__Wno_logical_op" >&6; }
+if test "x$ax_cv_check_cflags__Werror__Wno_logical_op" = xyes
+then :
   SODIUM_COMPILER_FLAGS="$SODIUM_COMPILER_FLAGS -Wno-logical-op"
-else
+else $as_nop
   :
 fi
 
@@ -72555,9 +75473,7 @@
 EOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define COMPILE_DL_SODIUM 1
-_ACEOF
+printf "%s\n" "#define COMPILE_DL_SODIUM 1" >>confdefs.h
 
     fi
   fi
@@ -72820,9 +75736,7 @@
 EOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define COMPILE_DL_SPL 1
-_ACEOF
+printf "%s\n" "#define COMPILE_DL_SPL 1" >>confdefs.h
 
     fi
   fi
@@ -73024,17 +75938,19 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether flush should be called explicitly after a buffered io" >&5
-$as_echo_n "checking whether flush should be called explicitly after a buffered io... " >&6; }
-if ${ac_cv_flush_io+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether flush should be called explicitly after a buffered io" >&5
+printf %s "checking whether flush should be called explicitly after a buffered io... " >&6; }
+if test ${ac_cv_flush_io+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
-if test "$cross_compiling" = yes; then :
+if test "$cross_compiling" = yes
+then :
 
   ac_cv_flush_io=no
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -73077,11 +75993,12 @@
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
 
   ac_cv_flush_io=no
 
-else
+else $as_nop
 
   ac_cv_flush_io=yes
 
@@ -73091,24 +76008,25 @@
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_flush_io" >&5
-$as_echo "$ac_cv_flush_io" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_flush_io" >&5
+printf "%s\n" "$ac_cv_flush_io" >&6; }
 if test "$ac_cv_flush_io" = "yes"; then
 
-$as_echo "#define HAVE_FLUSHIO 1" >>confdefs.h
+printf "%s\n" "#define HAVE_FLUSHIO 1" >>confdefs.h
 
 fi
 
 
 php_with_external_libcrypt=no
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for external libcrypt or libxcrypt" >&5
-$as_echo_n "checking for external libcrypt or libxcrypt... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for external libcrypt or libxcrypt" >&5
+printf %s "checking for external libcrypt or libxcrypt... " >&6; }
 
 # Check whether --with-external-libcrypt was given.
-if test "${with_external_libcrypt+set}" = set; then :
+if test ${with_external_libcrypt+y}
+then :
   withval=$with_external_libcrypt; PHP_EXTERNAL_LIBCRYPT=$withval
-else
+else $as_nop
 
   PHP_EXTERNAL_LIBCRYPT=no
 
@@ -73117,8 +76035,8 @@
 
 
 ext_output=$PHP_EXTERNAL_LIBCRYPT
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -73130,13 +76048,15 @@
   unset found
 
   ac_fn_c_check_func "$LINENO" "crypt" "ac_cv_func_crypt"
-if test "x$ac_cv_func_crypt" = xyes; then :
+if test "x$ac_cv_func_crypt" = xyes
+then :
   found=yes
-else
+else $as_nop
    ac_fn_c_check_func "$LINENO" "__crypt" "ac_cv_func___crypt"
-if test "x$ac_cv_func___crypt" = xyes; then :
+if test "x$ac_cv_func___crypt" = xyes
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 
@@ -73146,7 +76066,7 @@
   case $found in
   yes)
 
-$as_echo "#define HAVE_CRYPT 1" >>confdefs.h
+printf "%s\n" "#define HAVE_CRYPT 1" >>confdefs.h
 
     ac_cv_func_crypt=yes
   ;;
@@ -73156,11 +76076,12 @@
   unset ac_cv_lib_crypt_crypt
   unset ac_cv_lib_crypt___crypt
   unset found
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for crypt in -lcrypt" >&5
-$as_echo_n "checking for crypt in -lcrypt... " >&6; }
-if ${ac_cv_lib_crypt_crypt+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for crypt in -lcrypt" >&5
+printf %s "checking for crypt in -lcrypt... " >&6; }
+if test ${ac_cv_lib_crypt_crypt+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcrypt  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -73169,38 +76090,38 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char crypt ();
 int
-main ()
+main (void)
 {
 return crypt ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_crypt_crypt=yes
-else
+else $as_nop
   ac_cv_lib_crypt_crypt=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypt_crypt" >&5
-$as_echo "$ac_cv_lib_crypt_crypt" >&6; }
-if test "x$ac_cv_lib_crypt_crypt" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypt_crypt" >&5
+printf "%s\n" "$ac_cv_lib_crypt_crypt" >&6; }
+if test "x$ac_cv_lib_crypt_crypt" = xyes
+then :
   found=yes
-else
+else $as_nop
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __crypt in -lcrypt" >&5
-$as_echo_n "checking for __crypt in -lcrypt... " >&6; }
-if ${ac_cv_lib_crypt___crypt+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __crypt in -lcrypt" >&5
+printf %s "checking for __crypt in -lcrypt... " >&6; }
+if test ${ac_cv_lib_crypt___crypt+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcrypt  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -73209,32 +76130,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char __crypt ();
 int
-main ()
+main (void)
 {
 return __crypt ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_crypt___crypt=yes
-else
+else $as_nop
   ac_cv_lib_crypt___crypt=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypt___crypt" >&5
-$as_echo "$ac_cv_lib_crypt___crypt" >&6; }
-if test "x$ac_cv_lib_crypt___crypt" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypt___crypt" >&5
+printf "%s\n" "$ac_cv_lib_crypt___crypt" >&6; }
+if test "x$ac_cv_lib_crypt___crypt" = xyes
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 
@@ -73245,18 +76165,20 @@
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lcrypt"
-    if test "$cross_compiling" = yes; then :
+    if test "$cross_compiling" = yes
+then :
 
             found=yes
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int main(void) { return (0); }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -73278,10 +76200,10 @@
 
 
 
-$as_echo "#define HAVE_CRYPT 1" >>confdefs.h
+printf "%s\n" "#define HAVE_CRYPT 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_LIBCRYPT 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBCRYPT 1" >>confdefs.h
 
     ac_cv_func_crypt=yes
   else
@@ -73300,13 +76222,15 @@
   unset found
 
   ac_fn_c_check_func "$LINENO" "crypt_r" "ac_cv_func_crypt_r"
-if test "x$ac_cv_func_crypt_r" = xyes; then :
+if test "x$ac_cv_func_crypt_r" = xyes
+then :
   found=yes
-else
+else $as_nop
    ac_fn_c_check_func "$LINENO" "__crypt_r" "ac_cv_func___crypt_r"
-if test "x$ac_cv_func___crypt_r" = xyes; then :
+if test "x$ac_cv_func___crypt_r" = xyes
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 
@@ -73316,7 +76240,7 @@
   case $found in
   yes)
 
-$as_echo "#define HAVE_CRYPT_R 1" >>confdefs.h
+printf "%s\n" "#define HAVE_CRYPT_R 1" >>confdefs.h
 
     ac_cv_func_crypt_r=yes
   ;;
@@ -73326,11 +76250,12 @@
   unset ac_cv_lib_crypt_crypt_r
   unset ac_cv_lib_crypt___crypt_r
   unset found
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for crypt_r in -lcrypt" >&5
-$as_echo_n "checking for crypt_r in -lcrypt... " >&6; }
-if ${ac_cv_lib_crypt_crypt_r+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for crypt_r in -lcrypt" >&5
+printf %s "checking for crypt_r in -lcrypt... " >&6; }
+if test ${ac_cv_lib_crypt_crypt_r+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcrypt  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -73339,38 +76264,38 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char crypt_r ();
 int
-main ()
+main (void)
 {
 return crypt_r ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_crypt_crypt_r=yes
-else
+else $as_nop
   ac_cv_lib_crypt_crypt_r=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypt_crypt_r" >&5
-$as_echo "$ac_cv_lib_crypt_crypt_r" >&6; }
-if test "x$ac_cv_lib_crypt_crypt_r" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypt_crypt_r" >&5
+printf "%s\n" "$ac_cv_lib_crypt_crypt_r" >&6; }
+if test "x$ac_cv_lib_crypt_crypt_r" = xyes
+then :
   found=yes
-else
+else $as_nop
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __crypt_r in -lcrypt" >&5
-$as_echo_n "checking for __crypt_r in -lcrypt... " >&6; }
-if ${ac_cv_lib_crypt___crypt_r+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __crypt_r in -lcrypt" >&5
+printf %s "checking for __crypt_r in -lcrypt... " >&6; }
+if test ${ac_cv_lib_crypt___crypt_r+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcrypt  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -73379,32 +76304,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char __crypt_r ();
 int
-main ()
+main (void)
 {
 return __crypt_r ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_crypt___crypt_r=yes
-else
+else $as_nop
   ac_cv_lib_crypt___crypt_r=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypt___crypt_r" >&5
-$as_echo "$ac_cv_lib_crypt___crypt_r" >&6; }
-if test "x$ac_cv_lib_crypt___crypt_r" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypt___crypt_r" >&5
+printf "%s\n" "$ac_cv_lib_crypt___crypt_r" >&6; }
+if test "x$ac_cv_lib_crypt___crypt_r" = xyes
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 
@@ -73415,18 +76339,20 @@
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lcrypt"
-    if test "$cross_compiling" = yes; then :
+    if test "$cross_compiling" = yes
+then :
 
             found=yes
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int main(void) { return (0); }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -73448,10 +76374,10 @@
 
 
 
-$as_echo "#define HAVE_CRYPT_R 1" >>confdefs.h
+printf "%s\n" "#define HAVE_CRYPT_R 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_LIBCRYPT 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBCRYPT 1" >>confdefs.h
 
     ac_cv_func_crypt_r=yes
   else
@@ -73464,25 +76390,21 @@
 
   esac
 
-  for ac_header in crypt.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "crypt.h" "ac_cv_header_crypt_h" "$ac_includes_default"
-if test "x$ac_cv_header_crypt_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_CRYPT_H 1
-_ACEOF
+  ac_fn_c_check_header_compile "$LINENO" "crypt.h" "ac_cv_header_crypt_h" "$ac_includes_default"
+if test "x$ac_cv_header_crypt_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_CRYPT_H 1" >>confdefs.h
 
 fi
 
-done
-
   if test "$ac_cv_func_crypt_r" = "yes"; then
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking which data struct is used by crypt_r" >&5
-$as_echo_n "checking which data struct is used by crypt_r... " >&6; }
-if ${php_cv_crypt_r_style+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which data struct is used by crypt_r" >&5
+printf %s "checking which data struct is used by crypt_r... " >&6; }
+if test ${php_cv_crypt_r_style+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
     php_cv_crypt_r_style=none
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -73492,7 +76414,7 @@
 #include <crypt.h>
 
 int
-main ()
+main (void)
 {
 
 CRYPTD buffer;
@@ -73502,10 +76424,11 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   php_cv_crypt_r_style=cryptd
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
     if test "$php_cv_crypt_r_style" = "none"; then
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -73515,7 +76438,7 @@
 #include <crypt.h>
 
 int
-main ()
+main (void)
 {
 
 struct crypt_data buffer;
@@ -73525,10 +76448,11 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   php_cv_crypt_r_style=struct_crypt_data
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
     fi
 
     if test "$php_cv_crypt_r_style" = "none"; then
@@ -73540,7 +76464,7 @@
 #include <crypt.h>
 
 int
-main ()
+main (void)
 {
 
 struct crypt_data buffer;
@@ -73550,10 +76474,11 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   php_cv_crypt_r_style=struct_crypt_data_gnu_source
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
     fi
 
     if test "$php_cv_crypt_r_style" = "none"; then
@@ -73564,7 +76489,7 @@
 #include <unistd.h>
 
 int
-main ()
+main (void)
 {
 
 struct crypt_data buffer;
@@ -73574,29 +76499,30 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   php_cv_crypt_r_style=struct_crypt_data
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
     fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_cv_crypt_r_style" >&5
-$as_echo "$php_cv_crypt_r_style" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_crypt_r_style" >&5
+printf "%s\n" "$php_cv_crypt_r_style" >&6; }
 
   if test "$php_cv_crypt_r_style" = "cryptd"; then
 
-$as_echo "#define CRYPT_R_CRYPTD 1" >>confdefs.h
+printf "%s\n" "#define CRYPT_R_CRYPTD 1" >>confdefs.h
 
   fi
   if test "$php_cv_crypt_r_style" = "struct_crypt_data" -o "$php_cv_crypt_r_style" = "struct_crypt_data_gnu_source"; then
 
-$as_echo "#define CRYPT_R_STRUCT_CRYPT_DATA 1" >>confdefs.h
+printf "%s\n" "#define CRYPT_R_STRUCT_CRYPT_DATA 1" >>confdefs.h
 
   fi
   if test "$php_cv_crypt_r_style" = "struct_crypt_data_gnu_source"; then
 
-$as_echo "#define CRYPT_R_GNU_SOURCE 1" >>confdefs.h
+printf "%s\n" "#define CRYPT_R_GNU_SOURCE 1" >>confdefs.h
 
   fi
   if test "$php_cv_crypt_r_style" = "none"; then
@@ -73605,17 +76531,19 @@
 
   fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for standard DES crypt" >&5
-$as_echo_n "checking for standard DES crypt... " >&6; }
-if ${ac_cv_crypt_des+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for standard DES crypt" >&5
+printf %s "checking for standard DES crypt... " >&6; }
+if test ${ac_cv_crypt_des+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
-    if test "$cross_compiling" = yes; then :
+    if test "$cross_compiling" = yes
+then :
 
   ac_cv_crypt_des=yes
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -73641,11 +76569,12 @@
 #endif
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
 
   ac_cv_crypt_des=yes
 
-else
+else $as_nop
 
   ac_cv_crypt_des=no
 
@@ -73655,20 +76584,22 @@
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crypt_des" >&5
-$as_echo "$ac_cv_crypt_des" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crypt_des" >&5
+printf "%s\n" "$ac_cv_crypt_des" >&6; }
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for extended DES crypt" >&5
-$as_echo_n "checking for extended DES crypt... " >&6; }
-if ${ac_cv_crypt_ext_des+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for extended DES crypt" >&5
+printf %s "checking for extended DES crypt... " >&6; }
+if test ${ac_cv_crypt_ext_des+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
-    if test "$cross_compiling" = yes; then :
+    if test "$cross_compiling" = yes
+then :
 
     ac_cv_crypt_ext_des=no
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -73694,11 +76625,12 @@
 #endif
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
 
     ac_cv_crypt_ext_des=yes
 
-else
+else $as_nop
 
     ac_cv_crypt_ext_des=no
 
@@ -73708,20 +76640,22 @@
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crypt_ext_des" >&5
-$as_echo "$ac_cv_crypt_ext_des" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crypt_ext_des" >&5
+printf "%s\n" "$ac_cv_crypt_ext_des" >&6; }
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MD5 crypt" >&5
-$as_echo_n "checking for MD5 crypt... " >&6; }
-if ${ac_cv_crypt_md5+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MD5 crypt" >&5
+printf %s "checking for MD5 crypt... " >&6; }
+if test ${ac_cv_crypt_md5+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
-  if test "$cross_compiling" = yes; then :
+  if test "$cross_compiling" = yes
+then :
 
     ac_cv_crypt_md5=no
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -73757,11 +76691,12 @@
 #endif
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
 
     ac_cv_crypt_md5=yes
 
-else
+else $as_nop
 
     ac_cv_crypt_md5=no
 
@@ -73771,20 +76706,22 @@
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crypt_md5" >&5
-$as_echo "$ac_cv_crypt_md5" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crypt_md5" >&5
+printf "%s\n" "$ac_cv_crypt_md5" >&6; }
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Blowfish crypt" >&5
-$as_echo_n "checking for Blowfish crypt... " >&6; }
-if ${ac_cv_crypt_blowfish+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Blowfish crypt" >&5
+printf %s "checking for Blowfish crypt... " >&6; }
+if test ${ac_cv_crypt_blowfish+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
-  if test "$cross_compiling" = yes; then :
+  if test "$cross_compiling" = yes
+then :
 
     ac_cv_crypt_blowfish=no
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -73817,11 +76754,12 @@
 #endif
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
 
     ac_cv_crypt_blowfish=yes
 
-else
+else $as_nop
 
     ac_cv_crypt_blowfish=no
 
@@ -73831,20 +76769,22 @@
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crypt_blowfish" >&5
-$as_echo "$ac_cv_crypt_blowfish" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crypt_blowfish" >&5
+printf "%s\n" "$ac_cv_crypt_blowfish" >&6; }
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SHA512 crypt" >&5
-$as_echo_n "checking for SHA512 crypt... " >&6; }
-if ${ac_cv_crypt_sha512+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SHA512 crypt" >&5
+printf %s "checking for SHA512 crypt... " >&6; }
+if test ${ac_cv_crypt_sha512+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
-  if test "$cross_compiling" = yes; then :
+  if test "$cross_compiling" = yes
+then :
 
     ac_cv_crypt_sha512=no
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -73876,11 +76816,12 @@
 #endif
   }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
 
     ac_cv_crypt_sha512=yes
 
-else
+else $as_nop
 
     ac_cv_crypt_sha512=no
 
@@ -73890,20 +76831,22 @@
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crypt_sha512" >&5
-$as_echo "$ac_cv_crypt_sha512" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crypt_sha512" >&5
+printf "%s\n" "$ac_cv_crypt_sha512" >&6; }
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SHA256 crypt" >&5
-$as_echo_n "checking for SHA256 crypt... " >&6; }
-if ${ac_cv_crypt_sha256+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SHA256 crypt" >&5
+printf %s "checking for SHA256 crypt... " >&6; }
+if test ${ac_cv_crypt_sha256+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
-  if test "$cross_compiling" = yes; then :
+  if test "$cross_compiling" = yes
+then :
 
     ac_cv_crypt_sha256=no
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -73935,11 +76878,12 @@
 #endif
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
 
     ac_cv_crypt_sha256=yes
 
-else
+else $as_nop
 
     ac_cv_crypt_sha256=no
 
@@ -73949,8 +76893,8 @@
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crypt_sha256" >&5
-$as_echo "$ac_cv_crypt_sha256" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crypt_sha256" >&5
+printf "%s\n" "$ac_cv_crypt_sha256" >&6; }
 
 
   if test "$ac_cv_crypt_blowfish" = "no" || test "$ac_cv_crypt_des" = "no" || test "$ac_cv_crypt_ext_des" = "no" || test "$ac_cv_crypt_md5" = "no" || test "$ac_cv_crypt_sha512" = "no" || test "$ac_cv_crypt_sha256" = "no" || test "$ac_cv_func_crypt_r" != "yes"; then
@@ -73958,15 +76902,11 @@
   fi
 
 
-cat >>confdefs.h <<_ACEOF
-#define PHP_USE_PHP_CRYPT_R 0
-_ACEOF
+printf "%s\n" "#define PHP_USE_PHP_CRYPT_R 0" >>confdefs.h
 
 else
 
-cat >>confdefs.h <<_ACEOF
-#define PHP_USE_PHP_CRYPT_R 1
-_ACEOF
+printf "%s\n" "#define PHP_USE_PHP_CRYPT_R 1" >>confdefs.h
 
 
 
@@ -74017,18 +76957,19 @@
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports aligned attribute" >&5
-$as_echo_n "checking whether the compiler supports aligned attribute... " >&6; }
-if ${ac_cv_attribute_aligned+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports aligned attribute" >&5
+printf %s "checking whether the compiler supports aligned attribute... " >&6; }
+if test ${ac_cv_attribute_aligned+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
 int
-main ()
+main (void)
 {
 
   unsigned char test32 __attribute__ ((__aligned__ (__alignof__ (int))));
@@ -74037,22 +76978,23 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
   ac_cv_attribute_aligned=yes
 
-else
+else $as_nop
 
   ac_cv_attribute_aligned=no
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_attribute_aligned" >&5
-$as_echo "$ac_cv_attribute_aligned" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_attribute_aligned" >&5
+printf "%s\n" "$ac_cv_attribute_aligned" >&6; }
 if test "$ac_cv_attribute_aligned" = "yes"; then
 
-$as_echo "#define HAVE_ATTRIBUTE_ALIGNED 1" >>confdefs.h
+printf "%s\n" "#define HAVE_ATTRIBUTE_ALIGNED 1" >>confdefs.h
 
 fi
 
@@ -74060,23 +77002,25 @@
   case $host_alias in
     *linux*)
 
-$as_echo "#define HAVE_FNMATCH 1" >>confdefs.h
+printf "%s\n" "#define HAVE_FNMATCH 1" >>confdefs.h
 
       ;;
   esac
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working POSIX fnmatch" >&5
-$as_echo_n "checking for working POSIX fnmatch... " >&6; }
-if ${ac_cv_func_fnmatch_works+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working POSIX fnmatch" >&5
+printf %s "checking for working POSIX fnmatch... " >&6; }
+if test ${ac_cv_func_fnmatch_works+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   # Some versions of Solaris, SCO, and the GNU C Library
    # have a broken or incompatible fnmatch.
    # So we run a test program.  If we are cross-compiling, take no chance.
    # Thanks to John Oleynick, Franc,ois Pinard, and Paul Eggert for this test.
-   if test "$cross_compiling" = yes; then :
+   if test "$cross_compiling" = yes
+then :
   ac_cv_func_fnmatch_works=cross
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <fnmatch.h>
@@ -74084,7 +77028,7 @@
 #	   define n(a, b, c) (fnmatch (a, b, c) == FNM_NOMATCH)
 
 int
-main ()
+main (void)
 {
 return
 	   (!(y ("a*", "abc", 0)
@@ -74098,9 +77042,10 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   ac_cv_func_fnmatch_works=yes
-else
+else $as_nop
   ac_cv_func_fnmatch_works=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -74108,47 +77053,50 @@
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_fnmatch_works" >&5
-$as_echo "$ac_cv_func_fnmatch_works" >&6; }
-if test $ac_cv_func_fnmatch_works = yes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_fnmatch_works" >&5
+printf "%s\n" "$ac_cv_func_fnmatch_works" >&6; }
+if test $ac_cv_func_fnmatch_works = yes
+then :
 
-$as_echo "#define HAVE_FNMATCH 1" >>confdefs.h
+printf "%s\n" "#define HAVE_FNMATCH 1" >>confdefs.h
 
 fi
 
 
 fi
 
-for ac_func in fork CreateProcess
+
+  for ac_func in fork CreateProcess
 do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+  as_ac_var=`printf "%s\n" "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"
+then :
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `printf "%s\n" "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
   php_can_support_proc_open=yes
   break
 
-else
+else $as_nop
 
   php_can_support_proc_open=no
 
 fi
-done
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if your OS can spawn processes with inherited handles" >&5
-$as_echo_n "checking if your OS can spawn processes with inherited handles... " >&6; }
+done
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if your OS can spawn processes with inherited handles" >&5
+printf %s "checking if your OS can spawn processes with inherited handles... " >&6; }
 if test "$php_can_support_proc_open" = "yes"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-$as_echo "#define PHP_CAN_SUPPORT_PROC_OPEN 1" >>confdefs.h
+printf "%s\n" "#define PHP_CAN_SUPPORT_PROC_OPEN 1" >>confdefs.h
 
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 PHP_ENABLE_CHROOT_FUNC=no
@@ -74175,7 +77123,7 @@
 
 if test "$PHP_ENABLE_CHROOT_FUNC" = "yes"; then
 
-$as_echo "#define ENABLE_CHROOT_FUNC 1" >>confdefs.h
+printf "%s\n" "#define ENABLE_CHROOT_FUNC 1" >>confdefs.h
 
 fi
 
@@ -74185,13 +77133,15 @@
   unset found
 
   ac_fn_c_check_func "$LINENO" "res_nsearch" "ac_cv_func_res_nsearch"
-if test "x$ac_cv_func_res_nsearch" = xyes; then :
+if test "x$ac_cv_func_res_nsearch" = xyes
+then :
   found=yes
-else
+else $as_nop
    ac_fn_c_check_func "$LINENO" "__res_nsearch" "ac_cv_func___res_nsearch"
-if test "x$ac_cv_func___res_nsearch" = xyes; then :
+if test "x$ac_cv_func___res_nsearch" = xyes
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 
@@ -74201,7 +77151,7 @@
   case $found in
   yes)
 
-$as_echo "#define HAVE_RES_NSEARCH 1" >>confdefs.h
+printf "%s\n" "#define HAVE_RES_NSEARCH 1" >>confdefs.h
 
     ac_cv_func_res_nsearch=yes
   ;;
@@ -74211,11 +77161,12 @@
   unset ac_cv_lib_resolv_res_nsearch
   unset ac_cv_lib_resolv___res_nsearch
   unset found
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_nsearch in -lresolv" >&5
-$as_echo_n "checking for res_nsearch in -lresolv... " >&6; }
-if ${ac_cv_lib_resolv_res_nsearch+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for res_nsearch in -lresolv" >&5
+printf %s "checking for res_nsearch in -lresolv... " >&6; }
+if test ${ac_cv_lib_resolv_res_nsearch+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -74224,38 +77175,38 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char res_nsearch ();
 int
-main ()
+main (void)
 {
 return res_nsearch ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_resolv_res_nsearch=yes
-else
+else $as_nop
   ac_cv_lib_resolv_res_nsearch=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_res_nsearch" >&5
-$as_echo "$ac_cv_lib_resolv_res_nsearch" >&6; }
-if test "x$ac_cv_lib_resolv_res_nsearch" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_res_nsearch" >&5
+printf "%s\n" "$ac_cv_lib_resolv_res_nsearch" >&6; }
+if test "x$ac_cv_lib_resolv_res_nsearch" = xyes
+then :
   found=yes
-else
+else $as_nop
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __res_nsearch in -lresolv" >&5
-$as_echo_n "checking for __res_nsearch in -lresolv... " >&6; }
-if ${ac_cv_lib_resolv___res_nsearch+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __res_nsearch in -lresolv" >&5
+printf %s "checking for __res_nsearch in -lresolv... " >&6; }
+if test ${ac_cv_lib_resolv___res_nsearch+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -74264,32 +77215,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char __res_nsearch ();
 int
-main ()
+main (void)
 {
 return __res_nsearch ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_resolv___res_nsearch=yes
-else
+else $as_nop
   ac_cv_lib_resolv___res_nsearch=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___res_nsearch" >&5
-$as_echo "$ac_cv_lib_resolv___res_nsearch" >&6; }
-if test "x$ac_cv_lib_resolv___res_nsearch" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___res_nsearch" >&5
+printf "%s\n" "$ac_cv_lib_resolv___res_nsearch" >&6; }
+if test "x$ac_cv_lib_resolv___res_nsearch" = xyes
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 
@@ -74300,18 +77250,20 @@
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lresolv"
-    if test "$cross_compiling" = yes; then :
+    if test "$cross_compiling" = yes
+then :
 
             found=yes
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int main(void) { return (0); }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -74333,10 +77285,10 @@
 
 
 
-$as_echo "#define HAVE_RES_NSEARCH 1" >>confdefs.h
+printf "%s\n" "#define HAVE_RES_NSEARCH 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_LIBRESOLV 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBRESOLV 1" >>confdefs.h
 
     ac_cv_func_res_nsearch=yes
   else
@@ -74345,11 +77297,12 @@
   unset ac_cv_lib_bind_res_nsearch
   unset ac_cv_lib_bind___res_nsearch
   unset found
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_nsearch in -lbind" >&5
-$as_echo_n "checking for res_nsearch in -lbind... " >&6; }
-if ${ac_cv_lib_bind_res_nsearch+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for res_nsearch in -lbind" >&5
+printf %s "checking for res_nsearch in -lbind... " >&6; }
+if test ${ac_cv_lib_bind_res_nsearch+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbind  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -74358,38 +77311,38 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char res_nsearch ();
 int
-main ()
+main (void)
 {
 return res_nsearch ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_bind_res_nsearch=yes
-else
+else $as_nop
   ac_cv_lib_bind_res_nsearch=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind_res_nsearch" >&5
-$as_echo "$ac_cv_lib_bind_res_nsearch" >&6; }
-if test "x$ac_cv_lib_bind_res_nsearch" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind_res_nsearch" >&5
+printf "%s\n" "$ac_cv_lib_bind_res_nsearch" >&6; }
+if test "x$ac_cv_lib_bind_res_nsearch" = xyes
+then :
   found=yes
-else
+else $as_nop
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __res_nsearch in -lbind" >&5
-$as_echo_n "checking for __res_nsearch in -lbind... " >&6; }
-if ${ac_cv_lib_bind___res_nsearch+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __res_nsearch in -lbind" >&5
+printf %s "checking for __res_nsearch in -lbind... " >&6; }
+if test ${ac_cv_lib_bind___res_nsearch+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbind  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -74398,32 +77351,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char __res_nsearch ();
 int
-main ()
+main (void)
 {
 return __res_nsearch ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_bind___res_nsearch=yes
-else
+else $as_nop
   ac_cv_lib_bind___res_nsearch=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind___res_nsearch" >&5
-$as_echo "$ac_cv_lib_bind___res_nsearch" >&6; }
-if test "x$ac_cv_lib_bind___res_nsearch" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind___res_nsearch" >&5
+printf "%s\n" "$ac_cv_lib_bind___res_nsearch" >&6; }
+if test "x$ac_cv_lib_bind___res_nsearch" = xyes
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 
@@ -74434,18 +77386,20 @@
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lbind"
-    if test "$cross_compiling" = yes; then :
+    if test "$cross_compiling" = yes
+then :
 
             found=yes
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int main(void) { return (0); }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -74467,10 +77421,10 @@
 
 
 
-$as_echo "#define HAVE_RES_NSEARCH 1" >>confdefs.h
+printf "%s\n" "#define HAVE_RES_NSEARCH 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_LIBBIND 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBBIND 1" >>confdefs.h
 
     ac_cv_func_res_nsearch=yes
   else
@@ -74479,11 +77433,12 @@
   unset ac_cv_lib_socket_res_nsearch
   unset ac_cv_lib_socket___res_nsearch
   unset found
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_nsearch in -lsocket" >&5
-$as_echo_n "checking for res_nsearch in -lsocket... " >&6; }
-if ${ac_cv_lib_socket_res_nsearch+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for res_nsearch in -lsocket" >&5
+printf %s "checking for res_nsearch in -lsocket... " >&6; }
+if test ${ac_cv_lib_socket_res_nsearch+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -74492,38 +77447,38 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char res_nsearch ();
 int
-main ()
+main (void)
 {
 return res_nsearch ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_socket_res_nsearch=yes
-else
+else $as_nop
   ac_cv_lib_socket_res_nsearch=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_res_nsearch" >&5
-$as_echo "$ac_cv_lib_socket_res_nsearch" >&6; }
-if test "x$ac_cv_lib_socket_res_nsearch" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_res_nsearch" >&5
+printf "%s\n" "$ac_cv_lib_socket_res_nsearch" >&6; }
+if test "x$ac_cv_lib_socket_res_nsearch" = xyes
+then :
   found=yes
-else
+else $as_nop
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __res_nsearch in -lsocket" >&5
-$as_echo_n "checking for __res_nsearch in -lsocket... " >&6; }
-if ${ac_cv_lib_socket___res_nsearch+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __res_nsearch in -lsocket" >&5
+printf %s "checking for __res_nsearch in -lsocket... " >&6; }
+if test ${ac_cv_lib_socket___res_nsearch+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -74532,32 +77487,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char __res_nsearch ();
 int
-main ()
+main (void)
 {
 return __res_nsearch ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_socket___res_nsearch=yes
-else
+else $as_nop
   ac_cv_lib_socket___res_nsearch=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___res_nsearch" >&5
-$as_echo "$ac_cv_lib_socket___res_nsearch" >&6; }
-if test "x$ac_cv_lib_socket___res_nsearch" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___res_nsearch" >&5
+printf "%s\n" "$ac_cv_lib_socket___res_nsearch" >&6; }
+if test "x$ac_cv_lib_socket___res_nsearch" = xyes
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 
@@ -74568,18 +77522,20 @@
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lsocket"
-    if test "$cross_compiling" = yes; then :
+    if test "$cross_compiling" = yes
+then :
 
             found=yes
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int main(void) { return (0); }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -74601,10 +77557,10 @@
 
 
 
-$as_echo "#define HAVE_RES_NSEARCH 1" >>confdefs.h
+printf "%s\n" "#define HAVE_RES_NSEARCH 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_LIBSOCKET 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBSOCKET 1" >>confdefs.h
 
     ac_cv_func_res_nsearch=yes
   else
@@ -74629,13 +77585,15 @@
   unset found
 
   ac_fn_c_check_func "$LINENO" "res_ndestroy" "ac_cv_func_res_ndestroy"
-if test "x$ac_cv_func_res_ndestroy" = xyes; then :
+if test "x$ac_cv_func_res_ndestroy" = xyes
+then :
   found=yes
-else
+else $as_nop
    ac_fn_c_check_func "$LINENO" "__res_ndestroy" "ac_cv_func___res_ndestroy"
-if test "x$ac_cv_func___res_ndestroy" = xyes; then :
+if test "x$ac_cv_func___res_ndestroy" = xyes
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 
@@ -74645,7 +77603,7 @@
   case $found in
   yes)
 
-$as_echo "#define HAVE_RES_NDESTROY 1" >>confdefs.h
+printf "%s\n" "#define HAVE_RES_NDESTROY 1" >>confdefs.h
 
     ac_cv_func_res_ndestroy=yes
   ;;
@@ -74655,11 +77613,12 @@
   unset ac_cv_lib_resolv_res_ndestroy
   unset ac_cv_lib_resolv___res_ndestroy
   unset found
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_ndestroy in -lresolv" >&5
-$as_echo_n "checking for res_ndestroy in -lresolv... " >&6; }
-if ${ac_cv_lib_resolv_res_ndestroy+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for res_ndestroy in -lresolv" >&5
+printf %s "checking for res_ndestroy in -lresolv... " >&6; }
+if test ${ac_cv_lib_resolv_res_ndestroy+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -74668,38 +77627,38 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char res_ndestroy ();
 int
-main ()
+main (void)
 {
 return res_ndestroy ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_resolv_res_ndestroy=yes
-else
+else $as_nop
   ac_cv_lib_resolv_res_ndestroy=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_res_ndestroy" >&5
-$as_echo "$ac_cv_lib_resolv_res_ndestroy" >&6; }
-if test "x$ac_cv_lib_resolv_res_ndestroy" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_res_ndestroy" >&5
+printf "%s\n" "$ac_cv_lib_resolv_res_ndestroy" >&6; }
+if test "x$ac_cv_lib_resolv_res_ndestroy" = xyes
+then :
   found=yes
-else
+else $as_nop
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __res_ndestroy in -lresolv" >&5
-$as_echo_n "checking for __res_ndestroy in -lresolv... " >&6; }
-if ${ac_cv_lib_resolv___res_ndestroy+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __res_ndestroy in -lresolv" >&5
+printf %s "checking for __res_ndestroy in -lresolv... " >&6; }
+if test ${ac_cv_lib_resolv___res_ndestroy+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -74708,32 +77667,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char __res_ndestroy ();
 int
-main ()
+main (void)
 {
 return __res_ndestroy ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_resolv___res_ndestroy=yes
-else
+else $as_nop
   ac_cv_lib_resolv___res_ndestroy=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___res_ndestroy" >&5
-$as_echo "$ac_cv_lib_resolv___res_ndestroy" >&6; }
-if test "x$ac_cv_lib_resolv___res_ndestroy" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___res_ndestroy" >&5
+printf "%s\n" "$ac_cv_lib_resolv___res_ndestroy" >&6; }
+if test "x$ac_cv_lib_resolv___res_ndestroy" = xyes
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 
@@ -74744,18 +77702,20 @@
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lresolv"
-    if test "$cross_compiling" = yes; then :
+    if test "$cross_compiling" = yes
+then :
 
             found=yes
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int main(void) { return (0); }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -74777,10 +77737,10 @@
 
 
 
-$as_echo "#define HAVE_RES_NDESTROY 1" >>confdefs.h
+printf "%s\n" "#define HAVE_RES_NDESTROY 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_LIBRESOLV 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBRESOLV 1" >>confdefs.h
 
     ac_cv_func_res_ndestroy=yes
   else
@@ -74789,11 +77749,12 @@
   unset ac_cv_lib_bind_res_ndestroy
   unset ac_cv_lib_bind___res_ndestroy
   unset found
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_ndestroy in -lbind" >&5
-$as_echo_n "checking for res_ndestroy in -lbind... " >&6; }
-if ${ac_cv_lib_bind_res_ndestroy+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for res_ndestroy in -lbind" >&5
+printf %s "checking for res_ndestroy in -lbind... " >&6; }
+if test ${ac_cv_lib_bind_res_ndestroy+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbind  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -74802,38 +77763,38 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char res_ndestroy ();
 int
-main ()
+main (void)
 {
 return res_ndestroy ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_bind_res_ndestroy=yes
-else
+else $as_nop
   ac_cv_lib_bind_res_ndestroy=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind_res_ndestroy" >&5
-$as_echo "$ac_cv_lib_bind_res_ndestroy" >&6; }
-if test "x$ac_cv_lib_bind_res_ndestroy" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind_res_ndestroy" >&5
+printf "%s\n" "$ac_cv_lib_bind_res_ndestroy" >&6; }
+if test "x$ac_cv_lib_bind_res_ndestroy" = xyes
+then :
   found=yes
-else
+else $as_nop
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __res_ndestroy in -lbind" >&5
-$as_echo_n "checking for __res_ndestroy in -lbind... " >&6; }
-if ${ac_cv_lib_bind___res_ndestroy+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __res_ndestroy in -lbind" >&5
+printf %s "checking for __res_ndestroy in -lbind... " >&6; }
+if test ${ac_cv_lib_bind___res_ndestroy+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbind  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -74842,32 +77803,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char __res_ndestroy ();
 int
-main ()
+main (void)
 {
 return __res_ndestroy ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_bind___res_ndestroy=yes
-else
+else $as_nop
   ac_cv_lib_bind___res_ndestroy=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind___res_ndestroy" >&5
-$as_echo "$ac_cv_lib_bind___res_ndestroy" >&6; }
-if test "x$ac_cv_lib_bind___res_ndestroy" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind___res_ndestroy" >&5
+printf "%s\n" "$ac_cv_lib_bind___res_ndestroy" >&6; }
+if test "x$ac_cv_lib_bind___res_ndestroy" = xyes
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 
@@ -74878,18 +77838,20 @@
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lbind"
-    if test "$cross_compiling" = yes; then :
+    if test "$cross_compiling" = yes
+then :
 
             found=yes
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int main(void) { return (0); }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -74911,10 +77873,10 @@
 
 
 
-$as_echo "#define HAVE_RES_NDESTROY 1" >>confdefs.h
+printf "%s\n" "#define HAVE_RES_NDESTROY 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_LIBBIND 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBBIND 1" >>confdefs.h
 
     ac_cv_func_res_ndestroy=yes
   else
@@ -74923,11 +77885,12 @@
   unset ac_cv_lib_socket_res_ndestroy
   unset ac_cv_lib_socket___res_ndestroy
   unset found
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_ndestroy in -lsocket" >&5
-$as_echo_n "checking for res_ndestroy in -lsocket... " >&6; }
-if ${ac_cv_lib_socket_res_ndestroy+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for res_ndestroy in -lsocket" >&5
+printf %s "checking for res_ndestroy in -lsocket... " >&6; }
+if test ${ac_cv_lib_socket_res_ndestroy+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -74936,38 +77899,38 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char res_ndestroy ();
 int
-main ()
+main (void)
 {
 return res_ndestroy ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_socket_res_ndestroy=yes
-else
+else $as_nop
   ac_cv_lib_socket_res_ndestroy=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_res_ndestroy" >&5
-$as_echo "$ac_cv_lib_socket_res_ndestroy" >&6; }
-if test "x$ac_cv_lib_socket_res_ndestroy" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_res_ndestroy" >&5
+printf "%s\n" "$ac_cv_lib_socket_res_ndestroy" >&6; }
+if test "x$ac_cv_lib_socket_res_ndestroy" = xyes
+then :
   found=yes
-else
+else $as_nop
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __res_ndestroy in -lsocket" >&5
-$as_echo_n "checking for __res_ndestroy in -lsocket... " >&6; }
-if ${ac_cv_lib_socket___res_ndestroy+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __res_ndestroy in -lsocket" >&5
+printf %s "checking for __res_ndestroy in -lsocket... " >&6; }
+if test ${ac_cv_lib_socket___res_ndestroy+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -74976,32 +77939,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char __res_ndestroy ();
 int
-main ()
+main (void)
 {
 return __res_ndestroy ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_socket___res_ndestroy=yes
-else
+else $as_nop
   ac_cv_lib_socket___res_ndestroy=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___res_ndestroy" >&5
-$as_echo "$ac_cv_lib_socket___res_ndestroy" >&6; }
-if test "x$ac_cv_lib_socket___res_ndestroy" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___res_ndestroy" >&5
+printf "%s\n" "$ac_cv_lib_socket___res_ndestroy" >&6; }
+if test "x$ac_cv_lib_socket___res_ndestroy" = xyes
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 
@@ -75012,18 +77974,20 @@
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lsocket"
-    if test "$cross_compiling" = yes; then :
+    if test "$cross_compiling" = yes
+then :
 
             found=yes
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int main(void) { return (0); }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -75045,10 +78009,10 @@
 
 
 
-$as_echo "#define HAVE_RES_NDESTROY 1" >>confdefs.h
+printf "%s\n" "#define HAVE_RES_NDESTROY 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_LIBSOCKET 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBSOCKET 1" >>confdefs.h
 
     ac_cv_func_res_ndestroy=yes
   else
@@ -75073,13 +78037,15 @@
   unset found
 
   ac_fn_c_check_func "$LINENO" "dns_search" "ac_cv_func_dns_search"
-if test "x$ac_cv_func_dns_search" = xyes; then :
+if test "x$ac_cv_func_dns_search" = xyes
+then :
   found=yes
-else
+else $as_nop
    ac_fn_c_check_func "$LINENO" "__dns_search" "ac_cv_func___dns_search"
-if test "x$ac_cv_func___dns_search" = xyes; then :
+if test "x$ac_cv_func___dns_search" = xyes
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 
@@ -75089,7 +78055,7 @@
   case $found in
   yes)
 
-$as_echo "#define HAVE_DNS_SEARCH 1" >>confdefs.h
+printf "%s\n" "#define HAVE_DNS_SEARCH 1" >>confdefs.h
 
     ac_cv_func_dns_search=yes
   ;;
@@ -75099,11 +78065,12 @@
   unset ac_cv_lib_resolv_dns_search
   unset ac_cv_lib_resolv___dns_search
   unset found
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dns_search in -lresolv" >&5
-$as_echo_n "checking for dns_search in -lresolv... " >&6; }
-if ${ac_cv_lib_resolv_dns_search+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dns_search in -lresolv" >&5
+printf %s "checking for dns_search in -lresolv... " >&6; }
+if test ${ac_cv_lib_resolv_dns_search+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -75112,38 +78079,38 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char dns_search ();
 int
-main ()
+main (void)
 {
 return dns_search ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_resolv_dns_search=yes
-else
+else $as_nop
   ac_cv_lib_resolv_dns_search=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_dns_search" >&5
-$as_echo "$ac_cv_lib_resolv_dns_search" >&6; }
-if test "x$ac_cv_lib_resolv_dns_search" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_dns_search" >&5
+printf "%s\n" "$ac_cv_lib_resolv_dns_search" >&6; }
+if test "x$ac_cv_lib_resolv_dns_search" = xyes
+then :
   found=yes
-else
+else $as_nop
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __dns_search in -lresolv" >&5
-$as_echo_n "checking for __dns_search in -lresolv... " >&6; }
-if ${ac_cv_lib_resolv___dns_search+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __dns_search in -lresolv" >&5
+printf %s "checking for __dns_search in -lresolv... " >&6; }
+if test ${ac_cv_lib_resolv___dns_search+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -75152,32 +78119,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char __dns_search ();
 int
-main ()
+main (void)
 {
 return __dns_search ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_resolv___dns_search=yes
-else
+else $as_nop
   ac_cv_lib_resolv___dns_search=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___dns_search" >&5
-$as_echo "$ac_cv_lib_resolv___dns_search" >&6; }
-if test "x$ac_cv_lib_resolv___dns_search" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___dns_search" >&5
+printf "%s\n" "$ac_cv_lib_resolv___dns_search" >&6; }
+if test "x$ac_cv_lib_resolv___dns_search" = xyes
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 
@@ -75188,18 +78154,20 @@
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lresolv"
-    if test "$cross_compiling" = yes; then :
+    if test "$cross_compiling" = yes
+then :
 
             found=yes
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int main(void) { return (0); }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -75221,10 +78189,10 @@
 
 
 
-$as_echo "#define HAVE_DNS_SEARCH 1" >>confdefs.h
+printf "%s\n" "#define HAVE_DNS_SEARCH 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_LIBRESOLV 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBRESOLV 1" >>confdefs.h
 
     ac_cv_func_dns_search=yes
   else
@@ -75233,11 +78201,12 @@
   unset ac_cv_lib_bind_dns_search
   unset ac_cv_lib_bind___dns_search
   unset found
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dns_search in -lbind" >&5
-$as_echo_n "checking for dns_search in -lbind... " >&6; }
-if ${ac_cv_lib_bind_dns_search+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dns_search in -lbind" >&5
+printf %s "checking for dns_search in -lbind... " >&6; }
+if test ${ac_cv_lib_bind_dns_search+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbind  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -75246,38 +78215,38 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char dns_search ();
 int
-main ()
+main (void)
 {
 return dns_search ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_bind_dns_search=yes
-else
+else $as_nop
   ac_cv_lib_bind_dns_search=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind_dns_search" >&5
-$as_echo "$ac_cv_lib_bind_dns_search" >&6; }
-if test "x$ac_cv_lib_bind_dns_search" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind_dns_search" >&5
+printf "%s\n" "$ac_cv_lib_bind_dns_search" >&6; }
+if test "x$ac_cv_lib_bind_dns_search" = xyes
+then :
   found=yes
-else
+else $as_nop
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __dns_search in -lbind" >&5
-$as_echo_n "checking for __dns_search in -lbind... " >&6; }
-if ${ac_cv_lib_bind___dns_search+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __dns_search in -lbind" >&5
+printf %s "checking for __dns_search in -lbind... " >&6; }
+if test ${ac_cv_lib_bind___dns_search+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbind  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -75286,32 +78255,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char __dns_search ();
 int
-main ()
+main (void)
 {
 return __dns_search ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_bind___dns_search=yes
-else
+else $as_nop
   ac_cv_lib_bind___dns_search=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind___dns_search" >&5
-$as_echo "$ac_cv_lib_bind___dns_search" >&6; }
-if test "x$ac_cv_lib_bind___dns_search" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind___dns_search" >&5
+printf "%s\n" "$ac_cv_lib_bind___dns_search" >&6; }
+if test "x$ac_cv_lib_bind___dns_search" = xyes
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 
@@ -75322,18 +78290,20 @@
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lbind"
-    if test "$cross_compiling" = yes; then :
+    if test "$cross_compiling" = yes
+then :
 
             found=yes
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int main(void) { return (0); }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -75355,10 +78325,10 @@
 
 
 
-$as_echo "#define HAVE_DNS_SEARCH 1" >>confdefs.h
+printf "%s\n" "#define HAVE_DNS_SEARCH 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_LIBBIND 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBBIND 1" >>confdefs.h
 
     ac_cv_func_dns_search=yes
   else
@@ -75367,11 +78337,12 @@
   unset ac_cv_lib_socket_dns_search
   unset ac_cv_lib_socket___dns_search
   unset found
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dns_search in -lsocket" >&5
-$as_echo_n "checking for dns_search in -lsocket... " >&6; }
-if ${ac_cv_lib_socket_dns_search+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dns_search in -lsocket" >&5
+printf %s "checking for dns_search in -lsocket... " >&6; }
+if test ${ac_cv_lib_socket_dns_search+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -75380,38 +78351,38 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char dns_search ();
 int
-main ()
+main (void)
 {
 return dns_search ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_socket_dns_search=yes
-else
+else $as_nop
   ac_cv_lib_socket_dns_search=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_dns_search" >&5
-$as_echo "$ac_cv_lib_socket_dns_search" >&6; }
-if test "x$ac_cv_lib_socket_dns_search" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_dns_search" >&5
+printf "%s\n" "$ac_cv_lib_socket_dns_search" >&6; }
+if test "x$ac_cv_lib_socket_dns_search" = xyes
+then :
   found=yes
-else
+else $as_nop
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __dns_search in -lsocket" >&5
-$as_echo_n "checking for __dns_search in -lsocket... " >&6; }
-if ${ac_cv_lib_socket___dns_search+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __dns_search in -lsocket" >&5
+printf %s "checking for __dns_search in -lsocket... " >&6; }
+if test ${ac_cv_lib_socket___dns_search+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -75420,32 +78391,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char __dns_search ();
 int
-main ()
+main (void)
 {
 return __dns_search ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_socket___dns_search=yes
-else
+else $as_nop
   ac_cv_lib_socket___dns_search=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___dns_search" >&5
-$as_echo "$ac_cv_lib_socket___dns_search" >&6; }
-if test "x$ac_cv_lib_socket___dns_search" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___dns_search" >&5
+printf "%s\n" "$ac_cv_lib_socket___dns_search" >&6; }
+if test "x$ac_cv_lib_socket___dns_search" = xyes
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 
@@ -75456,18 +78426,20 @@
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lsocket"
-    if test "$cross_compiling" = yes; then :
+    if test "$cross_compiling" = yes
+then :
 
             found=yes
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int main(void) { return (0); }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -75489,10 +78461,10 @@
 
 
 
-$as_echo "#define HAVE_DNS_SEARCH 1" >>confdefs.h
+printf "%s\n" "#define HAVE_DNS_SEARCH 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_LIBSOCKET 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBSOCKET 1" >>confdefs.h
 
     ac_cv_func_dns_search=yes
   else
@@ -75517,13 +78489,15 @@
   unset found
 
   ac_fn_c_check_func "$LINENO" "dn_expand" "ac_cv_func_dn_expand"
-if test "x$ac_cv_func_dn_expand" = xyes; then :
+if test "x$ac_cv_func_dn_expand" = xyes
+then :
   found=yes
-else
+else $as_nop
    ac_fn_c_check_func "$LINENO" "__dn_expand" "ac_cv_func___dn_expand"
-if test "x$ac_cv_func___dn_expand" = xyes; then :
+if test "x$ac_cv_func___dn_expand" = xyes
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 
@@ -75533,7 +78507,7 @@
   case $found in
   yes)
 
-$as_echo "#define HAVE_DN_EXPAND 1" >>confdefs.h
+printf "%s\n" "#define HAVE_DN_EXPAND 1" >>confdefs.h
 
     ac_cv_func_dn_expand=yes
   ;;
@@ -75543,11 +78517,12 @@
   unset ac_cv_lib_resolv_dn_expand
   unset ac_cv_lib_resolv___dn_expand
   unset found
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dn_expand in -lresolv" >&5
-$as_echo_n "checking for dn_expand in -lresolv... " >&6; }
-if ${ac_cv_lib_resolv_dn_expand+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dn_expand in -lresolv" >&5
+printf %s "checking for dn_expand in -lresolv... " >&6; }
+if test ${ac_cv_lib_resolv_dn_expand+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -75556,38 +78531,38 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char dn_expand ();
 int
-main ()
+main (void)
 {
 return dn_expand ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_resolv_dn_expand=yes
-else
+else $as_nop
   ac_cv_lib_resolv_dn_expand=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_dn_expand" >&5
-$as_echo "$ac_cv_lib_resolv_dn_expand" >&6; }
-if test "x$ac_cv_lib_resolv_dn_expand" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_dn_expand" >&5
+printf "%s\n" "$ac_cv_lib_resolv_dn_expand" >&6; }
+if test "x$ac_cv_lib_resolv_dn_expand" = xyes
+then :
   found=yes
-else
+else $as_nop
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __dn_expand in -lresolv" >&5
-$as_echo_n "checking for __dn_expand in -lresolv... " >&6; }
-if ${ac_cv_lib_resolv___dn_expand+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __dn_expand in -lresolv" >&5
+printf %s "checking for __dn_expand in -lresolv... " >&6; }
+if test ${ac_cv_lib_resolv___dn_expand+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -75596,32 +78571,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char __dn_expand ();
 int
-main ()
+main (void)
 {
 return __dn_expand ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_resolv___dn_expand=yes
-else
+else $as_nop
   ac_cv_lib_resolv___dn_expand=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___dn_expand" >&5
-$as_echo "$ac_cv_lib_resolv___dn_expand" >&6; }
-if test "x$ac_cv_lib_resolv___dn_expand" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___dn_expand" >&5
+printf "%s\n" "$ac_cv_lib_resolv___dn_expand" >&6; }
+if test "x$ac_cv_lib_resolv___dn_expand" = xyes
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 
@@ -75632,18 +78606,20 @@
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lresolv"
-    if test "$cross_compiling" = yes; then :
+    if test "$cross_compiling" = yes
+then :
 
             found=yes
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int main(void) { return (0); }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -75665,10 +78641,10 @@
 
 
 
-$as_echo "#define HAVE_DN_EXPAND 1" >>confdefs.h
+printf "%s\n" "#define HAVE_DN_EXPAND 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_LIBRESOLV 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBRESOLV 1" >>confdefs.h
 
     ac_cv_func_dn_expand=yes
   else
@@ -75677,11 +78653,12 @@
   unset ac_cv_lib_bind_dn_expand
   unset ac_cv_lib_bind___dn_expand
   unset found
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dn_expand in -lbind" >&5
-$as_echo_n "checking for dn_expand in -lbind... " >&6; }
-if ${ac_cv_lib_bind_dn_expand+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dn_expand in -lbind" >&5
+printf %s "checking for dn_expand in -lbind... " >&6; }
+if test ${ac_cv_lib_bind_dn_expand+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbind  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -75690,38 +78667,38 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char dn_expand ();
 int
-main ()
+main (void)
 {
 return dn_expand ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_bind_dn_expand=yes
-else
+else $as_nop
   ac_cv_lib_bind_dn_expand=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind_dn_expand" >&5
-$as_echo "$ac_cv_lib_bind_dn_expand" >&6; }
-if test "x$ac_cv_lib_bind_dn_expand" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind_dn_expand" >&5
+printf "%s\n" "$ac_cv_lib_bind_dn_expand" >&6; }
+if test "x$ac_cv_lib_bind_dn_expand" = xyes
+then :
   found=yes
-else
+else $as_nop
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __dn_expand in -lbind" >&5
-$as_echo_n "checking for __dn_expand in -lbind... " >&6; }
-if ${ac_cv_lib_bind___dn_expand+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __dn_expand in -lbind" >&5
+printf %s "checking for __dn_expand in -lbind... " >&6; }
+if test ${ac_cv_lib_bind___dn_expand+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbind  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -75730,32 +78707,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char __dn_expand ();
 int
-main ()
+main (void)
 {
 return __dn_expand ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_bind___dn_expand=yes
-else
+else $as_nop
   ac_cv_lib_bind___dn_expand=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind___dn_expand" >&5
-$as_echo "$ac_cv_lib_bind___dn_expand" >&6; }
-if test "x$ac_cv_lib_bind___dn_expand" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind___dn_expand" >&5
+printf "%s\n" "$ac_cv_lib_bind___dn_expand" >&6; }
+if test "x$ac_cv_lib_bind___dn_expand" = xyes
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 
@@ -75766,18 +78742,20 @@
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lbind"
-    if test "$cross_compiling" = yes; then :
+    if test "$cross_compiling" = yes
+then :
 
             found=yes
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int main(void) { return (0); }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -75799,10 +78777,10 @@
 
 
 
-$as_echo "#define HAVE_DN_EXPAND 1" >>confdefs.h
+printf "%s\n" "#define HAVE_DN_EXPAND 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_LIBBIND 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBBIND 1" >>confdefs.h
 
     ac_cv_func_dn_expand=yes
   else
@@ -75811,11 +78789,12 @@
   unset ac_cv_lib_socket_dn_expand
   unset ac_cv_lib_socket___dn_expand
   unset found
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dn_expand in -lsocket" >&5
-$as_echo_n "checking for dn_expand in -lsocket... " >&6; }
-if ${ac_cv_lib_socket_dn_expand+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dn_expand in -lsocket" >&5
+printf %s "checking for dn_expand in -lsocket... " >&6; }
+if test ${ac_cv_lib_socket_dn_expand+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -75824,38 +78803,38 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char dn_expand ();
 int
-main ()
+main (void)
 {
 return dn_expand ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_socket_dn_expand=yes
-else
+else $as_nop
   ac_cv_lib_socket_dn_expand=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_dn_expand" >&5
-$as_echo "$ac_cv_lib_socket_dn_expand" >&6; }
-if test "x$ac_cv_lib_socket_dn_expand" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_dn_expand" >&5
+printf "%s\n" "$ac_cv_lib_socket_dn_expand" >&6; }
+if test "x$ac_cv_lib_socket_dn_expand" = xyes
+then :
   found=yes
-else
+else $as_nop
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __dn_expand in -lsocket" >&5
-$as_echo_n "checking for __dn_expand in -lsocket... " >&6; }
-if ${ac_cv_lib_socket___dn_expand+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __dn_expand in -lsocket" >&5
+printf %s "checking for __dn_expand in -lsocket... " >&6; }
+if test ${ac_cv_lib_socket___dn_expand+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -75864,32 +78843,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char __dn_expand ();
 int
-main ()
+main (void)
 {
 return __dn_expand ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_socket___dn_expand=yes
-else
+else $as_nop
   ac_cv_lib_socket___dn_expand=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___dn_expand" >&5
-$as_echo "$ac_cv_lib_socket___dn_expand" >&6; }
-if test "x$ac_cv_lib_socket___dn_expand" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___dn_expand" >&5
+printf "%s\n" "$ac_cv_lib_socket___dn_expand" >&6; }
+if test "x$ac_cv_lib_socket___dn_expand" = xyes
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 
@@ -75900,18 +78878,20 @@
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lsocket"
-    if test "$cross_compiling" = yes; then :
+    if test "$cross_compiling" = yes
+then :
 
             found=yes
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int main(void) { return (0); }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -75933,10 +78913,10 @@
 
 
 
-$as_echo "#define HAVE_DN_EXPAND 1" >>confdefs.h
+printf "%s\n" "#define HAVE_DN_EXPAND 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_LIBSOCKET 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBSOCKET 1" >>confdefs.h
 
     ac_cv_func_dn_expand=yes
   else
@@ -75961,13 +78941,15 @@
   unset found
 
   ac_fn_c_check_func "$LINENO" "dn_skipname" "ac_cv_func_dn_skipname"
-if test "x$ac_cv_func_dn_skipname" = xyes; then :
+if test "x$ac_cv_func_dn_skipname" = xyes
+then :
   found=yes
-else
+else $as_nop
    ac_fn_c_check_func "$LINENO" "__dn_skipname" "ac_cv_func___dn_skipname"
-if test "x$ac_cv_func___dn_skipname" = xyes; then :
+if test "x$ac_cv_func___dn_skipname" = xyes
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 
@@ -75977,7 +78959,7 @@
   case $found in
   yes)
 
-$as_echo "#define HAVE_DN_SKIPNAME 1" >>confdefs.h
+printf "%s\n" "#define HAVE_DN_SKIPNAME 1" >>confdefs.h
 
     ac_cv_func_dn_skipname=yes
   ;;
@@ -75987,11 +78969,12 @@
   unset ac_cv_lib_resolv_dn_skipname
   unset ac_cv_lib_resolv___dn_skipname
   unset found
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dn_skipname in -lresolv" >&5
-$as_echo_n "checking for dn_skipname in -lresolv... " >&6; }
-if ${ac_cv_lib_resolv_dn_skipname+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dn_skipname in -lresolv" >&5
+printf %s "checking for dn_skipname in -lresolv... " >&6; }
+if test ${ac_cv_lib_resolv_dn_skipname+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -76000,38 +78983,38 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char dn_skipname ();
 int
-main ()
+main (void)
 {
 return dn_skipname ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_resolv_dn_skipname=yes
-else
+else $as_nop
   ac_cv_lib_resolv_dn_skipname=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_dn_skipname" >&5
-$as_echo "$ac_cv_lib_resolv_dn_skipname" >&6; }
-if test "x$ac_cv_lib_resolv_dn_skipname" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_dn_skipname" >&5
+printf "%s\n" "$ac_cv_lib_resolv_dn_skipname" >&6; }
+if test "x$ac_cv_lib_resolv_dn_skipname" = xyes
+then :
   found=yes
-else
+else $as_nop
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __dn_skipname in -lresolv" >&5
-$as_echo_n "checking for __dn_skipname in -lresolv... " >&6; }
-if ${ac_cv_lib_resolv___dn_skipname+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __dn_skipname in -lresolv" >&5
+printf %s "checking for __dn_skipname in -lresolv... " >&6; }
+if test ${ac_cv_lib_resolv___dn_skipname+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -76040,32 +79023,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char __dn_skipname ();
 int
-main ()
+main (void)
 {
 return __dn_skipname ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_resolv___dn_skipname=yes
-else
+else $as_nop
   ac_cv_lib_resolv___dn_skipname=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___dn_skipname" >&5
-$as_echo "$ac_cv_lib_resolv___dn_skipname" >&6; }
-if test "x$ac_cv_lib_resolv___dn_skipname" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___dn_skipname" >&5
+printf "%s\n" "$ac_cv_lib_resolv___dn_skipname" >&6; }
+if test "x$ac_cv_lib_resolv___dn_skipname" = xyes
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 
@@ -76076,18 +79058,20 @@
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lresolv"
-    if test "$cross_compiling" = yes; then :
+    if test "$cross_compiling" = yes
+then :
 
             found=yes
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int main(void) { return (0); }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -76109,10 +79093,10 @@
 
 
 
-$as_echo "#define HAVE_DN_SKIPNAME 1" >>confdefs.h
+printf "%s\n" "#define HAVE_DN_SKIPNAME 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_LIBRESOLV 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBRESOLV 1" >>confdefs.h
 
     ac_cv_func_dn_skipname=yes
   else
@@ -76121,11 +79105,12 @@
   unset ac_cv_lib_bind_dn_skipname
   unset ac_cv_lib_bind___dn_skipname
   unset found
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dn_skipname in -lbind" >&5
-$as_echo_n "checking for dn_skipname in -lbind... " >&6; }
-if ${ac_cv_lib_bind_dn_skipname+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dn_skipname in -lbind" >&5
+printf %s "checking for dn_skipname in -lbind... " >&6; }
+if test ${ac_cv_lib_bind_dn_skipname+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbind  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -76134,38 +79119,38 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char dn_skipname ();
 int
-main ()
+main (void)
 {
 return dn_skipname ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_bind_dn_skipname=yes
-else
+else $as_nop
   ac_cv_lib_bind_dn_skipname=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind_dn_skipname" >&5
-$as_echo "$ac_cv_lib_bind_dn_skipname" >&6; }
-if test "x$ac_cv_lib_bind_dn_skipname" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind_dn_skipname" >&5
+printf "%s\n" "$ac_cv_lib_bind_dn_skipname" >&6; }
+if test "x$ac_cv_lib_bind_dn_skipname" = xyes
+then :
   found=yes
-else
+else $as_nop
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __dn_skipname in -lbind" >&5
-$as_echo_n "checking for __dn_skipname in -lbind... " >&6; }
-if ${ac_cv_lib_bind___dn_skipname+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __dn_skipname in -lbind" >&5
+printf %s "checking for __dn_skipname in -lbind... " >&6; }
+if test ${ac_cv_lib_bind___dn_skipname+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbind  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -76174,32 +79159,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char __dn_skipname ();
 int
-main ()
+main (void)
 {
 return __dn_skipname ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_bind___dn_skipname=yes
-else
+else $as_nop
   ac_cv_lib_bind___dn_skipname=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind___dn_skipname" >&5
-$as_echo "$ac_cv_lib_bind___dn_skipname" >&6; }
-if test "x$ac_cv_lib_bind___dn_skipname" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind___dn_skipname" >&5
+printf "%s\n" "$ac_cv_lib_bind___dn_skipname" >&6; }
+if test "x$ac_cv_lib_bind___dn_skipname" = xyes
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 
@@ -76210,18 +79194,20 @@
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lbind"
-    if test "$cross_compiling" = yes; then :
+    if test "$cross_compiling" = yes
+then :
 
             found=yes
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int main(void) { return (0); }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -76243,10 +79229,10 @@
 
 
 
-$as_echo "#define HAVE_DN_SKIPNAME 1" >>confdefs.h
+printf "%s\n" "#define HAVE_DN_SKIPNAME 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_LIBBIND 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBBIND 1" >>confdefs.h
 
     ac_cv_func_dn_skipname=yes
   else
@@ -76255,11 +79241,12 @@
   unset ac_cv_lib_socket_dn_skipname
   unset ac_cv_lib_socket___dn_skipname
   unset found
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dn_skipname in -lsocket" >&5
-$as_echo_n "checking for dn_skipname in -lsocket... " >&6; }
-if ${ac_cv_lib_socket_dn_skipname+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dn_skipname in -lsocket" >&5
+printf %s "checking for dn_skipname in -lsocket... " >&6; }
+if test ${ac_cv_lib_socket_dn_skipname+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -76268,38 +79255,38 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char dn_skipname ();
 int
-main ()
+main (void)
 {
 return dn_skipname ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_socket_dn_skipname=yes
-else
+else $as_nop
   ac_cv_lib_socket_dn_skipname=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_dn_skipname" >&5
-$as_echo "$ac_cv_lib_socket_dn_skipname" >&6; }
-if test "x$ac_cv_lib_socket_dn_skipname" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_dn_skipname" >&5
+printf "%s\n" "$ac_cv_lib_socket_dn_skipname" >&6; }
+if test "x$ac_cv_lib_socket_dn_skipname" = xyes
+then :
   found=yes
-else
+else $as_nop
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __dn_skipname in -lsocket" >&5
-$as_echo_n "checking for __dn_skipname in -lsocket... " >&6; }
-if ${ac_cv_lib_socket___dn_skipname+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __dn_skipname in -lsocket" >&5
+printf %s "checking for __dn_skipname in -lsocket... " >&6; }
+if test ${ac_cv_lib_socket___dn_skipname+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -76308,32 +79295,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char __dn_skipname ();
 int
-main ()
+main (void)
 {
 return __dn_skipname ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_socket___dn_skipname=yes
-else
+else $as_nop
   ac_cv_lib_socket___dn_skipname=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___dn_skipname" >&5
-$as_echo "$ac_cv_lib_socket___dn_skipname" >&6; }
-if test "x$ac_cv_lib_socket___dn_skipname" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___dn_skipname" >&5
+printf "%s\n" "$ac_cv_lib_socket___dn_skipname" >&6; }
+if test "x$ac_cv_lib_socket___dn_skipname" = xyes
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 
@@ -76344,18 +79330,20 @@
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lsocket"
-    if test "$cross_compiling" = yes; then :
+    if test "$cross_compiling" = yes
+then :
 
             found=yes
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int main(void) { return (0); }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -76377,10 +79365,10 @@
 
 
 
-$as_echo "#define HAVE_DN_SKIPNAME 1" >>confdefs.h
+printf "%s\n" "#define HAVE_DN_SKIPNAME 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_LIBSOCKET 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBSOCKET 1" >>confdefs.h
 
     ac_cv_func_dn_skipname=yes
   else
@@ -76407,13 +79395,15 @@
   unset found
 
   ac_fn_c_check_func "$LINENO" "res_search" "ac_cv_func_res_search"
-if test "x$ac_cv_func_res_search" = xyes; then :
+if test "x$ac_cv_func_res_search" = xyes
+then :
   found=yes
-else
+else $as_nop
    ac_fn_c_check_func "$LINENO" "__res_search" "ac_cv_func___res_search"
-if test "x$ac_cv_func___res_search" = xyes; then :
+if test "x$ac_cv_func___res_search" = xyes
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 
@@ -76423,7 +79413,7 @@
   case $found in
   yes)
 
-$as_echo "#define HAVE_RES_SEARCH 1" >>confdefs.h
+printf "%s\n" "#define HAVE_RES_SEARCH 1" >>confdefs.h
 
     ac_cv_func_res_search=yes
   ;;
@@ -76433,11 +79423,12 @@
   unset ac_cv_lib_resolv_res_search
   unset ac_cv_lib_resolv___res_search
   unset found
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_search in -lresolv" >&5
-$as_echo_n "checking for res_search in -lresolv... " >&6; }
-if ${ac_cv_lib_resolv_res_search+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for res_search in -lresolv" >&5
+printf %s "checking for res_search in -lresolv... " >&6; }
+if test ${ac_cv_lib_resolv_res_search+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -76446,38 +79437,38 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char res_search ();
 int
-main ()
+main (void)
 {
 return res_search ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_resolv_res_search=yes
-else
+else $as_nop
   ac_cv_lib_resolv_res_search=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_res_search" >&5
-$as_echo "$ac_cv_lib_resolv_res_search" >&6; }
-if test "x$ac_cv_lib_resolv_res_search" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_res_search" >&5
+printf "%s\n" "$ac_cv_lib_resolv_res_search" >&6; }
+if test "x$ac_cv_lib_resolv_res_search" = xyes
+then :
   found=yes
-else
+else $as_nop
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __res_search in -lresolv" >&5
-$as_echo_n "checking for __res_search in -lresolv... " >&6; }
-if ${ac_cv_lib_resolv___res_search+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __res_search in -lresolv" >&5
+printf %s "checking for __res_search in -lresolv... " >&6; }
+if test ${ac_cv_lib_resolv___res_search+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -76486,32 +79477,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char __res_search ();
 int
-main ()
+main (void)
 {
 return __res_search ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_resolv___res_search=yes
-else
+else $as_nop
   ac_cv_lib_resolv___res_search=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___res_search" >&5
-$as_echo "$ac_cv_lib_resolv___res_search" >&6; }
-if test "x$ac_cv_lib_resolv___res_search" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___res_search" >&5
+printf "%s\n" "$ac_cv_lib_resolv___res_search" >&6; }
+if test "x$ac_cv_lib_resolv___res_search" = xyes
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 
@@ -76522,18 +79512,20 @@
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lresolv"
-    if test "$cross_compiling" = yes; then :
+    if test "$cross_compiling" = yes
+then :
 
             found=yes
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int main(void) { return (0); }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -76555,10 +79547,10 @@
 
 
 
-$as_echo "#define HAVE_RES_SEARCH 1" >>confdefs.h
+printf "%s\n" "#define HAVE_RES_SEARCH 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_LIBRESOLV 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBRESOLV 1" >>confdefs.h
 
     ac_cv_func_res_search=yes
   else
@@ -76567,11 +79559,12 @@
   unset ac_cv_lib_bind_res_search
   unset ac_cv_lib_bind___res_search
   unset found
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_search in -lbind" >&5
-$as_echo_n "checking for res_search in -lbind... " >&6; }
-if ${ac_cv_lib_bind_res_search+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for res_search in -lbind" >&5
+printf %s "checking for res_search in -lbind... " >&6; }
+if test ${ac_cv_lib_bind_res_search+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbind  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -76580,38 +79573,38 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char res_search ();
 int
-main ()
+main (void)
 {
 return res_search ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_bind_res_search=yes
-else
+else $as_nop
   ac_cv_lib_bind_res_search=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind_res_search" >&5
-$as_echo "$ac_cv_lib_bind_res_search" >&6; }
-if test "x$ac_cv_lib_bind_res_search" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind_res_search" >&5
+printf "%s\n" "$ac_cv_lib_bind_res_search" >&6; }
+if test "x$ac_cv_lib_bind_res_search" = xyes
+then :
   found=yes
-else
+else $as_nop
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __res_search in -lbind" >&5
-$as_echo_n "checking for __res_search in -lbind... " >&6; }
-if ${ac_cv_lib_bind___res_search+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __res_search in -lbind" >&5
+printf %s "checking for __res_search in -lbind... " >&6; }
+if test ${ac_cv_lib_bind___res_search+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbind  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -76620,32 +79613,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char __res_search ();
 int
-main ()
+main (void)
 {
 return __res_search ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_bind___res_search=yes
-else
+else $as_nop
   ac_cv_lib_bind___res_search=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind___res_search" >&5
-$as_echo "$ac_cv_lib_bind___res_search" >&6; }
-if test "x$ac_cv_lib_bind___res_search" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind___res_search" >&5
+printf "%s\n" "$ac_cv_lib_bind___res_search" >&6; }
+if test "x$ac_cv_lib_bind___res_search" = xyes
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 
@@ -76656,18 +79648,20 @@
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lbind"
-    if test "$cross_compiling" = yes; then :
+    if test "$cross_compiling" = yes
+then :
 
             found=yes
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int main(void) { return (0); }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -76689,10 +79683,10 @@
 
 
 
-$as_echo "#define HAVE_RES_SEARCH 1" >>confdefs.h
+printf "%s\n" "#define HAVE_RES_SEARCH 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_LIBBIND 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBBIND 1" >>confdefs.h
 
     ac_cv_func_res_search=yes
   else
@@ -76701,11 +79695,12 @@
   unset ac_cv_lib_socket_res_search
   unset ac_cv_lib_socket___res_search
   unset found
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_search in -lsocket" >&5
-$as_echo_n "checking for res_search in -lsocket... " >&6; }
-if ${ac_cv_lib_socket_res_search+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for res_search in -lsocket" >&5
+printf %s "checking for res_search in -lsocket... " >&6; }
+if test ${ac_cv_lib_socket_res_search+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -76714,38 +79709,38 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char res_search ();
 int
-main ()
+main (void)
 {
 return res_search ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_socket_res_search=yes
-else
+else $as_nop
   ac_cv_lib_socket_res_search=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_res_search" >&5
-$as_echo "$ac_cv_lib_socket_res_search" >&6; }
-if test "x$ac_cv_lib_socket_res_search" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_res_search" >&5
+printf "%s\n" "$ac_cv_lib_socket_res_search" >&6; }
+if test "x$ac_cv_lib_socket_res_search" = xyes
+then :
   found=yes
-else
+else $as_nop
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __res_search in -lsocket" >&5
-$as_echo_n "checking for __res_search in -lsocket... " >&6; }
-if ${ac_cv_lib_socket___res_search+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __res_search in -lsocket" >&5
+printf %s "checking for __res_search in -lsocket... " >&6; }
+if test ${ac_cv_lib_socket___res_search+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -76754,32 +79749,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char __res_search ();
 int
-main ()
+main (void)
 {
 return __res_search ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_socket___res_search=yes
-else
+else $as_nop
   ac_cv_lib_socket___res_search=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___res_search" >&5
-$as_echo "$ac_cv_lib_socket___res_search" >&6; }
-if test "x$ac_cv_lib_socket___res_search" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___res_search" >&5
+printf "%s\n" "$ac_cv_lib_socket___res_search" >&6; }
+if test "x$ac_cv_lib_socket___res_search" = xyes
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 
@@ -76790,18 +79784,20 @@
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lsocket"
-    if test "$cross_compiling" = yes; then :
+    if test "$cross_compiling" = yes
+then :
 
             found=yes
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int main(void) { return (0); }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -76823,10 +79819,10 @@
 
 
 
-$as_echo "#define HAVE_RES_SEARCH 1" >>confdefs.h
+printf "%s\n" "#define HAVE_RES_SEARCH 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_LIBSOCKET 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBSOCKET 1" >>confdefs.h
 
     ac_cv_func_res_search=yes
   else
@@ -76852,13 +79848,15 @@
   unset found
 
   ac_fn_c_check_func "$LINENO" "posix_spawn_file_actions_addchdir_np" "ac_cv_func_posix_spawn_file_actions_addchdir_np"
-if test "x$ac_cv_func_posix_spawn_file_actions_addchdir_np" = xyes; then :
+if test "x$ac_cv_func_posix_spawn_file_actions_addchdir_np" = xyes
+then :
   found=yes
-else
+else $as_nop
    ac_fn_c_check_func "$LINENO" "__posix_spawn_file_actions_addchdir_np" "ac_cv_func___posix_spawn_file_actions_addchdir_np"
-if test "x$ac_cv_func___posix_spawn_file_actions_addchdir_np" = xyes; then :
+if test "x$ac_cv_func___posix_spawn_file_actions_addchdir_np" = xyes
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 
@@ -76868,7 +79866,7 @@
   case $found in
   yes)
 
-$as_echo "#define HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR_NP 1" >>confdefs.h
+printf "%s\n" "#define HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR_NP 1" >>confdefs.h
 
     ac_cv_func_posix_spawn_file_actions_addchdir_np=yes
   ;;
@@ -76876,11 +79874,12 @@
   esac
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether strptime() declaration fails" >&5
-$as_echo_n "checking whether strptime() declaration fails... " >&6; }
-if ${ac_cv_strptime_decl_fails+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether strptime() declaration fails" >&5
+printf %s "checking whether strptime() declaration fails... " >&6; }
+if test ${ac_cv_strptime_decl_fails+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -76888,7 +79887,7 @@
 #include <time.h>
 
 int
-main ()
+main (void)
 {
 
 #ifndef HAVE_STRPTIME
@@ -76902,35 +79901,37 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
   ac_cv_strptime_decl_fails=no
 
-else
+else $as_nop
 
   ac_cv_strptime_decl_fails=yes
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_strptime_decl_fails" >&5
-$as_echo "$ac_cv_strptime_decl_fails" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_strptime_decl_fails" >&5
+printf "%s\n" "$ac_cv_strptime_decl_fails" >&6; }
 if test "$ac_cv_strptime_decl_fails" = "yes"; then
 
-$as_echo "#define HAVE_STRPTIME_DECL_FAILS 1" >>confdefs.h
+printf "%s\n" "#define HAVE_STRPTIME_DECL_FAILS 1" >>confdefs.h
 
 fi
 
 
 php_with_password_argon2=no
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Argon2 support" >&5
-$as_echo_n "checking for Argon2 support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Argon2 support" >&5
+printf %s "checking for Argon2 support... " >&6; }
 
 # Check whether --with-password-argon2 was given.
-if test "${with_password_argon2+set}" = set; then :
+if test ${with_password_argon2+y}
+then :
   withval=$with_password_argon2; PHP_PASSWORD_ARGON2=$withval
-else
+else $as_nop
 
   PHP_PASSWORD_ARGON2=no
   test "$PHP_ENABLE_ALL" && PHP_PASSWORD_ARGON2=$PHP_ENABLE_ALL
@@ -76960,8 +79961,8 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -76969,17 +79970,17 @@
 if test "$PHP_PASSWORD_ARGON2" != "no"; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libargon2" >&5
-$as_echo_n "checking for libargon2... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libargon2" >&5
+printf %s "checking for libargon2... " >&6; }
 
 if test -n "$ARGON2_CFLAGS"; then
     pkg_cv_ARGON2_CFLAGS="$ARGON2_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libargon2\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libargon2\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libargon2") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_ARGON2_CFLAGS=`$PKG_CONFIG --cflags "libargon2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -76993,10 +79994,10 @@
     pkg_cv_ARGON2_LIBS="$ARGON2_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libargon2\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libargon2\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libargon2") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_ARGON2_LIBS=`$PKG_CONFIG --libs "libargon2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -77010,8 +80011,8 @@
 
 
 if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -77037,10 +80038,10 @@
 and ARGON2_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -77054,8 +80055,8 @@
 else
 	ARGON2_CFLAGS=$pkg_cv_ARGON2_CFLAGS
 	ARGON2_LIBS=$pkg_cv_ARGON2_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
 fi
 
@@ -77181,30 +80182,25 @@
 
 
 
-$as_echo "#define HAVE_ARGON2LIB 1" >>confdefs.h
+printf "%s\n" "#define HAVE_ARGON2LIB 1" >>confdefs.h
 
 fi
 
-for ac_header in net/if.h
-do :
-  ac_fn_c_check_header_compile "$LINENO" "net/if.h" "ac_cv_header_net_if_h" "
+ac_fn_c_check_header_compile "$LINENO" "net/if.h" "ac_cv_header_net_if_h" "
   #ifdef HAVE_SYS_SOCKET_H
   #include <sys/socket.h>
   #endif
   #include <net/if.h>
 
 "
-if test "x$ac_cv_header_net_if_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_NET_IF_H 1
-_ACEOF
+if test "x$ac_cv_header_net_if_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_NET_IF_H 1" >>confdefs.h
 
 fi
 
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for usable getifaddrs" >&5
-$as_echo_n "checking for usable getifaddrs... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for usable getifaddrs" >&5
+printf %s "checking for usable getifaddrs... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -77212,7 +80208,7 @@
   #include <ifaddrs.h>
 
 int
-main ()
+main (void)
 {
 
   struct ifaddrs *interfaces;
@@ -77224,22 +80220,23 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_have_getifaddrs=yes
-else
+else $as_nop
   ac_have_getifaddrs=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 if test "$ac_have_getifaddrs" = "yes" ; then
 
-$as_echo "#define HAVE_GETIFADDRS 1" >>confdefs.h
+printf "%s\n" "#define HAVE_GETIFADDRS 1" >>confdefs.h
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -77398,9 +80395,7 @@
 EOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define COMPILE_DL_STANDARD 1
-_ACEOF
+printf "%s\n" "#define COMPILE_DL_STANDARD 1" >>confdefs.h
 
     fi
   fi
@@ -77581,12 +80576,13 @@
 
 php_enable_sysvmsg=no
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable System V IPC support" >&5
-$as_echo_n "checking whether to enable System V IPC support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable System V IPC support" >&5
+printf %s "checking whether to enable System V IPC support... " >&6; }
 # Check whether --enable-sysvmsg was given.
-if test "${enable_sysvmsg+set}" = set; then :
+if test ${enable_sysvmsg+y}
+then :
   enableval=$enable_sysvmsg; PHP_SYSVMSG=$enableval
-else
+else $as_nop
 
   PHP_SYSVMSG=no
   test "$PHP_ENABLE_ALL" && PHP_SYSVMSG=$PHP_ENABLE_ALL
@@ -77616,25 +80612,25 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
 
 if test "$PHP_SYSVMSG" != "no"; then
-  ac_fn_c_check_header_mongrel "$LINENO" "sys/msg.h" "ac_cv_header_sys_msg_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_msg_h" = xyes; then :
+  ac_fn_c_check_header_compile "$LINENO" "sys/msg.h" "ac_cv_header_sys_msg_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_msg_h" = xyes
+then :
 
-else
+else $as_nop
   as_fn_error $? "Cannot enable System V IPC support, sys/msg.h is missing" "$LINENO" 5
 
 fi
 
 
 
-
-$as_echo "#define HAVE_SYSVMSG 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SYSVMSG 1" >>confdefs.h
 
 
   ext_builddir=ext/sysvmsg
@@ -77770,9 +80766,7 @@
 EOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define COMPILE_DL_SYSVMSG 1
-_ACEOF
+printf "%s\n" "#define COMPILE_DL_SYSVMSG 1" >>confdefs.h
 
     fi
   fi
@@ -77901,12 +80895,13 @@
 
 php_enable_sysvsem=no
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable System V semaphore support" >&5
-$as_echo_n "checking whether to enable System V semaphore support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable System V semaphore support" >&5
+printf %s "checking whether to enable System V semaphore support... " >&6; }
 # Check whether --enable-sysvsem was given.
-if test "${enable_sysvsem+set}" = set; then :
+if test ${enable_sysvsem+y}
+then :
   enableval=$enable_sysvsem; PHP_SYSVSEM=$enableval
-else
+else $as_nop
 
   PHP_SYSVSEM=no
   test "$PHP_ENABLE_ALL" && PHP_SYSVSEM=$PHP_ENABLE_ALL
@@ -77936,8 +80931,8 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -78077,9 +81072,7 @@
 EOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define COMPILE_DL_SYSVSEM 1
-_ACEOF
+printf "%s\n" "#define COMPILE_DL_SYSVSEM 1" >>confdefs.h
 
     fi
   fi
@@ -78201,13 +81194,14 @@
   fi
 
 
-$as_echo "#define HAVE_SYSVSEM 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SYSVSEM 1" >>confdefs.h
 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for union semun" >&5
-$as_echo_n "checking for union semun... " >&6; }
-if ${php_cv_semun+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for union semun" >&5
+printf %s "checking for union semun... " >&6; }
+if test ${php_cv_semun+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -78216,34 +81210,35 @@
 #include <sys/sem.h>
 
 int
-main ()
+main (void)
 {
 union semun x;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
      php_cv_semun=yes
 
-else
+else $as_nop
 
      php_cv_semun=no
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_cv_semun" >&5
-$as_echo "$php_cv_semun" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_semun" >&5
+printf "%s\n" "$php_cv_semun" >&6; }
  if test "$php_cv_semun" = "yes"; then
 
-$as_echo "#define HAVE_SEMUN 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SEMUN 1" >>confdefs.h
 
  else
 
-$as_echo "#define HAVE_SEMUN 0" >>confdefs.h
+printf "%s\n" "#define HAVE_SEMUN 0" >>confdefs.h
 
  fi
 fi
@@ -78254,12 +81249,13 @@
 
 php_enable_sysvshm=no
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable System V shared memory support" >&5
-$as_echo_n "checking whether to enable System V shared memory support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable System V shared memory support" >&5
+printf %s "checking whether to enable System V shared memory support... " >&6; }
 # Check whether --enable-sysvshm was given.
-if test "${enable_sysvshm+set}" = set; then :
+if test ${enable_sysvshm+y}
+then :
   enableval=$enable_sysvshm; PHP_SYSVSHM=$enableval
-else
+else $as_nop
 
   PHP_SYSVSHM=no
   test "$PHP_ENABLE_ALL" && PHP_SYSVSHM=$PHP_ENABLE_ALL
@@ -78289,15 +81285,15 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
 
 if test "$PHP_SYSVSHM" != "no"; then
 
-$as_echo "#define HAVE_SYSVSHM 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SYSVSHM 1" >>confdefs.h
 
 
   ext_builddir=ext/sysvshm
@@ -78433,9 +81429,7 @@
 EOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define COMPILE_DL_SYSVSHM 1
-_ACEOF
+printf "%s\n" "#define COMPILE_DL_SYSVSHM 1" >>confdefs.h
 
     fi
   fi
@@ -78564,13 +81558,14 @@
 
 php_with_tidy=no
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIDY support" >&5
-$as_echo_n "checking for TIDY support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for TIDY support" >&5
+printf %s "checking for TIDY support... " >&6; }
 
 # Check whether --with-tidy was given.
-if test "${with_tidy+set}" = set; then :
+if test ${with_tidy+y}
+then :
   withval=$with_tidy; PHP_TIDY=$withval
-else
+else $as_nop
 
   PHP_TIDY=no
   test "$PHP_ENABLE_ALL" && PHP_TIDY=$PHP_ENABLE_ALL
@@ -78600,8 +81595,8 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -78635,7 +81630,7 @@
   else
                 if test -f "$TIDY_INCDIR/tidybuffio.h"; then
 
-$as_echo "#define HAVE_TIDYBUFFIO_H 1" >>confdefs.h
+printf "%s\n" "#define HAVE_TIDYBUFFIO_H 1" >>confdefs.h
 
     fi
   fi
@@ -78643,11 +81638,11 @@
   TIDY_LIBDIR=$TIDY_DIR/$PHP_LIBDIR
   if test "$TIDY_LIB_NAME" == 'tidyp'; then
 
-$as_echo "#define HAVE_TIDYP_H 1" >>confdefs.h
+printf "%s\n" "#define HAVE_TIDYP_H 1" >>confdefs.h
 
   else
 
-$as_echo "#define HAVE_TIDY_H 1" >>confdefs.h
+printf "%s\n" "#define HAVE_TIDY_H 1" >>confdefs.h
 
   fi
 
@@ -78757,12 +81752,13 @@
     esac
   done
 
-  as_ac_Lib=`$as_echo "ac_cv_lib_$TIDY_LIB_NAME''_tidyOptGetDoc" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tidyOptGetDoc in -l$TIDY_LIB_NAME" >&5
-$as_echo_n "checking for tidyOptGetDoc in -l$TIDY_LIB_NAME... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  as_ac_Lib=`printf "%s\n" "ac_cv_lib_$TIDY_LIB_NAME""_tidyOptGetDoc" | $as_tr_sh`
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tidyOptGetDoc in -l$TIDY_LIB_NAME" >&5
+printf %s "checking for tidyOptGetDoc in -l$TIDY_LIB_NAME... " >&6; }
+if eval test \${$as_ac_Lib+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$TIDY_LIB_NAME  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -78771,41 +81767,40 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char tidyOptGetDoc ();
 int
-main ()
+main (void)
 {
 return tidyOptGetDoc ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   eval "$as_ac_Lib=yes"
-else
+else $as_nop
   eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"
+then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-$as_echo "#define HAVE_TIDYOPTGETDOC 1" >>confdefs.h
+printf "%s\n" "#define HAVE_TIDYOPTGETDOC 1" >>confdefs.h
 
 
 
-else
+else $as_nop
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -78916,11 +81911,12 @@
     esac
   done
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tidyOptGetDoc in -ltidy5" >&5
-$as_echo_n "checking for tidyOptGetDoc in -ltidy5... " >&6; }
-if ${ac_cv_lib_tidy5_tidyOptGetDoc+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tidyOptGetDoc in -ltidy5" >&5
+printf %s "checking for tidyOptGetDoc in -ltidy5... " >&6; }
+if test ${ac_cv_lib_tidy5_tidyOptGetDoc+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltidy5  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -78929,41 +81925,40 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char tidyOptGetDoc ();
 int
-main ()
+main (void)
 {
 return tidyOptGetDoc ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_tidy5_tidyOptGetDoc=yes
-else
+else $as_nop
   ac_cv_lib_tidy5_tidyOptGetDoc=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tidy5_tidyOptGetDoc" >&5
-$as_echo "$ac_cv_lib_tidy5_tidyOptGetDoc" >&6; }
-if test "x$ac_cv_lib_tidy5_tidyOptGetDoc" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tidy5_tidyOptGetDoc" >&5
+printf "%s\n" "$ac_cv_lib_tidy5_tidyOptGetDoc" >&6; }
+if test "x$ac_cv_lib_tidy5_tidyOptGetDoc" = xyes
+then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
       TIDY_LIB_NAME=tidy5
 
-$as_echo "#define HAVE_TIDYOPTGETDOC 1" >>confdefs.h
+printf "%s\n" "#define HAVE_TIDYOPTGETDOC 1" >>confdefs.h
 
 
 
-else
+else $as_nop
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -79082,12 +82077,13 @@
     esac
   done
 
-  as_ac_Lib=`$as_echo "ac_cv_lib_$TIDY_LIB_NAME''_tidyReleaseDate" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tidyReleaseDate in -l$TIDY_LIB_NAME" >&5
-$as_echo_n "checking for tidyReleaseDate in -l$TIDY_LIB_NAME... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  as_ac_Lib=`printf "%s\n" "ac_cv_lib_$TIDY_LIB_NAME""_tidyReleaseDate" | $as_tr_sh`
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tidyReleaseDate in -l$TIDY_LIB_NAME" >&5
+printf %s "checking for tidyReleaseDate in -l$TIDY_LIB_NAME... " >&6; }
+if eval test \${$as_ac_Lib+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$TIDY_LIB_NAME  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -79096,41 +82092,40 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char tidyReleaseDate ();
 int
-main ()
+main (void)
 {
 return tidyReleaseDate ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   eval "$as_ac_Lib=yes"
-else
+else $as_nop
   eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"
+then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-$as_echo "#define HAVE_TIDYRELEASEDATE 1" >>confdefs.h
+printf "%s\n" "#define HAVE_TIDYRELEASEDATE 1" >>confdefs.h
 
 
 
-else
+else $as_nop
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -79404,9 +82399,7 @@
 EOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define COMPILE_DL_TIDY 1
-_ACEOF
+printf "%s\n" "#define COMPILE_DL_TIDY 1" >>confdefs.h
 
     fi
   fi
@@ -79531,7 +82524,7 @@
   PHP_VAR_SUBST="$PHP_VAR_SUBST TIDY_SHARED_LIBADD"
 
 
-$as_echo "#define HAVE_TIDY 1" >>confdefs.h
+printf "%s\n" "#define HAVE_TIDY 1" >>confdefs.h
 
 fi
 
@@ -79541,12 +82534,13 @@
 
 php_enable_tokenizer=yes
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable tokenizer support" >&5
-$as_echo_n "checking whether to enable tokenizer support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable tokenizer support" >&5
+printf %s "checking whether to enable tokenizer support... " >&6; }
 # Check whether --enable-tokenizer was given.
-if test "${enable_tokenizer+set}" = set; then :
+if test ${enable_tokenizer+y}
+then :
   enableval=$enable_tokenizer; PHP_TOKENIZER=$enableval
-else
+else $as_nop
 
   PHP_TOKENIZER=yes
   test "$PHP_ENABLE_ALL" && PHP_TOKENIZER=$PHP_ENABLE_ALL
@@ -79576,8 +82570,8 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -79717,9 +82711,7 @@
 EOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define COMPILE_DL_TOKENIZER 1
-_ACEOF
+printf "%s\n" "#define COMPILE_DL_TOKENIZER 1" >>confdefs.h
 
     fi
   fi
@@ -79854,12 +82846,13 @@
 
 php_enable_xml=yes
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable XML support" >&5
-$as_echo_n "checking whether to enable XML support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable XML support" >&5
+printf %s "checking whether to enable XML support... " >&6; }
 # Check whether --enable-xml was given.
-if test "${enable_xml+set}" = set; then :
+if test ${enable_xml+y}
+then :
   enableval=$enable_xml; PHP_XML=$enableval
-else
+else $as_nop
 
   PHP_XML=yes
   test "$PHP_ENABLE_ALL" && PHP_XML=$PHP_ENABLE_ALL
@@ -79889,8 +82882,8 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -79898,13 +82891,14 @@
 
 php_with_expat=no
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build with expat support" >&5
-$as_echo_n "checking whether to build with expat support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build with expat support" >&5
+printf %s "checking whether to build with expat support... " >&6; }
 
 # Check whether --with-expat was given.
-if test "${with_expat+set}" = set; then :
+if test ${with_expat+y}
+then :
   withval=$with_expat; PHP_EXPAT=$withval
-else
+else $as_nop
 
   PHP_EXPAT=no
 
@@ -79913,8 +82907,8 @@
 
 
 ext_output=$PHP_EXPAT
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -79930,17 +82924,17 @@
 
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 >= 2.9.0" >&5
-$as_echo_n "checking for libxml-2.0 >= 2.9.0... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 >= 2.9.0" >&5
+printf %s "checking for libxml-2.0 >= 2.9.0... " >&6; }
 
 if test -n "$LIBXML_CFLAGS"; then
     pkg_cv_LIBXML_CFLAGS="$LIBXML_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.9.0") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBXML_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 >= 2.9.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -79954,10 +82948,10 @@
     pkg_cv_LIBXML_LIBS="$LIBXML_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.9.0") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBXML_LIBS=`$PKG_CONFIG --libs "libxml-2.0 >= 2.9.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -79971,8 +82965,8 @@
 
 
 if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -79998,10 +82992,10 @@
 and LIBXML_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -80015,8 +83009,8 @@
 else
 	LIBXML_CFLAGS=$pkg_cv_LIBXML_CFLAGS
 	LIBXML_LIBS=$pkg_cv_LIBXML_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
 fi
 
@@ -80161,7 +83155,7 @@
 
 
 
-$as_echo "#define HAVE_LIBXML 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBXML 1" >>confdefs.h
 
 
 
@@ -80191,17 +83185,17 @@
 
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for expat" >&5
-$as_echo_n "checking for expat... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for expat" >&5
+printf %s "checking for expat... " >&6; }
 
 if test -n "$EXPAT_CFLAGS"; then
     pkg_cv_EXPAT_CFLAGS="$EXPAT_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"expat\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"expat\""; } >&5
   ($PKG_CONFIG --exists --print-errors "expat") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_EXPAT_CFLAGS=`$PKG_CONFIG --cflags "expat" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -80215,10 +83209,10 @@
     pkg_cv_EXPAT_LIBS="$EXPAT_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"expat\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"expat\""; } >&5
   ($PKG_CONFIG --exists --print-errors "expat") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_EXPAT_LIBS=`$PKG_CONFIG --libs "expat" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -80232,8 +83226,8 @@
 
 
 if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -80259,10 +83253,10 @@
 and EXPAT_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -80276,8 +83270,8 @@
 else
 	EXPAT_CFLAGS=$pkg_cv_EXPAT_CFLAGS
 	EXPAT_LIBS=$pkg_cv_EXPAT_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
 fi
 
@@ -80422,7 +83416,7 @@
 
 
 
-$as_echo "#define HAVE_LIBEXPAT 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBEXPAT 1" >>confdefs.h
 
 
   fi
@@ -80561,9 +83555,7 @@
 EOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define COMPILE_DL_XML 1
-_ACEOF
+printf "%s\n" "#define COMPILE_DL_XML 1" >>confdefs.h
 
     fi
   fi
@@ -80706,7 +83698,7 @@
 
 
 
-$as_echo "#define HAVE_XML 1" >>confdefs.h
+printf "%s\n" "#define HAVE_XML 1" >>confdefs.h
 
 fi
 
@@ -80716,12 +83708,13 @@
 
 php_enable_xmlreader=yes
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable XMLReader support" >&5
-$as_echo_n "checking whether to enable XMLReader support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable XMLReader support" >&5
+printf %s "checking whether to enable XMLReader support... " >&6; }
 # Check whether --enable-xmlreader was given.
-if test "${enable_xmlreader+set}" = set; then :
+if test ${enable_xmlreader+y}
+then :
   enableval=$enable_xmlreader; PHP_XMLREADER=$enableval
-else
+else $as_nop
 
   PHP_XMLREADER=yes
   test "$PHP_ENABLE_ALL" && PHP_XMLREADER=$PHP_ENABLE_ALL
@@ -80751,8 +83744,8 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -80766,17 +83759,17 @@
 
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 >= 2.9.0" >&5
-$as_echo_n "checking for libxml-2.0 >= 2.9.0... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 >= 2.9.0" >&5
+printf %s "checking for libxml-2.0 >= 2.9.0... " >&6; }
 
 if test -n "$LIBXML_CFLAGS"; then
     pkg_cv_LIBXML_CFLAGS="$LIBXML_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.9.0") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBXML_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 >= 2.9.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -80790,10 +83783,10 @@
     pkg_cv_LIBXML_LIBS="$LIBXML_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.9.0") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBXML_LIBS=`$PKG_CONFIG --libs "libxml-2.0 >= 2.9.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -80807,8 +83800,8 @@
 
 
 if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -80834,10 +83827,10 @@
 and LIBXML_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -80851,8 +83844,8 @@
 else
 	LIBXML_CFLAGS=$pkg_cv_LIBXML_CFLAGS
 	LIBXML_LIBS=$pkg_cv_LIBXML_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
 fi
 
@@ -80997,12 +83990,12 @@
 
 
 
-$as_echo "#define HAVE_LIBXML 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBXML 1" >>confdefs.h
 
 
 
 
-$as_echo "#define HAVE_XMLREADER 1" >>confdefs.h
+printf "%s\n" "#define HAVE_XMLREADER 1" >>confdefs.h
 
 
   ext_builddir=ext/xmlreader
@@ -81138,9 +84131,7 @@
 EOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define COMPILE_DL_XMLREADER 1
-_ACEOF
+printf "%s\n" "#define COMPILE_DL_XMLREADER 1" >>confdefs.h
 
     fi
   fi
@@ -81293,12 +84284,13 @@
 
 php_enable_xmlwriter=yes
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable XMLWriter support" >&5
-$as_echo_n "checking whether to enable XMLWriter support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable XMLWriter support" >&5
+printf %s "checking whether to enable XMLWriter support... " >&6; }
 # Check whether --enable-xmlwriter was given.
-if test "${enable_xmlwriter+set}" = set; then :
+if test ${enable_xmlwriter+y}
+then :
   enableval=$enable_xmlwriter; PHP_XMLWRITER=$enableval
-else
+else $as_nop
 
   PHP_XMLWRITER=yes
   test "$PHP_ENABLE_ALL" && PHP_XMLWRITER=$PHP_ENABLE_ALL
@@ -81328,8 +84320,8 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -81343,17 +84335,17 @@
 
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 >= 2.9.0" >&5
-$as_echo_n "checking for libxml-2.0 >= 2.9.0... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 >= 2.9.0" >&5
+printf %s "checking for libxml-2.0 >= 2.9.0... " >&6; }
 
 if test -n "$LIBXML_CFLAGS"; then
     pkg_cv_LIBXML_CFLAGS="$LIBXML_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.9.0") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBXML_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 >= 2.9.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -81367,10 +84359,10 @@
     pkg_cv_LIBXML_LIBS="$LIBXML_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.9.0") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBXML_LIBS=`$PKG_CONFIG --libs "libxml-2.0 >= 2.9.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -81384,8 +84376,8 @@
 
 
 if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -81411,10 +84403,10 @@
 and LIBXML_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -81428,8 +84420,8 @@
 else
 	LIBXML_CFLAGS=$pkg_cv_LIBXML_CFLAGS
 	LIBXML_LIBS=$pkg_cv_LIBXML_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
 fi
 
@@ -81574,12 +84566,12 @@
 
 
 
-$as_echo "#define HAVE_LIBXML 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBXML 1" >>confdefs.h
 
 
 
 
-$as_echo "#define HAVE_XMLWRITER 1" >>confdefs.h
+printf "%s\n" "#define HAVE_XMLWRITER 1" >>confdefs.h
 
 
   ext_builddir=ext/xmlwriter
@@ -81715,9 +84707,7 @@
 EOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define COMPILE_DL_XMLWRITER 1
-_ACEOF
+printf "%s\n" "#define COMPILE_DL_XMLWRITER 1" >>confdefs.h
 
     fi
   fi
@@ -81851,13 +84841,14 @@
 
 php_with_xsl=no
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build with XSL support" >&5
-$as_echo_n "checking whether to build with XSL support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build with XSL support" >&5
+printf %s "checking whether to build with XSL support... " >&6; }
 
 # Check whether --with-xsl was given.
-if test "${with_xsl+set}" = set; then :
+if test ${with_xsl+y}
+then :
   withval=$with_xsl; PHP_XSL=$withval
-else
+else $as_nop
 
   PHP_XSL=no
   test "$PHP_ENABLE_ALL" && PHP_XSL=$PHP_ENABLE_ALL
@@ -81887,8 +84878,8 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -81905,17 +84896,17 @@
 
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxslt >= 1.1.0" >&5
-$as_echo_n "checking for libxslt >= 1.1.0... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libxslt >= 1.1.0" >&5
+printf %s "checking for libxslt >= 1.1.0... " >&6; }
 
 if test -n "$XSL_CFLAGS"; then
     pkg_cv_XSL_CFLAGS="$XSL_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxslt >= 1.1.0\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxslt >= 1.1.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libxslt >= 1.1.0") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_XSL_CFLAGS=`$PKG_CONFIG --cflags "libxslt >= 1.1.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -81929,10 +84920,10 @@
     pkg_cv_XSL_LIBS="$XSL_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxslt >= 1.1.0\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxslt >= 1.1.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libxslt >= 1.1.0") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_XSL_LIBS=`$PKG_CONFIG --libs "libxslt >= 1.1.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -81946,8 +84937,8 @@
 
 
 if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -81973,10 +84964,10 @@
 and XSL_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -81990,8 +84981,8 @@
 else
 	XSL_CFLAGS=$pkg_cv_XSL_CFLAGS
 	XSL_LIBS=$pkg_cv_XSL_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
 fi
 
@@ -82137,17 +85128,17 @@
 
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libexslt" >&5
-$as_echo_n "checking for libexslt... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libexslt" >&5
+printf %s "checking for libexslt... " >&6; }
 
 if test -n "$EXSLT_CFLAGS"; then
     pkg_cv_EXSLT_CFLAGS="$EXSLT_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libexslt\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libexslt\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libexslt") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_EXSLT_CFLAGS=`$PKG_CONFIG --cflags "libexslt" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -82161,10 +85152,10 @@
     pkg_cv_EXSLT_LIBS="$EXSLT_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libexslt\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libexslt\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libexslt") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_EXSLT_LIBS=`$PKG_CONFIG --libs "libexslt" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -82178,8 +85169,8 @@
 
 
 if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -82196,14 +85187,14 @@
 
 
 elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 else
 	EXSLT_CFLAGS=$pkg_cv_EXSLT_CFLAGS
 	EXSLT_LIBS=$pkg_cv_EXSLT_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
 
   for ac_i in $EXSLT_CFLAGS; do
@@ -82345,13 +85336,13 @@
   done
 
 
-$as_echo "#define HAVE_XSL_EXSLT 1" >>confdefs.h
+printf "%s\n" "#define HAVE_XSL_EXSLT 1" >>confdefs.h
 
 
 fi
 
 
-$as_echo "#define HAVE_XSL 1" >>confdefs.h
+printf "%s\n" "#define HAVE_XSL 1" >>confdefs.h
 
 
   ext_builddir=ext/xsl
@@ -82487,9 +85478,7 @@
 EOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define COMPILE_DL_XSL 1
-_ACEOF
+printf "%s\n" "#define COMPILE_DL_XSL 1" >>confdefs.h
 
     fi
   fi
@@ -82659,12 +85648,13 @@
 
 php_enable_zend_test=no
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable zend-test extension" >&5
-$as_echo_n "checking whether to enable zend-test extension... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable zend-test extension" >&5
+printf %s "checking whether to enable zend-test extension... " >&6; }
 # Check whether --enable-zend-test was given.
-if test "${enable_zend_test+set}" = set; then :
+if test ${enable_zend_test+y}
+then :
   enableval=$enable_zend_test; PHP_ZEND_TEST=$enableval
-else
+else $as_nop
 
   PHP_ZEND_TEST=no
   test "$PHP_ENABLE_ALL" && PHP_ZEND_TEST=$PHP_ENABLE_ALL
@@ -82694,8 +85684,8 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -82835,9 +85825,7 @@
 EOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define COMPILE_DL_ZEND_TEST 1
-_ACEOF
+printf "%s\n" "#define COMPILE_DL_ZEND_TEST 1" >>confdefs.h
 
     fi
   fi
@@ -82966,13 +85954,14 @@
 
 php_with_zip=no
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for zip archive read/write support" >&5
-$as_echo_n "checking for zip archive read/write support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for zip archive read/write support" >&5
+printf %s "checking for zip archive read/write support... " >&6; }
 
 # Check whether --with-zip was given.
-if test "${with_zip+set}" = set; then :
+if test ${with_zip+y}
+then :
   withval=$with_zip; PHP_ZIP=$withval
-else
+else $as_nop
 
   PHP_ZIP=no
   test "$PHP_ENABLE_ALL" && PHP_ZIP=$PHP_ENABLE_ALL
@@ -83002,8 +85991,8 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -83011,17 +86000,17 @@
 if test "$PHP_ZIP" != "no"; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libzip >= 0.11 libzip != 1.3.1 libzip != 1.7.0" >&5
-$as_echo_n "checking for libzip >= 0.11 libzip != 1.3.1 libzip != 1.7.0... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libzip >= 0.11 libzip != 1.3.1 libzip != 1.7.0" >&5
+printf %s "checking for libzip >= 0.11 libzip != 1.3.1 libzip != 1.7.0... " >&6; }
 
 if test -n "$LIBZIP_CFLAGS"; then
     pkg_cv_LIBZIP_CFLAGS="$LIBZIP_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libzip >= 0.11 libzip != 1.3.1 libzip != 1.7.0\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libzip >= 0.11 libzip != 1.3.1 libzip != 1.7.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libzip >= 0.11 libzip != 1.3.1 libzip != 1.7.0") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBZIP_CFLAGS=`$PKG_CONFIG --cflags "libzip >= 0.11 libzip != 1.3.1 libzip != 1.7.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -83035,10 +86024,10 @@
     pkg_cv_LIBZIP_LIBS="$LIBZIP_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libzip >= 0.11 libzip != 1.3.1 libzip != 1.7.0\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libzip >= 0.11 libzip != 1.3.1 libzip != 1.7.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libzip >= 0.11 libzip != 1.3.1 libzip != 1.7.0") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBZIP_LIBS=`$PKG_CONFIG --libs "libzip >= 0.11 libzip != 1.3.1 libzip != 1.7.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -83052,8 +86041,8 @@
 
 
 if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -83079,10 +86068,10 @@
 and LIBZIP_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -83096,8 +86085,8 @@
 else
 	LIBZIP_CFLAGS=$pkg_cv_LIBZIP_CFLAGS
 	LIBZIP_LIBS=$pkg_cv_LIBZIP_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
 fi
 
@@ -83348,11 +86337,12 @@
     esac
   done
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for zip_file_set_mtime in -lzip" >&5
-$as_echo_n "checking for zip_file_set_mtime in -lzip... " >&6; }
-if ${ac_cv_lib_zip_zip_file_set_mtime+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for zip_file_set_mtime in -lzip" >&5
+printf %s "checking for zip_file_set_mtime in -lzip... " >&6; }
+if test ${ac_cv_lib_zip_zip_file_set_mtime+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lzip  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -83361,47 +86351,46 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char zip_file_set_mtime ();
 int
-main ()
+main (void)
 {
 return zip_file_set_mtime ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_zip_zip_file_set_mtime=yes
-else
+else $as_nop
   ac_cv_lib_zip_zip_file_set_mtime=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_zip_zip_file_set_mtime" >&5
-$as_echo "$ac_cv_lib_zip_zip_file_set_mtime" >&6; }
-if test "x$ac_cv_lib_zip_zip_file_set_mtime" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_zip_zip_file_set_mtime" >&5
+printf "%s\n" "$ac_cv_lib_zip_zip_file_set_mtime" >&6; }
+if test "x$ac_cv_lib_zip_zip_file_set_mtime" = xyes
+then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-$as_echo "#define HAVE_SET_MTIME 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SET_MTIME 1" >>confdefs.h
 
 
 
-else
+else $as_nop
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_zip_zip_file_set_mtime
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libzip >= 1.0.0 needed for setting mtime" >&5
-$as_echo "$as_me: WARNING: Libzip >= 1.0.0 needed for setting mtime" >&2;}
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Libzip >= 1.0.0 needed for setting mtime" >&5
+printf "%s\n" "$as_me: WARNING: Libzip >= 1.0.0 needed for setting mtime" >&2;}
 
 
 fi
@@ -83514,11 +86503,12 @@
     esac
   done
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for zip_file_set_encryption in -lzip" >&5
-$as_echo_n "checking for zip_file_set_encryption in -lzip... " >&6; }
-if ${ac_cv_lib_zip_zip_file_set_encryption+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for zip_file_set_encryption in -lzip" >&5
+printf %s "checking for zip_file_set_encryption in -lzip... " >&6; }
+if test ${ac_cv_lib_zip_zip_file_set_encryption+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lzip  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -83527,47 +86517,46 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char zip_file_set_encryption ();
 int
-main ()
+main (void)
 {
 return zip_file_set_encryption ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_zip_zip_file_set_encryption=yes
-else
+else $as_nop
   ac_cv_lib_zip_zip_file_set_encryption=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_zip_zip_file_set_encryption" >&5
-$as_echo "$ac_cv_lib_zip_zip_file_set_encryption" >&6; }
-if test "x$ac_cv_lib_zip_zip_file_set_encryption" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_zip_zip_file_set_encryption" >&5
+printf "%s\n" "$ac_cv_lib_zip_zip_file_set_encryption" >&6; }
+if test "x$ac_cv_lib_zip_zip_file_set_encryption" = xyes
+then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-$as_echo "#define HAVE_ENCRYPTION 1" >>confdefs.h
+printf "%s\n" "#define HAVE_ENCRYPTION 1" >>confdefs.h
 
 
 
-else
+else $as_nop
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_zip_zip_file_set_encryption
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libzip >= 1.2.0 needed for encryption support" >&5
-$as_echo "$as_me: WARNING: Libzip >= 1.2.0 needed for encryption support" >&2;}
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Libzip >= 1.2.0 needed for encryption support" >&5
+printf "%s\n" "$as_me: WARNING: Libzip >= 1.2.0 needed for encryption support" >&2;}
 
 
 fi
@@ -83680,11 +86669,12 @@
     esac
   done
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for zip_libzip_version in -lzip" >&5
-$as_echo_n "checking for zip_libzip_version in -lzip... " >&6; }
-if ${ac_cv_lib_zip_zip_libzip_version+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for zip_libzip_version in -lzip" >&5
+printf %s "checking for zip_libzip_version in -lzip... " >&6; }
+if test ${ac_cv_lib_zip_zip_libzip_version+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lzip  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -83693,40 +86683,39 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char zip_libzip_version ();
 int
-main ()
+main (void)
 {
 return zip_libzip_version ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_zip_zip_libzip_version=yes
-else
+else $as_nop
   ac_cv_lib_zip_zip_libzip_version=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_zip_zip_libzip_version" >&5
-$as_echo "$ac_cv_lib_zip_zip_libzip_version" >&6; }
-if test "x$ac_cv_lib_zip_zip_libzip_version" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_zip_zip_libzip_version" >&5
+printf "%s\n" "$ac_cv_lib_zip_zip_libzip_version" >&6; }
+if test "x$ac_cv_lib_zip_zip_libzip_version" = xyes
+then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-$as_echo "#define HAVE_LIBZIP_VERSION 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBZIP_VERSION 1" >>confdefs.h
 
 
 
-else
+else $as_nop
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -83844,11 +86833,12 @@
     esac
   done
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for zip_register_progress_callback_with_state in -lzip" >&5
-$as_echo_n "checking for zip_register_progress_callback_with_state in -lzip... " >&6; }
-if ${ac_cv_lib_zip_zip_register_progress_callback_with_state+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for zip_register_progress_callback_with_state in -lzip" >&5
+printf %s "checking for zip_register_progress_callback_with_state in -lzip... " >&6; }
+if test ${ac_cv_lib_zip_zip_register_progress_callback_with_state+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lzip  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -83857,40 +86847,39 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char zip_register_progress_callback_with_state ();
 int
-main ()
+main (void)
 {
 return zip_register_progress_callback_with_state ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_zip_zip_register_progress_callback_with_state=yes
-else
+else $as_nop
   ac_cv_lib_zip_zip_register_progress_callback_with_state=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_zip_zip_register_progress_callback_with_state" >&5
-$as_echo "$ac_cv_lib_zip_zip_register_progress_callback_with_state" >&6; }
-if test "x$ac_cv_lib_zip_zip_register_progress_callback_with_state" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_zip_zip_register_progress_callback_with_state" >&5
+printf "%s\n" "$ac_cv_lib_zip_zip_register_progress_callback_with_state" >&6; }
+if test "x$ac_cv_lib_zip_zip_register_progress_callback_with_state" = xyes
+then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-$as_echo "#define HAVE_PROGRESS_CALLBACK 1" >>confdefs.h
+printf "%s\n" "#define HAVE_PROGRESS_CALLBACK 1" >>confdefs.h
 
 
 
-else
+else $as_nop
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -84008,11 +86997,12 @@
     esac
   done
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for zip_register_cancel_callback_with_state in -lzip" >&5
-$as_echo_n "checking for zip_register_cancel_callback_with_state in -lzip... " >&6; }
-if ${ac_cv_lib_zip_zip_register_cancel_callback_with_state+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for zip_register_cancel_callback_with_state in -lzip" >&5
+printf %s "checking for zip_register_cancel_callback_with_state in -lzip... " >&6; }
+if test ${ac_cv_lib_zip_zip_register_cancel_callback_with_state+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lzip  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -84021,40 +87011,39 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char zip_register_cancel_callback_with_state ();
 int
-main ()
+main (void)
 {
 return zip_register_cancel_callback_with_state ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_zip_zip_register_cancel_callback_with_state=yes
-else
+else $as_nop
   ac_cv_lib_zip_zip_register_cancel_callback_with_state=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_zip_zip_register_cancel_callback_with_state" >&5
-$as_echo "$ac_cv_lib_zip_zip_register_cancel_callback_with_state" >&6; }
-if test "x$ac_cv_lib_zip_zip_register_cancel_callback_with_state" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_zip_zip_register_cancel_callback_with_state" >&5
+printf "%s\n" "$ac_cv_lib_zip_zip_register_cancel_callback_with_state" >&6; }
+if test "x$ac_cv_lib_zip_zip_register_cancel_callback_with_state" = xyes
+then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-$as_echo "#define HAVE_CANCEL_CALLBACK 1" >>confdefs.h
+printf "%s\n" "#define HAVE_CANCEL_CALLBACK 1" >>confdefs.h
 
 
 
-else
+else $as_nop
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -84172,11 +87161,12 @@
     esac
   done
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for zip_compression_method_supported in -lzip" >&5
-$as_echo_n "checking for zip_compression_method_supported in -lzip... " >&6; }
-if ${ac_cv_lib_zip_zip_compression_method_supported+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for zip_compression_method_supported in -lzip" >&5
+printf %s "checking for zip_compression_method_supported in -lzip... " >&6; }
+if test ${ac_cv_lib_zip_zip_compression_method_supported+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lzip  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -84185,40 +87175,39 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char zip_compression_method_supported ();
 int
-main ()
+main (void)
 {
 return zip_compression_method_supported ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_zip_zip_compression_method_supported=yes
-else
+else $as_nop
   ac_cv_lib_zip_zip_compression_method_supported=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_zip_zip_compression_method_supported" >&5
-$as_echo "$ac_cv_lib_zip_zip_compression_method_supported" >&6; }
-if test "x$ac_cv_lib_zip_zip_compression_method_supported" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_zip_zip_compression_method_supported" >&5
+printf "%s\n" "$ac_cv_lib_zip_zip_compression_method_supported" >&6; }
+if test "x$ac_cv_lib_zip_zip_compression_method_supported" = xyes
+then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-$as_echo "#define HAVE_METHOD_SUPPORTED 1" >>confdefs.h
+printf "%s\n" "#define HAVE_METHOD_SUPPORTED 1" >>confdefs.h
 
 
 
-else
+else $as_nop
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -84230,7 +87219,7 @@
 
 
 
-$as_echo "#define HAVE_ZIP 1" >>confdefs.h
+printf "%s\n" "#define HAVE_ZIP 1" >>confdefs.h
 
 
   PHP_ZIP_SOURCES="php_zip.c zip_stream.c"
@@ -84368,9 +87357,7 @@
 EOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define COMPILE_DL_ZIP 1
-_ACEOF
+printf "%s\n" "#define COMPILE_DL_ZIP 1" >>confdefs.h
 
     fi
   fi
@@ -84503,12 +87490,13 @@
 
 php_enable_mysqlnd=no
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mysqlnd" >&5
-$as_echo_n "checking whether to enable mysqlnd... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable mysqlnd" >&5
+printf %s "checking whether to enable mysqlnd... " >&6; }
 # Check whether --enable-mysqlnd was given.
-if test "${enable_mysqlnd+set}" = set; then :
+if test ${enable_mysqlnd+y}
+then :
   enableval=$enable_mysqlnd; PHP_MYSQLND=$enableval
-else
+else $as_nop
 
   PHP_MYSQLND=no
   test "$PHP_ENABLE_ALL" && PHP_MYSQLND=$PHP_ENABLE_ALL
@@ -84538,8 +87526,8 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -84547,12 +87535,13 @@
 
 php_enable_mysqlnd_compression_support=yes
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable compressed protocol support in mysqlnd" >&5
-$as_echo_n "checking whether to enable compressed protocol support in mysqlnd... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable compressed protocol support in mysqlnd" >&5
+printf %s "checking whether to enable compressed protocol support in mysqlnd... " >&6; }
 # Check whether --enable-mysqlnd-compression-support was given.
-if test "${enable_mysqlnd_compression_support+set}" = set; then :
+if test ${enable_mysqlnd_compression_support+y}
+then :
   enableval=$enable_mysqlnd_compression_support; PHP_MYSQLND_COMPRESSION_SUPPORT=$enableval
-else
+else $as_nop
 
   PHP_MYSQLND_COMPRESSION_SUPPORT=yes
 
@@ -84561,8 +87550,8 @@
 
 
 ext_output=$PHP_MYSQLND_COMPRESSION_SUPPORT
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -84579,17 +87568,17 @@
   if test "$PHP_MYSQLND_COMPRESSION_SUPPORT" != "no"; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for zlib" >&5
-$as_echo_n "checking for zlib... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for zlib" >&5
+printf %s "checking for zlib... " >&6; }
 
 if test -n "$ZLIB_CFLAGS"; then
     pkg_cv_ZLIB_CFLAGS="$ZLIB_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zlib\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zlib\""; } >&5
   ($PKG_CONFIG --exists --print-errors "zlib") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_ZLIB_CFLAGS=`$PKG_CONFIG --cflags "zlib" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -84603,10 +87592,10 @@
     pkg_cv_ZLIB_LIBS="$ZLIB_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zlib\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zlib\""; } >&5
   ($PKG_CONFIG --exists --print-errors "zlib") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_ZLIB_LIBS=`$PKG_CONFIG --libs "zlib" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -84620,8 +87609,8 @@
 
 
 if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -84647,10 +87636,10 @@
 and ZLIB_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -84664,8 +87653,8 @@
 else
 	ZLIB_CFLAGS=$pkg_cv_ZLIB_CFLAGS
 	ZLIB_LIBS=$pkg_cv_ZLIB_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
 fi
 
@@ -84808,12 +87797,12 @@
   done
 
 
-$as_echo "#define MYSQLND_COMPRESSION_ENABLED 1" >>confdefs.h
+printf "%s\n" "#define MYSQLND_COMPRESSION_ENABLED 1" >>confdefs.h
 
   fi
 
 
-$as_echo "#define MYSQLND_SSL_SUPPORTED 1" >>confdefs.h
+printf "%s\n" "#define MYSQLND_SSL_SUPPORTED 1" >>confdefs.h
 
 
   test -z "$PHP_OPENSSL" && PHP_OPENSSL=no
@@ -84824,17 +87813,17 @@
 
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for openssl >= 1.0.2" >&5
-$as_echo_n "checking for openssl >= 1.0.2... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for openssl >= 1.0.2" >&5
+printf %s "checking for openssl >= 1.0.2... " >&6; }
 
 if test -n "$OPENSSL_CFLAGS"; then
     pkg_cv_OPENSSL_CFLAGS="$OPENSSL_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 1.0.2\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 1.0.2\""; } >&5
   ($PKG_CONFIG --exists --print-errors "openssl >= 1.0.2") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_OPENSSL_CFLAGS=`$PKG_CONFIG --cflags "openssl >= 1.0.2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -84848,10 +87837,10 @@
     pkg_cv_OPENSSL_LIBS="$OPENSSL_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 1.0.2\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 1.0.2\""; } >&5
   ($PKG_CONFIG --exists --print-errors "openssl >= 1.0.2") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_OPENSSL_LIBS=`$PKG_CONFIG --libs "openssl >= 1.0.2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -84865,8 +87854,8 @@
 
 
 if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -84892,10 +87881,10 @@
 and OPENSSL_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -84909,8 +87898,8 @@
 else
 	OPENSSL_CFLAGS=$pkg_cv_OPENSSL_CFLAGS
 	OPENSSL_LIBS=$pkg_cv_OPENSSL_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 	found_openssl=yes
 fi
 
@@ -85055,7 +88044,7 @@
   done
 
 
-$as_echo "#define MYSQLND_HAVE_SSL 1" >>confdefs.h
+printf "%s\n" "#define MYSQLND_HAVE_SSL 1" >>confdefs.h
 
 
   fi
@@ -85197,9 +88186,7 @@
 EOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define COMPILE_DL_MYSQLND 1
-_ACEOF
+printf "%s\n" "#define COMPILE_DL_MYSQLND 1" >>confdefs.h
 
     fi
   fi
@@ -85358,27 +88345,29 @@
 
 case $host_alias in
   i345686-*-linux-* | x86_64-*-linux-*)
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking linker support for -zcommon-page-size=2097152" >&5
-$as_echo_n "checking linker support for -zcommon-page-size=2097152... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking linker support for -zcommon-page-size=2097152" >&5
+printf %s "checking linker support for -zcommon-page-size=2097152... " >&6; }
     save_LDFLAGS=$LDFLAGS
     LDFLAGS="$LDFLAGS -Wl,-zcommon-page-size=2097152 -Wl,-zmax-page-size=2097152"
-    if test "$cross_compiling" = yes; then :
+    if test "$cross_compiling" = yes
+then :
   ac_cv_common_page_size=no
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   ac_cv_common_page_size=yes
-else
+else $as_nop
   ac_cv_common_page_size=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -85387,33 +88376,35 @@
 
     LDFLAGS=$save_LDFLAGS
     if test "$ac_cv_common_page_size" = "yes"; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
         EXTRA_LDFLAGS_PROGRAM="$EXTRA_LDFLAGS_PROGRAM -Wl,-zcommon-page-size=2097152 -Wl,-zmax-page-size=2097152"
     else
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking linker support for -zmax-page-size=2097152" >&5
-$as_echo_n "checking linker support for -zmax-page-size=2097152... " >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking linker support for -zmax-page-size=2097152" >&5
+printf %s "checking linker support for -zmax-page-size=2097152... " >&6; }
         save_LDFLAGS=$LDFLAGS
         LDFLAGS="$LDFLAGS -Wl,-zmax-page-size=2097152"
-        if test "$cross_compiling" = yes; then :
+        if test "$cross_compiling" = yes
+then :
   ac_cv_max_page_size=no
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   ac_cv_max_page_size=yes
-else
+else $as_nop
   ac_cv_max_page_size=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -85422,12 +88413,12 @@
 
         LDFLAGS=$save_LDFLAGS
         if test "$ac_cv_max_page_size" = "yes"; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
             EXTRA_LDFLAGS_PROGRAM="$EXTRA_LDFLAGS_PROGRAM -Wl,-zmax-page-size=2097152"
         else
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
         fi
     fi
     ;;
@@ -85470,16 +88461,17 @@
 
 
 # Check whether --enable- was given.
-if test "${enable_+set}" = set; then :
+if test ${enable_+y}
+then :
   enableval=$enable_;
 fi
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
-$as_echo "" >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${T_MD}Configuring PEAR${T_ME}" >&5
-$as_echo "${T_MD}Configuring PEAR${T_ME}" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5
+printf "%s\n" "" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${T_MD}Configuring PEAR${T_ME}" >&5
+printf "%s\n" "${T_MD}Configuring PEAR${T_ME}" >&6; }
 
 
 if test -z "$with_pear" && test "$enable_pear" = "no"; then
@@ -85493,13 +88485,14 @@
 
 php_with_pear=no
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to install PEAR" >&5
-$as_echo_n "checking whether to install PEAR... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to install PEAR" >&5
+printf %s "checking whether to install PEAR... " >&6; }
 
 # Check whether --with-pear was given.
-if test "${with_pear+set}" = set; then :
+if test ${with_pear+y}
+then :
   withval=$with_pear; PHP_PEAR=$withval
-else
+else $as_nop
 
   PHP_PEAR=no
   test "$PHP_ENABLE_ALL" && PHP_PEAR=$PHP_ENABLE_ALL
@@ -85529,8 +88522,8 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-$as_echo "$ext_output" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+printf "%s\n" "$ext_output" >&6; }
 
 
 
@@ -85546,8 +88539,8 @@
     as_fn_error $? "$pear_error_msg" "$LINENO" 5
   fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The --with-pear option is deprecated" >&5
-$as_echo "$as_me: WARNING: The --with-pear option is deprecated" >&2;}
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: The --with-pear option is deprecated" >&5
+printf "%s\n" "$as_me: WARNING: The --with-pear option is deprecated" >&2;}
 
   install_pear="install-pear"
   PEAR_INSTALLDIR=$PHP_PEAR
@@ -85570,22 +88563,24 @@
 
 
 # Check whether --enable- was given.
-if test "${enable_+set}" = set; then :
+if test ${enable_+y}
+then :
   enableval=$enable_;
 fi
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
-$as_echo "" >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${T_MD}Configuring Zend${T_ME}" >&5
-$as_echo "${T_MD}Configuring Zend${T_ME}" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5
+printf "%s\n" "" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${T_MD}Configuring Zend${T_ME}" >&5
+printf "%s\n" "${T_MD}Configuring Zend${T_ME}" >&6; }
 
 
 # Check whether --enable-fiber-asm was given.
-if test "${enable_fiber_asm+set}" = set; then :
+if test ${enable_fiber_asm+y}
+then :
   enableval=$enable_fiber_asm; fiber_asm=$enableval
-else
+else $as_nop
   fiber_asm='yes'
 fi
 
@@ -85675,14 +88670,16 @@
   fiber_asm="no"
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether syscall to create shadow stack exists" >&5
-$as_echo_n "checking whether syscall to create shadow stack exists... " >&6; }
-if ${ac_cv_syscall_shadow_stack_exists+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether syscall to create shadow stack exists" >&5
+printf %s "checking whether syscall to create shadow stack exists... " >&6; }
+if test ${ac_cv_syscall_shadow_stack_exists+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test "$cross_compiling" = yes
+then :
   ac_cv_syscall_shadow_stack_exists=no
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -85700,9 +88697,10 @@
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   ac_cv_syscall_shadow_stack_exists=yes
-else
+else $as_nop
   ac_cv_syscall_shadow_stack_exists=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -85711,11 +88709,11 @@
 
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_syscall_shadow_stack_exists" >&5
-$as_echo "$ac_cv_syscall_shadow_stack_exists" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_syscall_shadow_stack_exists" >&5
+printf "%s\n" "$ac_cv_syscall_shadow_stack_exists" >&6; }
 if test "$ac_cv_syscall_shadow_stack_exists" = yes; then
 
-$as_echo "#define SHADOW_STACK_SYSCALL 1" >>confdefs.h
+printf "%s\n" "#define SHADOW_STACK_SYSCALL 1" >>confdefs.h
 
   # asm file can't see macro from AC_DEFINE, workaround this via cflag
   fiber_asm_cflag="-DSHADOW_STACK_SYSCALL=1"
@@ -85724,10 +88722,10 @@
 fi
 
 if test "$fiber_asm" = 'yes'; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fiber switching context" >&5
-$as_echo_n "checking for fiber switching context... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fiber switching context" >&5
+printf %s "checking for fiber switching context... " >&6; }
 
-$as_echo "#define ZEND_FIBER_ASM 1" >>confdefs.h
+printf "%s\n" "#define ZEND_FIBER_ASM 1" >>confdefs.h
 
 
 
@@ -85775,70 +88773,109 @@
   done
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $fiber_asm_file" >&5
-$as_echo "$fiber_asm_file" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $fiber_asm_file" >&5
+printf "%s\n" "$fiber_asm_file" >&6; }
 else
   if test "$fiber_os" = 'mac'; then
 
-$as_echo "#define _XOPEN_SOURCE 1" >>confdefs.h
+printf "%s\n" "#define _XOPEN_SOURCE 1" >>confdefs.h
 
   fi
-  ac_fn_c_check_header_mongrel "$LINENO" "ucontext.h" "ac_cv_header_ucontext_h" "$ac_includes_default"
-if test "x$ac_cv_header_ucontext_h" = xyes; then :
+  ac_fn_c_check_header_compile "$LINENO" "ucontext.h" "ac_cv_header_ucontext_h" "$ac_includes_default"
+if test "x$ac_cv_header_ucontext_h" = xyes
+then :
 
 
-$as_echo "#define ZEND_FIBER_UCONTEXT 1" >>confdefs.h
+printf "%s\n" "#define ZEND_FIBER_UCONTEXT 1" >>confdefs.h
 
 
-else
+else $as_nop
 
        as_fn_error $? "fibers not available on this platform" "$LINENO" 5
 
 fi
 
+fi
+
+
+
+
+ac_fn_c_check_header_compile "$LINENO" "cpuid.h" "ac_cv_header_cpuid_h" "$ac_includes_default"
+if test "x$ac_cv_header_cpuid_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_CPUID_H 1" >>confdefs.h
 
 fi
 
 
 
 
-for ac_header in cpuid.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "cpuid.h" "ac_cv_header_cpuid_h" "$ac_includes_default"
-if test "x$ac_cv_header_cpuid_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_CPUID_H 1
-_ACEOF
+ac_fn_c_check_func "$LINENO" "getpid" "ac_cv_func_getpid"
+if test "x$ac_cv_func_getpid" = xyes
+then :
+  printf "%s\n" "#define HAVE_GETPID 1" >>confdefs.h
 
 fi
+ac_fn_c_check_func "$LINENO" "kill" "ac_cv_func_kill"
+if test "x$ac_cv_func_kill" = xyes
+then :
+  printf "%s\n" "#define HAVE_KILL 1" >>confdefs.h
 
-done
+fi
+ac_fn_c_check_func "$LINENO" "sigsetjmp" "ac_cv_func_sigsetjmp"
+if test "x$ac_cv_func_sigsetjmp" = xyes
+then :
+  printf "%s\n" "#define HAVE_SIGSETJMP 1" >>confdefs.h
 
+fi
+ac_fn_c_check_func "$LINENO" "pthread_getattr_np" "ac_cv_func_pthread_getattr_np"
+if test "x$ac_cv_func_pthread_getattr_np" = xyes
+then :
+  printf "%s\n" "#define HAVE_PTHREAD_GETATTR_NP 1" >>confdefs.h
 
+fi
+ac_fn_c_check_func "$LINENO" "pthread_attr_get_np" "ac_cv_func_pthread_attr_get_np"
+if test "x$ac_cv_func_pthread_attr_get_np" = xyes
+then :
+  printf "%s\n" "#define HAVE_PTHREAD_ATTR_GET_NP 1" >>confdefs.h
 
+fi
+ac_fn_c_check_func "$LINENO" "pthread_get_stackaddr_np" "ac_cv_func_pthread_get_stackaddr_np"
+if test "x$ac_cv_func_pthread_get_stackaddr_np" = xyes
+then :
+  printf "%s\n" "#define HAVE_PTHREAD_GET_STACKADDR_NP 1" >>confdefs.h
 
-for ac_func in getpid kill sigsetjmp pthread_getattr_np pthread_attr_get_np pthread_get_stackaddr_np pthread_attr_getstack pthread_stackseg_np gettid
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
+fi
+ac_fn_c_check_func "$LINENO" "pthread_attr_getstack" "ac_cv_func_pthread_attr_getstack"
+if test "x$ac_cv_func_pthread_attr_getstack" = xyes
+then :
+  printf "%s\n" "#define HAVE_PTHREAD_ATTR_GETSTACK 1" >>confdefs.h
 
 fi
-done
+ac_fn_c_check_func "$LINENO" "pthread_stackseg_np" "ac_cv_func_pthread_stackseg_np"
+if test "x$ac_cv_func_pthread_stackseg_np" = xyes
+then :
+  printf "%s\n" "#define HAVE_PTHREAD_STACKSEG_NP 1" >>confdefs.h
 
+fi
+ac_fn_c_check_func "$LINENO" "gettid" "ac_cv_func_gettid"
+if test "x$ac_cv_func_gettid" = xyes
+then :
+  printf "%s\n" "#define HAVE_GETTID 1" >>confdefs.h
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the stack grows downwards" >&5
-$as_echo_n "checking whether the stack grows downwards... " >&6; }
+fi
 
-if test "$cross_compiling" = yes; then :
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the stack grows downwards" >&5
+printf %s "checking whether the stack grows downwards... " >&6; }
 
-else
+if test "$cross_compiling" = yes
+then :
+
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -85859,18 +88896,19 @@
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
 
 
-$as_echo "#define ZEND_CHECK_STACK_LIMIT 1" >>confdefs.h
+printf "%s\n" "#define ZEND_CHECK_STACK_LIMIT 1" >>confdefs.h
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-else
+else $as_nop
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -85879,15 +88917,15 @@
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for usable _FPU_SETCW" >&5
-$as_echo_n "checking for usable _FPU_SETCW... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for usable _FPU_SETCW" >&5
+printf %s "checking for usable _FPU_SETCW... " >&6; }
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
     #include <fpu_control.h>
 
 int
-main ()
+main (void)
 {
 
     fpu_control_t fpu_oldcw, fpu_cw;
@@ -85905,33 +88943,34 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cfp_have__fpu_setcw=yes
-else
+else $as_nop
   ac_cfp_have__fpu_setcw=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
   if test "$ac_cfp_have__fpu_setcw" = "yes" ; then
 
-$as_echo "#define HAVE__FPU_SETCW 1" >>confdefs.h
+printf "%s\n" "#define HAVE__FPU_SETCW 1" >>confdefs.h
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
   fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for usable fpsetprec" >&5
-$as_echo_n "checking for usable fpsetprec... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for usable fpsetprec" >&5
+printf %s "checking for usable fpsetprec... " >&6; }
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
     #include <machine/ieeefp.h>
 
 int
-main ()
+main (void)
 {
 
     fp_prec_t fpu_oldprec;
@@ -85948,33 +88987,34 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cfp_have_fpsetprec=yes
-else
+else $as_nop
   ac_cfp_have_fpsetprec=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
   if test "$ac_cfp_have_fpsetprec" = "yes" ; then
 
-$as_echo "#define HAVE_FPSETPREC 1" >>confdefs.h
+printf "%s\n" "#define HAVE_FPSETPREC 1" >>confdefs.h
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
   fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for usable _controlfp" >&5
-$as_echo_n "checking for usable _controlfp... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for usable _controlfp" >&5
+printf %s "checking for usable _controlfp... " >&6; }
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
     #include <float.h>
 
 int
-main ()
+main (void)
 {
 
     unsigned int fpu_oldcw;
@@ -85991,33 +89031,34 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cfp_have__controlfp=yes
-else
+else $as_nop
   ac_cfp_have__controlfp=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
   if test "$ac_cfp_have__controlfp" = "yes" ; then
 
-$as_echo "#define HAVE__CONTROLFP 1" >>confdefs.h
+printf "%s\n" "#define HAVE__CONTROLFP 1" >>confdefs.h
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
   fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for usable _controlfp_s" >&5
-$as_echo_n "checking for usable _controlfp_s... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for usable _controlfp_s" >&5
+printf %s "checking for usable _controlfp_s... " >&6; }
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
    #include <float.h>
 
 int
-main ()
+main (void)
 {
 
     unsigned int fpu_oldcw, fpu_cw;
@@ -86035,33 +89076,34 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cfp_have__controlfp_s=yes
-else
+else $as_nop
   ac_cfp_have__controlfp_s=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
   if test "$ac_cfp_have__controlfp_s" = "yes" ; then
 
-$as_echo "#define HAVE__CONTROLFP_S 1" >>confdefs.h
+printf "%s\n" "#define HAVE__CONTROLFP_S 1" >>confdefs.h
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
   fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether FPU control word can be manipulated by inline assembler" >&5
-$as_echo_n "checking whether FPU control word can be manipulated by inline assembler... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether FPU control word can be manipulated by inline assembler" >&5
+printf %s "checking whether FPU control word can be manipulated by inline assembler... " >&6; }
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
     /* nothing */
 
 int
-main ()
+main (void)
 {
 
     unsigned int oldcw, cw;
@@ -86081,47 +89123,43 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cfp_have_fpu_inline_asm_x86=yes
-else
+else $as_nop
   ac_cfp_have_fpu_inline_asm_x86=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
   if test "$ac_cfp_have_fpu_inline_asm_x86" = "yes" ; then
 
-$as_echo "#define HAVE_FPU_INLINE_ASM_X86 1" >>confdefs.h
+printf "%s\n" "#define HAVE_FPU_INLINE_ASM_X86 1" >>confdefs.h
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
   fi
 
 
-for ac_header in dlfcn.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default"
-if test "x$ac_cv_header_dlfcn_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_DLFCN_H 1
-_ACEOF
+ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default"
+if test "x$ac_cv_header_dlfcn_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_DLFCN_H 1" >>confdefs.h
 
 fi
 
-done
-
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether dlsym() requires a leading underscore in symbol names" >&5
-$as_echo_n "checking whether dlsym() requires a leading underscore in symbol names... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether dlsym() requires a leading underscore in symbol names" >&5
+printf %s "checking whether dlsym() requires a leading underscore in symbol names... " >&6; }
 if test "$cross_compiling" = yes; then :
 
 else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 86124 "configure"
+#line 89162 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -86184,32 +89222,32 @@
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
     (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
     case x$lt_status in
       x$lt_dlno_uscore)
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
  ;;
       x$lt_dlneed_uscore)
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-$as_echo "#define DLSYM_NEEDS_UNDERSCORE 1" >>confdefs.h
+printf "%s\n" "#define DLSYM_NEEDS_UNDERSCORE 1" >>confdefs.h
 
  ;;
       x$lt_dlunknown|x*)
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
  ;;
     esac
   else :
     # compilation failed
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
   fi
 fi
@@ -86218,19 +89256,19 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable thread-safety" >&5
-$as_echo_n "checking whether to enable thread-safety... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ZEND_ZTS" >&5
-$as_echo "$ZEND_ZTS" >&6; }
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable Zend debugging" >&5
-$as_echo_n "checking whether to enable Zend debugging... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ZEND_DEBUG" >&5
-$as_echo "$ZEND_DEBUG" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable thread-safety" >&5
+printf %s "checking whether to enable thread-safety... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ZEND_ZTS" >&5
+printf "%s\n" "$ZEND_ZTS" >&6; }
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable Zend debugging" >&5
+printf %s "checking whether to enable Zend debugging... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ZEND_DEBUG" >&5
+printf "%s\n" "$ZEND_DEBUG" >&6; }
 
 if test "$ZEND_DEBUG" = "yes"; then
 
-$as_echo "#define ZEND_DEBUG 1" >>confdefs.h
+printf "%s\n" "#define ZEND_DEBUG 1" >>confdefs.h
 
   echo " $CFLAGS" | grep ' -g' >/dev/null || DEBUG_CFLAGS="-g"
   if test "$CFLAGS" = "-g -O2"; then
@@ -86238,16 +89276,17 @@
   fi
 else
 
-$as_echo "#define ZEND_DEBUG 0" >>confdefs.h
+printf "%s\n" "#define ZEND_DEBUG 0" >>confdefs.h
 
 fi
 
 test -n "$GCC" && CFLAGS="-Wall -Wextra -Wno-unused-parameter -Wno-sign-compare $CFLAGS"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wno-clobbered" >&5
-$as_echo_n "checking whether C compiler accepts -Wno-clobbered... " >&6; }
-if ${ax_cv_check_cflags__Werror__Wno_clobbered+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wno-clobbered" >&5
+printf %s "checking whether C compiler accepts -Wno-clobbered... " >&6; }
+if test ${ax_cv_check_cflags__Werror__Wno_clobbered+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
   ax_check_save_flags=$CFLAGS
   CFLAGS="$CFLAGS -Werror -Wno-clobbered"
@@ -86255,34 +89294,37 @@
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ax_cv_check_cflags__Werror__Wno_clobbered=yes
-else
+else $as_nop
   ax_cv_check_cflags__Werror__Wno_clobbered=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
   CFLAGS=$ax_check_save_flags
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wno_clobbered" >&5
-$as_echo "$ax_cv_check_cflags__Werror__Wno_clobbered" >&6; }
-if test "x$ax_cv_check_cflags__Werror__Wno_clobbered" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wno_clobbered" >&5
+printf "%s\n" "$ax_cv_check_cflags__Werror__Wno_clobbered" >&6; }
+if test "x$ax_cv_check_cflags__Werror__Wno_clobbered" = xyes
+then :
   CFLAGS="-Wno-clobbered $CFLAGS"
-else
+else $as_nop
   :
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wimplicit-fallthrough=1" >&5
-$as_echo_n "checking whether C compiler accepts -Wimplicit-fallthrough=1... " >&6; }
-if ${ax_cv_check_cflags__Werror__Wimplicit_fallthrough_1+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wimplicit-fallthrough=1" >&5
+printf %s "checking whether C compiler accepts -Wimplicit-fallthrough=1... " >&6; }
+if test ${ax_cv_check_cflags__Werror__Wimplicit_fallthrough_1+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
   ax_check_save_flags=$CFLAGS
   CFLAGS="$CFLAGS -Werror -Wimplicit-fallthrough=1"
@@ -86290,34 +89332,37 @@
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ax_cv_check_cflags__Werror__Wimplicit_fallthrough_1=yes
-else
+else $as_nop
   ax_cv_check_cflags__Werror__Wimplicit_fallthrough_1=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
   CFLAGS=$ax_check_save_flags
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wimplicit_fallthrough_1" >&5
-$as_echo "$ax_cv_check_cflags__Werror__Wimplicit_fallthrough_1" >&6; }
-if test "x$ax_cv_check_cflags__Werror__Wimplicit_fallthrough_1" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wimplicit_fallthrough_1" >&5
+printf "%s\n" "$ax_cv_check_cflags__Werror__Wimplicit_fallthrough_1" >&6; }
+if test "x$ax_cv_check_cflags__Werror__Wimplicit_fallthrough_1" = xyes
+then :
   CFLAGS="$CFLAGS -Wimplicit-fallthrough=1"
-else
+else $as_nop
   :
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wduplicated-cond" >&5
-$as_echo_n "checking whether C compiler accepts -Wduplicated-cond... " >&6; }
-if ${ax_cv_check_cflags__Werror__Wduplicated_cond+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wduplicated-cond" >&5
+printf %s "checking whether C compiler accepts -Wduplicated-cond... " >&6; }
+if test ${ax_cv_check_cflags__Werror__Wduplicated_cond+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
   ax_check_save_flags=$CFLAGS
   CFLAGS="$CFLAGS -Werror -Wduplicated-cond"
@@ -86325,34 +89370,37 @@
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ax_cv_check_cflags__Werror__Wduplicated_cond=yes
-else
+else $as_nop
   ax_cv_check_cflags__Werror__Wduplicated_cond=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
   CFLAGS=$ax_check_save_flags
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wduplicated_cond" >&5
-$as_echo "$ax_cv_check_cflags__Werror__Wduplicated_cond" >&6; }
-if test "x$ax_cv_check_cflags__Werror__Wduplicated_cond" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wduplicated_cond" >&5
+printf "%s\n" "$ax_cv_check_cflags__Werror__Wduplicated_cond" >&6; }
+if test "x$ax_cv_check_cflags__Werror__Wduplicated_cond" = xyes
+then :
   CFLAGS="-Wduplicated-cond $CFLAGS"
-else
+else $as_nop
   :
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wlogical-op" >&5
-$as_echo_n "checking whether C compiler accepts -Wlogical-op... " >&6; }
-if ${ax_cv_check_cflags__Werror__Wlogical_op+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wlogical-op" >&5
+printf %s "checking whether C compiler accepts -Wlogical-op... " >&6; }
+if test ${ax_cv_check_cflags__Werror__Wlogical_op+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
   ax_check_save_flags=$CFLAGS
   CFLAGS="$CFLAGS -Werror -Wlogical-op"
@@ -86360,34 +89408,37 @@
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ax_cv_check_cflags__Werror__Wlogical_op=yes
-else
+else $as_nop
   ax_cv_check_cflags__Werror__Wlogical_op=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
   CFLAGS=$ax_check_save_flags
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wlogical_op" >&5
-$as_echo "$ax_cv_check_cflags__Werror__Wlogical_op" >&6; }
-if test "x$ax_cv_check_cflags__Werror__Wlogical_op" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wlogical_op" >&5
+printf "%s\n" "$ax_cv_check_cflags__Werror__Wlogical_op" >&6; }
+if test "x$ax_cv_check_cflags__Werror__Wlogical_op" = xyes
+then :
   CFLAGS="-Wlogical-op $CFLAGS"
-else
+else $as_nop
   :
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wformat-truncation" >&5
-$as_echo_n "checking whether C compiler accepts -Wformat-truncation... " >&6; }
-if ${ax_cv_check_cflags__Werror__Wformat_truncation+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wformat-truncation" >&5
+printf %s "checking whether C compiler accepts -Wformat-truncation... " >&6; }
+if test ${ax_cv_check_cflags__Werror__Wformat_truncation+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
   ax_check_save_flags=$CFLAGS
   CFLAGS="$CFLAGS -Werror -Wformat-truncation"
@@ -86395,34 +89446,37 @@
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ax_cv_check_cflags__Werror__Wformat_truncation=yes
-else
+else $as_nop
   ax_cv_check_cflags__Werror__Wformat_truncation=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
   CFLAGS=$ax_check_save_flags
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wformat_truncation" >&5
-$as_echo "$ax_cv_check_cflags__Werror__Wformat_truncation" >&6; }
-if test "x$ax_cv_check_cflags__Werror__Wformat_truncation" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wformat_truncation" >&5
+printf "%s\n" "$ax_cv_check_cflags__Werror__Wformat_truncation" >&6; }
+if test "x$ax_cv_check_cflags__Werror__Wformat_truncation" = xyes
+then :
   CFLAGS="-Wformat-truncation $CFLAGS"
-else
+else $as_nop
   :
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wstrict-prototypes" >&5
-$as_echo_n "checking whether C compiler accepts -Wstrict-prototypes... " >&6; }
-if ${ax_cv_check_cflags__Werror__Wstrict_prototypes+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wstrict-prototypes" >&5
+printf %s "checking whether C compiler accepts -Wstrict-prototypes... " >&6; }
+if test ${ax_cv_check_cflags__Werror__Wstrict_prototypes+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
   ax_check_save_flags=$CFLAGS
   CFLAGS="$CFLAGS -Werror -Wstrict-prototypes"
@@ -86430,34 +89484,37 @@
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ax_cv_check_cflags__Werror__Wstrict_prototypes=yes
-else
+else $as_nop
   ax_cv_check_cflags__Werror__Wstrict_prototypes=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
   CFLAGS=$ax_check_save_flags
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wstrict_prototypes" >&5
-$as_echo "$ax_cv_check_cflags__Werror__Wstrict_prototypes" >&6; }
-if test "x$ax_cv_check_cflags__Werror__Wstrict_prototypes" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wstrict_prototypes" >&5
+printf "%s\n" "$ax_cv_check_cflags__Werror__Wstrict_prototypes" >&6; }
+if test "x$ax_cv_check_cflags__Werror__Wstrict_prototypes" = xyes
+then :
   CFLAGS="-Wstrict-prototypes $CFLAGS"
-else
+else $as_nop
   :
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fno-common" >&5
-$as_echo_n "checking whether C compiler accepts -fno-common... " >&6; }
-if ${ax_cv_check_cflags__Werror__fno_common+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fno-common" >&5
+printf %s "checking whether C compiler accepts -fno-common... " >&6; }
+if test ${ax_cv_check_cflags__Werror__fno_common+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
   ax_check_save_flags=$CFLAGS
   CFLAGS="$CFLAGS -Werror -fno-common"
@@ -86465,26 +89522,28 @@
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ax_cv_check_cflags__Werror__fno_common=yes
-else
+else $as_nop
   ax_cv_check_cflags__Werror__fno_common=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
   CFLAGS=$ax_check_save_flags
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__fno_common" >&5
-$as_echo "$ax_cv_check_cflags__Werror__fno_common" >&6; }
-if test "x$ax_cv_check_cflags__Werror__fno_common" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__fno_common" >&5
+printf "%s\n" "$ax_cv_check_cflags__Werror__fno_common" >&6; }
+if test "x$ax_cv_check_cflags__Werror__fno_common" = xyes
+then :
   CFLAGS="-fno-common $CFLAGS"
-else
+else $as_nop
   :
 fi
 
@@ -86493,37 +89552,39 @@
 
 if test "$ZEND_ZTS" = "yes"; then
 
-$as_echo "#define ZTS 1" >>confdefs.h
+printf "%s\n" "#define ZTS 1" >>confdefs.h
 
   CFLAGS="$CFLAGS -DZTS"
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
-$as_echo_n "checking for inline... " >&6; }
-if ${ac_cv_c_inline+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
+printf %s "checking for inline... " >&6; }
+if test ${ac_cv_c_inline+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifndef __cplusplus
 typedef int foo_t;
-static $ac_kw foo_t static_foo () {return 0; }
-$ac_kw foo_t foo () {return 0; }
+static $ac_kw foo_t static_foo (void) {return 0; }
+$ac_kw foo_t foo (void) {return 0; }
 #endif
 
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_c_inline=$ac_kw
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
   test "$ac_cv_c_inline" != no && break
 done
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
-$as_echo "$ac_cv_c_inline" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
+printf "%s\n" "$ac_cv_c_inline" >&6; }
 
 case $ac_cv_c_inline in
   inline | yes) ;;
@@ -86541,35 +89602,36 @@
 esac
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system is Darwin" >&5
-$as_echo_n "checking target system is Darwin... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking target system is Darwin" >&5
+printf %s "checking target system is Darwin... " >&6; }
 if echo "$target" | grep "darwin" > /dev/null; then
 
-$as_echo "#define DARWIN 1" >>confdefs.h
+printf "%s\n" "#define DARWIN 1" >>confdefs.h
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MM alignment and log values" >&5
-$as_echo_n "checking for MM alignment and log values... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MM alignment and log values" >&5
+printf %s "checking for MM alignment and log values... " >&6; }
 
-if test "$cross_compiling" = yes; then :
+if test "$cross_compiling" = yes
+then :
 
 
-$as_echo "#define ZEND_MM_ALIGNMENT 8" >>confdefs.h
+printf "%s\n" "#define ZEND_MM_ALIGNMENT 8" >>confdefs.h
 
 
-$as_echo "#define ZEND_MM_ALIGNMENT_LOG2 3" >>confdefs.h
+printf "%s\n" "#define ZEND_MM_ALIGNMENT_LOG2 3" >>confdefs.h
 
 
-$as_echo "#define ZEND_MM_NEED_EIGHT_BYTE_REALIGNMENT 0" >>confdefs.h
+printf "%s\n" "#define ZEND_MM_NEED_EIGHT_BYTE_REALIGNMENT 0" >>confdefs.h
 
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -86607,25 +89669,20 @@
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
 
   LIBZEND_MM_ALIGN=`cat conftest.zend | cut -d ' ' -f 1`
   LIBZEND_MM_ALIGN_LOG2=`cat conftest.zend | cut -d ' ' -f 2`
   LIBZEND_MM_NEED_EIGHT_BYTE_REALIGNMENT=`cat conftest.zend | cut -d ' ' -f 3`
 
-cat >>confdefs.h <<_ACEOF
-#define ZEND_MM_ALIGNMENT $LIBZEND_MM_ALIGN
-_ACEOF
+printf "%s\n" "#define ZEND_MM_ALIGNMENT $LIBZEND_MM_ALIGN" >>confdefs.h
 
 
-cat >>confdefs.h <<_ACEOF
-#define ZEND_MM_ALIGNMENT_LOG2 $LIBZEND_MM_ALIGN_LOG2
-_ACEOF
+printf "%s\n" "#define ZEND_MM_ALIGNMENT_LOG2 $LIBZEND_MM_ALIGN_LOG2" >>confdefs.h
 
 
-cat >>confdefs.h <<_ACEOF
-#define ZEND_MM_NEED_EIGHT_BYTE_REALIGNMENT $LIBZEND_MM_NEED_EIGHT_BYTE_REALIGNMENT
-_ACEOF
+printf "%s\n" "#define ZEND_MM_NEED_EIGHT_BYTE_REALIGNMENT $LIBZEND_MM_NEED_EIGHT_BYTE_REALIGNMENT" >>confdefs.h
 
 
 fi
@@ -86634,60 +89691,58 @@
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
-$as_echo "done" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: done" >&5
+printf "%s\n" "done" >&6; }
 
-for ac_func in mremap
-do :
-  ac_fn_c_check_func "$LINENO" "mremap" "ac_cv_func_mremap"
-if test "x$ac_cv_func_mremap" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_MREMAP 1
-_ACEOF
+ac_fn_c_check_func "$LINENO" "mremap" "ac_cv_func_mremap"
+if test "x$ac_cv_func_mremap" = xyes
+then :
+  printf "%s\n" "#define HAVE_MREMAP 1" >>confdefs.h
 
 fi
-done
 
 
 # Check whether --enable-zend-signals was given.
-if test "${enable_zend_signals+set}" = set; then :
+if test ${enable_zend_signals+y}
+then :
   enableval=$enable_zend_signals; ZEND_SIGNALS=$enableval
-else
+else $as_nop
   ZEND_SIGNALS=yes
 fi
 
 
-for ac_func in sigaction
+
+  for ac_func in sigaction
 do :
   ac_fn_c_check_func "$LINENO" "sigaction" "ac_cv_func_sigaction"
-if test "x$ac_cv_func_sigaction" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_SIGACTION 1
-_ACEOF
+if test "x$ac_cv_func_sigaction" = xyes
+then :
+  printf "%s\n" "#define HAVE_SIGACTION 1" >>confdefs.h
 
-else
+else $as_nop
 
   ZEND_SIGNALS=no
 
 fi
-done
 
+done
 if test "$ZEND_SIGNALS" = "yes"; then
 
-$as_echo "#define ZEND_SIGNALS 1" >>confdefs.h
+printf "%s\n" "#define ZEND_SIGNALS 1" >>confdefs.h
 
 	CFLAGS="$CFLAGS -DZEND_SIGNALS"
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable zend signal handling" >&5
-$as_echo_n "checking whether to enable zend signal handling... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ZEND_SIGNALS" >&5
-$as_echo "$ZEND_SIGNALS" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable zend signal handling" >&5
+printf %s "checking whether to enable zend signal handling... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ZEND_SIGNALS" >&5
+printf "%s\n" "$ZEND_SIGNALS" >&6; }
 
 # Check whether --enable-zend-max-execution-timers was given.
-if test "${enable_zend_max_execution_timers+set}" = set; then :
+if test ${enable_zend_max_execution_timers+y}
+then :
   enableval=$enable_zend_max_execution_timers; ZEND_MAX_EXECUTION_TIMERS=$enableval
-else
+else $as_nop
   ZEND_MAX_EXECUTION_TIMERS=$ZEND_ZTS
 fi
 
@@ -86705,13 +89760,15 @@
   unset found
 
   ac_fn_c_check_func "$LINENO" "timer_create" "ac_cv_func_timer_create"
-if test "x$ac_cv_func_timer_create" = xyes; then :
+if test "x$ac_cv_func_timer_create" = xyes
+then :
   found=yes
-else
+else $as_nop
    ac_fn_c_check_func "$LINENO" "__timer_create" "ac_cv_func___timer_create"
-if test "x$ac_cv_func___timer_create" = xyes; then :
+if test "x$ac_cv_func___timer_create" = xyes
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 
@@ -86721,7 +89778,7 @@
   case $found in
   yes)
 
-$as_echo "#define HAVE_TIMER_CREATE 1" >>confdefs.h
+printf "%s\n" "#define HAVE_TIMER_CREATE 1" >>confdefs.h
 
     ac_cv_func_timer_create=yes
   ;;
@@ -86731,11 +89788,12 @@
   unset ac_cv_lib_rt_timer_create
   unset ac_cv_lib_rt___timer_create
   unset found
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for timer_create in -lrt" >&5
-$as_echo_n "checking for timer_create in -lrt... " >&6; }
-if ${ac_cv_lib_rt_timer_create+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for timer_create in -lrt" >&5
+printf %s "checking for timer_create in -lrt... " >&6; }
+if test ${ac_cv_lib_rt_timer_create+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lrt  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -86744,38 +89802,38 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char timer_create ();
 int
-main ()
+main (void)
 {
 return timer_create ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_rt_timer_create=yes
-else
+else $as_nop
   ac_cv_lib_rt_timer_create=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_timer_create" >&5
-$as_echo "$ac_cv_lib_rt_timer_create" >&6; }
-if test "x$ac_cv_lib_rt_timer_create" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_timer_create" >&5
+printf "%s\n" "$ac_cv_lib_rt_timer_create" >&6; }
+if test "x$ac_cv_lib_rt_timer_create" = xyes
+then :
   found=yes
-else
+else $as_nop
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __timer_create in -lrt" >&5
-$as_echo_n "checking for __timer_create in -lrt... " >&6; }
-if ${ac_cv_lib_rt___timer_create+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __timer_create in -lrt" >&5
+printf %s "checking for __timer_create in -lrt... " >&6; }
+if test ${ac_cv_lib_rt___timer_create+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lrt  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -86784,32 +89842,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char __timer_create ();
 int
-main ()
+main (void)
 {
 return __timer_create ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_rt___timer_create=yes
-else
+else $as_nop
   ac_cv_lib_rt___timer_create=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt___timer_create" >&5
-$as_echo "$ac_cv_lib_rt___timer_create" >&6; }
-if test "x$ac_cv_lib_rt___timer_create" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt___timer_create" >&5
+printf "%s\n" "$ac_cv_lib_rt___timer_create" >&6; }
+if test "x$ac_cv_lib_rt___timer_create" = xyes
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 
@@ -86820,18 +89877,20 @@
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lrt"
-    if test "$cross_compiling" = yes; then :
+    if test "$cross_compiling" = yes
+then :
 
             found=yes
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int main(void) { return (0); }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   found=yes
-else
+else $as_nop
   found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -86853,10 +89912,10 @@
 
 
 
-$as_echo "#define HAVE_TIMER_CREATE 1" >>confdefs.h
+printf "%s\n" "#define HAVE_TIMER_CREATE 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_LIBRT 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBRT 1" >>confdefs.h
 
     ac_cv_func_timer_create=yes
   else
@@ -86875,15 +89934,15 @@
 
 if test "$ZEND_MAX_EXECUTION_TIMERS" = "yes"; then
 
-$as_echo "#define ZEND_MAX_EXECUTION_TIMERS 1" >>confdefs.h
+printf "%s\n" "#define ZEND_MAX_EXECUTION_TIMERS 1" >>confdefs.h
 
   CFLAGS="$CFLAGS -DZEND_MAX_EXECUTION_TIMERS"
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable zend max execution timers" >&5
-$as_echo_n "checking whether to enable zend max execution timers... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ZEND_MAX_EXECUTION_TIMERS" >&5
-$as_echo "$ZEND_MAX_EXECUTION_TIMERS" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable zend max execution timers" >&5
+printf %s "checking whether to enable zend max execution timers... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ZEND_MAX_EXECUTION_TIMERS" >&5
+printf "%s\n" "$ZEND_MAX_EXECUTION_TIMERS" >&6; }
 
 
 
@@ -86899,19 +89958,20 @@
 unset LIBS
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
-$as_echo "" >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${T_MD}Configuring TSRM${T_ME}" >&5
-$as_echo "${T_MD}Configuring TSRM${T_ME}" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5
+printf "%s\n" "" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${T_MD}Configuring TSRM${T_ME}" >&5
+printf "%s\n" "${T_MD}Configuring TSRM${T_ME}" >&6; }
 
 if test "$PHP_THREAD_SAFETY" = "yes"; then
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthreads_cflags" >&5
-$as_echo_n "checking for pthreads_cflags... " >&6; }
-if ${ac_cv_pthreads_cflags+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthreads_cflags" >&5
+printf %s "checking for pthreads_cflags... " >&6; }
+if test ${ac_cv_pthreads_cflags+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
 ac_cv_pthreads_cflags=
 if test "$pthreads_working" != "yes"; then
@@ -86937,17 +89997,18 @@
     return pthread_create(&thd, NULL, thread_routine, &data);
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
 
   pthreads_checked=yes
 
-else
+else $as_nop
 
   pthreads_checked=no
 
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
     CFLAGS=$ac_save
     if test "$pthreads_checked" = "yes"; then
@@ -86958,14 +90019,15 @@
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pthreads_cflags" >&5
-$as_echo "$ac_cv_pthreads_cflags" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pthreads_cflags" >&5
+printf "%s\n" "$ac_cv_pthreads_cflags" >&6; }
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthreads_lib" >&5
-$as_echo_n "checking for pthreads_lib... " >&6; }
-if ${ac_cv_pthreads_lib+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthreads_lib" >&5
+printf %s "checking for pthreads_lib... " >&6; }
+if test ${ac_cv_pthreads_lib+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
 ac_cv_pthreads_lib=
 if test "$pthreads_working" != "yes"; then
@@ -86991,17 +90053,18 @@
     return pthread_create(&thd, NULL, thread_routine, &data);
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
 
   pthreads_checked=yes
 
-else
+else $as_nop
 
   pthreads_checked=no
 
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
     LIBS=$ac_save
     if test "$pthreads_checked" = "yes"; then
@@ -87012,8 +90075,8 @@
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pthreads_lib" >&5
-$as_echo "$ac_cv_pthreads_lib" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pthreads_lib" >&5
+printf "%s\n" "$ac_cv_pthreads_lib" >&6; }
 
 if test "x$ac_cv_pthreads_cflags" != "x" -o "x$ac_cv_pthreads_lib" != "x"; then
   pthreads_working="yes"
@@ -87025,13 +90088,13 @@
 fi
 
 
-$as_echo "#define PTHREADS 1" >>confdefs.h
+printf "%s\n" "#define PTHREADS 1" >>confdefs.h
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for POSIX threads" >&5
-$as_echo_n "checking for POSIX threads... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for POSIX threads" >&5
+printf %s "checking for POSIX threads... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
 fi
 
@@ -87048,7 +90111,7 @@
 # Double any \ or $.
 # By default was `s,x,x', remove it if useless.
 ac_script='s/\\$/&&/g;s/;s,x,x,$//'
-program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
+program_transform_name=`printf "%s\n" "$program_transform_name" | sed "$ac_script"`
 
 
 test "$prefix" = "NONE" && prefix=/usr/local
@@ -87189,41 +90252,29 @@
 UNAME=`uname -a | xargs`
 PHP_UNAME=${PHP_UNAME:-$UNAME}
 
-cat >>confdefs.h <<_ACEOF
-#define PHP_UNAME "$PHP_UNAME"
-_ACEOF
+printf "%s\n" "#define PHP_UNAME \"$PHP_UNAME\"" >>confdefs.h
 
 PHP_OS=`uname | xargs`
 
-cat >>confdefs.h <<_ACEOF
-#define PHP_OS "$PHP_OS"
-_ACEOF
+printf "%s\n" "#define PHP_OS \"$PHP_OS\"" >>confdefs.h
 
 PHP_BUILD_SYSTEM=${PHP_BUILD_SYSTEM:-$PHP_UNAME}
 
-cat >>confdefs.h <<_ACEOF
-#define PHP_BUILD_SYSTEM "$PHP_BUILD_SYSTEM"
-_ACEOF
+printf "%s\n" "#define PHP_BUILD_SYSTEM \"$PHP_BUILD_SYSTEM\"" >>confdefs.h
 
 if test -n "${PHP_BUILD_PROVIDER}"; then
 
-cat >>confdefs.h <<_ACEOF
-#define PHP_BUILD_PROVIDER "$PHP_BUILD_PROVIDER"
-_ACEOF
+printf "%s\n" "#define PHP_BUILD_PROVIDER \"$PHP_BUILD_PROVIDER\"" >>confdefs.h
 
 fi
 if test -n "${PHP_BUILD_COMPILER}"; then
 
-cat >>confdefs.h <<_ACEOF
-#define PHP_BUILD_COMPILER "$PHP_BUILD_COMPILER"
-_ACEOF
+printf "%s\n" "#define PHP_BUILD_COMPILER \"$PHP_BUILD_COMPILER\"" >>confdefs.h
 
 fi
 if test -n "${PHP_BUILD_ARCH}"; then
 
-cat >>confdefs.h <<_ACEOF
-#define PHP_BUILD_ARCH "$PHP_BUILD_ARCH"
-_ACEOF
+printf "%s\n" "#define PHP_BUILD_ARCH \"$PHP_BUILD_ARCH\"" >>confdefs.h
 
 fi
 
@@ -87504,11 +90555,12 @@
 fi
 
 if test "$PHP_MEMORY_SANITIZER" = "yes"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fsanitize=memory -fsanitize-memory-track-origins" >&5
-$as_echo_n "checking whether C compiler accepts -fsanitize=memory -fsanitize-memory-track-origins... " >&6; }
-if ${ax_cv_check_cflags___fsanitize_memory__fsanitize_memory_track_origins+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fsanitize=memory -fsanitize-memory-track-origins" >&5
+printf %s "checking whether C compiler accepts -fsanitize=memory -fsanitize-memory-track-origins... " >&6; }
+if test ${ax_cv_check_cflags___fsanitize_memory__fsanitize_memory_track_origins+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
   ax_check_save_flags=$CFLAGS
   CFLAGS="$CFLAGS  -fsanitize=memory -fsanitize-memory-track-origins"
@@ -87516,40 +90568,43 @@
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ax_cv_check_cflags___fsanitize_memory__fsanitize_memory_track_origins=yes
-else
+else $as_nop
   ax_cv_check_cflags___fsanitize_memory__fsanitize_memory_track_origins=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
   CFLAGS=$ax_check_save_flags
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fsanitize_memory__fsanitize_memory_track_origins" >&5
-$as_echo "$ax_cv_check_cflags___fsanitize_memory__fsanitize_memory_track_origins" >&6; }
-if test "x$ax_cv_check_cflags___fsanitize_memory__fsanitize_memory_track_origins" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fsanitize_memory__fsanitize_memory_track_origins" >&5
+printf "%s\n" "$ax_cv_check_cflags___fsanitize_memory__fsanitize_memory_track_origins" >&6; }
+if test "x$ax_cv_check_cflags___fsanitize_memory__fsanitize_memory_track_origins" = xyes
+then :
 
     CFLAGS="$CFLAGS -fsanitize=memory -fsanitize-memory-track-origins"
     CXXFLAGS="$CXXFLAGS -fsanitize=memory -fsanitize-memory-track-origins"
 
-else
+else $as_nop
   as_fn_error $? "MemorySanitizer is not available" "$LINENO" 5
 fi
 
 fi
 
 if test "$PHP_ADDRESS_SANITIZER" = "yes"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fsanitize=address" >&5
-$as_echo_n "checking whether C compiler accepts -fsanitize=address... " >&6; }
-if ${ax_cv_check_cflags___fsanitize_address+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fsanitize=address" >&5
+printf %s "checking whether C compiler accepts -fsanitize=address... " >&6; }
+if test ${ax_cv_check_cflags___fsanitize_address+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
   ax_check_save_flags=$CFLAGS
   CFLAGS="$CFLAGS  -fsanitize=address"
@@ -87557,40 +90612,43 @@
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ax_cv_check_cflags___fsanitize_address=yes
-else
+else $as_nop
   ax_cv_check_cflags___fsanitize_address=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
   CFLAGS=$ax_check_save_flags
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fsanitize_address" >&5
-$as_echo "$ax_cv_check_cflags___fsanitize_address" >&6; }
-if test "x$ax_cv_check_cflags___fsanitize_address" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fsanitize_address" >&5
+printf "%s\n" "$ax_cv_check_cflags___fsanitize_address" >&6; }
+if test "x$ax_cv_check_cflags___fsanitize_address" = xyes
+then :
 
     CFLAGS="$CFLAGS -fsanitize=address -DZEND_TRACK_ARENA_ALLOC"
     CXXFLAGS="$CXXFLAGS -fsanitize=address -DZEND_TRACK_ARENA_ALLOC"
 
-else
+else $as_nop
   as_fn_error $? "AddressSanitizer is not available" "$LINENO" 5
 fi
 
 fi
 
 if test "$PHP_UNDEFINED_SANITIZER" = "yes"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fsanitize=undefined" >&5
-$as_echo_n "checking whether C compiler accepts -fsanitize=undefined... " >&6; }
-if ${ax_cv_check_cflags___fsanitize_undefined+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fsanitize=undefined" >&5
+printf %s "checking whether C compiler accepts -fsanitize=undefined... " >&6; }
+if test ${ax_cv_check_cflags___fsanitize_undefined+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
   ax_check_save_flags=$CFLAGS
   CFLAGS="$CFLAGS  -fsanitize=undefined"
@@ -87598,32 +90656,35 @@
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ax_cv_check_cflags___fsanitize_undefined=yes
-else
+else $as_nop
   ax_cv_check_cflags___fsanitize_undefined=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
   CFLAGS=$ax_check_save_flags
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fsanitize_undefined" >&5
-$as_echo "$ax_cv_check_cflags___fsanitize_undefined" >&6; }
-if test "x$ax_cv_check_cflags___fsanitize_undefined" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fsanitize_undefined" >&5
+printf "%s\n" "$ax_cv_check_cflags___fsanitize_undefined" >&6; }
+if test "x$ax_cv_check_cflags___fsanitize_undefined" = xyes
+then :
 
     CFLAGS="$CFLAGS -fsanitize=undefined -fno-sanitize-recover=undefined"
     CXXFLAGS="$CXXFLAGS -fsanitize=undefined -fno-sanitize-recover=undefined"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fno-sanitize=object-size" >&5
-$as_echo_n "checking whether C compiler accepts -fno-sanitize=object-size... " >&6; }
-if ${ax_cv_check_cflags___fno_sanitize_object_size+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fno-sanitize=object-size" >&5
+printf %s "checking whether C compiler accepts -fno-sanitize=object-size... " >&6; }
+if test ${ax_cv_check_cflags___fno_sanitize_object_size+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
   ax_check_save_flags=$CFLAGS
   CFLAGS="$CFLAGS  -fno-sanitize=object-size"
@@ -87631,44 +90692,48 @@
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ax_cv_check_cflags___fno_sanitize_object_size=yes
-else
+else $as_nop
   ax_cv_check_cflags___fno_sanitize_object_size=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
   CFLAGS=$ax_check_save_flags
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fno_sanitize_object_size" >&5
-$as_echo "$ax_cv_check_cflags___fno_sanitize_object_size" >&6; }
-if test "x$ax_cv_check_cflags___fno_sanitize_object_size" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fno_sanitize_object_size" >&5
+printf "%s\n" "$ax_cv_check_cflags___fno_sanitize_object_size" >&6; }
+if test "x$ax_cv_check_cflags___fno_sanitize_object_size" = xyes
+then :
 
                   CFLAGS="$CFLAGS -fno-sanitize=object-size"
       CXXFLAGS="$CFLAGS -fno-sanitize=object-size"
 
-else
+else $as_nop
   :
 fi
 
 
             OLD_CFLAGS="$CFLAGS"
     CFLAGS="$CFLAGS -fno-sanitize-recover=undefined"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to add -fno-sanitize=function" >&5
-$as_echo_n "checking whether to add -fno-sanitize=function... " >&6; }
-if ${php_cv_ubsan_no_function+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to add -fno-sanitize=function" >&5
+printf %s "checking whether to add -fno-sanitize=function... " >&6; }
+if test ${php_cv_ubsan_no_function+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
-    if test "$cross_compiling" = yes; then :
+    if test "$cross_compiling" = yes
+then :
   php_cv_ubsan_no_function=no
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -87679,9 +90744,10 @@
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   php_cv_ubsan_no_function=no
-else
+else $as_nop
   php_cv_ubsan_no_function=yes
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -87689,15 +90755,15 @@
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_cv_ubsan_no_function" >&5
-$as_echo "$php_cv_ubsan_no_function" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_ubsan_no_function" >&5
+printf "%s\n" "$php_cv_ubsan_no_function" >&6; }
     CFLAGS="$OLD_CFLAGS"
     if test "$php_cv_ubsan_no_function" = yes; then
       CFLAGS="$CFLAGS -fno-sanitize=function"
       CXXFLAGS="$CFLAGS -fno-sanitize=function"
     fi
 
-else
+else $as_nop
   as_fn_error $? "UndefinedBehaviorSanitizer is not available" "$LINENO" 5
 fi
 
@@ -87713,16 +90779,17 @@
 
 
 # Check whether --enable- was given.
-if test "${enable_+set}" = set; then :
+if test ${enable_+y}
+then :
   enableval=$enable_;
 fi
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
-$as_echo "" >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${T_MD}Configuring libtool${T_ME}" >&5
-$as_echo "${T_MD}Configuring libtool${T_ME}" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5
+printf "%s\n" "" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${T_MD}Configuring libtool${T_ME}" >&5
+printf "%s\n" "${T_MD}Configuring libtool${T_ME}" >&6; }
 
 
 AR_FLAGS=cr
@@ -87730,7 +90797,8 @@
 
 
 # Check whether --enable-shared was given.
-if test "${enable_shared+set}" = set; then :
+if test ${enable_shared+y}
+then :
   enableval=$enable_shared;     p=${PACKAGE-default}
     case $enableval in
     yes) enable_shared=yes ;;
@@ -87748,13 +90816,14 @@
       IFS="$lt_save_ifs"
       ;;
     esac
-else
+else $as_nop
   enable_shared=yes
 fi
 
 
 # Check whether --enable-static was given.
-if test "${enable_static+set}" = set; then :
+if test ${enable_static+y}
+then :
   enableval=$enable_static;     p=${PACKAGE-default}
     case $enableval in
     yes) enable_static=yes ;;
@@ -87772,13 +90841,14 @@
       IFS="$lt_save_ifs"
       ;;
     esac
-else
+else $as_nop
   enable_static=yes
 fi
 
 
 # Check whether --enable-fast-install was given.
-if test "${enable_fast_install+set}" = set; then :
+if test ${enable_fast_install+y}
+then :
   enableval=$enable_fast_install;     p=${PACKAGE-default}
     case $enableval in
     yes) enable_fast_install=yes ;;
@@ -87796,16 +90866,17 @@
       IFS="$lt_save_ifs"
       ;;
     esac
-else
+else $as_nop
   enable_fast_install=yes
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
-$as_echo_n "checking for a sed that does not truncate output... " >&6; }
-if ${lt_cv_path_SED+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+printf %s "checking for a sed that does not truncate output... " >&6; }
+if test ${lt_cv_path_SED+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   # Loop through the user's path and test for sed and gsed.
 # Then use that list of sed's as ones to test for truncation.
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -87855,22 +90926,23 @@
 fi
 
 SED=$lt_cv_path_SED
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $SED" >&5
-$as_echo "$SED" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $SED" >&5
+printf "%s\n" "$SED" >&6; }
 
 
 # Check whether --with-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then :
+if test ${with_gnu_ld+y}
+then :
   withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
-else
+else $as_nop
   with_gnu_ld=no
 fi
 
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
-$as_echo_n "checking for ld used by $CC... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+printf %s "checking for ld used by $CC... " >&6; }
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -87899,15 +90971,16 @@
     ;;
   esac
 elif test "$with_gnu_ld" = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
-$as_echo_n "checking for GNU ld... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+printf %s "checking for GNU ld... " >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
-$as_echo_n "checking for non-GNU ld... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+printf %s "checking for non-GNU ld... " >&6; }
 fi
-if ${lt_cv_path_LD+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+if test ${lt_cv_path_LD+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -z "$LD"; then
   lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
   for ac_dir in $PATH; do
@@ -87936,18 +91009,19 @@
 
 LD="$lt_cv_path_LD"
 if test -n "$LD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
-$as_echo "$LD" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+printf "%s\n" "$LD" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
-$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if ${lt_cv_prog_gnu_ld+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+printf %s "checking if the linker ($LD) is GNU ld... " >&6; }
+if test ${lt_cv_prog_gnu_ld+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   # I'd rather use --version here, but apparently some GNU lds only accept -v.
 case `$LD -v 2>&1 </dev/null` in
 *GNU* | *'with BFD'*)
@@ -87958,20 +91032,21 @@
   ;;
 esac
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
-$as_echo "$lt_cv_prog_gnu_ld" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
+printf "%s\n" "$lt_cv_prog_gnu_ld" >&6; }
 with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
-$as_echo_n "checking for $LD option to reload object files... " >&6; }
-if ${lt_cv_ld_reload_flag+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
+printf %s "checking for $LD option to reload object files... " >&6; }
+if test ${lt_cv_ld_reload_flag+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   lt_cv_ld_reload_flag='-r'
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
-$as_echo "$lt_cv_ld_reload_flag" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
+printf "%s\n" "$lt_cv_ld_reload_flag" >&6; }
 reload_flag=$lt_cv_ld_reload_flag
 case $reload_flag in
 "" | " "*) ;;
@@ -87988,11 +91063,12 @@
     ;;
 esac
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD-compatible nm" >&5
-$as_echo_n "checking for BSD-compatible nm... " >&6; }
-if ${lt_cv_path_NM+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for BSD-compatible nm" >&5
+printf %s "checking for BSD-compatible nm... " >&6; }
+if test ${lt_cv_path_NM+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$NM"; then
   # Let the user override the test.
   lt_cv_path_NM="$NM"
@@ -88037,15 +91113,16 @@
   test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
-$as_echo "$lt_cv_path_NM" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
+printf "%s\n" "$lt_cv_path_NM" >&6; }
 NM="$lt_cv_path_NM"
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
-$as_echo_n "checking how to recognize dependent libraries... " >&6; }
-if ${lt_cv_deplibs_check_method+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
+printf %s "checking how to recognize dependent libraries... " >&6; }
+if test ${lt_cv_deplibs_check_method+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   lt_cv_file_magic_cmd='$MAGIC_CMD'
 lt_cv_file_magic_test_file=
 lt_cv_deplibs_check_method='unknown'
@@ -88227,8 +91304,8 @@
 esac
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
-$as_echo "$lt_cv_deplibs_check_method" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
+printf "%s\n" "$lt_cv_deplibs_check_method" >&6; }
 file_magic_cmd=$lt_cv_file_magic_cmd
 deplibs_check_method=$lt_cv_deplibs_check_method
 test -z "$deplibs_check_method" && deplibs_check_method=unknown
@@ -88258,7 +91335,7 @@
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     case `/usr/bin/file conftest.$ac_objext` in
     *ELF-32*)
@@ -88273,11 +91350,11 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 88276 "configure"' > conftest.$ac_ext
+  echo '#line 91353 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
    if test "$lt_cv_prog_gnu_ld" = yes; then
     case `/usr/bin/file conftest.$ac_objext` in
@@ -88315,7 +91392,7 @@
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     case `/usr/bin/file conftest.o` in
     *32-bit*)
@@ -88371,11 +91448,12 @@
   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
-$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
-if ${lt_cv_cc_needs_belf+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
+printf %s "checking whether the C compiler needs -belf... " >&6; }
+if test ${lt_cv_cc_needs_belf+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -88386,19 +91464,20 @@
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   lt_cv_cc_needs_belf=yes
-else
+else $as_nop
   lt_cv_cc_needs_belf=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
     ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -88407,8 +91486,8 @@
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
-$as_echo "$lt_cv_cc_needs_belf" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
+printf "%s\n" "$lt_cv_cc_needs_belf" >&6; }
   if test x"$lt_cv_cc_needs_belf" != x"yes"; then
     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
     CFLAGS="$SAVE_CFLAGS"
@@ -88420,7 +91499,7 @@
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     case `/usr/bin/file conftest.o` in
     *64-bit*)
@@ -88454,36 +91533,32 @@
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
-$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
+printf %s "checking how to run the C++ preprocessor... " >&6; }
 if test -z "$CXXCPP"; then
-  if ${ac_cv_prog_CXXCPP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-      # Double quotes because CXXCPP needs to be expanded
-    for CXXCPP in "$CXX -E" "/lib/cpp"
+  if test ${ac_cv_prog_CXXCPP+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+      # Double quotes because $CXX needs to be expanded
+    for CXXCPP in "$CXX -E" cpp /lib/cpp
     do
       ac_preproc_ok=false
 for ac_cxx_preproc_warn_flag in '' yes
 do
   # Use a header file that comes with gcc, so configuring glibc
   # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
+#include <limits.h>
 		     Syntax error
 _ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
+if ac_fn_cxx_try_cpp "$LINENO"
+then :
 
-else
+else $as_nop
   # Broken: fails on valid input.
 continue
 fi
@@ -88495,10 +91570,11 @@
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
+if ac_fn_cxx_try_cpp "$LINENO"
+then :
   # Broken: success on invalid input.
 continue
-else
+else $as_nop
   # Passes both tests.
 ac_preproc_ok=:
 break
@@ -88508,7 +91584,8 @@
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
+if $ac_preproc_ok
+then :
   break
 fi
 
@@ -88520,29 +91597,24 @@
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
-$as_echo "$CXXCPP" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
+printf "%s\n" "$CXXCPP" >&6; }
 ac_preproc_ok=false
 for ac_cxx_preproc_warn_flag in '' yes
 do
   # Use a header file that comes with gcc, so configuring glibc
   # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
+#include <limits.h>
 		     Syntax error
 _ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
+if ac_fn_cxx_try_cpp "$LINENO"
+then :
 
-else
+else $as_nop
   # Broken: fails on valid input.
 continue
 fi
@@ -88554,10 +91626,11 @@
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
+if ac_fn_cxx_try_cpp "$LINENO"
+then :
   # Broken: success on invalid input.
 continue
-else
+else $as_nop
   # Passes both tests.
 ac_preproc_ok=:
 break
@@ -88567,11 +91640,12 @@
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
+if $ac_preproc_ok
+then :
 
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+else $as_nop
+  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
 See \`config.log' for more details" "$LINENO" 5; }
 fi
@@ -88587,11 +91661,12 @@
 
 # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
 # find the maximum length of command line arguments
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
-$as_echo_n "checking the maximum length of command line arguments... " >&6; }
-if ${lt_cv_sys_max_cmd_len+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
+printf %s "checking the maximum length of command line arguments... " >&6; }
+if test ${lt_cv_sys_max_cmd_len+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
     i=0
   teststring="ABCD"
 
@@ -88699,11 +91774,11 @@
 fi
 
 if test -n $lt_cv_sys_max_cmd_len ; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
-$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
+printf "%s\n" "$lt_cv_sys_max_cmd_len" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
-$as_echo "none" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none" >&5
+printf "%s\n" "none" >&6; }
 fi
 
 
@@ -88711,11 +91786,12 @@
 
 
 # Check for command to grab the raw symbol name followed by C symbol from nm.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
-$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
-if ${lt_cv_sys_global_symbol_pipe+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
+printf %s "checking command to parse $NM output from $compiler object... " >&6; }
+if test ${lt_cv_sys_global_symbol_pipe+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
 # These are sane defaults that work on at least a few old systems.
 # They come from Ultrix.  What could be older than Ultrix?!! ;)
@@ -88819,14 +91895,14 @@
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     # Now try to grab the symbols.
     nlist=conftest.nm
     if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5
   (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s "$nlist"; then
       # Try sorting and uniquifying the output.
       if sort "$nlist" | uniq > "$nlist"T; then
@@ -88881,7 +91957,7 @@
 	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s conftest${ac_exeext}; then
 	    pipe_works=yes
 	  fi
@@ -88916,18 +91992,19 @@
   lt_cv_sys_global_symbol_to_cdecl=
 fi
 if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-$as_echo "failed" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+printf "%s\n" "failed" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-$as_echo "ok" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+printf "%s\n" "ok" >&6; }
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
-$as_echo_n "checking for objdir... " >&6; }
-if ${lt_cv_objdir+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
+printf %s "checking for objdir... " >&6; }
+if test ${lt_cv_objdir+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   rm -f .libs 2>/dev/null
 mkdir .libs 2>/dev/null
 if test -d .libs; then
@@ -88938,8 +92015,8 @@
 fi
 rmdir .libs 2>/dev/null
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
-$as_echo "$lt_cv_objdir" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
+printf "%s\n" "$lt_cv_objdir" >&6; }
 objdir=$lt_cv_objdir
 
 
@@ -88990,11 +92067,12 @@
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AR+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_AR+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$AR"; then
   ac_cv_prog_AR="$AR" # Let the user override the test.
 else
@@ -89002,11 +92080,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_AR="${ac_tool_prefix}ar"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -89017,11 +92099,11 @@
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
-$as_echo "$AR" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+printf "%s\n" "$AR" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -89030,11 +92112,12 @@
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_AR+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_AR+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ac_ct_AR"; then
   ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
 else
@@ -89042,11 +92125,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_AR="ar"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -89057,11 +92144,11 @@
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
-$as_echo "$ac_ct_AR" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+printf "%s\n" "$ac_ct_AR" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
   if test "x$ac_ct_AR" = x; then
@@ -89069,8 +92156,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     AR=$ac_ct_AR
@@ -89082,11 +92169,12 @@
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_RANLIB+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_RANLIB+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
 else
@@ -89094,11 +92182,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -89109,11 +92201,11 @@
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
-$as_echo "$RANLIB" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+printf "%s\n" "$RANLIB" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -89122,11 +92214,12 @@
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_RANLIB+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ac_ct_RANLIB"; then
   ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
 else
@@ -89134,11 +92227,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -89149,11 +92246,11 @@
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
-$as_echo "$ac_ct_RANLIB" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+printf "%s\n" "$ac_ct_RANLIB" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
   if test "x$ac_ct_RANLIB" = x; then
@@ -89161,8 +92258,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     RANLIB=$ac_ct_RANLIB
@@ -89174,11 +92271,12 @@
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_STRIP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_STRIP+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$STRIP"; then
   ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
 else
@@ -89186,11 +92284,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -89201,11 +92303,11 @@
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-$as_echo "$STRIP" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+printf "%s\n" "$STRIP" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -89214,11 +92316,12 @@
   ac_ct_STRIP=$STRIP
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_STRIP+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ac_ct_STRIP"; then
   ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
 else
@@ -89226,11 +92329,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_STRIP="strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -89241,11 +92348,11 @@
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-$as_echo "$ac_ct_STRIP" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+printf "%s\n" "$ac_ct_STRIP" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
   if test "x$ac_ct_STRIP" = x; then
@@ -89253,8 +92360,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     STRIP=$ac_ct_STRIP
@@ -89317,11 +92424,12 @@
 case $deplibs_check_method in
 file_magic*)
   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
-$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
-if ${lt_cv_path_MAGIC_CMD+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
+printf %s "checking for ${ac_tool_prefix}file... " >&6; }
+if test ${lt_cv_path_MAGIC_CMD+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $MAGIC_CMD in
 \\/* |  ?:\\/*)
   lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
@@ -89370,20 +92478,21 @@
 
 MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 if test -n "$MAGIC_CMD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
-$as_echo "$MAGIC_CMD" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+printf "%s\n" "$MAGIC_CMD" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 if test -z "$lt_cv_path_MAGIC_CMD"; then
   if test -n "$ac_tool_prefix"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
-$as_echo_n "checking for file... " >&6; }
-if ${lt_cv_path_MAGIC_CMD+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for file" >&5
+printf %s "checking for file... " >&6; }
+if test ${lt_cv_path_MAGIC_CMD+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $MAGIC_CMD in
 \\/* |  ?:\\/*)
   lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
@@ -89432,11 +92541,11 @@
 
 MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 if test -n "$MAGIC_CMD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
-$as_echo "$MAGIC_CMD" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+printf "%s\n" "$MAGIC_CMD" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
   else
@@ -89454,11 +92563,12 @@
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_DSYMUTIL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_DSYMUTIL+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$DSYMUTIL"; then
   ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
 else
@@ -89466,11 +92576,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -89481,11 +92595,11 @@
 fi
 DSYMUTIL=$ac_cv_prog_DSYMUTIL
 if test -n "$DSYMUTIL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
-$as_echo "$DSYMUTIL" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
+printf "%s\n" "$DSYMUTIL" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -89494,11 +92608,12 @@
   ac_ct_DSYMUTIL=$DSYMUTIL
   # Extract the first word of "dsymutil", so it can be a program name with args.
 set dummy dsymutil; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_DSYMUTIL+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ac_ct_DSYMUTIL"; then
   ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
 else
@@ -89506,11 +92621,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -89521,11 +92640,11 @@
 fi
 ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
 if test -n "$ac_ct_DSYMUTIL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
-$as_echo "$ac_ct_DSYMUTIL" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
+printf "%s\n" "$ac_ct_DSYMUTIL" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
   if test "x$ac_ct_DSYMUTIL" = x; then
@@ -89533,8 +92652,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     DSYMUTIL=$ac_ct_DSYMUTIL
@@ -89546,11 +92665,12 @@
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
 set dummy ${ac_tool_prefix}nmedit; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_NMEDIT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_NMEDIT+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$NMEDIT"; then
   ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
 else
@@ -89558,11 +92678,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -89573,11 +92697,11 @@
 fi
 NMEDIT=$ac_cv_prog_NMEDIT
 if test -n "$NMEDIT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
-$as_echo "$NMEDIT" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
+printf "%s\n" "$NMEDIT" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -89586,11 +92710,12 @@
   ac_ct_NMEDIT=$NMEDIT
   # Extract the first word of "nmedit", so it can be a program name with args.
 set dummy nmedit; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_NMEDIT+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ac_ct_NMEDIT"; then
   ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
 else
@@ -89598,11 +92723,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_NMEDIT="nmedit"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -89613,11 +92742,11 @@
 fi
 ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
 if test -n "$ac_ct_NMEDIT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
-$as_echo "$ac_ct_NMEDIT" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
+printf "%s\n" "$ac_ct_NMEDIT" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
   if test "x$ac_ct_NMEDIT" = x; then
@@ -89625,8 +92754,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     NMEDIT=$ac_ct_NMEDIT
@@ -89636,11 +92765,12 @@
 fi
 
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
-$as_echo_n "checking for -single_module linker flag... " >&6; }
-if ${lt_cv_apple_cc_single_mod+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
+printf %s "checking for -single_module linker flag... " >&6; }
+if test ${lt_cv_apple_cc_single_mod+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   lt_cv_apple_cc_single_mod=no
       if test -z "${LT_MULTI_MODULE}"; then
    # By default we will add the -single_module flag. You can override
@@ -89657,20 +92787,21 @@
    rm conftest.c
       fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
-$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
-$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
-if ${lt_cv_ld_exported_symbols_list+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
+printf "%s\n" "$lt_cv_apple_cc_single_mod" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
+printf %s "checking for -exported_symbols_list linker flag... " >&6; }
+if test ${lt_cv_ld_exported_symbols_list+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   lt_cv_ld_exported_symbols_list=no
       save_LDFLAGS=$LDFLAGS
       echo "_main" > conftest.sym
       LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
 
 cat > conftest.$ac_ext <<EOF
-#line 89673 "configure"
+#line 92804 "configure"
 #include "confdefs.h"
 int main(void) {
 ; return 0; }
@@ -89678,7 +92809,7 @@
 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s conftest${ac_exeext}; then
  lt_cv_ld_exported_symbols_list=yes
   rm -rf conftest*
@@ -89692,8 +92823,8 @@
    LDFLAGS="$save_LDFLAGS"
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
-$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
+printf "%s\n" "$lt_cv_ld_exported_symbols_list" >&6; }
     case $host_os in
     rhapsody* | darwin1.0123)
       _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
@@ -89734,7 +92865,8 @@
 enable_win32_dll=no
 
 # Check whether --enable-libtool-lock was given.
-if test "${enable_libtool_lock+set}" = set; then :
+if test ${enable_libtool_lock+y}
+then :
   enableval=$enable_libtool_lock;
 fi
 
@@ -89742,9 +92874,10 @@
 
 
 # Check whether --with-pic was given.
-if test "${with_pic+set}" = set; then :
+if test ${with_pic+y}
+then :
   withval=$with_pic; pic_mode="$withval"
-else
+else $as_nop
   pic_mode=default
 fi
 
@@ -89809,11 +92942,12 @@
   lt_prog_compiler_no_builtin_flag=' -fno-builtin'
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
-if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+printf %s "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
+if test ${lt_cv_prog_compiler_rtti_exceptions+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   lt_cv_prog_compiler_rtti_exceptions=no
   ac_outfile=conftest.$ac_objext
    echo "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -89827,11 +92961,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:89830: $lt_compile\"" >&5)
+   (eval echo "\"configure:92964: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "configure:89834: \$? = $ac_status" >&5
+   echo "configure:92968: \$? = $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.
@@ -89844,8 +92978,8 @@
    $rm conftest*
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+printf "%s\n" "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
 
 if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
     lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
@@ -89859,8 +92993,8 @@
 lt_prog_compiler_pic=
 lt_prog_compiler_static=
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+printf %s "checking for $compiler option to produce PIC... " >&6; }
 
   if test "$GCC" = yes; then
     lt_prog_compiler_wl='-Wl,'
@@ -90099,19 +93233,20 @@
     esac
   fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
-$as_echo "$lt_prog_compiler_pic" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
+printf "%s\n" "$lt_prog_compiler_pic" >&6; }
 
 #
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic"; then
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
-$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
-if ${lt_cv_prog_compiler_pic_works+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+printf %s "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
+if test ${lt_cv_prog_compiler_pic_works+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   lt_cv_prog_compiler_pic_works=no
   ac_outfile=conftest.$ac_objext
    echo "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -90125,11 +93260,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:90128: $lt_compile\"" >&5)
+   (eval echo "\"configure:93263: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "configure:90132: \$? = $ac_status" >&5
+   echo "configure:93267: \$? = $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.
@@ -90142,8 +93277,8 @@
    $rm conftest*
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
-$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
+printf "%s\n" "$lt_cv_prog_compiler_pic_works" >&6; }
 
 if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
     case $lt_prog_compiler_pic in
@@ -90170,11 +93305,12 @@
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-if ${lt_cv_prog_compiler_static_works+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+printf %s "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+if test ${lt_cv_prog_compiler_static_works+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   lt_cv_prog_compiler_static_works=no
    save_LDFLAGS="$LDFLAGS"
    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
@@ -90198,8 +93334,8 @@
    LDFLAGS="$save_LDFLAGS"
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
-$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
+printf "%s\n" "$lt_cv_prog_compiler_static_works" >&6; }
 
 if test x"$lt_cv_prog_compiler_static_works" = xyes; then
     :
@@ -90208,11 +93344,12 @@
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if ${lt_cv_prog_compiler_c_o+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+printf %s "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if test ${lt_cv_prog_compiler_c_o+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   lt_cv_prog_compiler_c_o=no
    $rm -r conftest 2>/dev/null
    mkdir conftest
@@ -90229,11 +93366,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:90232: $lt_compile\"" >&5)
+   (eval echo "\"configure:93369: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "configure:90236: \$? = $ac_status" >&5
+   echo "configure:93373: \$? = $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
@@ -90255,34 +93392,34 @@
    $rm conftest*
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
-$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
+printf "%s\n" "$lt_cv_prog_compiler_c_o" >&6; }
 
 
 hard_links="nottested"
 if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
   # do not overwrite the value of need_locks provided by the user
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
-$as_echo_n "checking if we can lock with hard links... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
+printf %s "checking if we can lock with hard links... " >&6; }
   hard_links=yes
   $rm conftest*
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
   touch conftest.a
   ln conftest.a conftest.b 2>&5 || hard_links=no
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
-$as_echo "$hard_links" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
+printf "%s\n" "$hard_links" >&6; }
   if test "$hard_links" = no; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
-$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
+printf "%s\n" "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
     need_locks=warn
   fi
 else
   need_locks=no
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+printf %s "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 
   runpath_var=
   allow_undefined_flag=
@@ -90693,7 +93830,7 @@
        # Determine the default libpath from the value encoded in an empty executable.
 
 cat > conftest.$ac_ext <<EOF
-#line 90696 "configure"
+#line 93833 "configure"
 #include "confdefs.h"
 int main(void) {
 ; return 0; }
@@ -90701,7 +93838,7 @@
 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s conftest${ac_exeext}; then
 
 lt_aix_libpath_sed='
@@ -90735,7 +93872,7 @@
 	 # Determine the default libpath from the value encoded in an empty executable.
 
 cat > conftest.$ac_ext <<EOF
-#line 90738 "configure"
+#line 93875 "configure"
 #include "confdefs.h"
 int main(void) {
 ; return 0; }
@@ -90743,7 +93880,7 @@
 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s conftest${ac_exeext}; then
 
 lt_aix_libpath_sed='
@@ -91209,8 +94346,8 @@
     esac
   fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
-$as_echo "$ld_shlibs" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
+printf "%s\n" "$ld_shlibs" >&6; }
 test "$ld_shlibs" = no && can_build_shared=no
 
 #
@@ -91230,15 +94367,15 @@
       # Test whether the compiler implicitly links with -lc since on some
       # systems, -lgcc has to come before -lc. If gcc already passes -lc
       # to ld, don't add -lc before -lgcc.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
-$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
+printf %s "checking whether -lc should be explicitly linked in... " >&6; }
       $rm conftest*
       echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
       if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } 2>conftest.err; then
         soname=conftest
         lib=conftest
@@ -91256,7 +94393,7 @@
         if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\""; } >&5
   (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
         then
 	  archive_cmds_need_lc=no
@@ -91268,16 +94405,16 @@
         cat conftest.err 1>&5
       fi
       $rm conftest*
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5
-$as_echo "$archive_cmds_need_lc" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5
+printf "%s\n" "$archive_cmds_need_lc" >&6; }
       ;;
     esac
   fi
   ;;
 esac
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
-$as_echo_n "checking dynamic linker characteristics... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
+printf %s "checking dynamic linker characteristics... " >&6; }
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
@@ -91885,20 +95022,22 @@
   dynamic_linker=no
   ;;
 esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
-$as_echo "$dynamic_linker" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
+printf "%s\n" "$dynamic_linker" >&6; }
 test "$dynamic_linker" = no && can_build_shared=no
 
-if ${lt_cv_sys_lib_search_path_spec+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+if test ${lt_cv_sys_lib_search_path_spec+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
 fi
 
 sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-if ${lt_cv_sys_lib_dlsearch_path_spec+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+if test ${lt_cv_sys_lib_dlsearch_path_spec+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
 fi
 
@@ -91909,8 +95048,8 @@
   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
-$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
+printf %s "checking how to hardcode library paths into programs... " >&6; }
 hardcode_action=
 if test -n "$hardcode_libdir_flag_spec" || \
    test -n "$runpath_var" || \
@@ -91934,8 +95073,8 @@
   # directories.
   hardcode_action=unsupported
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
-$as_echo "$hardcode_action" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
+printf "%s\n" "$hardcode_action" >&6; }
 
 if test "$hardcode_action" = relink; then
   # Fast installation is not supported
@@ -91948,13 +95087,13 @@
 
 striplib=
 old_striplib=
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
-$as_echo_n "checking whether stripping libraries is possible... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
+printf %s "checking whether stripping libraries is possible... " >&6; }
 if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
   test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
   test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 else
 # FIXME - insert some real tests, host_os isn't really good enough
   case $host_os in
@@ -91962,16 +95101,16 @@
        if test -n "$STRIP" ; then
          striplib="$STRIP -x"
          old_striplib="$STRIP -S"
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
        else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
        ;;
    *)
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
     ;;
   esac
 fi
@@ -92003,11 +95142,12 @@
 
   darwin*)
   # if libdl is installed we need to link against it
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if ${ac_cv_lib_dl_dlopen+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+printf %s "checking for dlopen in -ldl... " >&6; }
+if test ${ac_cv_lib_dl_dlopen+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -92016,32 +95156,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char dlopen ();
 int
-main ()
+main (void)
 {
 return dlopen ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_dl_dlopen=yes
-else
+else $as_nop
   ac_cv_lib_dl_dlopen=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = xyes
+then :
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
+else $as_nop
 
     lt_cv_dlopen="dyld"
     lt_cv_dlopen_libs=
@@ -92053,14 +95192,16 @@
 
   *)
     ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
-if test "x$ac_cv_func_shl_load" = xyes; then :
+if test "x$ac_cv_func_shl_load" = xyes
+then :
   lt_cv_dlopen="shl_load"
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
-$as_echo_n "checking for shl_load in -ldld... " >&6; }
-if ${ac_cv_lib_dld_shl_load+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
+printf %s "checking for shl_load in -ldld... " >&6; }
+if test ${ac_cv_lib_dld_shl_load+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -92069,41 +95210,42 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char shl_load ();
 int
-main ()
+main (void)
 {
 return shl_load ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_dld_shl_load=yes
-else
+else $as_nop
   ac_cv_lib_dld_shl_load=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
-$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
-if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
+printf "%s\n" "$ac_cv_lib_dld_shl_load" >&6; }
+if test "x$ac_cv_lib_dld_shl_load" = xyes
+then :
   lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
-else
+else $as_nop
   ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
-if test "x$ac_cv_func_dlopen" = xyes; then :
+if test "x$ac_cv_func_dlopen" = xyes
+then :
   lt_cv_dlopen="dlopen"
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if ${ac_cv_lib_dl_dlopen+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+printf %s "checking for dlopen in -ldl... " >&6; }
+if test ${ac_cv_lib_dl_dlopen+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -92112,37 +95254,37 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char dlopen ();
 int
-main ()
+main (void)
 {
 return dlopen ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_dl_dlopen=yes
-else
+else $as_nop
   ac_cv_lib_dl_dlopen=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = xyes
+then :
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
-$as_echo_n "checking for dlopen in -lsvld... " >&6; }
-if ${ac_cv_lib_svld_dlopen+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
+printf %s "checking for dlopen in -lsvld... " >&6; }
+if test ${ac_cv_lib_svld_dlopen+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsvld  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -92151,37 +95293,37 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char dlopen ();
 int
-main ()
+main (void)
 {
 return dlopen ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_svld_dlopen=yes
-else
+else $as_nop
   ac_cv_lib_svld_dlopen=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
-$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
-if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
+printf "%s\n" "$ac_cv_lib_svld_dlopen" >&6; }
+if test "x$ac_cv_lib_svld_dlopen" = xyes
+then :
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
-$as_echo_n "checking for dld_link in -ldld... " >&6; }
-if ${ac_cv_lib_dld_dld_link+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
+printf %s "checking for dld_link in -ldld... " >&6; }
+if test ${ac_cv_lib_dld_dld_link+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -92190,30 +95332,29 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char dld_link ();
 int
-main ()
+main (void)
 {
 return dld_link ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_dld_dld_link=yes
-else
+else $as_nop
   ac_cv_lib_dld_dld_link=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
-$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
-if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
+printf "%s\n" "$ac_cv_lib_dld_dld_link" >&6; }
+if test "x$ac_cv_lib_dld_dld_link" = xyes
+then :
   lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
 fi
 
@@ -92252,18 +95393,19 @@
     save_LIBS="$LIBS"
     LIBS="$lt_cv_dlopen_libs $LIBS"
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
-$as_echo_n "checking whether a program can dlopen itself... " >&6; }
-if ${lt_cv_dlopen_self+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
+printf %s "checking whether a program can dlopen itself... " >&6; }
+if test ${lt_cv_dlopen_self+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   	  if test "$cross_compiling" = yes; then :
   lt_cv_dlopen_self=cross
 else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 92266 "configure"
+#line 95408 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -92326,7 +95468,7 @@
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
     (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
@@ -92344,23 +95486,24 @@
 
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
-$as_echo "$lt_cv_dlopen_self" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
+printf "%s\n" "$lt_cv_dlopen_self" >&6; }
 
     if test "x$lt_cv_dlopen_self" = xyes; then
       wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
-$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
-if ${lt_cv_dlopen_self_static+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
+printf %s "checking whether a statically linked program can dlopen itself... " >&6; }
+if test ${lt_cv_dlopen_self_static+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   	  if test "$cross_compiling" = yes; then :
   lt_cv_dlopen_self_static=cross
 else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 92363 "configure"
+#line 95506 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -92423,7 +95566,7 @@
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
     (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
@@ -92441,8 +95584,8 @@
 
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
-$as_echo "$lt_cv_dlopen_self_static" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
+printf "%s\n" "$lt_cv_dlopen_self_static" >&6; }
     fi
 
     CPPFLAGS="$save_CPPFLAGS"
@@ -92464,13 +95607,13 @@
 
 
 # Report which library types will actually be built
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
-$as_echo_n "checking if libtool supports shared libraries... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
-$as_echo "$can_build_shared" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
+printf %s "checking if libtool supports shared libraries... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
+printf "%s\n" "$can_build_shared" >&6; }
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
-$as_echo_n "checking whether to build shared libraries... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
+printf %s "checking whether to build shared libraries... " >&6; }
 test "$can_build_shared" = "no" && enable_shared=no
 
 # On AIX, shared libraries and static libraries use the same namespace, and
@@ -92490,15 +95633,15 @@
   fi
     ;;
 esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
-$as_echo "$enable_shared" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
+printf "%s\n" "$enable_shared" >&6; }
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
-$as_echo_n "checking whether to build static libraries... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
+printf %s "checking whether to build static libraries... " >&6; }
 # Make sure either enable_shared or enable_static is yes.
 test "$enable_shared" = yes || enable_static=yes
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
-$as_echo "$enable_static" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
+printf "%s\n" "$enable_static" >&6; }
 
 # The else clause should only fire when bootstrapping the
 # libtool distribution, otherwise you forgot to ship ltmain.sh
@@ -92591,9 +95734,9 @@
 cfgfile="${ofile}T"
   trap "$rm \"$cfgfile\"; exit 1" 1 2 15
   $rm -f "$cfgfile"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result:
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result:
 creating $ofile" >&5
-$as_echo "
+printf "%s\n" "
 creating $ofile" >&6; }
 
   cat <<__EOF__ >> "$cfgfile"
@@ -92999,25 +96142,26 @@
 
 
 # Check whether --with-tags was given.
-if test "${with_tags+set}" = set; then :
+if test ${with_tags+y}
+then :
   withval=$with_tags; tagnames="$withval"
 fi
 
 
 if test -f "$ltmain" && test -n "$tagnames"; then
   if test ! -f "${ofile}"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: output file '$ofile' does not exist" >&5
-$as_echo "$as_me: WARNING: output file '$ofile' does not exist" >&2;}
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: output file '$ofile' does not exist" >&5
+printf "%s\n" "$as_me: WARNING: output file '$ofile' does not exist" >&2;}
   fi
 
   if test -z "$LTCC"; then
     eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
     if test -z "$LTCC"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: output file '$ofile' does not look like a libtool script" >&5
-$as_echo "$as_me: WARNING: output file '$ofile' does not look like a libtool script" >&2;}
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: output file '$ofile' does not look like a libtool script" >&5
+printf "%s\n" "$as_me: WARNING: output file '$ofile' does not look like a libtool script" >&2;}
     else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using 'LTCC=$LTCC', extracted from '$ofile'" >&5
-$as_echo "$as_me: WARNING: using 'LTCC=$LTCC', extracted from '$ofile'" >&2;}
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using 'LTCC=$LTCC', extracted from '$ofile'" >&5
+printf "%s\n" "$as_me: WARNING: using 'LTCC=$LTCC', extracted from '$ofile'" >&2;}
     fi
   fi
   if test -z "$LTCFLAGS"; then
@@ -93173,17 +96317,18 @@
 
 
 # Check whether --with-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then :
+if test ${with_gnu_ld+y}
+then :
   withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
-else
+else $as_nop
   with_gnu_ld=no
 fi
 
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
-$as_echo_n "checking for ld used by $CC... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+printf %s "checking for ld used by $CC... " >&6; }
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -93212,15 +96357,16 @@
     ;;
   esac
 elif test "$with_gnu_ld" = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
-$as_echo_n "checking for GNU ld... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+printf %s "checking for GNU ld... " >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
-$as_echo_n "checking for non-GNU ld... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+printf %s "checking for non-GNU ld... " >&6; }
 fi
-if ${lt_cv_path_LD+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+if test ${lt_cv_path_LD+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -z "$LD"; then
   lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
   for ac_dir in $PATH; do
@@ -93249,18 +96395,19 @@
 
 LD="$lt_cv_path_LD"
 if test -n "$LD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
-$as_echo "$LD" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+printf "%s\n" "$LD" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
-$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if ${lt_cv_prog_gnu_ld+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+printf %s "checking if the linker ($LD) is GNU ld... " >&6; }
+if test ${lt_cv_prog_gnu_ld+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   # I'd rather use --version here, but apparently some GNU lds only accept -v.
 case `$LD -v 2>&1 </dev/null` in
 *GNU* | *'with BFD'*)
@@ -93271,8 +96418,8 @@
   ;;
 esac
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
-$as_echo "$lt_cv_prog_gnu_ld" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
+printf "%s\n" "$lt_cv_prog_gnu_ld" >&6; }
 with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
@@ -93322,8 +96469,8 @@
 fi
 
 # PORTME: fill in a description of your system's C++ link characteristics
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+printf %s "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 ld_shlibs_CXX=yes
 case $host_os in
   aix3*)
@@ -93421,7 +96568,7 @@
       # Determine the default libpath from the value encoded in an empty executable.
 
 cat > conftest.$ac_ext <<EOF
-#line 93424 "configure"
+#line 96571 "configure"
 #include "confdefs.h"
 int main(void) {
 ; return 0; }
@@ -93429,7 +96576,7 @@
 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s conftest${ac_exeext}; then
 
 lt_aix_libpath_sed='
@@ -93464,7 +96611,7 @@
 	# Determine the default libpath from the value encoded in an empty executable.
 
 cat > conftest.$ac_ext <<EOF
-#line 93467 "configure"
+#line 96614 "configure"
 #include "confdefs.h"
 int main(void) {
 ; return 0; }
@@ -93472,7 +96619,7 @@
 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s conftest${ac_exeext}; then
 
 lt_aix_libpath_sed='
@@ -94220,8 +97367,8 @@
     ld_shlibs_CXX=no
     ;;
 esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
-$as_echo "$ld_shlibs_CXX" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
+printf "%s\n" "$ld_shlibs_CXX" >&6; }
 test "$ld_shlibs_CXX" = no && can_build_shared=no
 
 GCC_CXX="$GXX"
@@ -94244,7 +97391,7 @@
 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   # Parse the compiler output and extract the necessary
   # objects, libraries and library flags.
@@ -94400,8 +97547,8 @@
 lt_prog_compiler_pic_CXX=
 lt_prog_compiler_static_CXX=
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+printf %s "checking for $compiler option to produce PIC... " >&6; }
 
   # C++ specific cases for pic, static, wl, etc.
   if test "$GXX" = yes; then
@@ -94690,19 +97837,20 @@
     esac
   fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5
-$as_echo "$lt_prog_compiler_pic_CXX" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5
+printf "%s\n" "$lt_prog_compiler_pic_CXX" >&6; }
 
 #
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic_CXX"; then
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
-$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; }
-if ${lt_cv_prog_compiler_pic_works_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
+printf %s "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; }
+if test ${lt_cv_prog_compiler_pic_works_CXX+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   lt_cv_prog_compiler_pic_works_CXX=no
   ac_outfile=conftest.$ac_objext
    echo "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -94716,11 +97864,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:94719: $lt_compile\"" >&5)
+   (eval echo "\"configure:97867: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "configure:94723: \$? = $ac_status" >&5
+   echo "configure:97871: \$? = $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.
@@ -94733,8 +97881,8 @@
    $rm conftest*
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
-$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
+printf "%s\n" "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
 
 if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
     case $lt_prog_compiler_pic_CXX in
@@ -94761,11 +97909,12 @@
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-if ${lt_cv_prog_compiler_static_works_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+printf %s "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+if test ${lt_cv_prog_compiler_static_works_CXX+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   lt_cv_prog_compiler_static_works_CXX=no
    save_LDFLAGS="$LDFLAGS"
    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
@@ -94789,8 +97938,8 @@
    LDFLAGS="$save_LDFLAGS"
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5
-$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5
+printf "%s\n" "$lt_cv_prog_compiler_static_works_CXX" >&6; }
 
 if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
     :
@@ -94799,11 +97948,12 @@
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if ${lt_cv_prog_compiler_c_o_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+printf %s "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if test ${lt_cv_prog_compiler_c_o_CXX+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   lt_cv_prog_compiler_c_o_CXX=no
    $rm -r conftest 2>/dev/null
    mkdir conftest
@@ -94820,11 +97970,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:94823: $lt_compile\"" >&5)
+   (eval echo "\"configure:97973: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "configure:94827: \$? = $ac_status" >&5
+   echo "configure:97977: \$? = $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
@@ -94846,34 +97996,34 @@
    $rm conftest*
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5
-$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5
+printf "%s\n" "$lt_cv_prog_compiler_c_o_CXX" >&6; }
 
 
 hard_links="nottested"
 if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
   # do not overwrite the value of need_locks provided by the user
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
-$as_echo_n "checking if we can lock with hard links... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
+printf %s "checking if we can lock with hard links... " >&6; }
   hard_links=yes
   $rm conftest*
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
   touch conftest.a
   ln conftest.a conftest.b 2>&5 || hard_links=no
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
-$as_echo "$hard_links" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
+printf "%s\n" "$hard_links" >&6; }
   if test "$hard_links" = no; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
-$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
+printf "%s\n" "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
     need_locks=warn
   fi
 else
   need_locks=no
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+printf %s "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 
   export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
   case $host_os in
@@ -94898,8 +98048,8 @@
   esac
   exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__FID_.*'
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
-$as_echo "$ld_shlibs_CXX" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
+printf "%s\n" "$ld_shlibs_CXX" >&6; }
 test "$ld_shlibs_CXX" = no && can_build_shared=no
 
 #
@@ -94919,15 +98069,15 @@
       # Test whether the compiler implicitly links with -lc since on some
       # systems, -lgcc has to come before -lc. If gcc already passes -lc
       # to ld, don't add -lc before -lgcc.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
-$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
+printf %s "checking whether -lc should be explicitly linked in... " >&6; }
       $rm conftest*
       echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
       if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } 2>conftest.err; then
         soname=conftest
         lib=conftest
@@ -94945,7 +98095,7 @@
         if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\""; } >&5
   (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
         then
 	  archive_cmds_need_lc_CXX=no
@@ -94957,16 +98107,16 @@
         cat conftest.err 1>&5
       fi
       $rm conftest*
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc_CXX" >&5
-$as_echo "$archive_cmds_need_lc_CXX" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc_CXX" >&5
+printf "%s\n" "$archive_cmds_need_lc_CXX" >&6; }
       ;;
     esac
   fi
   ;;
 esac
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
-$as_echo_n "checking dynamic linker characteristics... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
+printf %s "checking dynamic linker characteristics... " >&6; }
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
@@ -95522,20 +98672,22 @@
   dynamic_linker=no
   ;;
 esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
-$as_echo "$dynamic_linker" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
+printf "%s\n" "$dynamic_linker" >&6; }
 test "$dynamic_linker" = no && can_build_shared=no
 
-if ${lt_cv_sys_lib_search_path_spec+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+if test ${lt_cv_sys_lib_search_path_spec+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
 fi
 
 sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-if ${lt_cv_sys_lib_dlsearch_path_spec+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+if test ${lt_cv_sys_lib_dlsearch_path_spec+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
 fi
 
@@ -95546,8 +98698,8 @@
   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
-$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
+printf %s "checking how to hardcode library paths into programs... " >&6; }
 hardcode_action_CXX=
 if test -n "$hardcode_libdir_flag_spec_CXX" || \
    test -n "$runpath_var_CXX" || \
@@ -95571,8 +98723,8 @@
   # directories.
   hardcode_action_CXX=unsupported
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5
-$as_echo "$hardcode_action_CXX" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5
+printf "%s\n" "$hardcode_action_CXX" >&6; }
 
 if test "$hardcode_action_CXX" = relink; then
   # Fast installation is not supported
@@ -96084,10 +99236,10 @@
 CC=$old_CC
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
-$as_echo "" >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${T_MD}Generating files${T_ME}" >&5
-$as_echo "${T_MD}Generating files${T_ME}" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5
+printf "%s\n" "" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${T_MD}Generating files${T_ME}" >&5
+printf "%s\n" "${T_MD}Generating files${T_ME}" >&6; }
 
 
 CXXFLAGS_CLEAN=$CXXFLAGS
@@ -96579,7 +99731,7 @@
 
 
 
-$as_echo "#define HAVE_BUILD_DEFS_H 1" >>confdefs.h
+printf "%s\n" "#define HAVE_BUILD_DEFS_H 1" >>confdefs.h
 
 
 $php_shtool mkdir -p pear
@@ -96625,8 +99777,8 @@
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
@@ -96656,15 +99808,15 @@
      /^ac_cv_env_/b end
      t clear
      :clear
-     s/^$^=*$=$.*{}.*$$/test "${\1+set}" = set || &/
+     s/^$^=*$=$.*{}.*$$/test ${\1+y} || &/
      t end
      s/^$^=*$=$.*$$/\1=${\1=\2}/
      :end' >>confcache
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     if test "x$cache_file" != "x/dev/null"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-$as_echo "$as_me: updating cache $cache_file" >&6;}
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+printf "%s\n" "$as_me: updating cache $cache_file" >&6;}
       if test ! -f "$cache_file" || test -h "$cache_file"; then
 	cat confcache >"$cache_file"
       else
@@ -96678,8 +99830,8 @@
       fi
     fi
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+printf "%s\n" "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
@@ -96696,7 +99848,7 @@
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
+  ac_i=`printf "%s\n" "$ac_i" | sed "$ac_script"`
   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
   #    will be set to the directory where LIBOBJS objects are built.
   as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
@@ -96708,8 +99860,8 @@
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: patching main/php_config.h.in" >&5
-$as_echo "$as_me: patching main/php_config.h.in" >&6;}
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: patching main/php_config.h.in" >&5
+printf "%s\n" "$as_me: patching main/php_config.h.in" >&6;}
 
   $SED -e 's/^#undef PACKAGE_^ */\/\* & \*\//g' < $srcdir/main/php_config.h.in \
     > $srcdir/main/php_config.h.in.tmp && mv $srcdir/main/php_config.h.in.tmp $srcdir/main/php_config.h.in
@@ -96719,8 +99871,8 @@
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+printf "%s\n" "$as_me: creating $CONFIG_STATUS" >&6;}
 as_write_fail=0
 cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
 #! $SHELL
@@ -96743,14 +99895,16 @@
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+as_nop=:
+if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
+then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
-else
+else $as_nop
   case `(set -o) 2>/dev/null` in #(
   *posix*) :
     set -o posix ;; #(
@@ -96760,46 +99914,46 @@
 fi
 
 
+
+# Reset variables that may have inherited troublesome values from
+# the environment.
+
+# IFS needs to be set, to space, tab, and newline, in precisely that order.
+# (If _AS_PATH_WALK were called with IFS unset, it would have the
+# side effect of setting IFS to empty, thus disabling word splitting.)
+# Quoting is to prevent editors from complaining about space-tab.
 as_nl='
 '
 export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\$.*\$"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in #(
-      *"$as_nl"*)
-	expr "X$arg" : "X\$.*\$$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\$.*\$"`;;
-      esac;
-      expr "X$arg" : "X\$.*\$" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
+IFS=" ""	$as_nl"
+
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# Ensure predictable behavior from utilities with locale-dependent output.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# We cannot yet rely on "unset" to work, but we need these variables
+# to be unset--not just set to an empty or harmless value--now, to
+# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh).  This construct
+# also avoids known problems related to "unset" and subshell syntax
+# in other old shells (e.g. bash 2.01 and pdksh 5.2.14).
+for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH
+do eval test \${$as_var+y} \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+
+# Ensure that fds 0, 1, and 2 are open.
+if (exec 3>&0) 2>/dev/null; then :; else exec 0</dev/null; fi
+if (exec 3>&1) 2>/dev/null; then :; else exec 1>/dev/null; fi
+if (exec 3>&2)            ; then :; else exec 2>/dev/null; fi
 
 # The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
+if ${PATH_SEPARATOR+false} :; then
   PATH_SEPARATOR=:
   (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
     (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
@@ -96808,13 +99962,6 @@
 fi
 
 
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
 # Find who we are.  Look in the path if we contain no directory separator.
 as_myself=
 case $0 in #((
@@ -96823,8 +99970,12 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    test -r "$as_dir$0" && as_myself=$as_dir$0 && break
   done
 IFS=$as_save_IFS
 
@@ -96836,30 +99987,10 @@
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   exit 1
 fi
 
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 
 # as_fn_error STATUS ERROR LINENO LOG_FD
@@ -96872,13 +100003,14 @@
   as_status=$1; test $as_status -eq 0 && as_status=1
   if test "$4"; then
     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  $as_echo "$as_me: error: $2" >&2
+  printf "%s\n" "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
 
+
 # as_fn_set_status STATUS
 # -----------------------
 # Set $? to STATUS, without forking.
@@ -96905,18 +100037,20 @@
   { eval $1=; unset $1;}
 }
 as_unset=as_fn_unset
+
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
 # advantage of any shell optimizations that allow amortized linear growth over
 # repeated appends, instead of the typical quadratic growth present in naive
 # implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null
+then :
   eval 'as_fn_append ()
   {
     eval $1+=\$2
   }'
-else
+else $as_nop
   as_fn_append ()
   {
     eval $1=\$$1\$2
@@ -96928,12 +100062,13 @@
 # Perform arithmetic evaluation on the ARGs, and store the result in the
 # global $as_val. Take advantage of shells that can avoid forks. The arguments
 # must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null
+then :
   eval 'as_fn_arith ()
   {
     as_val=$(( $* ))
   }'
-else
+else $as_nop
   as_fn_arith ()
   {
     as_val=`expr "$@" || test $? -eq 1`
@@ -96964,7 +100099,7 @@
 $as_expr X/"$0" : '.*/$^/^/*$/*$' \| \
 	 X"$0" : 'X$//$$' \| \
 	 X"$0" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X/"$0" |
+printf "%s\n" X/"$0" |
     sed '/^.*\/$^/^/*$\/*$/{
 	    s//\1/
 	    q
@@ -96986,6 +100121,10 @@
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
+
+# Determine whether it's possible to make 'echo' print without a newline.
+# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
+# for compatibility with existing Makefiles.
 ECHO_C= ECHO_N= ECHO_T=
 case `echo -n x` in #(((((
 -n*)
@@ -96999,6 +100138,12 @@
   ECHO_N='-n';;
 esac
 
+# For backward compatibility with old third-party macros, we provide
+# the shell variables $as_echo and $as_echo_n.  New code should use
+# AS_ECHO("message") and AS_ECHO_N("message"), respectively.
+as_echo='printf %s\n'
+as_echo_n='printf %s'
+
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
@@ -97040,7 +100185,7 @@
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -97049,7 +100194,7 @@
 	 X"$as_dir" : 'X$//$^/' \| \
 	 X"$as_dir" : 'X$//$$' \| \
 	 X"$as_dir" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
+printf "%s\n" X"$as_dir" |
     sed '/^X$.*^/$\/\/*^/^/*\/*$/{
 	    s//\1/
 	    q
@@ -97111,8 +100256,8 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by PHP $as_me 8.3.7, which was
-generated by GNU Autoconf 2.69.  Invocation command line was
+This file was extended by PHP $as_me 8.3.21, which was
+generated by GNU Autoconf 2.71.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -97175,14 +100320,16 @@
 PHP home page: <https://www.php.net>."
 
 _ACEOF
+ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"`
+ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"`
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/\\""\`\$/\\\\&/g'`"
+ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
-PHP config.status 8.3.7
-configured by $0, generated by GNU Autoconf 2.69,
+PHP config.status 8.3.21
+configured by $0, generated by GNU Autoconf 2.71,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2012 Free Software Foundation, Inc.
+Copyright (C) 2021 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -97219,15 +100366,15 @@
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    $as_echo "$ac_cs_version"; exit ;;
+    printf "%s\n" "$ac_cs_version"; exit ;;
   --config | --confi | --conf | --con | --co | --c )
-    $as_echo "$ac_cs_config"; exit ;;
+    printf "%s\n" "$ac_cs_config"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
     case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
     '') as_fn_error $? "missing file argument" ;;
     esac
     as_fn_append CONFIG_FILES " '$ac_optarg'"
@@ -97235,7 +100382,7 @@
   --header | --heade | --head | --hea )
     $ac_shift
     case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     as_fn_append CONFIG_HEADERS " '$ac_optarg'"
     ac_need_defaults=false;;
@@ -97244,7 +100391,7 @@
     as_fn_error $? "ambiguous option: \`$1'
 Try \`$0 --help' for more information.";;
   --help | --hel | -h )
-    $as_echo "$ac_cs_usage"; exit ;;
+    printf "%s\n" "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil | --si | --s)
     ac_cs_silent=: ;;
@@ -97272,7 +100419,7 @@
 if \$ac_cs_recheck; then
   set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
   shift
-  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+  \printf "%s\n" "running CONFIG_SHELL=$SHELL \$*" >&6
   CONFIG_SHELL='$SHELL'
   export CONFIG_SHELL
   exec "\$@"
@@ -97286,7 +100433,7 @@
   sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
 ## Running $as_me. ##
 _ASBOX
-  $as_echo "$ac_log"
+  printf "%s\n" "$ac_log"
 } >&5
 
 _ACEOF
@@ -97308,10 +100455,10 @@
 
 if test -n "\$REDO_ALL"; then
   echo "creating main/internal_functions.c"
-  AWK="$AWK" sh $srcdir/build/genif.sh $srcdir/main/internal_functions.c.in "$EXT_STATIC" > main/internal_functions.c
+  AWK="$AWK" $SHELL $srcdir/build/genif.sh $srcdir/main/internal_functions.c.in "$EXT_STATIC" > main/internal_functions.c
 
   echo "creating main/internal_functions_cli.c"
-  AWK="$AWK" sh $srcdir/build/genif.sh $srcdir/main/internal_functions.c.in "$EXT_CLI_STATIC" > main/internal_functions_cli.c
+  AWK="$AWK" $SHELL $srcdir/build/genif.sh $srcdir/main/internal_functions.c.in "$EXT_CLI_STATIC" > main/internal_functions_cli.c
 
     if test "$PHP_SAPI" = "apache2handler"; then
       if test "$APACHE_VERSION" -ge 2004001; then
@@ -97370,9 +100517,9 @@
 # We use the long form for the default assignment because of an extremely
 # bizarre bug on SunOS 4.1.3.
 if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
-  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
+  test ${CONFIG_FILES+y} || CONFIG_FILES=$config_files
+  test ${CONFIG_HEADERS+y} || CONFIG_HEADERS=$config_headers
+  test ${CONFIG_COMMANDS+y} || CONFIG_COMMANDS=$config_commands
 fi
 
 # Have a temporary directory for convenience.  Make it in the build tree
@@ -97708,7 +100855,7 @@
 	   esac ||
 	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
       esac
-      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
       as_fn_append ac_file_inputs " '$ac_f'"
     done
 
@@ -97716,17 +100863,17 @@
     # use $as_me), people would be surprised to read:
     #    /* config.h.  Generated by config.status.  */
     configure_input='Generated from '`
-	  $as_echo "$*" | sed 's|^^:*/||;s|:^:*/|, |g'
+	  printf "%s\n" "$*" | sed 's|^^:*/||;s|:^:*/|, |g'
 	`' by configure.'
     if test x"$ac_file" != x-; then
       configure_input="$ac_file.  $configure_input"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
-$as_echo "$as_me: creating $ac_file" >&6;}
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+printf "%s\n" "$as_me: creating $ac_file" >&6;}
     fi
     # Neutralize special characters interpreted by sed in replacement strings.
     case $configure_input in #(
     *\&* | *\|* | *\\* )
-       ac_sed_conf_input=`$as_echo "$configure_input" |
+       ac_sed_conf_input=`printf "%s\n" "$configure_input" |
        sed 's/\\\\&|/\\\\&/g'`;; #(
     *) ac_sed_conf_input=$configure_input;;
     esac
@@ -97743,7 +100890,7 @@
 	 X"$ac_file" : 'X$//$^/' \| \
 	 X"$ac_file" : 'X$//$$' \| \
 	 X"$ac_file" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X"$ac_file" |
+printf "%s\n" X"$ac_file" |
     sed '/^X$.*^/$\/\/*^/^/*\/*$/{
 	    s//\1/
 	    q
@@ -97767,9 +100914,9 @@
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.\\/||'`
+  ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.\\/||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/^\\/*|/..|g;s|/||'`
+  ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/^\\/*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -97822,8 +100969,8 @@
 case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+printf "%s\n" "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
   ac_datarootdir_hack='
@@ -97865,9 +101012,9 @@
   { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^	 *datarootdir	 *:*=/p' \
       "$ac_tmp/out"`; test -z "$ac_out"; } &&
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&5
-$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&2;}
 
   rm -f "$ac_tmp/stdin"
@@ -97883,27 +101030,27 @@
   #
   if test x"$ac_file" != x-; then
     {
-      $as_echo "/* $configure_input  */" \
+      printf "%s\n" "/* $configure_input  */" >&1 \
       && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
     } >"$ac_tmp/config.h" \
       || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
-$as_echo "$as_me: $ac_file is unchanged" >&6;}
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
+printf "%s\n" "$as_me: $ac_file is unchanged" >&6;}
     else
       rm -f "$ac_file"
       mv "$ac_tmp/config.h" "$ac_file" \
 	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
     fi
   else
-    $as_echo "/* $configure_input  */" \
+    printf "%s\n" "/* $configure_input  */" >&1 \
       && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
       || as_fn_error $? "could not create -" "$LINENO" 5
   fi
  ;;
 
-  :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
-$as_echo "$as_me: executing $ac_file commands" >&6;}
+  :C)  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
+printf "%s\n" "$as_me: executing $ac_file commands" >&6;}
  ;;
   esac
 
@@ -97959,7 +101106,8 @@
   $ac_cs_success || as_fn_exit 1
 fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
+

php-8.3.7.tar.xz/configure.ac -> php-8.3.21.tar.xz/configure.ac Changed

@@ -17,7 +17,7 @@
 dnl ----------------------------------------------------------------------------
 
 AC_PREREQ(2.68)
-AC_INIT(PHP,8.3.7,https://github.com/php/php-src/issues,php,https://www.php.net)
+AC_INIT(PHP,8.3.21,https://github.com/php/php-src/issues,php,https://www.php.net)
 AC_CONFIG_SRCDIR(main/php_version.h)
 AC_CONFIG_AUX_DIR(build)
 AC_PRESERVE_HELP_ORDER
@@ -220,6 +220,9 @@
     ;;
 esac
 
+dnl See https://github.com/php/php-src/issues/14140
+AX_CHECK_COMPILE_FLAG(-ffp-contract=off, CFLAGS="$CFLAGS -ffp-contract=off")
+
 dnl Mark symbols hidden by default if the compiler (for example, gcc >= 4)
 dnl supports it. This can help reduce the binary size and startup time.
 AX_CHECK_COMPILE_FLAG(-fvisibility=hidden,
@@ -261,7 +264,7 @@
 
 dnl Detect musl libc
 AC_MSG_CHECKING(whether we are using musl libc)
-if command -v ldd >/dev/null && ldd --version 2>&1 | grep -q ^musl
+if command -v ldd >/dev/null && ldd --version 2>&1 | grep ^musl >/dev/null 2>&1
 then
   AC_MSG_RESULT(yes)
   AC_DEFINE(__MUSL__, 1, Define when using musl libc)
@@ -750,11 +753,25 @@
 PHP_TIME_R_TYPE
 PHP_CHECK_IN_ADDR_T
 
-AC_CACHE_CHECK(for aarch64 CRC32 API, ac_cv_func___crc32d,
-AC_LINK_IFELSE(AC_LANG_PROGRAM(#include <arm_acle.h>,__crc32d(0, 0);),ac_cv_func___crc32d=yes,ac_cv_func___crc32d="no"))
-if test "$ac_cv_func___crc32d" = "yes"; then
-  AC_DEFINE(HAVE_AARCH64_CRC32, 1, Define when aarch64 CRC32 API is available.)
-fi
+AC_CACHE_CHECK(for aarch64 CRC32 API, ac_cv_func___crc32d,
+AC_LINK_IFELSE(AC_LANG_PROGRAM(
+#include <arm_acle.h>
+# if defined(__GNUC__)
+#  if!defined(__clang__)
+#   pragma GCC push_options
+#   pragma GCC target ("+nothing+crc")
+#  elif defined(__APPLE__)
+#   pragma clang attribute push(__attribute__((target("crc"))), apply_to=function)
+#  else
+#   pragma clang attribute push(__attribute__((target("+nothing+crc"))), apply_to=function)
+#  endif
+# endif
+, __crc32d(0, 0);),
+ac_cv_func___crc32d=yes,
+ac_cv_func___crc32d=no))
+AS_VAR_IF(ac_cv_func___crc32d, yes,
+  AC_DEFINE(HAVE_AARCH64_CRC32, 1,
+    Define to 1 when aarch64 CRC32 API is available.))
 
 dnl Check for asm goto support.
 AC_CACHE_CHECK(for asm goto, ac_cv__asm_goto,
@@ -843,10 +860,7 @@
   PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/build/Makefile.gcov, $abs_srcdir)
 
   dnl Remove all optimization flags from CFLAGS.
-  changequote({,})
-  CFLAGS=`echo "$CFLAGS" | "${SED}" -e 's/-O0-9s*//g'`
-  CXXFLAGS=`echo "$CXXFLAGS" | "${SED}" -e 's/-O0-9s*//g'`
-  changequote(,)
+  PHP_REMOVE_OPTIMIZATION_FLAGS
 
   dnl Add the special gcc flags.
   CFLAGS="$CFLAGS -O0 -fprofile-arcs -ftest-coverage"
@@ -863,10 +877,7 @@
 if test "$PHP_DEBUG" = "yes"; then
   PHP_DEBUG=1
   ZEND_DEBUG=yes
-  changequote({,})
-  CFLAGS=`echo "$CFLAGS" | "${SED}" -e 's/-O0-9s*//g'`
-  CXXFLAGS=`echo "$CXXFLAGS" | "${SED}" -e 's/-O0-9s*//g'`
-  changequote(,)
+  PHP_REMOVE_OPTIMIZATION_FLAGS
   dnl Add -O0 only if GCC or ICC is used.
   if test "$GCC" = "yes" || test "$ICC" = "yes"; then
     CFLAGS="$CFLAGS -O0"
@@ -1829,10 +1840,10 @@
 dnl Run this only when generating all the files.
 if test -n "\$REDO_ALL"; then
   echo "creating main/internal_functions.c"
-  AWK="$AWK" sh $srcdir/build/genif.sh $srcdir/main/internal_functions.c.in "$EXT_STATIC" > main/internal_functions.c
+  AWK="$AWK" $SHELL $srcdir/build/genif.sh $srcdir/main/internal_functions.c.in "$EXT_STATIC" > main/internal_functions.c
 
   echo "creating main/internal_functions_cli.c"
-  AWK="$AWK" sh $srcdir/build/genif.sh $srcdir/main/internal_functions.c.in "$EXT_CLI_STATIC" > main/internal_functions_cli.c
+  AWK="$AWK" $SHELL $srcdir/build/genif.sh $srcdir/main/internal_functions.c.in "$EXT_CLI_STATIC" > main/internal_functions_cli.c
 
     if test "$PHP_SAPI" = "apache2handler"; then
       if test "$APACHE_VERSION" -ge 2004001; then

php-8.3.7.tar.xz/ext/bcmath/bcmath.c -> php-8.3.21.tar.xz/ext/bcmath/bcmath.c Changed

php-8.3.7.tar.xz/ext/bcmath/libbcmath/src/bcmath.h -> php-8.3.21.tar.xz/ext/bcmath/libbcmath/src/bcmath.h Changed

php-8.3.7.tar.xz/ext/bcmath/libbcmath/src/init.c -> php-8.3.21.tar.xz/ext/bcmath/libbcmath/src/init.c Changed

php-8.3.7.tar.xz/ext/bcmath/libbcmath/src/raisemod.c -> php-8.3.21.tar.xz/ext/bcmath/libbcmath/src/raisemod.c Changed

php-8.3.21.tar.xz/ext/bcmath/tests/bcpowmod_with_mod_1.phpt Added

php-8.3.21.tar.xz/ext/bcmath/tests/gh17398.phpt Added

php-8.3.7.tar.xz/ext/calendar/cal_unix.c -> php-8.3.21.tar.xz/ext/calendar/cal_unix.c Changed

php-8.3.7.tar.xz/ext/calendar/dow.c -> php-8.3.21.tar.xz/ext/calendar/dow.c Changed

php-8.3.7.tar.xz/ext/calendar/easter.c -> php-8.3.21.tar.xz/ext/calendar/easter.c Changed

php-8.3.7.tar.xz/ext/calendar/gregor.c -> php-8.3.21.tar.xz/ext/calendar/gregor.c Changed

php-8.3.7.tar.xz/ext/calendar/jewish.c -> php-8.3.21.tar.xz/ext/calendar/jewish.c Changed

@@ -433,16 +433,31 @@
 								   zend_long *pMoladHalakim)
 {
 	register zend_ulong r1, r2, d1, d2;
+	zend_long chk;
 
 	/* Start with the time of the first molad after creation. */
 	r1 = NEW_MOON_OF_CREATION;
+	chk = (zend_long)metonicCycle;
+
+	if (chk > (ZEND_LONG_MAX - NEW_MOON_OF_CREATION) / (HALAKIM_PER_METONIC_CYCLE & 0xFFFF)) {
+		*pMoladDay = 0;
+		*pMoladHalakim = 0;
+		return;
+	}
 
 	/* Calculate metonicCycle * HALAKIM_PER_METONIC_CYCLE.  The upper 32
 	 * bits of the result will be in r2 and the lower 16 bits will be
 	 * in r1. */
-	r1 += metonicCycle * (HALAKIM_PER_METONIC_CYCLE & 0xFFFF);
+	r1 += chk * (HALAKIM_PER_METONIC_CYCLE & 0xFFFF);
+
+	if (chk > (ZEND_LONG_MAX - (r1 >> 16)) / ((HALAKIM_PER_METONIC_CYCLE >> 16) & 0xFFFF)) {
+		*pMoladDay = 0;
+		*pMoladHalakim = 0;
+		return;
+	}
+
 	r2 = r1 >> 16;
-	r2 += metonicCycle * ((HALAKIM_PER_METONIC_CYCLE >> 16) & 0xFFFF);
+	r2 += chk * ((HALAKIM_PER_METONIC_CYCLE >> 16) & 0xFFFF);
 
 	/* Calculate r2r1 / HALAKIM_PER_DAY.  The remainder will be in r1, the
 	 * upper 16 bits of the quotient will be in d2 and the lower 16 bits

php-8.3.21.tar.xz/ext/calendar/tests/gh16228.phpt Added

php-8.3.21.tar.xz/ext/calendar/tests/gh16231.phpt Added

php-8.3.21.tar.xz/ext/calendar/tests/gh16234.phpt Added

php-8.3.21.tar.xz/ext/calendar/tests/gh16235.phpt Added

php-8.3.21.tar.xz/ext/calendar/tests/gh16258.phpt Added

php-8.3.21.tar.xz/ext/calendar/tests/gh16834.phpt Added

php-8.3.7.tar.xz/ext/com_dotnet/com_typeinfo.c -> php-8.3.21.tar.xz/ext/com_dotnet/com_typeinfo.c Changed

php-8.3.7.tar.xz/ext/com_dotnet/com_variant.c -> php-8.3.21.tar.xz/ext/com_dotnet/com_variant.c Changed

php-8.3.7.tar.xz/ext/com_dotnet/tests/bug73679.phpt -> php-8.3.21.tar.xz/ext/com_dotnet/tests/bug73679.phpt Changed

php-8.3.7.tar.xz/ext/com_dotnet/tests/bug77177.phpt -> php-8.3.21.tar.xz/ext/com_dotnet/tests/bug77177.phpt Changed

php-8.3.21.tar.xz/ext/com_dotnet/tests/gh16991.phpt Added

php-8.3.21.tar.xz/ext/com_dotnet/tests/variant_variation.phpt Added

php-8.3.7.tar.xz/ext/curl/config.w32 -> php-8.3.21.tar.xz/ext/curl/config.w32 Changed

php-8.3.7.tar.xz/ext/curl/interface.c -> php-8.3.21.tar.xz/ext/curl/interface.c Changed

@@ -1443,7 +1443,7 @@
 				postval = Z_STR_P(prop);
 
 				if (php_check_open_basedir(ZSTR_VAL(postval))) {
-					return FAILURE;
+					goto out_string;
 				}
 
 				prop = zend_read_property(curl_CURLFile_class, Z_OBJ_P(current), "mime", sizeof("mime")-1, 0, &rv);
@@ -1469,15 +1469,18 @@
 					seekfunc = NULL;
 				}
 
+				part = curl_mime_addpart(mime);
+				if (part == NULL) {
+					if (stream) {
+						php_stream_close(stream);
+					}
+					goto out_string;
+				}
+
 				cb_arg = emalloc(sizeof *cb_arg);
 				cb_arg->filename = zend_string_copy(postval);
 				cb_arg->stream = stream;
 
-				part = curl_mime_addpart(mime);
-				if (part == NULL) {
-					zend_string_release_ex(string_key, 0);
-					return FAILURE;
-				}
 				if ((form_error = curl_mime_name(part, ZSTR_VAL(string_key))) != CURLE_OK
 					|| (form_error = curl_mime_data_cb(part, filesize, read_cb, seekfunc, free_cb, cb_arg)) != CURLE_OK
 					|| (form_error = curl_mime_filename(part, filename ? filename : ZSTR_VAL(postval))) != CURLE_OK
@@ -1511,8 +1514,7 @@
 
 			prop = zend_read_property(curl_CURLStringFile_class, Z_OBJ_P(current), "postname", sizeof("postname")-1, 0, &rv);
 			if (EG(exception)) {
-				zend_string_release_ex(string_key, 0);
-				return FAILURE;
+				goto out_string;
 			}
 			ZVAL_DEREF(prop);
 			ZEND_ASSERT(Z_TYPE_P(prop) == IS_STRING);
@@ -1521,8 +1523,7 @@
 
 			prop = zend_read_property(curl_CURLStringFile_class, Z_OBJ_P(current), "mime", sizeof("mime")-1, 0, &rv);
 			if (EG(exception)) {
-				zend_string_release_ex(string_key, 0);
-				return FAILURE;
+				goto out_string;
 			}
 			ZVAL_DEREF(prop);
 			ZEND_ASSERT(Z_TYPE_P(prop) == IS_STRING);
@@ -1531,8 +1532,7 @@
 
 			prop = zend_read_property(curl_CURLStringFile_class, Z_OBJ_P(current), "data", sizeof("data")-1, 0, &rv);
 			if (EG(exception)) {
-				zend_string_release_ex(string_key, 0);
-				return FAILURE;
+				goto out_string;
 			}
 			ZVAL_DEREF(prop);
 			ZEND_ASSERT(Z_TYPE_P(prop) == IS_STRING);
@@ -1545,8 +1545,7 @@
 
 			part = curl_mime_addpart(mime);
 			if (part == NULL) {
-				zend_string_release_ex(string_key, 0);
-				return FAILURE;
+				goto out_string;
 			}
 			if ((form_error = curl_mime_name(part, ZSTR_VAL(string_key))) != CURLE_OK
 				|| (form_error = curl_mime_data(part, ZSTR_VAL(postval), ZSTR_LEN(postval))) != CURLE_OK
@@ -1602,7 +1601,7 @@
 
 	SAVE_CURL_ERROR(ch, error);
 	if (error != CURLE_OK) {
-		return FAILURE;
+		goto out_mime;
 	}
 
 	if ((*ch->clone) == 1) {
@@ -1618,6 +1617,16 @@
 
 	SAVE_CURL_ERROR(ch, error);
 	return error == CURLE_OK ? SUCCESS : FAILURE;
+
+out_string:
+	zend_string_release_ex(string_key, false);
+out_mime:
+#if LIBCURL_VERSION_NUM >= 0x073800 /* 7.56.0 */
+	curl_mime_free(mime);
+#else
+	curl_formfree(first);
+#endif
+	return FAILURE;
 }
 /* }}} */
 
@@ -1976,7 +1985,10 @@
 			zend_string *str = zval_get_tmp_string(zvalue, &tmp_str);
 #if LIBCURL_VERSION_NUM >= 0x075500 /* Available since 7.85.0 */
 			if ((option == CURLOPT_PROTOCOLS_STR || option == CURLOPT_REDIR_PROTOCOLS_STR) &&
-				(PG(open_basedir) && *PG(open_basedir)) && php_memnistr(ZSTR_VAL(str), "file", sizeof("file") - 1, ZSTR_VAL(str) + ZSTR_LEN(str)) != NULL) {
+				(PG(open_basedir) && *PG(open_basedir))
+					&& (php_memnistr(ZSTR_VAL(str), "file", sizeof("file") - 1, ZSTR_VAL(str) + ZSTR_LEN(str)) != NULL
+					 || php_memnistr(ZSTR_VAL(str), "all", sizeof("all") - 1, ZSTR_VAL(str) + ZSTR_LEN(str)) != NULL)) {
+					zend_tmp_string_release(tmp_str);
 					php_error_docref(NULL, E_WARNING, "The FILE protocol cannot be activated when an open_basedir is set");
 					return FAILURE;
 			}
@@ -2869,7 +2881,11 @@
 
 	if (ch->err.no) {
 		ch->err.strCURL_ERROR_SIZE = 0;
-		RETURN_STRING(ch->err.str);
+		if (strlen(ch->err.str) > 0) {
+			RETURN_STRING(ch->err.str);
+		} else {
+			RETURN_STRING(curl_easy_strerror(ch->err.no));
+		}
 	} else {
 		RETURN_EMPTY_STRING();
 	}

php-8.3.7.tar.xz/ext/curl/multi.c -> php-8.3.21.tar.xz/ext/curl/multi.c Changed

@@ -97,12 +97,14 @@
 
 	_php_curl_cleanup_handle(ch);
 
-	Z_ADDREF_P(z_ch);
-	zend_llist_add_element(&mh->easyh, z_ch);
-
 	error = curl_multi_add_handle(mh->multi, ch->cp);
 	SAVE_CURLM_ERROR(mh, error);
 
+	if (error == CURLM_OK) {
+		Z_ADDREF_P(z_ch);
+		zend_llist_add_element(&mh->easyh, z_ch);
+	}
+
 	RETURN_LONG((zend_long) error);
 }
 /* }}} */
@@ -164,9 +166,11 @@
 	error = curl_multi_remove_handle(mh->multi, ch->cp);
 	SAVE_CURLM_ERROR(mh, error);
 
-	RETVAL_LONG((zend_long) error);
-	zend_llist_del_element(&mh->easyh, z_ch, (int (*)(void *, void *))curl_compare_objects);
+	if (error == CURLM_OK) {
+		zend_llist_del_element(&mh->easyh, z_ch, (int (*)(void *, void *))curl_compare_objects);
+	}
 
+	RETURN_LONG((zend_long) error);
 }
 /* }}} */
 
@@ -187,7 +191,15 @@
 
 	mh = Z_CURL_MULTI_P(z_mh);
 
-	error = curl_multi_wait(mh->multi, NULL, 0, (unsigned long) (timeout * 1000.0), &numfds);
+	if (!(timeout >= 0.0 && timeout <= ((double)INT_MAX / 1000.0))) {
+		php_error_docref(NULL, E_WARNING, "timeout must be between 0 and %d", (int)ceilf((double)INT_MAX / 1000));
+#ifdef CURLM_BAD_FUNCTION_ARGUMENT
+		SAVE_CURLM_ERROR(mh, CURLM_BAD_FUNCTION_ARGUMENT);
+#endif
+		RETURN_LONG(-1);
+	}
+
+	error = curl_multi_wait(mh->multi, NULL, 0, (int) (timeout * 1000.0), &numfds);
 	if (CURLM_OK != error) {
 		SAVE_CURLM_ERROR(mh, error);
 		RETURN_LONG(-1);

php-8.3.7.tar.xz/ext/curl/tests/bug45161.phpt -> php-8.3.21.tar.xz/ext/curl/tests/bug45161.phpt Changed

php-8.3.7.tar.xz/ext/curl/tests/bug48203_multi.phpt -> php-8.3.21.tar.xz/ext/curl/tests/bug48203_multi.phpt Changed

php-8.3.7.tar.xz/ext/curl/tests/bug71523.phpt -> php-8.3.21.tar.xz/ext/curl/tests/bug71523.phpt Changed

php-8.3.7.tar.xz/ext/curl/tests/curl_basic_008.phpt -> php-8.3.21.tar.xz/ext/curl/tests/curl_basic_008.phpt Changed

php-8.3.7.tar.xz/ext/curl/tests/curl_basic_018.phpt -> php-8.3.21.tar.xz/ext/curl/tests/curl_basic_018.phpt Changed

php-8.3.7.tar.xz/ext/curl/tests/curl_basic_022.phpt -> php-8.3.21.tar.xz/ext/curl/tests/curl_basic_022.phpt Changed

php-8.3.7.tar.xz/ext/curl/tests/curl_basic_024.phpt -> php-8.3.21.tar.xz/ext/curl/tests/curl_basic_024.phpt Changed

php-8.3.21.tar.xz/ext/curl/tests/curl_multi_add_handle_lifecycle.phpt Added

php-8.3.7.tar.xz/ext/curl/tests/curl_multi_getcontent_basic3.phpt -> php-8.3.21.tar.xz/ext/curl/tests/curl_multi_getcontent_basic3.phpt Changed

php-8.3.7.tar.xz/ext/curl/tests/curl_pushfunction_nonexistent_callback.phpt -> php-8.3.21.tar.xz/ext/curl/tests/curl_pushfunction_nonexistent_callback.phpt Changed

php-8.3.21.tar.xz/ext/curl/tests/gh15547.phpt Added

php-8.3.21.tar.xz/ext/curl/tests/gh16802.phpt Added

@@ -0,0 +1,31 @@
+--TEST--
+GH-16802 (open_basedir bypass using curl extension)
+--EXTENSIONS--
+curl
+--SKIPIF--
+<?php
+$curl_version = curl_version();
+if ($curl_version'version_number' < 0x075500) {
+    die("skip: blob options not supported for curl < 7.85.0");
+}
+?>
+--INI--
+open_basedir=/nowhere
+--FILE--
+<?php
+$ch = curl_init("file:///etc/passwd");
+curl_setopt($ch, CURLOPT_PROTOCOLS_STR, "all");
+curl_setopt($ch, CURLOPT_PROTOCOLS_STR, "ftp,all");
+curl_setopt($ch, CURLOPT_PROTOCOLS_STR, "all,ftp");
+curl_setopt($ch, CURLOPT_PROTOCOLS_STR, "all,file,ftp");
+var_dump(curl_exec($ch));
+?>
+--EXPECTF--
+Warning: curl_setopt(): The FILE protocol cannot be activated when an open_basedir is set in %s on line %d
+
+Warning: curl_setopt(): The FILE protocol cannot be activated when an open_basedir is set in %s on line %d
+
+Warning: curl_setopt(): The FILE protocol cannot be activated when an open_basedir is set in %s on line %d
+
+Warning: curl_setopt(): The FILE protocol cannot be activated when an open_basedir is set in %s on line %d
+bool(false)

php-8.3.7.tar.xz/ext/date/config0.m4 -> php-8.3.21.tar.xz/ext/date/config0.m4 Changed

php-8.3.7.tar.xz/ext/date/lib/parse_date.c -> php-8.3.21.tar.xz/ext/date/lib/parse_date.c Changed

@@ -1,4 +1,4 @@
-/* Generated by re2c 1.0.3 on Thu Nov 23 16:02:28 2023 */
+/* Generated by re2c 1.0.3 on Wed Sep 11 17:29:29 2024 */
 #line 1 "ext/date/lib/parse_date.re"
 /*
  * The MIT License (MIT)
@@ -549,22 +549,26 @@
 	timelib_sll tmp_nr = 0;
 	int len = 0;
 
-	str = timelib_calloc(1, max_length + 2); // for sign and \0
-	str_ptr = str;
+	/* Skip over non-numeric chars */
 
 	while (((**ptr < '0') || (**ptr > '9')) && (**ptr != '+') && (**ptr != '-')) {
 		if (**ptr == '\0') {
 			add_error(s, TIMELIB_ERR_UNEXPECTED_DATA, "Found unexpected data");
-			timelib_free(str);
 			return 0;
 		}
 		++*ptr;
 	}
-
-	if ((**ptr == '+') || (**ptr == '-')) {
-		*str_ptr = **ptr;
+	
+	/* Allocate string to feed to strtoll(): sign + length + '\0' */
+	str = timelib_calloc(1, max_length + 2);
+	str0 = '+'; /* First position is the sign */
+	str_ptr = str + 1;
+
+	while ((**ptr == '+') || (**ptr == '-')) {
+		if (**ptr == '-') {
+			str0 = str0 == '+' ? '-' : '+';
+		}
 		++*ptr;
-		++str_ptr;
 	}
 
 	while (((**ptr < '0') || (**ptr > '9'))) {
@@ -715,7 +719,7 @@
 
 static void add_with_overflow(Scanner *s, timelib_sll *e, timelib_sll amount, int multiplier)
 {
-#if defined(__has_builtin) && __has_builtin(__builtin_saddll_overflow)
+#if TIMELIB_HAVE_BUILTIN_SADDLL_OVERFLOW
 	if (__builtin_saddll_overflow(*e, amount * multiplier, e)) {
 		add_error(s, TIMELIB_ERR_NUMBER_OUT_OF_RANGE, "Number out of range");
 	}
@@ -1014,11 +1018,11 @@
 std:
 	s->tok = cursor;
 	s->len = 0;
-#line 1147 "ext/date/lib/parse_date.re"
+#line 1151 "ext/date/lib/parse_date.re"
 
 
 
-#line 1022 "<stdout>"
+#line 1026 "<stdout>"
 {
 	YYCTYPE yych;
 	unsigned int yyaccept = 0;
@@ -1199,23 +1203,23 @@
 	YYDEBUG(2, *YYCURSOR);
 	++YYCURSOR;
 	YYDEBUG(3, *YYCURSOR);
-#line 1980 "ext/date/lib/parse_date.re"
+#line 1984 "ext/date/lib/parse_date.re"
 	{
 		s->pos = cursor; s->line++;
 		goto std;
 	}
-#line 1208 "<stdout>"
+#line 1212 "<stdout>"
 yy4:
 	YYDEBUG(4, *YYCURSOR);
 	++YYCURSOR;
 yy5:
 	YYDEBUG(5, *YYCURSOR);
-#line 1986 "ext/date/lib/parse_date.re"
+#line 1990 "ext/date/lib/parse_date.re"
 	{
 		add_error(s, TIMELIB_ERR_UNEXPECTED_CHARACTER, "Unexpected character");
 		goto std;
 	}
-#line 1219 "<stdout>"
+#line 1223 "<stdout>"
 yy6:
 	YYDEBUG(6, *YYCURSOR);
 	yyaccept = 0;
@@ -1230,11 +1234,11 @@
 	if (yych <= '9') goto yy58;
 yy8:
 	YYDEBUG(8, *YYCURSOR);
-#line 1975 "ext/date/lib/parse_date.re"
+#line 1979 "ext/date/lib/parse_date.re"
 	{
 		goto std;
 	}
-#line 1238 "<stdout>"
+#line 1242 "<stdout>"
 yy9:
 	YYDEBUG(9, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -1268,11 +1272,11 @@
 	YYDEBUG(11, *YYCURSOR);
 	++YYCURSOR;
 	YYDEBUG(12, *YYCURSOR);
-#line 1970 "ext/date/lib/parse_date.re"
+#line 1974 "ext/date/lib/parse_date.re"
 	{
 		goto std;
 	}
-#line 1276 "<stdout>"
+#line 1280 "<stdout>"
 yy13:
 	YYDEBUG(13, *YYCURSOR);
 	yyaccept = 1;
@@ -1773,7 +1777,7 @@
 	}
 yy20:
 	YYDEBUG(20, *YYCURSOR);
-#line 1885 "ext/date/lib/parse_date.re"
+#line 1889 "ext/date/lib/parse_date.re"
 	{
 		int tz_not_found;
 		DEBUG_OUTPUT("tzcorrection | tz");
@@ -1787,7 +1791,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_TIMEZONE;
 	}
-#line 1791 "<stdout>"
+#line 1795 "<stdout>"
 yy21:
 	YYDEBUG(21, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -3592,7 +3596,7 @@
 	}
 yy81:
 	YYDEBUG(81, *YYCURSOR);
-#line 1632 "ext/date/lib/parse_date.re"
+#line 1636 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("datenoyearrev");
 		TIMELIB_INIT;
@@ -3603,7 +3607,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_DATE_TEXT;
 	}
-#line 3607 "<stdout>"
+#line 3611 "<stdout>"
 yy82:
 	YYDEBUG(82, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -4118,7 +4122,7 @@
 	}
 	if (yych == '.') goto yy289;
 	YYDEBUG(114, *YYCURSOR);
-#line 1207 "ext/date/lib/parse_date.re"
+#line 1211 "ext/date/lib/parse_date.re"
 	{
 		timelib_ull i;
 
@@ -4143,7 +4147,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
-#line 4147 "<stdout>"
+#line 4151 "<stdout>"
 yy115:
 	YYDEBUG(115, *YYCURSOR);
 	++YYCURSOR;
@@ -5869,7 +5873,7 @@
 	}
 yy177:
 	YYDEBUG(177, *YYCURSOR);
-#line 1373 "ext/date/lib/parse_date.re"
+#line 1377 "ext/date/lib/parse_date.re"
 	{
 		int tz_not_found;
 		DEBUG_OUTPUT("timetiny24 | timeshort24 | timelong24 | iso8601long");
@@ -5896,7 +5900,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_TIME24_WITH_ZONE;
 	}
-#line 5900 "<stdout>"
+#line 5904 "<stdout>"
 yy178:
 	YYDEBUG(178, *YYCURSOR);
 	yyaccept = 4;
@@ -6925,7 +6929,7 @@
 	}
 yy224:
 	YYDEBUG(224, *YYCURSOR);
-#line 1467 "ext/date/lib/parse_date.re"
+#line 1471 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("americanshort | american");
@@ -6940,7 +6944,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_AMERICAN;
 	}
-#line 6944 "<stdout>"
+#line 6948 "<stdout>"
 yy225:
 	YYDEBUG(225, *YYCURSOR);
 	yyaccept = 5;
@@ -7183,7 +7187,7 @@
 	if (yych <= '9') goto yy431;
 yy251:
 	YYDEBUG(251, *YYCURSOR);
-#line 1549 "ext/date/lib/parse_date.re"
+#line 1553 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("datefull");
@@ -7197,7 +7201,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_DATE_FULL;
 	}
-#line 7201 "<stdout>"
+#line 7205 "<stdout>"
 yy252:
 	YYDEBUG(252, *YYCURSOR);
 	yyaccept = 3;
@@ -7311,7 +7315,7 @@
 	if (yych == 'e') goto yy440;
 yy260:
 	YYDEBUG(260, *YYCURSOR);
-#line 1954 "ext/date/lib/parse_date.re"
+#line 1958 "ext/date/lib/parse_date.re"
 	{
 		timelib_ull i;
 		DEBUG_OUTPUT("relative");
@@ -7326,7 +7330,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
-#line 7330 "<stdout>"
+#line 7334 "<stdout>"
 yy261:
 	YYDEBUG(261, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -7772,7 +7776,7 @@
 	if (yych <= '9') goto yy471;
 yy290:
 	YYDEBUG(290, *YYCURSOR);
-#line 1233 "ext/date/lib/parse_date.re"
+#line 1237 "ext/date/lib/parse_date.re"
 	{
 		timelib_sll i;
 		timelib_ull us;
@@ -7811,7 +7815,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
-#line 7815 "<stdout>"
+#line 7819 "<stdout>"
 yy291:
 	YYDEBUG(291, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -7836,7 +7840,7 @@
 	}
 yy293:
 	YYDEBUG(293, *YYCURSOR);
-#line 1795 "ext/date/lib/parse_date.re"
+#line 1799 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("ago");
 		TIMELIB_INIT;
@@ -7856,7 +7860,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_AGO;
 	}
-#line 7860 "<stdout>"
+#line 7864 "<stdout>"
 yy294:
 	YYDEBUG(294, *YYCURSOR);
 	yyaccept = 7;
@@ -7895,7 +7899,7 @@
 	}
 yy295:
 	YYDEBUG(295, *YYCURSOR);
-#line 1875 "ext/date/lib/parse_date.re"
+#line 1879 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("monthtext");
 		TIMELIB_INIT;
@@ -7904,7 +7908,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_DATE_TEXT;
 	}
-#line 7908 "<stdout>"
+#line 7912 "<stdout>"
 yy296:
 	YYDEBUG(296, *YYCURSOR);
 	yyaccept = 7;
@@ -8479,7 +8483,7 @@
 	}
 yy315:
 	YYDEBUG(315, *YYCURSOR);
-#line 1816 "ext/date/lib/parse_date.re"
+#line 1820 "ext/date/lib/parse_date.re"
 	{
 		const timelib_relunit* relunit;
 		DEBUG_OUTPUT("daytext");
@@ -8496,7 +8500,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_WEEKDAY;
 	}
-#line 8500 "<stdout>"
+#line 8504 "<stdout>"
 yy316:
 	YYDEBUG(316, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -8764,7 +8768,7 @@
 	}
 yy325:
 	YYDEBUG(325, *YYCURSOR);
-#line 1618 "ext/date/lib/parse_date.re"
+#line 1622 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("datetextual | datenoyear");
@@ -8777,7 +8781,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_DATE_TEXT;
 	}
-#line 8781 "<stdout>"
+#line 8785 "<stdout>"
 yy326:
 	YYDEBUG(326, *YYCURSOR);
 	yyaccept = 10;
@@ -9471,7 +9475,7 @@
 	}
 yy351:
 	YYDEBUG(351, *YYCURSOR);
-#line 1164 "ext/date/lib/parse_date.re"
+#line 1168 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("now");
 		TIMELIB_INIT;
@@ -9479,7 +9483,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
-#line 9483 "<stdout>"
+#line 9487 "<stdout>"
 yy352:
 	YYDEBUG(352, *YYCURSOR);
 	yyaccept = 2;
@@ -10982,7 +10986,7 @@
 	}
 yy420:
 	YYDEBUG(420, *YYCURSOR);
-#line 1401 "ext/date/lib/parse_date.re"
+#line 1405 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("gnunocolon");
 		TIMELIB_INIT;
@@ -11004,7 +11008,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_GNU_NOCOLON;
 	}
-#line 11008 "<stdout>"
+#line 11012 "<stdout>"
 yy421:
 	YYDEBUG(421, *YYCURSOR);
 	yyaccept = 13;
@@ -11085,7 +11089,7 @@
 	}
 yy422:
 	YYDEBUG(422, *YYCURSOR);
-#line 1786 "ext/date/lib/parse_date.re"
+#line 1790 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("year4");
 		TIMELIB_INIT;
@@ -11093,7 +11097,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_CLF;
 	}
-#line 11097 "<stdout>"
+#line 11101 "<stdout>"
 yy423:
 	YYDEBUG(423, *YYCURSOR);
 	yyaccept = 3;
@@ -11700,7 +11704,7 @@
 	YYDEBUG(456, *YYCURSOR);
 	++YYCURSOR;
 	YYDEBUG(457, *YYCURSOR);
-#line 1335 "ext/date/lib/parse_date.re"
+#line 1339 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("timetiny12 | timeshort12 | timelong12");
 		TIMELIB_INIT;
@@ -11717,7 +11721,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_TIME12;
 	}
-#line 11721 "<stdout>"
+#line 11725 "<stdout>"
 yy458:
 	YYDEBUG(458, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -13044,7 +13048,7 @@
 	}
 yy526:
 	YYDEBUG(526, *YYCURSOR);
-#line 1173 "ext/date/lib/parse_date.re"
+#line 1177 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("noon");
 		TIMELIB_INIT;
@@ -13055,7 +13059,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
-#line 13059 "<stdout>"
+#line 13063 "<stdout>"
 yy527:
 	YYDEBUG(527, *YYCURSOR);
 	yyaccept = 2;
@@ -14101,7 +14105,7 @@
 	}
 yy567:
 	YYDEBUG(567, *YYCURSOR);
-#line 1535 "ext/date/lib/parse_date.re"
+#line 1539 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("gnudateshort");
@@ -14114,7 +14118,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_ISO_DATE;
 	}
-#line 14118 "<stdout>"
+#line 14122 "<stdout>"
 yy568:
 	YYDEBUG(568, *YYCURSOR);
 	yyaccept = 15;
@@ -14565,7 +14569,7 @@
 	}
 yy600:
 	YYDEBUG(600, *YYCURSOR);
-#line 1604 "ext/date/lib/parse_date.re"
+#line 1608 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("datenodayrev");
@@ -14578,7 +14582,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_DATE_NO_DAY;
 	}
-#line 14582 "<stdout>"
+#line 14586 "<stdout>"
 yy601:
 	YYDEBUG(601, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -15953,7 +15957,7 @@
 	YYDEBUG(696, *YYCURSOR);
 	++YYCURSOR;
 	YYDEBUG(697, *YYCURSOR);
-#line 1590 "ext/date/lib/parse_date.re"
+#line 1594 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("datenoday");
@@ -15966,7 +15970,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_DATE_NO_DAY;
 	}
-#line 15970 "<stdout>"
+#line 15974 "<stdout>"
 yy698:
 	YYDEBUG(698, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -16527,7 +16531,7 @@
 	}
 yy722:
 	YYDEBUG(722, *YYCURSOR);
-#line 1185 "ext/date/lib/parse_date.re"
+#line 1189 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("midnight | today");
 		TIMELIB_INIT;
@@ -16536,7 +16540,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
-#line 16540 "<stdout>"
+#line 16544 "<stdout>"
 yy723:
 	YYDEBUG(723, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -16846,7 +16850,7 @@
 	if (yych <= '9') goto yy897;
 yy739:
 	YYDEBUG(739, *YYCURSOR);
-#line 1576 "ext/date/lib/parse_date.re"
+#line 1580 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("pointed date YY");
@@ -16859,7 +16863,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_DATE_FULL_POINTED;
 	}
-#line 16863 "<stdout>"
+#line 16867 "<stdout>"
 yy740:
 	YYDEBUG(740, *YYCURSOR);
 	yyaccept = 15;
@@ -16971,7 +16975,7 @@
 	}
 yy752:
 	YYDEBUG(752, *YYCURSOR);
-#line 1521 "ext/date/lib/parse_date.re"
+#line 1525 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("gnudateshorter");
@@ -16984,7 +16988,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_ISO_DATE;
 	}
-#line 16988 "<stdout>"
+#line 16992 "<stdout>"
 yy753:
 	YYDEBUG(753, *YYCURSOR);
 	yyaccept = 18;
@@ -17233,7 +17237,7 @@
 	}
 yy777:
 	YYDEBUG(777, *YYCURSOR);
-#line 1447 "ext/date/lib/parse_date.re"
+#line 1451 "ext/date/lib/parse_date.re"
 	{
 		int tz_not_found;
 		DEBUG_OUTPUT("iso8601nocolon");
@@ -17252,7 +17256,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_ISO_NOCOLON;
 	}
-#line 17256 "<stdout>"
+#line 17260 "<stdout>"
 yy778:
 	YYDEBUG(778, *YYCURSOR);
 	yyaccept = 19;
@@ -18480,7 +18484,7 @@
 	}
 yy849:
 	YYDEBUG(849, *YYCURSOR);
-#line 1924 "ext/date/lib/parse_date.re"
+#line 1928 "ext/date/lib/parse_date.re"
 	{
 		int tz_not_found;
 		DEBUG_OUTPUT("dateshortwithtimeshort | dateshortwithtimelong | dateshortwithtimelongtz");
@@ -18509,7 +18513,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_SHORTDATE_WITH_TIME;
 	}
-#line 18513 "<stdout>"
+#line 18517 "<stdout>"
 yy850:
 	YYDEBUG(850, *YYCURSOR);
 	yyaccept = 20;
@@ -19553,7 +19557,7 @@
 	}
 yy926:
 	YYDEBUG(926, *YYCURSOR);
-#line 1682 "ext/date/lib/parse_date.re"
+#line 1686 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("pgydotd");
@@ -19566,7 +19570,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_PG_YEARDAY;
 	}
-#line 19570 "<stdout>"
+#line 19574 "<stdout>"
 yy927:
 	YYDEBUG(927, *YYCURSOR);
 	yyaccept = 21;
@@ -19820,7 +19824,7 @@
 	if (yych <= '7') goto yy1059;
 yy942:
 	YYDEBUG(942, *YYCURSOR);
-#line 1715 "ext/date/lib/parse_date.re"
+#line 1719 "ext/date/lib/parse_date.re"
 	{
 		timelib_sll w, d;
 		DEBUG_OUTPUT("isoweek");
@@ -19838,7 +19842,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_ISO_WEEK;
 	}
-#line 19842 "<stdout>"
+#line 19846 "<stdout>"
 yy943:
 	YYDEBUG(943, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -20314,7 +20318,7 @@
 	if (yych == 'e') goto yy1094;
 yy982:
 	YYDEBUG(982, *YYCURSOR);
-#line 1858 "ext/date/lib/parse_date.re"
+#line 1862 "ext/date/lib/parse_date.re"
 	{
 		timelib_sll i;
 		int         behavior = 0;
@@ -20330,7 +20334,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
-#line 20334 "<stdout>"
+#line 20338 "<stdout>"
 yy983:
 	YYDEBUG(983, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -20677,7 +20681,7 @@
 	YYDEBUG(1020, *YYCURSOR);
 	++YYCURSOR;
 	YYDEBUG(1021, *YYCURSOR);
-#line 1564 "ext/date/lib/parse_date.re"
+#line 1568 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("pointed date YYYY");
 		TIMELIB_INIT;
@@ -20688,7 +20692,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_DATE_FULL_POINTED;
 	}
-#line 20692 "<stdout>"
+#line 20696 "<stdout>"
 yy1022:
 	YYDEBUG(1022, *YYCURSOR);
 	++YYCURSOR;
@@ -20717,7 +20721,7 @@
 	}
 yy1025:
 	YYDEBUG(1025, *YYCURSOR);
-#line 1495 "ext/date/lib/parse_date.re"
+#line 1499 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("iso8601date2");
@@ -20730,7 +20734,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_ISO_DATE;
 	}
-#line 20734 "<stdout>"
+#line 20738 "<stdout>"
 yy1026:
 	YYDEBUG(1026, *YYCURSOR);
 	yyaccept = 15;
@@ -20950,7 +20954,7 @@
 	}
 yy1043:
 	YYDEBUG(1043, *YYCURSOR);
-#line 1483 "ext/date/lib/parse_date.re"
+#line 1487 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("iso8601date4 | iso8601date2 | iso8601dateslash | dateslash");
 		TIMELIB_INIT;
@@ -20961,7 +20965,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_ISO_DATE;
 	}
-#line 20965 "<stdout>"
+#line 20969 "<stdout>"
 yy1044:
 	YYDEBUG(1044, *YYCURSOR);
 	yyaccept = 26;
@@ -21076,7 +21080,7 @@
 	}
 yy1048:
 	YYDEBUG(1048, *YYCURSOR);
-#line 1644 "ext/date/lib/parse_date.re"
+#line 1648 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("datenocolon");
 		TIMELIB_INIT;
@@ -21087,7 +21091,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_DATE_NOCOLON;
 	}
-#line 21091 "<stdout>"
+#line 21095 "<stdout>"
 yy1049:
 	YYDEBUG(1049, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -21157,7 +21161,7 @@
 	YYDEBUG(1059, *YYCURSOR);
 	++YYCURSOR;
 	YYDEBUG(1060, *YYCURSOR);
-#line 1696 "ext/date/lib/parse_date.re"
+#line 1700 "ext/date/lib/parse_date.re"
 	{
 		timelib_sll w, d;
 		DEBUG_OUTPUT("isoweekday");
@@ -21175,7 +21179,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_ISO_WEEK;
 	}
-#line 21179 "<stdout>"
+#line 21183 "<stdout>"
 yy1061:
 	YYDEBUG(1061, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -21238,7 +21242,7 @@
 	if (yych <= '9') goto yy1143;
 yy1070:
 	YYDEBUG(1070, *YYCURSOR);
-#line 1734 "ext/date/lib/parse_date.re"
+#line 1738 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("pgtextshort");
@@ -21251,7 +21255,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_PG_TEXT;
 	}
-#line 21255 "<stdout>"
+#line 21259 "<stdout>"
 yy1071:
 	YYDEBUG(1071, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -21724,7 +21728,7 @@
 	++YYCURSOR;
 yy1107:
 	YYDEBUG(1107, *YYCURSOR);
-#line 1195 "ext/date/lib/parse_date.re"
+#line 1199 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("tomorrow");
 		TIMELIB_INIT;
@@ -21735,7 +21739,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
-#line 21739 "<stdout>"
+#line 21743 "<stdout>"
 yy1108:
 	YYDEBUG(1108, *YYCURSOR);
 	yyaccept = 28;
@@ -22072,7 +22076,7 @@
 	YYDEBUG(1140, *YYCURSOR);
 	++YYCURSOR;
 	YYDEBUG(1141, *YYCURSOR);
-#line 1748 "ext/date/lib/parse_date.re"
+#line 1752 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("pgtextreverse");
@@ -22085,7 +22089,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_PG_TEXT;
 	}
-#line 22089 "<stdout>"
+#line 22093 "<stdout>"
 yy1142:
 	YYDEBUG(1142, *YYCURSOR);
 	++YYCURSOR;
@@ -22129,7 +22133,7 @@
 	}
 yy1145:
 	YYDEBUG(1145, *YYCURSOR);
-#line 1290 "ext/date/lib/parse_date.re"
+#line 1294 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("backof | frontof");
 		TIMELIB_INIT;
@@ -22151,7 +22155,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_LF_DAY_OF_MONTH;
 	}
-#line 22155 "<stdout>"
+#line 22159 "<stdout>"
 yy1146:
 	YYDEBUG(1146, *YYCURSOR);
 	yyaccept = 29;
@@ -22475,7 +22479,7 @@
 	}
 yy1172:
 	YYDEBUG(1172, *YYCURSOR);
-#line 1834 "ext/date/lib/parse_date.re"
+#line 1838 "ext/date/lib/parse_date.re"
 	{
 		timelib_sll i;
 		int         behavior = 0;
@@ -22498,7 +22502,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
-#line 22502 "<stdout>"
+#line 22506 "<stdout>"
 yy1173:
 	YYDEBUG(1173, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -22510,7 +22514,7 @@
 	++YYCURSOR;
 yy1175:
 	YYDEBUG(1175, *YYCURSOR);
-#line 1152 "ext/date/lib/parse_date.re"
+#line 1156 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("yesterday");
 		TIMELIB_INIT;
@@ -22521,7 +22525,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
-#line 22525 "<stdout>"
+#line 22529 "<stdout>"
 yy1176:
 	YYDEBUG(1176, *YYCURSOR);
 	yyaccept = 31;
@@ -23014,7 +23018,7 @@
 	YYDEBUG(1222, *YYCURSOR);
 	++YYCURSOR;
 	YYDEBUG(1223, *YYCURSOR);
-#line 1900 "ext/date/lib/parse_date.re"
+#line 1904 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("dateshortwithtimeshort12 | dateshortwithtimelong12");
 		TIMELIB_INIT;
@@ -23037,7 +23041,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_SHORTDATE_WITH_TIME;
 	}
-#line 23041 "<stdout>"
+#line 23045 "<stdout>"
 yy1224:
 	YYDEBUG(1224, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -23539,7 +23543,7 @@
 	YYDEBUG(1268, *YYCURSOR);
 	++YYCURSOR;
 	YYDEBUG(1269, *YYCURSOR);
-#line 1313 "ext/date/lib/parse_date.re"
+#line 1317 "ext/date/lib/parse_date.re"
 	{
 		timelib_sll i;
 		int         behavior = 0;
@@ -23560,7 +23564,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_WEEK_DAY_OF_MONTH;
 	}
-#line 23564 "<stdout>"
+#line 23568 "<stdout>"
 yy1270:
 	YYDEBUG(1270, *YYCURSOR);
 	yyaccept = 24;
@@ -23607,7 +23611,7 @@
 	YYDEBUG(1273, *YYCURSOR);
 	++YYCURSOR;
 	YYDEBUG(1274, *YYCURSOR);
-#line 1273 "ext/date/lib/parse_date.re"
+#line 1277 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("firstdayof | lastdayof");
 		TIMELIB_INIT;
@@ -23623,12 +23627,12 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_LF_DAY_OF_MONTH;
 	}
-#line 23627 "<stdout>"
+#line 23631 "<stdout>"
 yy1275:
 	YYDEBUG(1275, *YYCURSOR);
 	++YYCURSOR;
 	YYDEBUG(1276, *YYCURSOR);
-#line 1509 "ext/date/lib/parse_date.re"
+#line 1513 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("iso8601datex");
 		TIMELIB_INIT;
@@ -23639,7 +23643,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_ISO_DATE;
 	}
-#line 23643 "<stdout>"
+#line 23647 "<stdout>"
 yy1277:
 	YYDEBUG(1277, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -23742,7 +23746,7 @@
 	YYDEBUG(1290, *YYCURSOR);
 	++YYCURSOR;
 	YYDEBUG(1291, *YYCURSOR);
-#line 1353 "ext/date/lib/parse_date.re"
+#line 1357 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("mssqltime");
 		TIMELIB_INIT;
@@ -23761,7 +23765,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_TIME24_WITH_ZONE;
 	}
-#line 23765 "<stdout>"
+#line 23769 "<stdout>"
 yy1292:
 	YYDEBUG(1292, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -24185,7 +24189,7 @@
 	if (yych <= '9') goto yy1331;
 yy1329:
 	YYDEBUG(1329, *YYCURSOR);
-#line 1656 "ext/date/lib/parse_date.re"
+#line 1660 "ext/date/lib/parse_date.re"
 	{
 		int tz_not_found;
 		DEBUG_OUTPUT("xmlrpc | xmlrpcnocolon | soap | wddx | exif");
@@ -24210,7 +24214,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_XMLRPC_SOAP;
 	}
-#line 24214 "<stdout>"
+#line 24218 "<stdout>"
 yy1330:
 	YYDEBUG(1330, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -24580,7 +24584,7 @@
 	if (yych <= ':') goto yy1383;
 yy1375:
 	YYDEBUG(1375, *YYCURSOR);
-#line 1762 "ext/date/lib/parse_date.re"
+#line 1766 "ext/date/lib/parse_date.re"
 	{
 		int tz_not_found;
 		DEBUG_OUTPUT("clf");
@@ -24603,7 +24607,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_CLF;
 	}
-#line 24607 "<stdout>"
+#line 24611 "<stdout>"
 yy1376:
 	YYDEBUG(1376, *YYCURSOR);
 	yyaccept = 33;
@@ -24835,7 +24839,7 @@
 	if (yych == ':') goto yy1286;
 	goto yy1329;
 }
-#line 1990 "ext/date/lib/parse_date.re"
+#line 1994 "ext/date/lib/parse_date.re"
 
 }

php-8.3.7.tar.xz/ext/date/lib/parse_date.re -> php-8.3.21.tar.xz/ext/date/lib/parse_date.re Changed

@@ -547,22 +547,26 @@
 	timelib_sll tmp_nr = 0;
 	int len = 0;
 
-	str = timelib_calloc(1, max_length + 2); // for sign and \0
-	str_ptr = str;
+	/* Skip over non-numeric chars */
 
 	while (((**ptr < '0') || (**ptr > '9')) && (**ptr != '+') && (**ptr != '-')) {
 		if (**ptr == '\0') {
 			add_error(s, TIMELIB_ERR_UNEXPECTED_DATA, "Found unexpected data");
-			timelib_free(str);
 			return 0;
 		}
 		++*ptr;
 	}
+	
+	/* Allocate string to feed to strtoll(): sign + length + '\0' */
+	str = timelib_calloc(1, max_length + 2);
+	str0 = '+'; /* First position is the sign */
+	str_ptr = str + 1;
 
-	if ((**ptr == '+') || (**ptr == '-')) {
-		*str_ptr = **ptr;
+	while ((**ptr == '+') || (**ptr == '-')) {
+		if (**ptr == '-') {
+			str0 = str0 == '+' ? '-' : '+';
+		}
 		++*ptr;
-		++str_ptr;
 	}
 
 	while (((**ptr < '0') || (**ptr > '9'))) {
@@ -713,7 +717,7 @@
 
 static void add_with_overflow(Scanner *s, timelib_sll *e, timelib_sll amount, int multiplier)
 {
-#if defined(__has_builtin) && __has_builtin(__builtin_saddll_overflow)
+#if TIMELIB_HAVE_BUILTIN_SADDLL_OVERFLOW
 	if (__builtin_saddll_overflow(*e, amount * multiplier, e)) {
 		add_error(s, TIMELIB_ERR_NUMBER_OUT_OF_RANGE, "Number out of range");
 	}

php-8.3.7.tar.xz/ext/date/lib/parse_iso_intervals.c -> php-8.3.21.tar.xz/ext/date/lib/parse_iso_intervals.c Changed

@@ -1,4 +1,4 @@
-/* Generated by re2c 0.15.3 on Wed Sep 14 16:32:05 2022 */
+/* Generated by re2c 1.0.3 on Wed Sep 11 17:29:40 2024 */
 #line 1 "ext/date/lib/parse_iso_intervals.re"
 /*
  * The MIT License (MIT)
@@ -223,54 +223,72 @@
 	yych = *YYCURSOR;
 	if (yych <= ',') {
 		if (yych <= '\n') {
-			if (yych <= 0x00) goto yy9;
-			if (yych <= 0x08) goto yy11;
-			if (yych <= '\t') goto yy7;
-			goto yy9;
+			if (yych <= 0x00) goto yy2;
+			if (yych <= 0x08) goto yy4;
+			if (yych <= '\t') goto yy6;
 		} else {
-			if (yych == ' ') goto yy7;
-			if (yych <= '+') goto yy11;
-			goto yy7;
+			if (yych == ' ') goto yy6;
+			if (yych <= '+') goto yy4;
+			goto yy6;
 		}
 	} else {
 		if (yych <= 'O') {
-			if (yych <= '-') goto yy11;
-			if (yych <= '/') goto yy7;
-			if (yych <= '9') goto yy4;
-			goto yy11;
+			if (yych <= '-') goto yy4;
+			if (yych <= '/') goto yy6;
+			if (yych <= '9') goto yy8;
+			goto yy4;
 		} else {
-			if (yych <= 'P') goto yy5;
-			if (yych != 'R') goto yy11;
+			if (yych <= 'P') goto yy9;
+			if (yych == 'R') goto yy11;
+			goto yy4;
 		}
 	}
+yy2:
 	YYDEBUG(2, *YYCURSOR);
 	++YYCURSOR;
-	if ((yych = *YYCURSOR) <= '/') goto yy3;
-	if (yych <= '9') goto yy98;
-yy3:
 	YYDEBUG(3, *YYCURSOR);
-#line 317 "ext/date/lib/parse_iso_intervals.re"
+#line 311 "ext/date/lib/parse_iso_intervals.re"
 	{
-		add_error(s, "Unexpected character");
+		s->pos = cursor; s->line++;
 		goto std;
 	}
-#line 258 "<stdout>"
+#line 256 "<stdout>"
 yy4:
 	YYDEBUG(4, *YYCURSOR);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '/') goto yy3;
-	if (yych <= '9') goto yy59;
-	goto yy3;
+	++YYCURSOR;
 yy5:
 	YYDEBUG(5, *YYCURSOR);
-	yyaccept = 1;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '/') goto yy6;
-	if (yych <= '9') goto yy12;
-	if (yych == 'T') goto yy14;
+#line 317 "ext/date/lib/parse_iso_intervals.re"
+	{
+		add_error(s, "Unexpected character");
+		goto std;
+	}
+#line 267 "<stdout>"
 yy6:
 	YYDEBUG(6, *YYCURSOR);
+	++YYCURSOR;
+	YYDEBUG(7, *YYCURSOR);
+#line 306 "ext/date/lib/parse_iso_intervals.re"
+	{
+		goto std;
+	}
+#line 276 "<stdout>"
+yy8:
+	YYDEBUG(8, *YYCURSOR);
+	yyaccept = 0;
+	yych = *(YYMARKER = ++YYCURSOR);
+	if (yych <= '/') goto yy5;
+	if (yych <= '9') goto yy12;
+	goto yy5;
+yy9:
+	YYDEBUG(9, *YYCURSOR);
+	yyaccept = 1;
+	yych = *(YYMARKER = ++YYCURSOR);
+	if (yych <= '/') goto yy10;
+	if (yych <= '9') goto yy14;
+	if (yych == 'T') goto yy15;
+yy10:
+	YYDEBUG(10, *YYCURSOR);
 #line 244 "ext/date/lib/parse_iso_intervals.re"
 	{
 		timelib_sll nr;
@@ -312,189 +330,197 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_PERIOD;
 	}
-#line 316 "<stdout>"
-yy7:
-	YYDEBUG(7, *YYCURSOR);
-	++YYCURSOR;
-	YYDEBUG(8, *YYCURSOR);
-#line 306 "ext/date/lib/parse_iso_intervals.re"
-	{
-		goto std;
-	}
-#line 325 "<stdout>"
-yy9:
-	YYDEBUG(9, *YYCURSOR);
-	++YYCURSOR;
-	YYDEBUG(10, *YYCURSOR);
-#line 311 "ext/date/lib/parse_iso_intervals.re"
-	{
-		s->pos = cursor; s->line++;
-		goto std;
-	}
-#line 335 "<stdout>"
+#line 334 "<stdout>"
 yy11:
 	YYDEBUG(11, *YYCURSOR);
 	yych = *++YYCURSOR;
-	goto yy3;
+	if (yybm0+yych & 128) {
+		goto yy16;
+	}
+	goto yy5;
 yy12:
 	YYDEBUG(12, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= 'L') {
-		if (yych <= '9') {
-			if (yych >= '0') goto yy25;
-		} else {
-			if (yych == 'D') goto yy24;
-		}
-	} else {
-		if (yych <= 'W') {
-			if (yych <= 'M') goto yy27;
-			if (yych >= 'W') goto yy26;
-		} else {
-			if (yych == 'Y') goto yy28;
-		}
-	}
+	if (yych <= '/') goto yy13;
+	if (yych <= '9') goto yy19;
 yy13:
 	YYDEBUG(13, *YYCURSOR);
 	YYCURSOR = YYMARKER;
 	if (yyaccept == 0) {
-		goto yy3;
+		goto yy5;
 	} else {
-		goto yy6;
+		goto yy10;
 	}
 yy14:
 	YYDEBUG(14, *YYCURSOR);
-	yyaccept = 1;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm0+yych & 128) {
-		goto yy15;
+	yych = *++YYCURSOR;
+	if (yych <= 'L') {
+		if (yych <= '9') {
+			if (yych <= '/') goto yy13;
+			goto yy20;
+		} else {
+			if (yych == 'D') goto yy21;
+			goto yy13;
+		}
+	} else {
+		if (yych <= 'W') {
+			if (yych <= 'M') goto yy22;
+			if (yych <= 'V') goto yy13;
+			goto yy23;
+		} else {
+			if (yych == 'Y') goto yy24;
+			goto yy13;
+		}
 	}
-	goto yy6;
 yy15:
 	YYDEBUG(15, *YYCURSOR);
+	yyaccept = 1;
+	yych = *(YYMARKER = ++YYCURSOR);
+	if (yych <= '/') goto yy10;
+	if (yych <= '9') goto yy25;
+	goto yy10;
+yy16:
+	YYDEBUG(16, *YYCURSOR);
 	++YYCURSOR;
-	if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
+	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	YYDEBUG(16, *YYCURSOR);
+	YYDEBUG(17, *YYCURSOR);
 	if (yybm0+yych & 128) {
-		goto yy15;
+		goto yy16;
 	}
+	YYDEBUG(18, *YYCURSOR);
+#line 209 "ext/date/lib/parse_iso_intervals.re"
+	{
+		DEBUG_OUTPUT("recurrences");
+		TIMELIB_INIT;
+		ptr++;
+		s->recurrences = timelib_get_unsigned_nr(&ptr, 9);
+		TIMELIB_DEINIT;
+		s->have_recurrences = 1;
+		return TIMELIB_PERIOD;
+	}
+#line 403 "<stdout>"
+yy19:
+	YYDEBUG(19, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if (yych <= '/') goto yy13;
+	if (yych <= '9') goto yy27;
+	goto yy13;
+yy20:
+	YYDEBUG(20, *YYCURSOR);
+	yych = *++YYCURSOR;
 	if (yych <= 'L') {
-		if (yych == 'H') goto yy19;
-		goto yy13;
+		if (yych <= '9') {
+			if (yych <= '/') goto yy13;
+			goto yy28;
+		} else {
+			if (yych != 'D') goto yy13;
+		}
 	} else {
-		if (yych <= 'M') goto yy18;
-		if (yych != 'S') goto yy13;
+		if (yych <= 'W') {
+			if (yych <= 'M') goto yy22;
+			if (yych <= 'V') goto yy13;
+			goto yy23;
+		} else {
+			if (yych == 'Y') goto yy24;
+			goto yy13;
+		}
 	}
-yy17:
-	YYDEBUG(17, *YYCURSOR);
+yy21:
+	YYDEBUG(21, *YYCURSOR);
 	yych = *++YYCURSOR;
-	goto yy6;
-yy18:
-	YYDEBUG(18, *YYCURSOR);
+	if (yych == 'T') goto yy15;
+	goto yy10;
+yy22:
+	YYDEBUG(22, *YYCURSOR);
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '/') goto yy6;
-	if (yych <= '9') goto yy22;
-	goto yy6;
-yy19:
-	YYDEBUG(19, *YYCURSOR);
+	if (yych <= '/') goto yy10;
+	if (yych <= '9') goto yy29;
+	if (yych == 'T') goto yy15;
+	goto yy10;
+yy23:
+	YYDEBUG(23, *YYCURSOR);
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '/') goto yy6;
-	if (yych >= ':') goto yy6;
-yy20:
-	YYDEBUG(20, *YYCURSOR);
+	if (yych <= '/') goto yy10;
+	if (yych <= '9') goto yy31;
+	if (yych == 'T') goto yy15;
+	goto yy10;
+yy24:
+	YYDEBUG(24, *YYCURSOR);
+	yyaccept = 1;
+	yych = *(YYMARKER = ++YYCURSOR);
+	if (yych <= '/') goto yy10;
+	if (yych <= '9') goto yy33;
+	if (yych == 'T') goto yy15;
+	goto yy10;
+yy25:
+	YYDEBUG(25, *YYCURSOR);
 	++YYCURSOR;
 	if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
 	yych = *YYCURSOR;
-	YYDEBUG(21, *YYCURSOR);
-	if (yych <= 'L') {
+	YYDEBUG(26, *YYCURSOR);
+	if (yych <= 'H') {
 		if (yych <= '/') goto yy13;
-		if (yych <= '9') goto yy20;
+		if (yych <= '9') goto yy25;
+		if (yych <= 'G') goto yy13;
+		goto yy35;
+	} else {
+		if (yych <= 'M') {
+			if (yych <= 'L') goto yy13;
+			goto yy36;
+		} else {
+			if (yych == 'S') goto yy37;
+			goto yy13;
+		}
+	}
+yy27:
+	YYDEBUG(27, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if (yych <= '/') {
+		if (yych == '-') goto yy38;
 		goto yy13;
 	} else {
-		if (yych <= 'M') goto yy18;
-		if (yych == 'S') goto yy17;
+		if (yych <= '0') goto yy39;
+		if (yych <= '1') goto yy40;
 		goto yy13;
 	}
-yy22:
-	YYDEBUG(22, *YYCURSOR);
-	++YYCURSOR;
-	if (YYLIMIT <= YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	YYDEBUG(23, *YYCURSOR);
-	if (yych <= '/') goto yy13;
-	if (yych <= '9') goto yy22;
-	if (yych == 'S') goto yy17;
-	goto yy13;
-yy24:
-	YYDEBUG(24, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'T') goto yy14;
-	goto yy6;
-yy25:
-	YYDEBUG(25, *YYCURSOR);
+yy28:
+	YYDEBUG(28, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'L') {
 		if (yych <= '9') {
 			if (yych <= '/') goto yy13;
-			goto yy35;
+			goto yy41;
 		} else {
-			if (yych == 'D') goto yy24;
+			if (yych == 'D') goto yy21;
 			goto yy13;
 		}
 	} else {
 		if (yych <= 'W') {
-			if (yych <= 'M') goto yy27;
+			if (yych <= 'M') goto yy22;
 			if (yych <= 'V') goto yy13;
+			goto yy23;
 		} else {
-			if (yych == 'Y') goto yy28;
+			if (yych == 'Y') goto yy24;
 			goto yy13;
 		}
 	}
-yy26:
-	YYDEBUG(26, *YYCURSOR);
-	yyaccept = 1;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '/') goto yy6;
-	if (yych <= '9') goto yy33;
-	if (yych == 'T') goto yy14;
-	goto yy6;
-yy27:
-	YYDEBUG(27, *YYCURSOR);
-	yyaccept = 1;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '/') goto yy6;
-	if (yych <= '9') goto yy31;
-	if (yych == 'T') goto yy14;
-	goto yy6;
-yy28:
-	YYDEBUG(28, *YYCURSOR);
-	yyaccept = 1;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '/') goto yy6;
-	if (yych <= '9') goto yy29;
-	if (yych == 'T') goto yy14;
-	goto yy6;
 yy29:
 	YYDEBUG(29, *YYCURSOR);
 	++YYCURSOR;
 	if ((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
 	yych = *YYCURSOR;
 	YYDEBUG(30, *YYCURSOR);
-	if (yych <= 'D') {
+	if (yych <= 'C') {
 		if (yych <= '/') goto yy13;
 		if (yych <= '9') goto yy29;
-		if (yych <= 'C') goto yy13;
-		goto yy24;
+		goto yy13;
 	} else {
-		if (yych <= 'M') {
-			if (yych <= 'L') goto yy13;
-			goto yy27;
-		} else {
-			if (yych == 'W') goto yy26;
-			goto yy13;
-		}
+		if (yych <= 'D') goto yy21;
+		if (yych == 'W') goto yy23;
+		goto yy13;
 	}
 yy31:
 	YYDEBUG(31, *YYCURSOR);
@@ -502,313 +528,372 @@
 	if ((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
 	yych = *YYCURSOR;
 	YYDEBUG(32, *YYCURSOR);
-	if (yych <= 'C') {
-		if (yych <= '/') goto yy13;
-		if (yych <= '9') goto yy31;
-		goto yy13;
-	} else {
-		if (yych <= 'D') goto yy24;
-		if (yych == 'W') goto yy26;
-		goto yy13;
-	}
+	if (yych <= '/') goto yy13;
+	if (yych <= '9') goto yy31;
+	if (yych == 'D') goto yy21;
+	goto yy13;
 yy33:
 	YYDEBUG(33, *YYCURSOR);
 	++YYCURSOR;
 	if ((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
 	yych = *YYCURSOR;
 	YYDEBUG(34, *YYCURSOR);
-	if (yych <= '/') goto yy13;
-	if (yych <= '9') goto yy33;
-	if (yych == 'D') goto yy24;
-	goto yy13;
-yy35:
-	YYDEBUG(35, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych <= 'L') {
-		if (yych <= '9') {
-			if (yych <= '/') goto yy13;
-		} else {
-			if (yych == 'D') goto yy24;
-			goto yy13;
-		}
+	if (yych <= 'D') {
+		if (yych <= '/') goto yy13;
+		if (yych <= '9') goto yy33;
+		if (yych <= 'C') goto yy13;
+		goto yy21;
 	} else {
-		if (yych <= 'W') {
-			if (yych <= 'M') goto yy27;
-			if (yych <= 'V') goto yy13;
-			goto yy26;
+		if (yych <= 'M') {
+			if (yych <= 'L') goto yy13;
+			goto yy22;
 		} else {
-			if (yych == 'Y') goto yy28;
+			if (yych == 'W') goto yy23;
 			goto yy13;
 		}
 	}
+yy35:
+	YYDEBUG(35, *YYCURSOR);
+	yyaccept = 1;
+	yych = *(YYMARKER = ++YYCURSOR);
+	if (yych <= '/') goto yy10;
+	if (yych <= '9') goto yy42;
+	goto yy10;
+yy36:
 	YYDEBUG(36, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych != '-') goto yy39;
+	yyaccept = 1;
+	yych = *(YYMARKER = ++YYCURSOR);
+	if (yych <= '/') goto yy10;
+	if (yych <= '9') goto yy44;
+	goto yy10;
+yy37:
 	YYDEBUG(37, *YYCURSOR);
+	++YYCURSOR;
+	goto yy10;
+yy38:
+	YYDEBUG(38, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy13;
-	if (yych <= '0') goto yy40;
-	if (yych <= '1') goto yy41;
+	if (yych <= '0') goto yy46;
+	if (yych <= '1') goto yy47;
 	goto yy13;
-yy38:
-	YYDEBUG(38, *YYCURSOR);
-	++YYCURSOR;
-	if ((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
-	yych = *YYCURSOR;
 yy39:
 	YYDEBUG(39, *YYCURSOR);
-	if (yych <= 'L') {
-		if (yych <= '9') {
-			if (yych <= '/') goto yy13;
-			goto yy38;
-		} else {
-			if (yych == 'D') goto yy24;
-			goto yy13;
-		}
-	} else {
-		if (yych <= 'W') {
-			if (yych <= 'M') goto yy27;
-			if (yych <= 'V') goto yy13;
-			goto yy26;
-		} else {
-			if (yych == 'Y') goto yy28;
-			goto yy13;
-		}
-	}
+	yych = *++YYCURSOR;
+	if (yych <= '0') goto yy13;
+	if (yych <= '9') goto yy48;
+	goto yy13;
 yy40:
 	YYDEBUG(40, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy13;
-	if (yych <= '9') goto yy42;
+	if (yych <= '2') goto yy48;
 	goto yy13;
 yy41:
 	YYDEBUG(41, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy13;
-	if (yych >= '3') goto yy13;
+	if (yych == '-') goto yy49;
+	goto yy51;
 yy42:
 	YYDEBUG(42, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych != '-') goto yy13;
+	++YYCURSOR;
+	if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
+	yych = *YYCURSOR;
 	YYDEBUG(43, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy13;
-	if (yych <= '0') goto yy44;
-	if (yych <= '2') goto yy45;
-	if (yych <= '3') goto yy46;
-	goto yy13;
+	if (yych <= 'L') {
+		if (yych <= '/') goto yy13;
+		if (yych <= '9') goto yy42;
+		goto yy13;
+	} else {
+		if (yych <= 'M') goto yy36;
+		if (yych == 'S') goto yy37;
+		goto yy13;
+	}
 yy44:
 	YYDEBUG(44, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy13;
-	if (yych <= '9') goto yy47;
-	goto yy13;
-yy45:
+	++YYCURSOR;
+	if (YYLIMIT <= YYCURSOR) YYFILL(1);
+	yych = *YYCURSOR;
 	YYDEBUG(45, *YYCURSOR);
-	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy13;
-	if (yych <= '9') goto yy47;
+	if (yych <= '9') goto yy44;
+	if (yych == 'S') goto yy37;
 	goto yy13;
 yy46:
 	YYDEBUG(46, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy13;
-	if (yych >= '2') goto yy13;
+	if (yych <= '0') goto yy13;
+	if (yych <= '9') goto yy52;
+	goto yy13;
 yy47:
 	YYDEBUG(47, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych != 'T') goto yy13;
+	if (yych <= '/') goto yy13;
+	if (yych <= '2') goto yy52;
+	goto yy13;
+yy48:
 	YYDEBUG(48, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy13;
-	if (yych <= '1') goto yy49;
-	if (yych <= '2') goto yy50;
+	if (yych <= '0') goto yy53;
+	if (yych <= '2') goto yy54;
+	if (yych <= '3') goto yy55;
 	goto yy13;
 yy49:
 	YYDEBUG(49, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy13;
-	if (yych <= '9') goto yy51;
+	if (yych <= '0') goto yy56;
+	if (yych <= '1') goto yy57;
 	goto yy13;
 yy50:
 	YYDEBUG(50, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy13;
-	if (yych >= '5') goto yy13;
+	++YYCURSOR;
+	if ((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
+	yych = *YYCURSOR;
 yy51:
 	YYDEBUG(51, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych != ':') goto yy13;
+	if (yych <= 'L') {
+		if (yych <= '9') {
+			if (yych <= '/') goto yy13;
+			goto yy50;
+		} else {
+			if (yych == 'D') goto yy21;
+			goto yy13;
+		}
+	} else {
+		if (yych <= 'W') {
+			if (yych <= 'M') goto yy22;
+			if (yych <= 'V') goto yy13;
+			goto yy23;
+		} else {
+			if (yych == 'Y') goto yy24;
+			goto yy13;
+		}
+	}
+yy52:
 	YYDEBUG(52, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy13;
-	if (yych >= '6') goto yy13;
+	if (yych == '-') goto yy58;
+	goto yy13;
+yy53:
 	YYDEBUG(53, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy13;
-	if (yych >= ':') goto yy13;
+	if (yych <= '0') goto yy13;
+	if (yych <= '9') goto yy59;
+	goto yy13;
+yy54:
 	YYDEBUG(54, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych != ':') goto yy13;
+	if (yych <= '/') goto yy13;
+	if (yych <= '9') goto yy59;
+	goto yy13;
+yy55:
 	YYDEBUG(55, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy13;
-	if (yych >= '6') goto yy13;
+	if (yych <= '1') goto yy59;
+	goto yy13;
+yy56:
 	YYDEBUG(56, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy13;
-	if (yych >= ':') goto yy13;
+	if (yych <= '9') goto yy60;
+	goto yy13;
+yy57:
 	YYDEBUG(57, *YYCURSOR);
-	++YYCURSOR;
+	yych = *++YYCURSOR;
+	if (yych <= '/') goto yy13;
+	if (yych <= '2') goto yy60;
+	goto yy13;
+yy58:
 	YYDEBUG(58, *YYCURSOR);
-#line 286 "ext/date/lib/parse_iso_intervals.re"
-	{
-		DEBUG_OUTPUT("combinedrep");
-		TIMELIB_INIT;
-		s->period->y = timelib_get_unsigned_nr(&ptr, 4);
-		ptr++;
-		s->period->m = timelib_get_unsigned_nr(&ptr, 2);
-		ptr++;
-		s->period->d = timelib_get_unsigned_nr(&ptr, 2);
-		ptr++;
-		s->period->h = timelib_get_unsigned_nr(&ptr, 2);
-		ptr++;
-		s->period->i = timelib_get_unsigned_nr(&ptr, 2);
-		ptr++;
-		s->period->s = timelib_get_unsigned_nr(&ptr, 2);
-		s->have_period = 1;
-		TIMELIB_DEINIT;
-		return TIMELIB_PERIOD;
-	}
-#line 684 "<stdout>"
+	yych = *++YYCURSOR;
+	if (yych <= '/') goto yy13;
+	if (yych <= '0') goto yy61;
+	if (yych <= '2') goto yy62;
+	if (yych <= '3') goto yy63;
+	goto yy13;
 yy59:
 	YYDEBUG(59, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy13;
-	if (yych >= ':') goto yy13;
+	if (yych == 'T') goto yy64;
+	goto yy13;
+yy60:
 	YYDEBUG(60, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy13;
-	if (yych >= ':') goto yy13;
+	if (yych == '-') goto yy65;
+	goto yy13;
+yy61:
 	YYDEBUG(61, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '/') {
-		if (yych == '-') goto yy64;
-		goto yy13;
-	} else {
-		if (yych <= '0') goto yy62;
-		if (yych <= '1') goto yy63;
-		goto yy13;
-	}
+	if (yych <= '0') goto yy13;
+	if (yych <= '9') goto yy66;
+	goto yy13;
 yy62:
 	YYDEBUG(62, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '0') goto yy13;
-	if (yych <= '9') goto yy85;
+	if (yych <= '/') goto yy13;
+	if (yych <= '9') goto yy66;
 	goto yy13;
 yy63:
 	YYDEBUG(63, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy13;
-	if (yych <= '2') goto yy85;
+	if (yych <= '1') goto yy66;
 	goto yy13;
 yy64:
 	YYDEBUG(64, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy13;
-	if (yych <= '0') goto yy65;
-	if (yych <= '1') goto yy66;
+	if (yych <= '1') goto yy67;
+	if (yych <= '2') goto yy68;
 	goto yy13;
 yy65:
 	YYDEBUG(65, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '0') goto yy13;
-	if (yych <= '9') goto yy67;
+	if (yych <= '/') goto yy13;
+	if (yych <= '2') goto yy69;
+	if (yych <= '3') goto yy70;
 	goto yy13;
 yy66:
 	YYDEBUG(66, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy13;
-	if (yych >= '3') goto yy13;
+	if (yych == 'T') goto yy71;
+	goto yy13;
 yy67:
 	YYDEBUG(67, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych != '-') goto yy13;
+	if (yych <= '/') goto yy13;
+	if (yych <= '9') goto yy72;
+	goto yy13;
+yy68:
 	YYDEBUG(68, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy13;
-	if (yych <= '0') goto yy69;
-	if (yych <= '2') goto yy70;
-	if (yych <= '3') goto yy71;
+	if (yych <= '4') goto yy72;
 	goto yy13;
 yy69:
 	YYDEBUG(69, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '0') goto yy13;
-	if (yych <= '9') goto yy72;
+	if (yych <= '/') goto yy13;
+	if (yych <= '9') goto yy73;
 	goto yy13;
 yy70:
 	YYDEBUG(70, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy13;
-	if (yych <= '9') goto yy72;
+	if (yych <= '1') goto yy73;
 	goto yy13;
 yy71:
 	YYDEBUG(71, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy13;
-	if (yych >= '2') goto yy13;
+	if (yych <= '1') goto yy74;
+	if (yych <= '2') goto yy75;
+	goto yy13;
 yy72:
 	YYDEBUG(72, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych != 'T') goto yy13;
+	if (yych <= '/') goto yy13;
+	if (yych <= '5') goto yy76;
+	goto yy13;
+yy73:
 	YYDEBUG(73, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy13;
-	if (yych <= '1') goto yy74;
-	if (yych <= '2') goto yy75;
+	if (yych == 'T') goto yy77;
 	goto yy13;
 yy74:
 	YYDEBUG(74, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy13;
-	if (yych <= '9') goto yy76;
+	if (yych <= '9') goto yy78;
 	goto yy13;
 yy75:
 	YYDEBUG(75, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy13;
-	if (yych >= '5') goto yy13;
+	if (yych <= '4') goto yy78;
+	goto yy13;
 yy76:
 	YYDEBUG(76, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych != ':') goto yy13;
+	if (yych <= '/') goto yy13;
+	if (yych <= '9') goto yy79;
+	goto yy13;
+yy77:
 	YYDEBUG(77, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy13;
-	if (yych >= '6') goto yy13;
+	if (yych <= '1') goto yy80;
+	if (yych <= '2') goto yy81;
+	goto yy13;
+yy78:
 	YYDEBUG(78, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy13;
-	if (yych >= ':') goto yy13;
+	if (yych == ':') goto yy82;
+	goto yy13;
+yy79:
 	YYDEBUG(79, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych != ':') goto yy13;
+	if (yych <= '/') goto yy13;
+	if (yych <= '5') goto yy83;
+	goto yy13;
+yy80:
 	YYDEBUG(80, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy13;
-	if (yych >= '6') goto yy13;
+	if (yych <= '9') goto yy84;
+	goto yy13;
+yy81:
 	YYDEBUG(81, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy13;
-	if (yych >= ':') goto yy13;
+	if (yych <= '4') goto yy84;
+	goto yy13;
+yy82:
 	YYDEBUG(82, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych != 'Z') goto yy13;
+	if (yych <= '/') goto yy13;
+	if (yych <= '5') goto yy85;
+	goto yy13;
 yy83:
 	YYDEBUG(83, *YYCURSOR);
-	++YYCURSOR;
+	yych = *++YYCURSOR;
+	if (yych <= '/') goto yy13;
+	if (yych <= '9') goto yy86;
+	goto yy13;
+yy84:
 	YYDEBUG(84, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if (yych == ':') goto yy87;
+	goto yy13;
+yy85:
+	YYDEBUG(85, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if (yych <= '/') goto yy13;
+	if (yych <= '9') goto yy88;
+	goto yy13;
+yy86:
+	YYDEBUG(86, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if (yych == 'Z') goto yy89;
+	goto yy13;
+yy87:
+	YYDEBUG(87, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if (yych <= '/') goto yy13;
+	if (yych <= '5') goto yy91;
+	goto yy13;
+yy88:
+	YYDEBUG(88, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if (yych == ':') goto yy79;
+	goto yy13;
+yy89:
+	YYDEBUG(89, *YYCURSOR);
+	++YYCURSOR;
+	YYDEBUG(90, *YYCURSOR);
 #line 220 "ext/date/lib/parse_iso_intervals.re"
 	{
 		timelib_time *current;
@@ -832,54 +917,15 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_ISO_DATE;
 	}
-#line 836 "<stdout>"
-yy85:
-	YYDEBUG(85, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy13;
-	if (yych <= '0') goto yy86;
-	if (yych <= '2') goto yy87;
-	if (yych <= '3') goto yy88;
-	goto yy13;
-yy86:
-	YYDEBUG(86, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych <= '0') goto yy13;
-	if (yych <= '9') goto yy89;
-	goto yy13;
-yy87:
-	YYDEBUG(87, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy13;
-	if (yych <= '9') goto yy89;
-	goto yy13;
-yy88:
-	YYDEBUG(88, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy13;
-	if (yych >= '2') goto yy13;
-yy89:
-	YYDEBUG(89, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych != 'T') goto yy13;
-	YYDEBUG(90, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy13;
-	if (yych <= '1') goto yy91;
-	if (yych <= '2') goto yy92;
-	goto yy13;
+#line 921 "<stdout>"
 yy91:
 	YYDEBUG(91, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy13;
-	if (yych <= '9') goto yy93;
-	goto yy13;
-yy92:
+	if (yych >= ':') goto yy13;
 	YYDEBUG(92, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy13;
-	if (yych >= '5') goto yy13;
-yy93:
+	if (yych != ':') goto yy13;
 	YYDEBUG(93, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy13;
@@ -889,38 +935,28 @@
 	if (yych <= '/') goto yy13;
 	if (yych >= ':') goto yy13;
 	YYDEBUG(95, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy13;
-	if (yych >= '6') goto yy13;
-	YYDEBUG(96, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy13;
-	if (yych >= ':') goto yy13;
-	YYDEBUG(97, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'Z') goto yy83;
-	goto yy13;
-yy98:
-	YYDEBUG(98, *YYCURSOR);
 	++YYCURSOR;
-	if (YYLIMIT <= YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	YYDEBUG(99, *YYCURSOR);
-	if (yych <= '/') goto yy100;
-	if (yych <= '9') goto yy98;
-yy100:
-	YYDEBUG(100, *YYCURSOR);
-#line 209 "ext/date/lib/parse_iso_intervals.re"
+	YYDEBUG(96, *YYCURSOR);
+#line 286 "ext/date/lib/parse_iso_intervals.re"
 	{
-		DEBUG_OUTPUT("recurrences");
+		DEBUG_OUTPUT("combinedrep");
 		TIMELIB_INIT;
+		s->period->y = timelib_get_unsigned_nr(&ptr, 4);
 		ptr++;
-		s->recurrences = timelib_get_unsigned_nr(&ptr, 9);
+		s->period->m = timelib_get_unsigned_nr(&ptr, 2);
+		ptr++;
+		s->period->d = timelib_get_unsigned_nr(&ptr, 2);
+		ptr++;
+		s->period->h = timelib_get_unsigned_nr(&ptr, 2);
+		ptr++;
+		s->period->i = timelib_get_unsigned_nr(&ptr, 2);
+		ptr++;
+		s->period->s = timelib_get_unsigned_nr(&ptr, 2);
+		s->have_period = 1;
 		TIMELIB_DEINIT;
-		s->have_recurrences = 1;
 		return TIMELIB_PERIOD;
 	}
-#line 924 "<stdout>"
+#line 960 "<stdout>"
 }
 #line 321 "ext/date/lib/parse_iso_intervals.re"
 
@@ -931,6 +967,7 @@
 
 #define YYMAXFILL 20
 
+
 void timelib_strtointerval(const char *s, size_t len,
                            timelib_time **begin, timelib_time **end,
 						   timelib_rel_time **period, int *recurrences,

php-8.3.7.tar.xz/ext/date/lib/timelib.h -> php-8.3.21.tar.xz/ext/date/lib/timelib.h Changed

php-8.3.7.tar.xz/ext/date/lib/timelib_private.h -> php-8.3.21.tar.xz/ext/date/lib/timelib_private.h Changed

php-8.3.7.tar.xz/ext/date/lib/timezonedb.h -> php-8.3.21.tar.xz/ext/date/lib/timezonedb.h Changed

@@ -4,7 +4,7 @@
 #endif
 
 #ifdef TIMELIB_SUPPORT_SLIM_FILE
-const timelib_tzdb_index_entry timezonedb_idx_builtin597 = {
+const timelib_tzdb_index_entry timezonedb_idx_builtin598 = {
 	{ (char*) "Africa/Abidjan"                    , 0x000000 },
 	{ (char*) "Africa/Accra"                      , 0x00008E },
 	{ (char*) "Africa/Addis_Ababa"                , 0x000356 },
@@ -79,533 +79,534 @@
 	{ (char*) "America/Argentina/Ushuaia"         , 0x006F0B },
 	{ (char*) "America/Aruba"                     , 0x0071F0 },
 	{ (char*) "America/Asuncion"                  , 0x007293 },
-	{ (char*) "America/Atikokan"                  , 0x007613 },
-	{ (char*) "America/Atka"                      , 0x007720 },
-	{ (char*) "America/Bahia"                     , 0x007AF5 },
-	{ (char*) "America/Bahia_Banderas"            , 0x007DB0 },
-	{ (char*) "America/Barbados"                  , 0x0080A5 },
-	{ (char*) "America/Belem"                     , 0x0081C7 },
-	{ (char*) "America/Belize"                    , 0x00836F },
-	{ (char*) "America/Blanc-Sablon"              , 0x008790 },
-	{ (char*) "America/Boa_Vista"                 , 0x008885 },
-	{ (char*) "America/Bogota"                    , 0x008A46 },
-	{ (char*) "America/Boise"                     , 0x008B05 },
-	{ (char*) "America/Buenos_Aires"              , 0x008F18 },
-	{ (char*) "America/Cambridge_Bay"             , 0x0091E8 },
-	{ (char*) "America/Campo_Grande"              , 0x00957B },
-	{ (char*) "America/Cancun"                    , 0x009951 },
-	{ (char*) "America/Caracas"                   , 0x009B7A },
-	{ (char*) "America/Catamarca"                 , 0x009C44 },
-	{ (char*) "America/Cayenne"                   , 0x009F14 },
-	{ (char*) "America/Cayman"                    , 0x009FB7 },
-	{ (char*) "America/Chicago"                   , 0x00A058 },
-	{ (char*) "America/Chihuahua"                 , 0x00A752 },
-	{ (char*) "America/Ciudad_Juarez"             , 0x00AA27 },
-	{ (char*) "America/Coral_Harbour"             , 0x00AD1D },
-	{ (char*) "America/Cordoba"                   , 0x00ADBE },
-	{ (char*) "America/Costa_Rica"                , 0x00B08E },
-	{ (char*) "America/Creston"                   , 0x00B182 },
-	{ (char*) "America/Cuiaba"                    , 0x00B23E },
-	{ (char*) "America/Curacao"                   , 0x00B5FB },
-	{ (char*) "America/Danmarkshavn"              , 0x00B69E },
-	{ (char*) "America/Dawson"                    , 0x00B883 },
-	{ (char*) "America/Dawson_Creek"              , 0x00BCA6 },
-	{ (char*) "America/Denver"                    , 0x00BF7D },
-	{ (char*) "America/Detroit"                   , 0x00C3B0 },
-	{ (char*) "America/Dominica"                  , 0x00C758 },
-	{ (char*) "America/Edmonton"                  , 0x00C7E6 },
-	{ (char*) "America/Eirunepe"                  , 0x00CBDE },
-	{ (char*) "America/El_Salvador"               , 0x00CDAD },
-	{ (char*) "America/Ensenada"                  , 0x00CE69 },
-	{ (char*) "America/Fort_Nelson"               , 0x00D276 },
-	{ (char*) "America/Fort_Wayne"                , 0x00D83E },
-	{ (char*) "America/Fortaleza"                 , 0x00DA5D },
-	{ (char*) "America/Glace_Bay"                 , 0x00DC73 },
-	{ (char*) "America/Godthab"                   , 0x00E00A },
-	{ (char*) "America/Goose_Bay"                 , 0x00E3DB },
-	{ (char*) "America/Grand_Turk"                , 0x00EA33 },
-	{ (char*) "America/Grenada"                   , 0x00ED94 },
-	{ (char*) "America/Guadeloupe"                , 0x00EE22 },
-	{ (char*) "America/Guatemala"                 , 0x00EEB0 },
-	{ (char*) "America/Guayaquil"                 , 0x00EF90 },
-	{ (char*) "America/Guyana"                    , 0x00F061 },
-	{ (char*) "America/Halifax"                   , 0x00F122 },
-	{ (char*) "America/Havana"                    , 0x00F7D4 },
-	{ (char*) "America/Hermosillo"                , 0x00FC3D },
-	{ (char*) "America/Indiana/Indianapolis"      , 0x00FD6D },
-	{ (char*) "America/Indiana/Knox"              , 0x00FFA5 },
-	{ (char*) "America/Indiana/Marengo"           , 0x0103BE },
-	{ (char*) "America/Indiana/Petersburg"        , 0x010618 },
-	{ (char*) "America/Indiana/Tell_City"         , 0x0108E2 },
-	{ (char*) "America/Indiana/Vevay"             , 0x010B0C },
-	{ (char*) "America/Indiana/Vincennes"         , 0x010CA3 },
-	{ (char*) "America/Indiana/Winamac"           , 0x010EF9 },
-	{ (char*) "America/Indianapolis"              , 0x011176 },
-	{ (char*) "America/Inuvik"                    , 0x011395 },
-	{ (char*) "America/Iqaluit"                   , 0x0116E6 },
-	{ (char*) "America/Jamaica"                   , 0x011A62 },
-	{ (char*) "America/Jujuy"                     , 0x011BC1 },
-	{ (char*) "America/Juneau"                    , 0x011E7F },
-	{ (char*) "America/Kentucky/Louisville"       , 0x012265 },
-	{ (char*) "America/Kentucky/Monticello"       , 0x012769 },
-	{ (char*) "America/Knox_IN"                   , 0x012B55 },
-	{ (char*) "America/Kralendijk"                , 0x012F59 },
-	{ (char*) "America/La_Paz"                    , 0x013016 },
-	{ (char*) "America/Lima"                      , 0x0130CC },
-	{ (char*) "America/Los_Angeles"               , 0x0131F3 },
-	{ (char*) "America/Louisville"                , 0x013714 },
-	{ (char*) "America/Lower_Princes"             , 0x013BFA },
-	{ (char*) "America/Maceio"                    , 0x013CB7 },
-	{ (char*) "America/Managua"                   , 0x013EC9 },
-	{ (char*) "America/Manaus"                    , 0x013FFC },
-	{ (char*) "America/Marigot"                   , 0x0141B3 },
-	{ (char*) "America/Martinique"                , 0x014270 },
-	{ (char*) "America/Matamoros"                 , 0x01432E },
-	{ (char*) "America/Mazatlan"                  , 0x01451B },
-	{ (char*) "America/Mendoza"                   , 0x014827 },
-	{ (char*) "America/Menominee"                 , 0x014AF7 },
-	{ (char*) "America/Merida"                    , 0x014EB7 },
-	{ (char*) "America/Metlakatla"                , 0x015162 },
-	{ (char*) "America/Mexico_City"               , 0x0153CF },
-	{ (char*) "America/Miquelon"                  , 0x0156EE },
-	{ (char*) "America/Moncton"                   , 0x015920 },
-	{ (char*) "America/Monterrey"                 , 0x015F19 },
-	{ (char*) "America/Montevideo"                , 0x0161DF },
-	{ (char*) "America/Montreal"                  , 0x0165B4 },
-	{ (char*) "America/Montserrat"                , 0x016C75 },
-	{ (char*) "America/Nassau"                    , 0x016D03 },
-	{ (char*) "America/New_York"                  , 0x0170FD },
-	{ (char*) "America/Nipigon"                   , 0x0177ED },
-	{ (char*) "America/Nome"                      , 0x017EAE },
-	{ (char*) "America/Noronha"                   , 0x018296 },
-	{ (char*) "America/North_Dakota/Beulah"       , 0x018496 },
-	{ (char*) "America/North_Dakota/Center"       , 0x0188CA },
-	{ (char*) "America/North_Dakota/New_Salem"    , 0x018CC9 },
-	{ (char*) "America/Nuuk"                      , 0x0190CE },
-	{ (char*) "America/Ojinaga"                   , 0x0194B0 },
-	{ (char*) "America/Panama"                    , 0x0197A6 },
-	{ (char*) "America/Pangnirtung"               , 0x019847 },
-	{ (char*) "America/Paramaribo"                , 0x019BAA },
-	{ (char*) "America/Phoenix"                   , 0x019C71 },
-	{ (char*) "America/Port-au-Prince"            , 0x019D85 },
-	{ (char*) "America/Port_of_Spain"             , 0x019FC6 },
-	{ (char*) "America/Porto_Acre"                , 0x01A054 },
-	{ (char*) "America/Porto_Velho"               , 0x01A202 },
-	{ (char*) "America/Puerto_Rico"               , 0x01A3A0 },
-	{ (char*) "America/Punta_Arenas"              , 0x01A45D },
-	{ (char*) "America/Rainy_River"               , 0x01A93F },
-	{ (char*) "America/Rankin_Inlet"              , 0x01AE59 },
-	{ (char*) "America/Recife"                    , 0x01B1A2 },
-	{ (char*) "America/Regina"                    , 0x01B39C },
-	{ (char*) "America/Resolute"                  , 0x01B63B },
-	{ (char*) "America/Rio_Branco"                , 0x01B985 },
-	{ (char*) "America/Rosario"                   , 0x01BB37 },
-	{ (char*) "America/Santa_Isabel"              , 0x01BE07 },
-	{ (char*) "America/Santarem"                  , 0x01C214 },
-	{ (char*) "America/Santiago"                  , 0x01C3C4 },
-	{ (char*) "America/Santo_Domingo"             , 0x01C927 },
-	{ (char*) "America/Sao_Paulo"                 , 0x01CA70 },
-	{ (char*) "America/Scoresbysund"              , 0x01CE6A },
-	{ (char*) "America/Shiprock"                  , 0x01D26B },
-	{ (char*) "America/Sitka"                     , 0x01D689 },
-	{ (char*) "America/St_Barthelemy"             , 0x01DA64 },
-	{ (char*) "America/St_Johns"                  , 0x01DB21 },
-	{ (char*) "America/St_Kitts"                  , 0x01E29E },
-	{ (char*) "America/St_Lucia"                  , 0x01E32C },
-	{ (char*) "America/St_Thomas"                 , 0x01E3CD },
-	{ (char*) "America/St_Vincent"                , 0x01E45B },
-	{ (char*) "America/Swift_Current"             , 0x01E4FC },
-	{ (char*) "America/Tegucigalpa"               , 0x01E68A },
-	{ (char*) "America/Thule"                     , 0x01E758 },
-	{ (char*) "America/Thunder_Bay"               , 0x01E939 },
-	{ (char*) "America/Tijuana"                   , 0x01EFFA },
-	{ (char*) "America/Toronto"                   , 0x01F416 },
-	{ (char*) "America/Tortola"                   , 0x01FAF5 },
-	{ (char*) "America/Vancouver"                 , 0x01FB83 },
-	{ (char*) "America/Virgin"                    , 0x0200DA },
-	{ (char*) "America/Whitehorse"                , 0x020197 },
-	{ (char*) "America/Winnipeg"                  , 0x0205BA },
-	{ (char*) "America/Yakutat"                   , 0x020AF1 },
-	{ (char*) "America/Yellowknife"               , 0x020EBF },
-	{ (char*) "Antarctica/Casey"                  , 0x021295 },
-	{ (char*) "Antarctica/Davis"                  , 0x0213C5 },
-	{ (char*) "Antarctica/DumontDUrville"         , 0x02149B },
-	{ (char*) "Antarctica/Macquarie"              , 0x02154F },
-	{ (char*) "Antarctica/Mawson"                 , 0x02193B },
-	{ (char*) "Antarctica/McMurdo"                , 0x0219E5 },
-	{ (char*) "Antarctica/Palmer"                 , 0x021D17 },
-	{ (char*) "Antarctica/Rothera"                , 0x0220A0 },
-	{ (char*) "Antarctica/South_Pole"             , 0x022137 },
-	{ (char*) "Antarctica/Syowa"                  , 0x022556 },
-	{ (char*) "Antarctica/Troll"                  , 0x0225EC },
-	{ (char*) "Antarctica/Vostok"                 , 0x02269B },
-	{ (char*) "Arctic/Longyearbyen"               , 0x022757 },
-	{ (char*) "Asia/Aden"                         , 0x022A24 },
-	{ (char*) "Asia/Almaty"                       , 0x022AB5 },
-	{ (char*) "Asia/Amman"                        , 0x022D3D },
-	{ (char*) "Asia/Anadyr"                       , 0x0230E9 },
-	{ (char*) "Asia/Aqtau"                        , 0x0233EF },
-	{ (char*) "Asia/Aqtobe"                       , 0x02366E },
-	{ (char*) "Asia/Ashgabat"                     , 0x0238EE },
-	{ (char*) "Asia/Ashkhabad"                    , 0x023A71 },
-	{ (char*) "Asia/Atyrau"                       , 0x023BF4 },
-	{ (char*) "Asia/Baghdad"                      , 0x023E7D },
-	{ (char*) "Asia/Bahrain"                      , 0x0240FF },
-	{ (char*) "Asia/Baku"                         , 0x0241B8 },
-	{ (char*) "Asia/Bangkok"                      , 0x0244AC },
-	{ (char*) "Asia/Barnaul"                      , 0x024550 },
-	{ (char*) "Asia/Beirut"                       , 0x02485B },
-	{ (char*) "Asia/Bishkek"                      , 0x024B43 },
-	{ (char*) "Asia/Brunei"                       , 0x024DB9 },
-	{ (char*) "Asia/Calcutta"                     , 0x024E5F },
-	{ (char*) "Asia/Chita"                        , 0x024F47 },
-	{ (char*) "Asia/Choibalsan"                   , 0x025255 },
-	{ (char*) "Asia/Chongqing"                    , 0x0254DE },
-	{ (char*) "Asia/Chungking"                    , 0x025673 },
-	{ (char*) "Asia/Colombo"                      , 0x025808 },
-	{ (char*) "Asia/Dacca"                        , 0x02590B },
-	{ (char*) "Asia/Damascus"                     , 0x0259FE },
-	{ (char*) "Asia/Dhaka"                        , 0x025EDC },
-	{ (char*) "Asia/Dili"                         , 0x025FCF },
-	{ (char*) "Asia/Dubai"                        , 0x026085 },
-	{ (char*) "Asia/Dushanbe"                     , 0x026116 },
-	{ (char*) "Asia/Famagusta"                    , 0x026290 },
-	{ (char*) "Asia/Gaza"                         , 0x026657 },
-	{ (char*) "Asia/Harbin"                       , 0x0271F3 },
-	{ (char*) "Asia/Hebron"                       , 0x027388 },
-	{ (char*) "Asia/Ho_Chi_Minh"                  , 0x027F35 },
-	{ (char*) "Asia/Hong_Kong"                    , 0x02802D },
-	{ (char*) "Asia/Hovd"                         , 0x028340 },
-	{ (char*) "Asia/Irkutsk"                      , 0x0285C9 },
-	{ (char*) "Asia/Istanbul"                     , 0x0288E7 },
-	{ (char*) "Asia/Jakarta"                      , 0x028DA3 },
-	{ (char*) "Asia/Jayapura"                     , 0x028EB4 },
-	{ (char*) "Asia/Jerusalem"                    , 0x028FA1 },
-	{ (char*) "Asia/Kabul"                        , 0x0293DF },
-	{ (char*) "Asia/Kamchatka"                    , 0x02948A },
-	{ (char*) "Asia/Karachi"                      , 0x02977F },
-	{ (char*) "Asia/Kashgar"                      , 0x029895 },
-	{ (char*) "Asia/Kathmandu"                    , 0x029926 },
-	{ (char*) "Asia/Katmandu"                     , 0x0299D3 },
-	{ (char*) "Asia/Khandyga"                     , 0x029A80 },
-	{ (char*) "Asia/Kolkata"                      , 0x029DB1 },
-	{ (char*) "Asia/Krasnoyarsk"                  , 0x029E99 },
-	{ (char*) "Asia/Kuala_Lumpur"                 , 0x02A1A3 },
-	{ (char*) "Asia/Kuching"                      , 0x02A2C3 },
-	{ (char*) "Asia/Kuwait"                       , 0x02A41D },
-	{ (char*) "Asia/Macao"                        , 0x02A4AE },
-	{ (char*) "Asia/Macau"                        , 0x02A7D1 },
-	{ (char*) "Asia/Magadan"                      , 0x02AAF4 },
-	{ (char*) "Asia/Makassar"                     , 0x02ADFF },
-	{ (char*) "Asia/Manila"                       , 0x02AF12 },
-	{ (char*) "Asia/Muscat"                       , 0x02B00C },
-	{ (char*) "Asia/Nicosia"                      , 0x02B09D },
-	{ (char*) "Asia/Novokuznetsk"                 , 0x02B30C },
-	{ (char*) "Asia/Novosibirsk"                  , 0x02B5FF },
-	{ (char*) "Asia/Omsk"                         , 0x02B910 },
-	{ (char*) "Asia/Oral"                         , 0x02BC0E },
-	{ (char*) "Asia/Phnom_Penh"                   , 0x02BE9A },
-	{ (char*) "Asia/Pontianak"                    , 0x02BF6E },
-	{ (char*) "Asia/Pyongyang"                    , 0x02C087 },
-	{ (char*) "Asia/Qatar"                        , 0x02C14A },
-	{ (char*) "Asia/Qostanay"                     , 0x02C1EE },
-	{ (char*) "Asia/Qyzylorda"                    , 0x02C484 },
-	{ (char*) "Asia/Rangoon"                      , 0x02C71D },
-	{ (char*) "Asia/Riyadh"                       , 0x02C7E4 },
-	{ (char*) "Asia/Saigon"                       , 0x02C875 },
-	{ (char*) "Asia/Sakhalin"                     , 0x02C96D },
-	{ (char*) "Asia/Samarkand"                    , 0x02CC84 },
-	{ (char*) "Asia/Seoul"                        , 0x02CE0F },
-	{ (char*) "Asia/Shanghai"                     , 0x02CFBA },
-	{ (char*) "Asia/Singapore"                    , 0x02D15B },
-	{ (char*) "Asia/Srednekolymsk"                , 0x02D267 },
-	{ (char*) "Asia/Taipei"                       , 0x02D577 },
-	{ (char*) "Asia/Tashkent"                     , 0x02D782 },
-	{ (char*) "Asia/Tbilisi"                      , 0x02D90D },
-	{ (char*) "Asia/Tehran"                       , 0x02DB8E },
-	{ (char*) "Asia/Tel_Aviv"                     , 0x02DEC6 },
-	{ (char*) "Asia/Thimbu"                       , 0x02E304 },
-	{ (char*) "Asia/Thimphu"                      , 0x02E3AA },
-	{ (char*) "Asia/Tokyo"                        , 0x02E450 },
-	{ (char*) "Asia/Tomsk"                        , 0x02E531 },
-	{ (char*) "Asia/Ujung_Pandang"                , 0x02E83C },
-	{ (char*) "Asia/Ulaanbaatar"                  , 0x02E906 },
-	{ (char*) "Asia/Ulan_Bator"                   , 0x02EB74 },
-	{ (char*) "Asia/Urumqi"                       , 0x02EDD2 },
-	{ (char*) "Asia/Ust-Nera"                     , 0x02EE70 },
-	{ (char*) "Asia/Vientiane"                    , 0x02F193 },
-	{ (char*) "Asia/Vladivostok"                  , 0x02F279 },
-	{ (char*) "Asia/Yakutsk"                      , 0x02F57E },
-	{ (char*) "Asia/Yangon"                       , 0x02F882 },
-	{ (char*) "Asia/Yekaterinburg"                , 0x02F949 },
-	{ (char*) "Asia/Yerevan"                      , 0x02FC5B },
-	{ (char*) "Atlantic/Azores"                   , 0x02FF2B },
-	{ (char*) "Atlantic/Bermuda"                  , 0x0304EA },
-	{ (char*) "Atlantic/Canary"                   , 0x0308F6 },
-	{ (char*) "Atlantic/Cape_Verde"               , 0x030AEE },
-	{ (char*) "Atlantic/Faeroe"                   , 0x030BA9 },
-	{ (char*) "Atlantic/Faroe"                    , 0x030D6E },
-	{ (char*) "Atlantic/Jan_Mayen"                , 0x030F33 },
-	{ (char*) "Atlantic/Madeira"                  , 0x031200 },
-	{ (char*) "Atlantic/Reykjavik"                , 0x0317C8 },
-	{ (char*) "Atlantic/South_Georgia"            , 0x031AC5 },
-	{ (char*) "Atlantic/St_Helena"                , 0x031B55 },
-	{ (char*) "Atlantic/Stanley"                  , 0x031BF6 },
-	{ (char*) "Australia/ACT"                     , 0x031F17 },
-	{ (char*) "Australia/Adelaide"                , 0x0322AB },
-	{ (char*) "Australia/Brisbane"                , 0x03265F },
-	{ (char*) "Australia/Broken_Hill"             , 0x0327A3 },
-	{ (char*) "Australia/Canberra"                , 0x032B78 },
-	{ (char*) "Australia/Currie"                  , 0x032F0C },
-	{ (char*) "Australia/Darwin"                  , 0x033303 },
-	{ (char*) "Australia/Eucla"                   , 0x03340B },
-	{ (char*) "Australia/Hobart"                  , 0x03356A },
-	{ (char*) "Australia/LHI"                     , 0x033969 },
-	{ (char*) "Australia/Lindeman"                , 0x033C29 },
-	{ (char*) "Australia/Lord_Howe"               , 0x033D99 },
-	{ (char*) "Australia/Melbourne"               , 0x034069 },
-	{ (char*) "Australia/North"                   , 0x034405 },
-	{ (char*) "Australia/NSW"                     , 0x0344FB },
-	{ (char*) "Australia/Perth"                   , 0x03488F },
-	{ (char*) "Australia/Queensland"              , 0x0349EB },
-	{ (char*) "Australia/South"                   , 0x034B18 },
-	{ (char*) "Australia/Sydney"                  , 0x034EBD },
-	{ (char*) "Australia/Tasmania"                , 0x03526D },
-	{ (char*) "Australia/Victoria"                , 0x035664 },
-	{ (char*) "Australia/West"                    , 0x0359F8 },
-	{ (char*) "Australia/Yancowinna"              , 0x035B36 },
-	{ (char*) "Brazil/Acre"                       , 0x035EEF },
-	{ (char*) "Brazil/DeNoronha"                  , 0x03609D },
-	{ (char*) "Brazil/East"                       , 0x03628D },
-	{ (char*) "Brazil/West"                       , 0x036651 },
-	{ (char*) "Canada/Atlantic"                   , 0x0367F9 },
-	{ (char*) "Canada/Central"                    , 0x036E8D },
-	{ (char*) "Canada/Eastern"                    , 0x0373A7 },
-	{ (char*) "Canada/Mountain"                   , 0x037A68 },
-	{ (char*) "Canada/Newfoundland"               , 0x037E3E },
-	{ (char*) "Canada/Pacific"                    , 0x0385A0 },
-	{ (char*) "Canada/Saskatchewan"               , 0x038ADE },
-	{ (char*) "Canada/Yukon"                      , 0x038D68 },
-	{ (char*) "CET"                               , 0x039179 },
-	{ (char*) "Chile/Continental"                 , 0x0393F2 },
-	{ (char*) "Chile/EasterIsland"                , 0x039948 },
-	{ (char*) "CST6CDT"                           , 0x039DEA },
-	{ (char*) "Cuba"                              , 0x03A1AD },
-	{ (char*) "EET"                               , 0x03A616 },
-	{ (char*) "Egypt"                             , 0x03A813 },
-	{ (char*) "Eire"                              , 0x03AD3C },
-	{ (char*) "EST"                               , 0x03B320 },
-	{ (char*) "EST5EDT"                           , 0x03B39B },
-	{ (char*) "Etc/GMT"                           , 0x03B75E },
-	{ (char*) "Etc/GMT+0"                         , 0x03B7D9 },
-	{ (char*) "Etc/GMT+1"                         , 0x03B854 },
-	{ (char*) "Etc/GMT+10"                        , 0x03B8D1 },
-	{ (char*) "Etc/GMT+11"                        , 0x03B94F },
-	{ (char*) "Etc/GMT+12"                        , 0x03B9CD },
-	{ (char*) "Etc/GMT+2"                         , 0x03BA4B },
-	{ (char*) "Etc/GMT+3"                         , 0x03BAC8 },
-	{ (char*) "Etc/GMT+4"                         , 0x03BB45 },
-	{ (char*) "Etc/GMT+5"                         , 0x03BBC2 },
-	{ (char*) "Etc/GMT+6"                         , 0x03BC3F },
-	{ (char*) "Etc/GMT+7"                         , 0x03BCBC },
-	{ (char*) "Etc/GMT+8"                         , 0x03BD39 },
-	{ (char*) "Etc/GMT+9"                         , 0x03BDB6 },
-	{ (char*) "Etc/GMT-0"                         , 0x03BE33 },
-	{ (char*) "Etc/GMT-1"                         , 0x03BEAE },
-	{ (char*) "Etc/GMT-10"                        , 0x03BF2C },
-	{ (char*) "Etc/GMT-11"                        , 0x03BFAB },
-	{ (char*) "Etc/GMT-12"                        , 0x03C02A },
-	{ (char*) "Etc/GMT-13"                        , 0x03C0A9 },
-	{ (char*) "Etc/GMT-14"                        , 0x03C128 },
-	{ (char*) "Etc/GMT-2"                         , 0x03C1A7 },
-	{ (char*) "Etc/GMT-3"                         , 0x03C225 },
-	{ (char*) "Etc/GMT-4"                         , 0x03C2A3 },
-	{ (char*) "Etc/GMT-5"                         , 0x03C321 },
-	{ (char*) "Etc/GMT-6"                         , 0x03C39F },
-	{ (char*) "Etc/GMT-7"                         , 0x03C41D },
-	{ (char*) "Etc/GMT-8"                         , 0x03C49B },
-	{ (char*) "Etc/GMT-9"                         , 0x03C519 },
-	{ (char*) "Etc/GMT0"                          , 0x03C597 },
-	{ (char*) "Etc/Greenwich"                     , 0x03C612 },
-	{ (char*) "Etc/UCT"                           , 0x03C68D },
-	{ (char*) "Etc/Universal"                     , 0x03C708 },
-	{ (char*) "Etc/UTC"                           , 0x03C783 },
-	{ (char*) "Etc/Zulu"                          , 0x03C7FE },
-	{ (char*) "Europe/Amsterdam"                  , 0x03C879 },
-	{ (char*) "Europe/Andorra"                    , 0x03CCB4 },
-	{ (char*) "Europe/Astrakhan"                  , 0x03CE45 },
-	{ (char*) "Europe/Athens"                     , 0x03D139 },
-	{ (char*) "Europe/Belfast"                    , 0x03D3EF },
-	{ (char*) "Europe/Belgrade"                   , 0x03DA3A },
-	{ (char*) "Europe/Berlin"                     , 0x03DC24 },
-	{ (char*) "Europe/Bratislava"                 , 0x03DF00 },
-	{ (char*) "Europe/Brussels"                   , 0x03E1DF },
-	{ (char*) "Europe/Bucharest"                  , 0x03E63A },
-	{ (char*) "Europe/Budapest"                   , 0x03E8DB },
-	{ (char*) "Europe/Busingen"                   , 0x03EBE5 },
-	{ (char*) "Europe/Chisinau"                   , 0x03EDEA },
-	{ (char*) "Europe/Copenhagen"                 , 0x03F0E9 },
-	{ (char*) "Europe/Dublin"                     , 0x03F364 },
-	{ (char*) "Europe/Gibraltar"                  , 0x03F948 },
-	{ (char*) "Europe/Guernsey"                   , 0x03FE18 },
-	{ (char*) "Europe/Helsinki"                   , 0x04046F },
-	{ (char*) "Europe/Isle_of_Man"                , 0x04065C },
-	{ (char*) "Europe/Istanbul"                   , 0x040CA7 },
-	{ (char*) "Europe/Jersey"                     , 0x041163 },
-	{ (char*) "Europe/Kaliningrad"                , 0x0417BA },
-	{ (char*) "Europe/Kiev"                       , 0x041B62 },
-	{ (char*) "Europe/Kirov"                      , 0x041D9C },
-	{ (char*) "Europe/Kyiv"                       , 0x042095 },
-	{ (char*) "Europe/Lisbon"                     , 0x0422DE },
-	{ (char*) "Europe/Ljubljana"                  , 0x0428AB },
-	{ (char*) "Europe/London"                     , 0x042A95 },
-	{ (char*) "Europe/Luxembourg"                 , 0x0430E0 },
-	{ (char*) "Europe/Madrid"                     , 0x04352B },
-	{ (char*) "Europe/Malta"                      , 0x0438C8 },
-	{ (char*) "Europe/Mariehamn"                  , 0x043C74 },
-	{ (char*) "Europe/Minsk"                      , 0x043E61 },
-	{ (char*) "Europe/Monaco"                     , 0x044195 },
-	{ (char*) "Europe/Moscow"                     , 0x0445FB },
-	{ (char*) "Europe/Nicosia"                    , 0x0449A7 },
-	{ (char*) "Europe/Oslo"                       , 0x044C08 },
-	{ (char*) "Europe/Paris"                      , 0x044EB8 },
-	{ (char*) "Europe/Podgorica"                  , 0x045315 },
-	{ (char*) "Europe/Prague"                     , 0x0454FF },
-	{ (char*) "Europe/Riga"                       , 0x0457DE },
-	{ (char*) "Europe/Rome"                       , 0x045AA0 },
-	{ (char*) "Europe/Samara"                     , 0x045E5F },
-	{ (char*) "Europe/San_Marino"                 , 0x046160 },
-	{ (char*) "Europe/Sarajevo"                   , 0x04651F },
-	{ (char*) "Europe/Saratov"                    , 0x046709 },
-	{ (char*) "Europe/Simferopol"                 , 0x0469FB },
-	{ (char*) "Europe/Skopje"                     , 0x046D6E },
-	{ (char*) "Europe/Sofia"                      , 0x046F58 },
-	{ (char*) "Europe/Stockholm"                  , 0x0471B4 },
-	{ (char*) "Europe/Tallinn"                    , 0x0473B1 },
-	{ (char*) "Europe/Tirane"                     , 0x047660 },
-	{ (char*) "Europe/Tiraspol"                   , 0x0478C8 },
-	{ (char*) "Europe/Ulyanovsk"                  , 0x047BC7 },
-	{ (char*) "Europe/Uzhgorod"                   , 0x047EDD },
-	{ (char*) "Europe/Vaduz"                      , 0x048117 },
-	{ (char*) "Europe/Vatican"                    , 0x048301 },
-	{ (char*) "Europe/Vienna"                     , 0x0486C0 },
-	{ (char*) "Europe/Vilnius"                    , 0x04895E },
-	{ (char*) "Europe/Volgograd"                  , 0x048C0E },
-	{ (char*) "Europe/Warsaw"                     , 0x048F1D },
-	{ (char*) "Europe/Zagreb"                     , 0x0492C4 },
-	{ (char*) "Europe/Zaporozhye"                 , 0x0494AE },
-	{ (char*) "Europe/Zurich"                     , 0x0496E8 },
-	{ (char*) "Factory"                           , 0x0498E5 },
-	{ (char*) "GB"                                , 0x049962 },
-	{ (char*) "GB-Eire"                           , 0x049FAD },
-	{ (char*) "GMT"                               , 0x04A5F8 },
-	{ (char*) "GMT+0"                             , 0x04A673 },
-	{ (char*) "GMT-0"                             , 0x04A6EE },
-	{ (char*) "GMT0"                              , 0x04A769 },
-	{ (char*) "Greenwich"                         , 0x04A7E4 },
-	{ (char*) "Hongkong"                          , 0x04A85F },
-	{ (char*) "HST"                               , 0x04AB72 },
-	{ (char*) "Iceland"                           , 0x04ABEE },
-	{ (char*) "Indian/Antananarivo"               , 0x04AC7C },
-	{ (char*) "Indian/Chagos"                     , 0x04AD28 },
-	{ (char*) "Indian/Christmas"                  , 0x04ADCC },
-	{ (char*) "Indian/Cocos"                      , 0x04AE5D },
-	{ (char*) "Indian/Comoro"                     , 0x04AEF5 },
-	{ (char*) "Indian/Kerguelen"                  , 0x04AF84 },
-	{ (char*) "Indian/Mahe"                       , 0x04B015 },
-	{ (char*) "Indian/Maldives"                   , 0x04B0A6 },
-	{ (char*) "Indian/Mauritius"                  , 0x04B14A },
-	{ (char*) "Indian/Mayotte"                    , 0x04B209 },
-	{ (char*) "Indian/Reunion"                    , 0x04B298 },
-	{ (char*) "Iran"                              , 0x04B329 },
-	{ (char*) "Israel"                            , 0x04B661 },
-	{ (char*) "Jamaica"                           , 0x04BA9F },
-	{ (char*) "Japan"                             , 0x04BBFE },
-	{ (char*) "Kwajalein"                         , 0x04BCDF },
-	{ (char*) "Libya"                             , 0x04BDC6 },
-	{ (char*) "MET"                               , 0x04BF81 },
-	{ (char*) "Mexico/BajaNorte"                  , 0x04C1FA },
-	{ (char*) "Mexico/BajaSur"                    , 0x04C607 },
-	{ (char*) "Mexico/General"                    , 0x04C8E1 },
-	{ (char*) "MST"                               , 0x04CBF2 },
-	{ (char*) "MST7MDT"                           , 0x04CC6D },
-	{ (char*) "Navajo"                            , 0x04D030 },
-	{ (char*) "NZ"                                , 0x04D44E },
-	{ (char*) "NZ-CHAT"                           , 0x04D86D },
-	{ (char*) "Pacific/Apia"                      , 0x04DBA1 },
-	{ (char*) "Pacific/Auckland"                  , 0x04DD44 },
-	{ (char*) "Pacific/Bougainville"              , 0x04E176 },
-	{ (char*) "Pacific/Chatham"                   , 0x04E257 },
-	{ (char*) "Pacific/Chuuk"                     , 0x04E59A },
-	{ (char*) "Pacific/Easter"                    , 0x04E678 },
-	{ (char*) "Pacific/Efate"                     , 0x04EB27 },
-	{ (char*) "Pacific/Enderbury"                 , 0x04EC89 },
-	{ (char*) "Pacific/Fakaofo"                   , 0x04ED41 },
-	{ (char*) "Pacific/Fiji"                      , 0x04EDE6 },
-	{ (char*) "Pacific/Funafuti"                  , 0x04EF7E },
-	{ (char*) "Pacific/Galapagos"                 , 0x04F010 },
-	{ (char*) "Pacific/Gambier"                   , 0x04F0DC },
-	{ (char*) "Pacific/Guadalcanal"               , 0x04F17B },
-	{ (char*) "Pacific/Guam"                      , 0x04F20D },
-	{ (char*) "Pacific/Honolulu"                  , 0x04F377 },
-	{ (char*) "Pacific/Johnston"                  , 0x04F466 },
-	{ (char*) "Pacific/Kanton"                    , 0x04F54F },
-	{ (char*) "Pacific/Kiritimati"                , 0x04F616 },
-	{ (char*) "Pacific/Kosrae"                    , 0x04F6DC },
-	{ (char*) "Pacific/Kwajalein"                 , 0x04F7E0 },
-	{ (char*) "Pacific/Majuro"                    , 0x04F8D0 },
-	{ (char*) "Pacific/Marquesas"                 , 0x04F9CE },
-	{ (char*) "Pacific/Midway"                    , 0x04FA76 },
-	{ (char*) "Pacific/Nauru"                     , 0x04FB39 },
-	{ (char*) "Pacific/Niue"                      , 0x04FBFC },
-	{ (char*) "Pacific/Norfolk"                   , 0x04FCA2 },
-	{ (char*) "Pacific/Noumea"                    , 0x04FD9B },
-	{ (char*) "Pacific/Pago_Pago"                 , 0x04FE6D },
-	{ (char*) "Pacific/Palau"                     , 0x04FF0B },
-	{ (char*) "Pacific/Pitcairn"                  , 0x04FFAB },
-	{ (char*) "Pacific/Pohnpei"                   , 0x050050 },
-	{ (char*) "Pacific/Ponape"                    , 0x050140 },
-	{ (char*) "Pacific/Port_Moresby"              , 0x0501D2 },
-	{ (char*) "Pacific/Rarotonga"                 , 0x050290 },
-	{ (char*) "Pacific/Saipan"                    , 0x050432 },
-	{ (char*) "Pacific/Samoa"                     , 0x050593 },
-	{ (char*) "Pacific/Tahiti"                    , 0x050631 },
-	{ (char*) "Pacific/Tarawa"                    , 0x0506D1 },
-	{ (char*) "Pacific/Tongatapu"                 , 0x050772 },
-	{ (char*) "Pacific/Truk"                      , 0x05086B },
-	{ (char*) "Pacific/Wake"                      , 0x050911 },
-	{ (char*) "Pacific/Wallis"                    , 0x0509AE },
-	{ (char*) "Pacific/Yap"                       , 0x050A40 },
-	{ (char*) "Poland"                            , 0x050AE6 },
-	{ (char*) "Portugal"                          , 0x050E8D },
-	{ (char*) "PRC"                               , 0x051447 },
-	{ (char*) "PST8PDT"                           , 0x0515DC },
-	{ (char*) "ROC"                               , 0x05199F },
-	{ (char*) "ROK"                               , 0x051BAA },
-	{ (char*) "Singapore"                         , 0x051D55 },
-	{ (char*) "Turkey"                            , 0x051E61 },
-	{ (char*) "UCT"                               , 0x05231D },
-	{ (char*) "Universal"                         , 0x052398 },
-	{ (char*) "US/Alaska"                         , 0x052413 },
-	{ (char*) "US/Aleutian"                       , 0x0527F0 },
-	{ (char*) "US/Arizona"                        , 0x052BC5 },
-	{ (char*) "US/Central"                        , 0x052CC1 },
-	{ (char*) "US/East-Indiana"                   , 0x0533A7 },
-	{ (char*) "US/Eastern"                        , 0x0535C6 },
-	{ (char*) "US/Hawaii"                         , 0x053CA2 },
-	{ (char*) "US/Indiana-Starke"                 , 0x053D8B },
-	{ (char*) "US/Michigan"                       , 0x05418F },
-	{ (char*) "US/Mountain"                       , 0x05451E },
-	{ (char*) "US/Pacific"                        , 0x05493C },
-	{ (char*) "US/Samoa"                          , 0x054E56 },
-	{ (char*) "UTC"                               , 0x054EF4 },
-	{ (char*) "W-SU"                              , 0x054F6F },
-	{ (char*) "WET"                               , 0x055307 },
-	{ (char*) "Zulu"                              , 0x055501 },
+	{ (char*) "America/Atikokan"                  , 0x0076DC },
+	{ (char*) "America/Atka"                      , 0x0077E9 },
+	{ (char*) "America/Bahia"                     , 0x007BBE },
+	{ (char*) "America/Bahia_Banderas"            , 0x007E79 },
+	{ (char*) "America/Barbados"                  , 0x008152 },
+	{ (char*) "America/Belem"                     , 0x008274 },
+	{ (char*) "America/Belize"                    , 0x00841C },
+	{ (char*) "America/Blanc-Sablon"              , 0x00883D },
+	{ (char*) "America/Boa_Vista"                 , 0x008932 },
+	{ (char*) "America/Bogota"                    , 0x008AF3 },
+	{ (char*) "America/Boise"                     , 0x008BB2 },
+	{ (char*) "America/Buenos_Aires"              , 0x008FC5 },
+	{ (char*) "America/Cambridge_Bay"             , 0x009295 },
+	{ (char*) "America/Campo_Grande"              , 0x009628 },
+	{ (char*) "America/Cancun"                    , 0x0099FE },
+	{ (char*) "America/Caracas"                   , 0x009C30 },
+	{ (char*) "America/Catamarca"                 , 0x009CFA },
+	{ (char*) "America/Cayenne"                   , 0x009FCA },
+	{ (char*) "America/Cayman"                    , 0x00A06D },
+	{ (char*) "America/Chicago"                   , 0x00A10E },
+	{ (char*) "America/Chihuahua"                 , 0x00A808 },
+	{ (char*) "America/Ciudad_Juarez"             , 0x00AADD },
+	{ (char*) "America/Coral_Harbour"             , 0x00ADD3 },
+	{ (char*) "America/Cordoba"                   , 0x00AE74 },
+	{ (char*) "America/Costa_Rica"                , 0x00B144 },
+	{ (char*) "America/Coyhaique"                 , 0x00B238 },
+	{ (char*) "America/Creston"                   , 0x00B7A2 },
+	{ (char*) "America/Cuiaba"                    , 0x00B85E },
+	{ (char*) "America/Curacao"                   , 0x00BC1B },
+	{ (char*) "America/Danmarkshavn"              , 0x00BCBE },
+	{ (char*) "America/Dawson"                    , 0x00BEA3 },
+	{ (char*) "America/Dawson_Creek"              , 0x00C2C6 },
+	{ (char*) "America/Denver"                    , 0x00C59D },
+	{ (char*) "America/Detroit"                   , 0x00C9D0 },
+	{ (char*) "America/Dominica"                  , 0x00CD78 },
+	{ (char*) "America/Edmonton"                  , 0x00CE06 },
+	{ (char*) "America/Eirunepe"                  , 0x00D1FE },
+	{ (char*) "America/El_Salvador"               , 0x00D3CD },
+	{ (char*) "America/Ensenada"                  , 0x00D489 },
+	{ (char*) "America/Fort_Nelson"               , 0x00D8CC },
+	{ (char*) "America/Fort_Wayne"                , 0x00DE94 },
+	{ (char*) "America/Fortaleza"                 , 0x00E0B3 },
+	{ (char*) "America/Glace_Bay"                 , 0x00E2C9 },
+	{ (char*) "America/Godthab"                   , 0x00E660 },
+	{ (char*) "America/Goose_Bay"                 , 0x00EA31 },
+	{ (char*) "America/Grand_Turk"                , 0x00F089 },
+	{ (char*) "America/Grenada"                   , 0x00F3EA },
+	{ (char*) "America/Guadeloupe"                , 0x00F478 },
+	{ (char*) "America/Guatemala"                 , 0x00F506 },
+	{ (char*) "America/Guayaquil"                 , 0x00F5E6 },
+	{ (char*) "America/Guyana"                    , 0x00F6B7 },
+	{ (char*) "America/Halifax"                   , 0x00F778 },
+	{ (char*) "America/Havana"                    , 0x00FE2A },
+	{ (char*) "America/Hermosillo"                , 0x010293 },
+	{ (char*) "America/Indiana/Indianapolis"      , 0x0103A7 },
+	{ (char*) "America/Indiana/Knox"              , 0x0105DF },
+	{ (char*) "America/Indiana/Marengo"           , 0x0109F8 },
+	{ (char*) "America/Indiana/Petersburg"        , 0x010C52 },
+	{ (char*) "America/Indiana/Tell_City"         , 0x010F1C },
+	{ (char*) "America/Indiana/Vevay"             , 0x011146 },
+	{ (char*) "America/Indiana/Vincennes"         , 0x0112DD },
+	{ (char*) "America/Indiana/Winamac"           , 0x011533 },
+	{ (char*) "America/Indianapolis"              , 0x0117B0 },
+	{ (char*) "America/Inuvik"                    , 0x0119CF },
+	{ (char*) "America/Iqaluit"                   , 0x011D20 },
+	{ (char*) "America/Jamaica"                   , 0x01209C },
+	{ (char*) "America/Jujuy"                     , 0x0121FB },
+	{ (char*) "America/Juneau"                    , 0x0124B9 },
+	{ (char*) "America/Kentucky/Louisville"       , 0x01289F },
+	{ (char*) "America/Kentucky/Monticello"       , 0x012DA3 },
+	{ (char*) "America/Knox_IN"                   , 0x01318F },
+	{ (char*) "America/Kralendijk"                , 0x013593 },
+	{ (char*) "America/La_Paz"                    , 0x013650 },
+	{ (char*) "America/Lima"                      , 0x013706 },
+	{ (char*) "America/Los_Angeles"               , 0x01382D },
+	{ (char*) "America/Louisville"                , 0x013D4E },
+	{ (char*) "America/Lower_Princes"             , 0x014234 },
+	{ (char*) "America/Maceio"                    , 0x0142F1 },
+	{ (char*) "America/Managua"                   , 0x014503 },
+	{ (char*) "America/Manaus"                    , 0x014636 },
+	{ (char*) "America/Marigot"                   , 0x0147ED },
+	{ (char*) "America/Martinique"                , 0x0148AA },
+	{ (char*) "America/Matamoros"                 , 0x014968 },
+	{ (char*) "America/Mazatlan"                  , 0x014B55 },
+	{ (char*) "America/Mendoza"                   , 0x014E45 },
+	{ (char*) "America/Menominee"                 , 0x015115 },
+	{ (char*) "America/Merida"                    , 0x0154D5 },
+	{ (char*) "America/Metlakatla"                , 0x015780 },
+	{ (char*) "America/Mexico_City"               , 0x0159ED },
+	{ (char*) "America/Miquelon"                  , 0x015D0C },
+	{ (char*) "America/Moncton"                   , 0x015F3E },
+	{ (char*) "America/Monterrey"                 , 0x016537 },
+	{ (char*) "America/Montevideo"                , 0x01683E },
+	{ (char*) "America/Montreal"                  , 0x016C13 },
+	{ (char*) "America/Montserrat"                , 0x0172D4 },
+	{ (char*) "America/Nassau"                    , 0x017362 },
+	{ (char*) "America/New_York"                  , 0x01775C },
+	{ (char*) "America/Nipigon"                   , 0x017E4C },
+	{ (char*) "America/Nome"                      , 0x01850D },
+	{ (char*) "America/Noronha"                   , 0x0188F5 },
+	{ (char*) "America/North_Dakota/Beulah"       , 0x018AF5 },
+	{ (char*) "America/North_Dakota/Center"       , 0x018F29 },
+	{ (char*) "America/North_Dakota/New_Salem"    , 0x019328 },
+	{ (char*) "America/Nuuk"                      , 0x01972D },
+	{ (char*) "America/Ojinaga"                   , 0x019B0F },
+	{ (char*) "America/Panama"                    , 0x019E05 },
+	{ (char*) "America/Pangnirtung"               , 0x019EA6 },
+	{ (char*) "America/Paramaribo"                , 0x01A209 },
+	{ (char*) "America/Phoenix"                   , 0x01A2D0 },
+	{ (char*) "America/Port-au-Prince"            , 0x01A3E4 },
+	{ (char*) "America/Port_of_Spain"             , 0x01A625 },
+	{ (char*) "America/Porto_Acre"                , 0x01A6B3 },
+	{ (char*) "America/Porto_Velho"               , 0x01A861 },
+	{ (char*) "America/Puerto_Rico"               , 0x01A9FF },
+	{ (char*) "America/Punta_Arenas"              , 0x01AABC },
+	{ (char*) "America/Rainy_River"               , 0x01AF9B },
+	{ (char*) "America/Rankin_Inlet"              , 0x01B4B5 },
+	{ (char*) "America/Recife"                    , 0x01B7FE },
+	{ (char*) "America/Regina"                    , 0x01B9F8 },
+	{ (char*) "America/Resolute"                  , 0x01BC97 },
+	{ (char*) "America/Rio_Branco"                , 0x01BFE1 },
+	{ (char*) "America/Rosario"                   , 0x01C193 },
+	{ (char*) "America/Santa_Isabel"              , 0x01C463 },
+	{ (char*) "America/Santarem"                  , 0x01C8A6 },
+	{ (char*) "America/Santiago"                  , 0x01CA56 },
+	{ (char*) "America/Santo_Domingo"             , 0x01CFB9 },
+	{ (char*) "America/Sao_Paulo"                 , 0x01D102 },
+	{ (char*) "America/Scoresbysund"              , 0x01D4FC },
+	{ (char*) "America/Shiprock"                  , 0x01D8FD },
+	{ (char*) "America/Sitka"                     , 0x01DD1B },
+	{ (char*) "America/St_Barthelemy"             , 0x01E0F6 },
+	{ (char*) "America/St_Johns"                  , 0x01E1B3 },
+	{ (char*) "America/St_Kitts"                  , 0x01E930 },
+	{ (char*) "America/St_Lucia"                  , 0x01E9BE },
+	{ (char*) "America/St_Thomas"                 , 0x01EA5F },
+	{ (char*) "America/St_Vincent"                , 0x01EAED },
+	{ (char*) "America/Swift_Current"             , 0x01EB8E },
+	{ (char*) "America/Tegucigalpa"               , 0x01ED1C },
+	{ (char*) "America/Thule"                     , 0x01EDEA },
+	{ (char*) "America/Thunder_Bay"               , 0x01EFCB },
+	{ (char*) "America/Tijuana"                   , 0x01F68C },
+	{ (char*) "America/Toronto"                   , 0x01FADE },
+	{ (char*) "America/Tortola"                   , 0x0201BD },
+	{ (char*) "America/Vancouver"                 , 0x02024B },
+	{ (char*) "America/Virgin"                    , 0x0207A2 },
+	{ (char*) "America/Whitehorse"                , 0x02085F },
+	{ (char*) "America/Winnipeg"                  , 0x020C82 },
+	{ (char*) "America/Yakutat"                   , 0x0211B9 },
+	{ (char*) "America/Yellowknife"               , 0x021587 },
+	{ (char*) "Antarctica/Casey"                  , 0x02195D },
+	{ (char*) "Antarctica/Davis"                  , 0x021A8D },
+	{ (char*) "Antarctica/DumontDUrville"         , 0x021B63 },
+	{ (char*) "Antarctica/Macquarie"              , 0x021C17 },
+	{ (char*) "Antarctica/Mawson"                 , 0x022003 },
+	{ (char*) "Antarctica/McMurdo"                , 0x0220AD },
+	{ (char*) "Antarctica/Palmer"                 , 0x0223DF },
+	{ (char*) "Antarctica/Rothera"                , 0x022768 },
+	{ (char*) "Antarctica/South_Pole"             , 0x0227FF },
+	{ (char*) "Antarctica/Syowa"                  , 0x022C1E },
+	{ (char*) "Antarctica/Troll"                  , 0x022CB4 },
+	{ (char*) "Antarctica/Vostok"                 , 0x022D63 },
+	{ (char*) "Arctic/Longyearbyen"               , 0x022E1F },
+	{ (char*) "Asia/Aden"                         , 0x0230EC },
+	{ (char*) "Asia/Almaty"                       , 0x02317D },
+	{ (char*) "Asia/Amman"                        , 0x023405 },
+	{ (char*) "Asia/Anadyr"                       , 0x0237B1 },
+	{ (char*) "Asia/Aqtau"                        , 0x023AB7 },
+	{ (char*) "Asia/Aqtobe"                       , 0x023D36 },
+	{ (char*) "Asia/Ashgabat"                     , 0x023FB6 },
+	{ (char*) "Asia/Ashkhabad"                    , 0x024139 },
+	{ (char*) "Asia/Atyrau"                       , 0x0242BC },
+	{ (char*) "Asia/Baghdad"                      , 0x024545 },
+	{ (char*) "Asia/Bahrain"                      , 0x0247C7 },
+	{ (char*) "Asia/Baku"                         , 0x024880 },
+	{ (char*) "Asia/Bangkok"                      , 0x024B74 },
+	{ (char*) "Asia/Barnaul"                      , 0x024C18 },
+	{ (char*) "Asia/Beirut"                       , 0x024F23 },
+	{ (char*) "Asia/Bishkek"                      , 0x02520B },
+	{ (char*) "Asia/Brunei"                       , 0x025481 },
+	{ (char*) "Asia/Calcutta"                     , 0x025527 },
+	{ (char*) "Asia/Chita"                        , 0x02560F },
+	{ (char*) "Asia/Choibalsan"                   , 0x02591D },
+	{ (char*) "Asia/Chongqing"                    , 0x025B7B },
+	{ (char*) "Asia/Chungking"                    , 0x025D10 },
+	{ (char*) "Asia/Colombo"                      , 0x025EA5 },
+	{ (char*) "Asia/Dacca"                        , 0x025FA8 },
+	{ (char*) "Asia/Damascus"                     , 0x02609B },
+	{ (char*) "Asia/Dhaka"                        , 0x026579 },
+	{ (char*) "Asia/Dili"                         , 0x02666C },
+	{ (char*) "Asia/Dubai"                        , 0x026722 },
+	{ (char*) "Asia/Dushanbe"                     , 0x0267B3 },
+	{ (char*) "Asia/Famagusta"                    , 0x02692D },
+	{ (char*) "Asia/Gaza"                         , 0x026CF4 },
+	{ (char*) "Asia/Harbin"                       , 0x027890 },
+	{ (char*) "Asia/Hebron"                       , 0x027A25 },
+	{ (char*) "Asia/Ho_Chi_Minh"                  , 0x0285D2 },
+	{ (char*) "Asia/Hong_Kong"                    , 0x0286CA },
+	{ (char*) "Asia/Hovd"                         , 0x0289DD },
+	{ (char*) "Asia/Irkutsk"                      , 0x028C51 },
+	{ (char*) "Asia/Istanbul"                     , 0x028F6F },
+	{ (char*) "Asia/Jakarta"                      , 0x02942B },
+	{ (char*) "Asia/Jayapura"                     , 0x02953C },
+	{ (char*) "Asia/Jerusalem"                    , 0x029629 },
+	{ (char*) "Asia/Kabul"                        , 0x029A67 },
+	{ (char*) "Asia/Kamchatka"                    , 0x029B12 },
+	{ (char*) "Asia/Karachi"                      , 0x029E07 },
+	{ (char*) "Asia/Kashgar"                      , 0x029F1D },
+	{ (char*) "Asia/Kathmandu"                    , 0x029FAE },
+	{ (char*) "Asia/Katmandu"                     , 0x02A05B },
+	{ (char*) "Asia/Khandyga"                     , 0x02A108 },
+	{ (char*) "Asia/Kolkata"                      , 0x02A439 },
+	{ (char*) "Asia/Krasnoyarsk"                  , 0x02A521 },
+	{ (char*) "Asia/Kuala_Lumpur"                 , 0x02A82B },
+	{ (char*) "Asia/Kuching"                      , 0x02A94B },
+	{ (char*) "Asia/Kuwait"                       , 0x02AAA5 },
+	{ (char*) "Asia/Macao"                        , 0x02AB36 },
+	{ (char*) "Asia/Macau"                        , 0x02AE59 },
+	{ (char*) "Asia/Magadan"                      , 0x02B17C },
+	{ (char*) "Asia/Makassar"                     , 0x02B487 },
+	{ (char*) "Asia/Manila"                       , 0x02B59A },
+	{ (char*) "Asia/Muscat"                       , 0x02B6B8 },
+	{ (char*) "Asia/Nicosia"                      , 0x02B749 },
+	{ (char*) "Asia/Novokuznetsk"                 , 0x02B9B8 },
+	{ (char*) "Asia/Novosibirsk"                  , 0x02BCAB },
+	{ (char*) "Asia/Omsk"                         , 0x02BFBC },
+	{ (char*) "Asia/Oral"                         , 0x02C2BA },
+	{ (char*) "Asia/Phnom_Penh"                   , 0x02C546 },
+	{ (char*) "Asia/Pontianak"                    , 0x02C61A },
+	{ (char*) "Asia/Pyongyang"                    , 0x02C733 },
+	{ (char*) "Asia/Qatar"                        , 0x02C7F6 },
+	{ (char*) "Asia/Qostanay"                     , 0x02C89A },
+	{ (char*) "Asia/Qyzylorda"                    , 0x02CB30 },
+	{ (char*) "Asia/Rangoon"                      , 0x02CDC9 },
+	{ (char*) "Asia/Riyadh"                       , 0x02CE90 },
+	{ (char*) "Asia/Saigon"                       , 0x02CF21 },
+	{ (char*) "Asia/Sakhalin"                     , 0x02D019 },
+	{ (char*) "Asia/Samarkand"                    , 0x02D330 },
+	{ (char*) "Asia/Seoul"                        , 0x02D4BB },
+	{ (char*) "Asia/Shanghai"                     , 0x02D666 },
+	{ (char*) "Asia/Singapore"                    , 0x02D807 },
+	{ (char*) "Asia/Srednekolymsk"                , 0x02D913 },
+	{ (char*) "Asia/Taipei"                       , 0x02DC23 },
+	{ (char*) "Asia/Tashkent"                     , 0x02DE2E },
+	{ (char*) "Asia/Tbilisi"                      , 0x02DFB9 },
+	{ (char*) "Asia/Tehran"                       , 0x02E23A },
+	{ (char*) "Asia/Tel_Aviv"                     , 0x02E572 },
+	{ (char*) "Asia/Thimbu"                       , 0x02E9B0 },
+	{ (char*) "Asia/Thimphu"                      , 0x02EA56 },
+	{ (char*) "Asia/Tokyo"                        , 0x02EAFC },
+	{ (char*) "Asia/Tomsk"                        , 0x02EBDD },
+	{ (char*) "Asia/Ujung_Pandang"                , 0x02EEE8 },
+	{ (char*) "Asia/Ulaanbaatar"                  , 0x02EFB2 },
+	{ (char*) "Asia/Ulan_Bator"                   , 0x02F220 },
+	{ (char*) "Asia/Urumqi"                       , 0x02F47E },
+	{ (char*) "Asia/Ust-Nera"                     , 0x02F51C },
+	{ (char*) "Asia/Vientiane"                    , 0x02F83F },
+	{ (char*) "Asia/Vladivostok"                  , 0x02F925 },
+	{ (char*) "Asia/Yakutsk"                      , 0x02FC2A },
+	{ (char*) "Asia/Yangon"                       , 0x02FF2E },
+	{ (char*) "Asia/Yekaterinburg"                , 0x02FFF5 },
+	{ (char*) "Asia/Yerevan"                      , 0x030307 },
+	{ (char*) "Atlantic/Azores"                   , 0x0305D7 },
+	{ (char*) "Atlantic/Bermuda"                  , 0x030B62 },
+	{ (char*) "Atlantic/Canary"                   , 0x030F6E },
+	{ (char*) "Atlantic/Cape_Verde"               , 0x031166 },
+	{ (char*) "Atlantic/Faeroe"                   , 0x031221 },
+	{ (char*) "Atlantic/Faroe"                    , 0x0313E6 },
+	{ (char*) "Atlantic/Jan_Mayen"                , 0x0315AB },
+	{ (char*) "Atlantic/Madeira"                  , 0x031878 },
+	{ (char*) "Atlantic/Reykjavik"                , 0x031DEF },
+	{ (char*) "Atlantic/South_Georgia"            , 0x0320EC },
+	{ (char*) "Atlantic/St_Helena"                , 0x03217C },
+	{ (char*) "Atlantic/Stanley"                  , 0x03221D },
+	{ (char*) "Australia/ACT"                     , 0x03253E },
+	{ (char*) "Australia/Adelaide"                , 0x0328D2 },
+	{ (char*) "Australia/Brisbane"                , 0x032C86 },
+	{ (char*) "Australia/Broken_Hill"             , 0x032DCA },
+	{ (char*) "Australia/Canberra"                , 0x03319F },
+	{ (char*) "Australia/Currie"                  , 0x033533 },
+	{ (char*) "Australia/Darwin"                  , 0x03392A },
+	{ (char*) "Australia/Eucla"                   , 0x033A32 },
+	{ (char*) "Australia/Hobart"                  , 0x033B91 },
+	{ (char*) "Australia/LHI"                     , 0x033F90 },
+	{ (char*) "Australia/Lindeman"                , 0x034250 },
+	{ (char*) "Australia/Lord_Howe"               , 0x0343C0 },
+	{ (char*) "Australia/Melbourne"               , 0x034690 },
+	{ (char*) "Australia/North"                   , 0x034A2C },
+	{ (char*) "Australia/NSW"                     , 0x034B22 },
+	{ (char*) "Australia/Perth"                   , 0x034EB6 },
+	{ (char*) "Australia/Queensland"              , 0x035012 },
+	{ (char*) "Australia/South"                   , 0x03513F },
+	{ (char*) "Australia/Sydney"                  , 0x0354E4 },
+	{ (char*) "Australia/Tasmania"                , 0x035894 },
+	{ (char*) "Australia/Victoria"                , 0x035C8B },
+	{ (char*) "Australia/West"                    , 0x03601F },
+	{ (char*) "Australia/Yancowinna"              , 0x03615D },
+	{ (char*) "Brazil/Acre"                       , 0x036516 },
+	{ (char*) "Brazil/DeNoronha"                  , 0x0366C4 },
+	{ (char*) "Brazil/East"                       , 0x0368B4 },
+	{ (char*) "Brazil/West"                       , 0x036C78 },
+	{ (char*) "Canada/Atlantic"                   , 0x036E20 },
+	{ (char*) "Canada/Central"                    , 0x0374B4 },
+	{ (char*) "Canada/Eastern"                    , 0x0379CE },
+	{ (char*) "Canada/Mountain"                   , 0x03808F },
+	{ (char*) "Canada/Newfoundland"               , 0x038465 },
+	{ (char*) "Canada/Pacific"                    , 0x038BC7 },
+	{ (char*) "Canada/Saskatchewan"               , 0x039105 },
+	{ (char*) "Canada/Yukon"                      , 0x03938F },
+	{ (char*) "CET"                               , 0x0397A0 },
+	{ (char*) "Chile/Continental"                 , 0x039BFB },
+	{ (char*) "Chile/EasterIsland"                , 0x03A151 },
+	{ (char*) "CST6CDT"                           , 0x03A5F3 },
+	{ (char*) "Cuba"                              , 0x03ACD9 },
+	{ (char*) "EET"                               , 0x03B142 },
+	{ (char*) "Egypt"                             , 0x03B3F8 },
+	{ (char*) "Eire"                              , 0x03B921 },
+	{ (char*) "EST"                               , 0x03BF05 },
+	{ (char*) "EST5EDT"                           , 0x03BFA6 },
+	{ (char*) "Etc/GMT"                           , 0x03C682 },
+	{ (char*) "Etc/GMT+0"                         , 0x03C6FD },
+	{ (char*) "Etc/GMT+1"                         , 0x03C778 },
+	{ (char*) "Etc/GMT+10"                        , 0x03C7F5 },
+	{ (char*) "Etc/GMT+11"                        , 0x03C873 },
+	{ (char*) "Etc/GMT+12"                        , 0x03C8F1 },
+	{ (char*) "Etc/GMT+2"                         , 0x03C96F },
+	{ (char*) "Etc/GMT+3"                         , 0x03C9EC },
+	{ (char*) "Etc/GMT+4"                         , 0x03CA69 },
+	{ (char*) "Etc/GMT+5"                         , 0x03CAE6 },
+	{ (char*) "Etc/GMT+6"                         , 0x03CB63 },
+	{ (char*) "Etc/GMT+7"                         , 0x03CBE0 },
+	{ (char*) "Etc/GMT+8"                         , 0x03CC5D },
+	{ (char*) "Etc/GMT+9"                         , 0x03CCDA },
+	{ (char*) "Etc/GMT-0"                         , 0x03CD57 },
+	{ (char*) "Etc/GMT-1"                         , 0x03CDD2 },
+	{ (char*) "Etc/GMT-10"                        , 0x03CE50 },
+	{ (char*) "Etc/GMT-11"                        , 0x03CECF },
+	{ (char*) "Etc/GMT-12"                        , 0x03CF4E },
+	{ (char*) "Etc/GMT-13"                        , 0x03CFCD },
+	{ (char*) "Etc/GMT-14"                        , 0x03D04C },
+	{ (char*) "Etc/GMT-2"                         , 0x03D0CB },
+	{ (char*) "Etc/GMT-3"                         , 0x03D149 },
+	{ (char*) "Etc/GMT-4"                         , 0x03D1C7 },
+	{ (char*) "Etc/GMT-5"                         , 0x03D245 },
+	{ (char*) "Etc/GMT-6"                         , 0x03D2C3 },
+	{ (char*) "Etc/GMT-7"                         , 0x03D341 },
+	{ (char*) "Etc/GMT-8"                         , 0x03D3BF },
+	{ (char*) "Etc/GMT-9"                         , 0x03D43D },
+	{ (char*) "Etc/GMT0"                          , 0x03D4BB },
+	{ (char*) "Etc/Greenwich"                     , 0x03D536 },
+	{ (char*) "Etc/UCT"                           , 0x03D5B1 },
+	{ (char*) "Etc/Universal"                     , 0x03D62C },
+	{ (char*) "Etc/UTC"                           , 0x03D6A7 },
+	{ (char*) "Etc/Zulu"                          , 0x03D722 },
+	{ (char*) "Europe/Amsterdam"                  , 0x03D79D },
+	{ (char*) "Europe/Andorra"                    , 0x03DBD8 },
+	{ (char*) "Europe/Astrakhan"                  , 0x03DD69 },
+	{ (char*) "Europe/Athens"                     , 0x03E05D },
+	{ (char*) "Europe/Belfast"                    , 0x03E313 },
+	{ (char*) "Europe/Belgrade"                   , 0x03E95E },
+	{ (char*) "Europe/Berlin"                     , 0x03EB48 },
+	{ (char*) "Europe/Bratislava"                 , 0x03EE24 },
+	{ (char*) "Europe/Brussels"                   , 0x03F103 },
+	{ (char*) "Europe/Bucharest"                  , 0x03F55E },
+	{ (char*) "Europe/Budapest"                   , 0x03F7FF },
+	{ (char*) "Europe/Busingen"                   , 0x03FB09 },
+	{ (char*) "Europe/Chisinau"                   , 0x03FD0E },
+	{ (char*) "Europe/Copenhagen"                 , 0x04000D },
+	{ (char*) "Europe/Dublin"                     , 0x040288 },
+	{ (char*) "Europe/Gibraltar"                  , 0x04086C },
+	{ (char*) "Europe/Guernsey"                   , 0x040D3C },
+	{ (char*) "Europe/Helsinki"                   , 0x041393 },
+	{ (char*) "Europe/Isle_of_Man"                , 0x041580 },
+	{ (char*) "Europe/Istanbul"                   , 0x041BCB },
+	{ (char*) "Europe/Jersey"                     , 0x042087 },
+	{ (char*) "Europe/Kaliningrad"                , 0x0426DE },
+	{ (char*) "Europe/Kiev"                       , 0x042A86 },
+	{ (char*) "Europe/Kirov"                      , 0x042CC0 },
+	{ (char*) "Europe/Kyiv"                       , 0x042FB9 },
+	{ (char*) "Europe/Lisbon"                     , 0x043202 },
+	{ (char*) "Europe/Ljubljana"                  , 0x0437D8 },
+	{ (char*) "Europe/London"                     , 0x0439C2 },
+	{ (char*) "Europe/Luxembourg"                 , 0x04400D },
+	{ (char*) "Europe/Madrid"                     , 0x044458 },
+	{ (char*) "Europe/Malta"                      , 0x0447F5 },
+	{ (char*) "Europe/Mariehamn"                  , 0x044BA1 },
+	{ (char*) "Europe/Minsk"                      , 0x044D8E },
+	{ (char*) "Europe/Monaco"                     , 0x0450C2 },
+	{ (char*) "Europe/Moscow"                     , 0x045528 },
+	{ (char*) "Europe/Nicosia"                    , 0x0458D4 },
+	{ (char*) "Europe/Oslo"                       , 0x045B35 },
+	{ (char*) "Europe/Paris"                      , 0x045DE5 },
+	{ (char*) "Europe/Podgorica"                  , 0x046242 },
+	{ (char*) "Europe/Prague"                     , 0x04642C },
+	{ (char*) "Europe/Riga"                       , 0x04670B },
+	{ (char*) "Europe/Rome"                       , 0x0469CD },
+	{ (char*) "Europe/Samara"                     , 0x046D8C },
+	{ (char*) "Europe/San_Marino"                 , 0x04708D },
+	{ (char*) "Europe/Sarajevo"                   , 0x04744C },
+	{ (char*) "Europe/Saratov"                    , 0x047636 },
+	{ (char*) "Europe/Simferopol"                 , 0x047928 },
+	{ (char*) "Europe/Skopje"                     , 0x047C9B },
+	{ (char*) "Europe/Sofia"                      , 0x047E85 },
+	{ (char*) "Europe/Stockholm"                  , 0x0480E1 },
+	{ (char*) "Europe/Tallinn"                    , 0x0482DE },
+	{ (char*) "Europe/Tirane"                     , 0x04858D },
+	{ (char*) "Europe/Tiraspol"                   , 0x0487F5 },
+	{ (char*) "Europe/Ulyanovsk"                  , 0x048AF4 },
+	{ (char*) "Europe/Uzhgorod"                   , 0x048E0A },
+	{ (char*) "Europe/Vaduz"                      , 0x049044 },
+	{ (char*) "Europe/Vatican"                    , 0x04922E },
+	{ (char*) "Europe/Vienna"                     , 0x0495ED },
+	{ (char*) "Europe/Vilnius"                    , 0x04988B },
+	{ (char*) "Europe/Volgograd"                  , 0x049B3B },
+	{ (char*) "Europe/Warsaw"                     , 0x049E4A },
+	{ (char*) "Europe/Zagreb"                     , 0x04A1F1 },
+	{ (char*) "Europe/Zaporozhye"                 , 0x04A3DB },
+	{ (char*) "Europe/Zurich"                     , 0x04A615 },
+	{ (char*) "Factory"                           , 0x04A812 },
+	{ (char*) "GB"                                , 0x04A88F },
+	{ (char*) "GB-Eire"                           , 0x04AEDA },
+	{ (char*) "GMT"                               , 0x04B525 },
+	{ (char*) "GMT+0"                             , 0x04B5A0 },
+	{ (char*) "GMT-0"                             , 0x04B61B },
+	{ (char*) "GMT0"                              , 0x04B696 },
+	{ (char*) "Greenwich"                         , 0x04B711 },
+	{ (char*) "Hongkong"                          , 0x04B78C },
+	{ (char*) "HST"                               , 0x04BA9F },
+	{ (char*) "Iceland"                           , 0x04BB88 },
+	{ (char*) "Indian/Antananarivo"               , 0x04BC16 },
+	{ (char*) "Indian/Chagos"                     , 0x04BCC2 },
+	{ (char*) "Indian/Christmas"                  , 0x04BD66 },
+	{ (char*) "Indian/Cocos"                      , 0x04BDF7 },
+	{ (char*) "Indian/Comoro"                     , 0x04BE8F },
+	{ (char*) "Indian/Kerguelen"                  , 0x04BF1E },
+	{ (char*) "Indian/Mahe"                       , 0x04BFAF },
+	{ (char*) "Indian/Maldives"                   , 0x04C040 },
+	{ (char*) "Indian/Mauritius"                  , 0x04C0E4 },
+	{ (char*) "Indian/Mayotte"                    , 0x04C1A3 },
+	{ (char*) "Indian/Reunion"                    , 0x04C232 },
+	{ (char*) "Iran"                              , 0x04C2C3 },
+	{ (char*) "Israel"                            , 0x04C5FB },
+	{ (char*) "Jamaica"                           , 0x04CA39 },
+	{ (char*) "Japan"                             , 0x04CB98 },
+	{ (char*) "Kwajalein"                         , 0x04CC79 },
+	{ (char*) "Libya"                             , 0x04CD60 },
+	{ (char*) "MET"                               , 0x04CF1B },
+	{ (char*) "Mexico/BajaNorte"                  , 0x04D376 },
+	{ (char*) "Mexico/BajaSur"                    , 0x04D7B9 },
+	{ (char*) "Mexico/General"                    , 0x04DA77 },
+	{ (char*) "MST"                               , 0x04DD88 },
+	{ (char*) "MST7MDT"                           , 0x04DE84 },
+	{ (char*) "Navajo"                            , 0x04E2A2 },
+	{ (char*) "NZ"                                , 0x04E6C0 },
+	{ (char*) "NZ-CHAT"                           , 0x04EADF },
+	{ (char*) "Pacific/Apia"                      , 0x04EE13 },
+	{ (char*) "Pacific/Auckland"                  , 0x04EFB6 },
+	{ (char*) "Pacific/Bougainville"              , 0x04F3E8 },
+	{ (char*) "Pacific/Chatham"                   , 0x04F4C9 },
+	{ (char*) "Pacific/Chuuk"                     , 0x04F80C },
+	{ (char*) "Pacific/Easter"                    , 0x04F8EA },
+	{ (char*) "Pacific/Efate"                     , 0x04FD99 },
+	{ (char*) "Pacific/Enderbury"                 , 0x04FEFB },
+	{ (char*) "Pacific/Fakaofo"                   , 0x04FFB3 },
+	{ (char*) "Pacific/Fiji"                      , 0x050058 },
+	{ (char*) "Pacific/Funafuti"                  , 0x0501F0 },
+	{ (char*) "Pacific/Galapagos"                 , 0x050282 },
+	{ (char*) "Pacific/Gambier"                   , 0x05034E },
+	{ (char*) "Pacific/Guadalcanal"               , 0x0503ED },
+	{ (char*) "Pacific/Guam"                      , 0x05047F },
+	{ (char*) "Pacific/Honolulu"                  , 0x0505E9 },
+	{ (char*) "Pacific/Johnston"                  , 0x0506D8 },
+	{ (char*) "Pacific/Kanton"                    , 0x0507C1 },
+	{ (char*) "Pacific/Kiritimati"                , 0x050888 },
+	{ (char*) "Pacific/Kosrae"                    , 0x05094E },
+	{ (char*) "Pacific/Kwajalein"                 , 0x050A52 },
+	{ (char*) "Pacific/Majuro"                    , 0x050B42 },
+	{ (char*) "Pacific/Marquesas"                 , 0x050C40 },
+	{ (char*) "Pacific/Midway"                    , 0x050CE8 },
+	{ (char*) "Pacific/Nauru"                     , 0x050DAB },
+	{ (char*) "Pacific/Niue"                      , 0x050E6E },
+	{ (char*) "Pacific/Norfolk"                   , 0x050F14 },
+	{ (char*) "Pacific/Noumea"                    , 0x05100D },
+	{ (char*) "Pacific/Pago_Pago"                 , 0x0510DF },
+	{ (char*) "Pacific/Palau"                     , 0x05117D },
+	{ (char*) "Pacific/Pitcairn"                  , 0x05121D },
+	{ (char*) "Pacific/Pohnpei"                   , 0x0512C2 },
+	{ (char*) "Pacific/Ponape"                    , 0x0513B2 },
+	{ (char*) "Pacific/Port_Moresby"              , 0x051444 },
+	{ (char*) "Pacific/Rarotonga"                 , 0x051502 },
+	{ (char*) "Pacific/Saipan"                    , 0x0516A4 },
+	{ (char*) "Pacific/Samoa"                     , 0x051805 },
+	{ (char*) "Pacific/Tahiti"                    , 0x0518A3 },
+	{ (char*) "Pacific/Tarawa"                    , 0x051943 },
+	{ (char*) "Pacific/Tongatapu"                 , 0x0519E4 },
+	{ (char*) "Pacific/Truk"                      , 0x051ADD },
+	{ (char*) "Pacific/Wake"                      , 0x051B83 },
+	{ (char*) "Pacific/Wallis"                    , 0x051C20 },
+	{ (char*) "Pacific/Yap"                       , 0x051CB2 },
+	{ (char*) "Poland"                            , 0x051D58 },
+	{ (char*) "Portugal"                          , 0x0520FF },
+	{ (char*) "PRC"                               , 0x0526C2 },
+	{ (char*) "PST8PDT"                           , 0x052857 },
+	{ (char*) "ROC"                               , 0x052D71 },
+	{ (char*) "ROK"                               , 0x052F7C },
+	{ (char*) "Singapore"                         , 0x053127 },
+	{ (char*) "Turkey"                            , 0x053233 },
+	{ (char*) "UCT"                               , 0x0536EF },
+	{ (char*) "Universal"                         , 0x05376A },
+	{ (char*) "US/Alaska"                         , 0x0537E5 },
+	{ (char*) "US/Aleutian"                       , 0x053BC2 },
+	{ (char*) "US/Arizona"                        , 0x053F97 },
+	{ (char*) "US/Central"                        , 0x054093 },
+	{ (char*) "US/East-Indiana"                   , 0x054779 },
+	{ (char*) "US/Eastern"                        , 0x054998 },
+	{ (char*) "US/Hawaii"                         , 0x055074 },
+	{ (char*) "US/Indiana-Starke"                 , 0x05515D },
+	{ (char*) "US/Michigan"                       , 0x055561 },
+	{ (char*) "US/Mountain"                       , 0x0558F0 },
+	{ (char*) "US/Pacific"                        , 0x055D0E },
+	{ (char*) "US/Samoa"                          , 0x056228 },
+	{ (char*) "UTC"                               , 0x0562C6 },
+	{ (char*) "W-SU"                              , 0x056341 },
+	{ (char*) "WET"                               , 0x0566D9 },
+	{ (char*) "Zulu"                              , 0x056C9C },
 };
 
 
-const unsigned char timelib_timezone_db_data_builtin349564 = {
+const unsigned char timelib_timezone_db_data_builtin355607 = {
 
 /* Africa/Abidjan */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x43, 0x49, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -1515,7 +1516,7 @@
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0xFF,
-0xFF, 0xFF, 0xFF, 0x82, 0x46, 0xC5, 0xF4, 0x01, 0x00, 0x00, 0x1E, 0x8C, 0x00, 0x00, 0x00, 0x00,
+0xFF, 0xFF, 0xFF, 0x8D, 0x42, 0xD5, 0x76, 0x01, 0x00, 0x00, 0x1E, 0x8A, 0x00, 0x00, 0x00, 0x00,
 0x1C, 0x20, 0x00, 0x04, 0x4C, 0x4D, 0x54, 0x00, 0x43, 0x41, 0x54, 0x00, 0x0A, 0x43, 0x41, 0x54,
 0x2D, 0x32, 0x0A, 0x00, 0x61, 0xB5, 0x05, 0x01, 0x44, 0x60, 0x5D, 0x00, 0x00, 0x00, 0x00, 
 
@@ -2627,7 +2628,7 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x10, 0xFF,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x68, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x10, 0xFF,
 0xFF, 0xFF, 0xFF, 0x69, 0x87, 0x11, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0x17, 0xF5, 0x90, 0x00,
 0x00, 0x00, 0x00, 0x05, 0x2B, 0xDA, 0x40, 0x00, 0x00, 0x00, 0x00, 0x07, 0xFC, 0xF0, 0xB0, 0x00,
 0x00, 0x00, 0x00, 0x0A, 0xCF, 0x74, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x0B, 0x97, 0xCA, 0xB0, 0x00,
@@ -2667,18 +2668,30 @@
 0x00, 0x00, 0x00, 0x4A, 0xDA, 0x92, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x4B, 0xC1, 0x3B, 0x30, 0x00,
 0x00, 0x00, 0x00, 0x4C, 0xA7, 0xFF, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x4D, 0xA1, 0x1D, 0x30, 0x00,
 0x00, 0x00, 0x00, 0x4E, 0x87, 0xE1, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x80, 0xFF, 0x30, 0x00,
-0x00, 0x00, 0x00, 0x50, 0x70, 0xFE, 0x40, 0x01, 0x02, 0x03, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
+0x00, 0x00, 0x00, 0x50, 0x70, 0xFE, 0x40, 0x00, 0x00, 0x00, 0x00, 0x51, 0x4E, 0x6C, 0x30, 0x00,
+0x00, 0x00, 0x00, 0x52, 0x50, 0xE0, 0x40, 0x00, 0x00, 0x00, 0x00, 0x53, 0x2E, 0x4E, 0x30, 0x00,
+0x00, 0x00, 0x00, 0x54, 0x30, 0xC2, 0x40, 0x00, 0x00, 0x00, 0x00, 0x55, 0x0E, 0x30, 0x30, 0x00,
+0x00, 0x00, 0x00, 0x56, 0x10, 0xA4, 0x40, 0x00, 0x00, 0x00, 0x00, 0x56, 0xF7, 0x4C, 0xB0, 0x00,
+0x00, 0x00, 0x00, 0x57, 0xF0, 0x86, 0x40, 0x00, 0x00, 0x00, 0x00, 0x58, 0xD7, 0x2E, 0xB0, 0x00,
+0x00, 0x00, 0x00, 0x59, 0xD0, 0x68, 0x40, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xB7, 0x10, 0xB0, 0x00,
+0x00, 0x00, 0x00, 0x5B, 0xB9, 0x84, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x5C, 0x96, 0xF2, 0xB0, 0x00,
+0x00, 0x00, 0x00, 0x5D, 0x99, 0x66, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x76, 0xD4, 0xB0, 0x00,
+0x00, 0x00, 0x00, 0x5F, 0x79, 0x48, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x60, 0x5F, 0xF1, 0x30, 0x00,
+0x00, 0x00, 0x00, 0x61, 0x59, 0x2A, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x62, 0x3F, 0xD3, 0x30, 0x00,
+0x00, 0x00, 0x00, 0x63, 0x39, 0x0C, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x64, 0x1F, 0xB5, 0x30, 0x00,
+0x00, 0x00, 0x00, 0x65, 0x18, 0xEE, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x65, 0xFF, 0x97, 0x30, 0x00,
+0x00, 0x00, 0x00, 0x67, 0x02, 0x0B, 0x40, 0x00, 0x00, 0x00, 0x00, 0x67, 0x0D, 0xDA, 0xB0, 0x01,
+0x02, 0x03, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
-0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0xFF, 0xFF, 0xC9, 0xF0, 0x00, 0x00, 0xFF, 0xFF, 0xC9, 0xF0,
-0x00, 0x04, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x08, 0xFF, 0xFF, 0xD5, 0xD0, 0x00, 0x0C, 0xFF, 0xFF,
-0xD5, 0xD0, 0x01, 0x0C, 0x4C, 0x4D, 0x54, 0x00, 0x41, 0x4D, 0x54, 0x00, 0x2D, 0x30, 0x34, 0x00,
-0x2D, 0x30, 0x33, 0x00, 0x0A, 0x3C, 0x2D, 0x30, 0x34, 0x3E, 0x34, 0x3C, 0x2D, 0x30, 0x33, 0x3E,
-0x2C, 0x4D, 0x31, 0x30, 0x2E, 0x31, 0x2E, 0x30, 0x2F, 0x30, 0x2C, 0x4D, 0x33, 0x2E, 0x34, 0x2E,
-0x30, 0x2F, 0x30, 0x0A, 0x00, 0x62, 0xC6, 0x75, 0x00, 0xBA, 0xAA, 0x75, 0x00, 0x00, 0x00, 0x00,
-
+0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
+0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x03, 0xFF, 0xFF, 0xC9, 0xF0, 0x00, 0x00, 0xFF, 0xFF, 0xC9,
+0xF0, 0x00, 0x04, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x08, 0xFF, 0xFF, 0xD5, 0xD0, 0x00, 0x0C, 0xFF,
+0xFF, 0xD5, 0xD0, 0x01, 0x0C, 0x4C, 0x4D, 0x54, 0x00, 0x41, 0x4D, 0x54, 0x00, 0x2D, 0x30, 0x34,
+0x00, 0x2D, 0x30, 0x33, 0x00, 0x0A, 0x3C, 0x2D, 0x30, 0x33, 0x3E, 0x33, 0x0A, 0x00, 0x62, 0xC6,
+0x75, 0x00, 0xBA, 0xAA, 0x75, 0x00, 0x00, 0x00, 0x00, 
 
 /* America/Atikokan */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x43, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -2815,12 +2828,11 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x18, 0xFF,
-0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF2, 0x6E, 0xE0, 0xFF,
-0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x56, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x43, 0xD2, 0x60, 0xFF,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3D, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x14, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF1, 0x2B, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x56, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x41, 0x3D, 0x70, 0xFF,
 0xFF, 0xFF, 0xFF, 0xB8, 0x0C, 0x36, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0xFD, 0x86, 0xF0, 0xFF,
-0xFF, 0xFF, 0xFF, 0xCB, 0xEA, 0x71, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xD8, 0x91, 0xB4, 0xF0, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x80, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x84, 0x10, 0x00,
+0xFF, 0xFF, 0xFF, 0xCB, 0xEA, 0x71, 0x60, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x84, 0x10, 0x00,
 0x00, 0x00, 0x00, 0x32, 0x73, 0x16, 0x80, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x66, 0x10, 0x00,
 0x00, 0x00, 0x00, 0x34, 0x52, 0xF8, 0x80, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x48, 0x10, 0x00,
 0x00, 0x00, 0x00, 0x36, 0x32, 0xDA, 0x80, 0x00, 0x00, 0x00, 0x00, 0x37, 0x07, 0x2A, 0x10, 0x00,
@@ -2847,17 +2859,16 @@
 0x00, 0x00, 0x00, 0x5D, 0xB5, 0x40, 0x70, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x89, 0x90, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x5F, 0x95, 0x22, 0x70, 0x00, 0x00, 0x00, 0x00, 0x60, 0x69, 0x72, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x61, 0x7E, 0x3E, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x62, 0x49, 0x54, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x63, 0x5E, 0x20, 0xF0, 0x01, 0x02, 0x01, 0x03, 0x01, 0x02, 0x01, 0x04, 0x01,
+0x00, 0x00, 0x00, 0x63, 0x5E, 0x20, 0xF0, 0x01, 0x02, 0x01, 0x03, 0x01, 0x02, 0x01, 0x03, 0x01,
 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01,
-0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x05, 0x02, 0x05, 0x02,
-0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02,
-0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0xFF, 0xFF, 0x9D, 0x54, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90,
-0x00, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x0C, 0xFF, 0xFF,
-0x8F, 0x80, 0x00, 0x10, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x14, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53,
-0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x4D, 0x44, 0x54, 0x00, 0x50, 0x53, 0x54, 0x00, 0x43, 0x44,
-0x54, 0x00, 0x0A, 0x43, 0x53, 0x54, 0x36, 0x0A, 0x00, 0xA9, 0x11, 0x40, 0x00, 0x72, 0x0F, 0x38,
-0x00, 0x00, 0x00, 0x11, 0x42, 0x61, 0x68, 0x69, 0x61, 0x20, 0x64, 0x65, 0x20, 0x42, 0x61, 0x6E,
-0x64, 0x65, 0x72, 0x61, 0x73, 
+0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
+0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
+0x04, 0x02, 0x04, 0x02, 0xFF, 0xFF, 0x9D, 0x54, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04,
+0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x0C, 0xFF, 0xFF, 0xB9, 0xB0,
+0x01, 0x10, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x4D, 0x44,
+0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x0A, 0x43, 0x53, 0x54, 0x36, 0x0A, 0x00, 0xA9, 0x11, 0x40,
+0x00, 0x72, 0x0F, 0x38, 0x00, 0x00, 0x00, 0x11, 0x42, 0x61, 0x68, 0x69, 0x61, 0x20, 0x64, 0x65,
+0x20, 0x42, 0x61, 0x6E, 0x64, 0x65, 0x72, 0x61, 0x73, 
 
 /* America/Barbados */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x42, 0x42, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -3287,36 +3298,37 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2A, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x14, 0xFF,
-0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xDA, 0x60, 0x00, 0x00, 0x00, 0x00, 0x16, 0x86, 0xD5, 0x60, 0x00,
-0x00, 0x00, 0x00, 0x31, 0x67, 0x67, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x32, 0x72, 0xFA, 0x60, 0x00,
-0x00, 0x00, 0x00, 0x33, 0x47, 0x49, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x34, 0x52, 0xDC, 0x60, 0x00,
-0x00, 0x00, 0x00, 0x35, 0x27, 0x2B, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x35, 0xC4, 0x00, 0x60, 0x00,
-0x00, 0x00, 0x00, 0x36, 0x32, 0xCC, 0x70, 0x00, 0x00, 0x00, 0x00, 0x37, 0x07, 0x1C, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x38, 0x1B, 0xE8, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x38, 0xE6, 0xFE, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x39, 0xFB, 0xCA, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xF5, 0x04, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x3B, 0xB6, 0xC2, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xAF, 0xFC, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x3D, 0xBB, 0x8E, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x8F, 0xDE, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x3F, 0x9B, 0x70, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x40, 0x6F, 0xC0, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x41, 0x84, 0x8D, 0x70, 0x00, 0x00, 0x00, 0x00, 0x42, 0x4F, 0xA2, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x43, 0x64, 0x6F, 0x70, 0x00, 0x00, 0x00, 0x00, 0x44, 0x2F, 0x84, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x45, 0x44, 0x51, 0x70, 0x00, 0x00, 0x00, 0x00, 0x46, 0x0F, 0x66, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x47, 0x24, 0x33, 0x70, 0x00, 0x00, 0x00, 0x00, 0x47, 0xF8, 0x83, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x49, 0x04, 0x15, 0x70, 0x00, 0x00, 0x00, 0x00, 0x49, 0xD8, 0x65, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x4A, 0xE3, 0xF7, 0x70, 0x00, 0x00, 0x00, 0x00, 0x4B, 0xB8, 0x47, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x4C, 0xCD, 0x13, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x98, 0x29, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x4E, 0xAC, 0xF5, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x78, 0x0B, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x50, 0x8C, 0xD7, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x51, 0x61, 0x27, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x52, 0x6C, 0xB9, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x53, 0x41, 0x09, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x54, 0x4C, 0x9B, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x54, 0xCD, 0xDD, 0x00, 0x01,
-0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x04, 0x01, 0x04, 0x01, 0x04, 0x01, 0x04, 0x01, 0x04, 0x01,
-0x04, 0x01, 0x04, 0x01, 0x04, 0x01, 0x04, 0x01, 0x04, 0x01, 0x04, 0x01, 0x04, 0x01, 0x04, 0x01,
-0x04, 0x01, 0x04, 0x01, 0x04, 0x01, 0x04, 0x01, 0x03, 0xFF, 0xFF, 0xAE, 0xA8, 0x00, 0x00, 0xFF,
-0xFF, 0xAB, 0xA0, 0x00, 0x04, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x08, 0xFF, 0xFF, 0xB9, 0xB0, 0x00,
-0x0C, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x10, 0x4C, 0x4D, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x45,
-0x44, 0x54, 0x00, 0x45, 0x53, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x0A, 0x45, 0x53, 0x54, 0x35,
-0x0A, 0x00, 0xA9, 0x7F, 0xED, 0x00, 0x8E, 0x43, 0x45, 0x00, 0x00, 0x00, 0x0C, 0x51, 0x75, 0x69,
-0x6E, 0x74, 0x61, 0x6E, 0x61, 0x20, 0x52, 0x6F, 0x6F, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2B, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x14, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xDA, 0x60, 0x00, 0x00, 0x00, 0x00, 0x16, 0x8A, 0xE6, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x18, 0x77, 0xCC, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x76, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x32, 0x73, 0x08, 0x70, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x58, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x34, 0x52, 0xEA, 0x70, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x2B, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x35, 0xC4, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0xCC, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x37, 0x07, 0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x1B, 0xE8, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x38, 0xE6, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0xCA, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x3A, 0xF5, 0x04, 0x80, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xB6, 0xC2, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x3C, 0xAF, 0xFC, 0x80, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0x8E, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x3E, 0x8F, 0xDE, 0x80, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x70, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x40, 0x6F, 0xC0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0x8D, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x42, 0x4F, 0xA2, 0x80, 0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x6F, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x44, 0x2F, 0x84, 0x80, 0x00, 0x00, 0x00, 0x00, 0x45, 0x44, 0x51, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x46, 0x0F, 0x66, 0x80, 0x00, 0x00, 0x00, 0x00, 0x47, 0x24, 0x33, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x47, 0xF8, 0x83, 0x00, 0x00, 0x00, 0x00, 0x00, 0x49, 0x04, 0x15, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x49, 0xD8, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4A, 0xE3, 0xF7, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x4B, 0xB8, 0x47, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4C, 0xCD, 0x13, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x4D, 0x98, 0x29, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4E, 0xAC, 0xF5, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x4F, 0x78, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x8C, 0xD7, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x51, 0x61, 0x27, 0x80, 0x00, 0x00, 0x00, 0x00, 0x52, 0x6C, 0xB9, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x53, 0x41, 0x09, 0x80, 0x00, 0x00, 0x00, 0x00, 0x54, 0x4C, 0x9B, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x54, 0xCD, 0xDD, 0x00, 0x01, 0x02, 0x01, 0x03, 0x01, 0x03, 0x02, 0x04, 0x03,
+0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03,
+0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03,
+0x01, 0x02, 0xFF, 0xFF, 0xAE, 0xA8, 0x00, 0x00, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x04, 0xFF, 0xFF,
+0xB9, 0xB0, 0x00, 0x08, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x0C, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x10,
+0x4C, 0x4D, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x45, 0x53, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00,
+0x45, 0x44, 0x54, 0x00, 0x0A, 0x45, 0x53, 0x54, 0x35, 0x0A, 0x00, 0xA9, 0x7F, 0xED, 0x00, 0x8E,
+0x43, 0x45, 0x00, 0x00, 0x00, 0x0C, 0x51, 0x75, 0x69, 0x6E, 0x74, 0x61, 0x6E, 0x61, 0x20, 0x52,
+0x6F, 0x6F, 
 
 /* America/Caracas */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x56, 0x45, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -3528,8 +3540,8 @@
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3C, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x14, 0xFF,
-0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF2, 0x6E, 0xE0, 0xFF,
-0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x56, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x43, 0xD2, 0x60, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF1, 0x2B, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x56, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x41, 0x3D, 0x70, 0xFF,
 0xFF, 0xFF, 0xFF, 0xB8, 0x0C, 0x36, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0xFD, 0x86, 0xF0, 0x00,
 0x00, 0x00, 0x00, 0x31, 0x67, 0x76, 0x00, 0x00, 0x00, 0x00, 0x00, 0x32, 0x73, 0x08, 0x70, 0x00,
 0x00, 0x00, 0x00, 0x33, 0x47, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x34, 0x52, 0xEA, 0x70, 0x00,
@@ -3576,8 +3588,8 @@
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3D, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x14, 0xFF,
-0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF2, 0x6E, 0xE0, 0xFF,
-0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x56, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x43, 0xD2, 0x60, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF1, 0x2B, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x56, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x41, 0x3D, 0x70, 0xFF,
 0xFF, 0xFF, 0xFF, 0xB8, 0x0C, 0x36, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0xFD, 0x86, 0xF0, 0x00,
 0x00, 0x00, 0x00, 0x31, 0x67, 0x76, 0x00, 0x00, 0x00, 0x00, 0x00, 0x32, 0x73, 0x08, 0x70, 0x00,
 0x00, 0x00, 0x00, 0x33, 0x47, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x34, 0x52, 0xEA, 0x70, 0x00,
@@ -3698,6 +3710,95 @@
 0x54, 0x00, 0x0A, 0x43, 0x53, 0x54, 0x36, 0x0A, 0x00, 0x98, 0x7C, 0x75, 0x00, 0x92, 0x5B, 0x72,
 0x00, 0x00, 0x00, 0x00, 
 
+/* America/Coyhaique */
+0x50, 0x48, 0x50, 0x32, 0x01, 0x43, 0x4C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x85, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x14, 0xFF,
+0xFF, 0xFF, 0xFF, 0x69, 0x87, 0x1F, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0x8F, 0x30, 0x47, 0x45, 0xFF,
+0xFF, 0xFF, 0xFF, 0x9B, 0x5C, 0xE5, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, 0x9F, 0x7C, 0xE2, 0xC5, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA1, 0x00, 0x71, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB0, 0x5E, 0x77, 0xC5, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB1, 0x77, 0x3D, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xB2, 0x41, 0x00, 0xD0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB3, 0x58, 0x70, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB4, 0x22, 0x34, 0x50, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB5, 0x39, 0xA4, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xB6, 0x03, 0x67, 0xD0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB7, 0x1A, 0xD7, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0xE4, 0x9B, 0x50, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB8, 0xFD, 0x5C, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB9, 0xC7, 0x20, 0x50, 0xFF,
+0xFF, 0xFF, 0xFF, 0xCC, 0x1C, 0x6E, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xCC, 0x6C, 0xE7, 0xD0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD4, 0x17, 0xE3, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xD5, 0x33, 0x55, 0xC0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD5, 0x76, 0x92, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xFD, 0xD1, 0x3C, 0x40, 0xFF,
+0xFF, 0xFF, 0xFF, 0xFE, 0x92, 0xFA, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xCC, 0xCD, 0xC0, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x72, 0xDC, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x01, 0x75, 0x50, 0xC0, 0x00,
+0x00, 0x00, 0x00, 0x02, 0x40, 0x49, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x03, 0x55, 0x32, 0xC0, 0x00,
+0x00, 0x00, 0x00, 0x04, 0x20, 0x2B, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x05, 0x3E, 0x4F, 0x40, 0x00,
+0x00, 0x00, 0x00, 0x06, 0x00, 0x0D, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x07, 0x0B, 0xBC, 0x40, 0x00,
+0x00, 0x00, 0x00, 0x07, 0xDF, 0xEF, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x08, 0xFE, 0x13, 0x40, 0x00,
+0x00, 0x00, 0x00, 0x09, 0xBF, 0xD1, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x0A, 0xDD, 0xF5, 0x40, 0x00,
+0x00, 0x00, 0x00, 0x0B, 0xA8, 0xEE, 0x30, 0x00, 0x00, 0x00, 0x00, 0x0C, 0xBD, 0xD7, 0x40, 0x00,
+0x00, 0x00, 0x00, 0x0D, 0x88, 0xD0, 0x30, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x9D, 0xB9, 0x40, 0x00,
+0x00, 0x00, 0x00, 0x0F, 0x68, 0xB2, 0x30, 0x00, 0x00, 0x00, 0x00, 0x10, 0x86, 0xD5, 0xC0, 0x00,
+0x00, 0x00, 0x00, 0x11, 0x48, 0x94, 0x30, 0x00, 0x00, 0x00, 0x00, 0x12, 0x66, 0xB7, 0xC0, 0x00,
+0x00, 0x00, 0x00, 0x13, 0x28, 0x76, 0x30, 0x00, 0x00, 0x00, 0x00, 0x14, 0x46, 0x99, 0xC0, 0x00,
+0x00, 0x00, 0x00, 0x15, 0x11, 0x92, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x16, 0x26, 0x7B, 0xC0, 0x00,
+0x00, 0x00, 0x00, 0x16, 0xF1, 0x74, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x18, 0x06, 0x5D, 0xC0, 0x00,
+0x00, 0x00, 0x00, 0x18, 0xD1, 0x56, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x19, 0xE6, 0x3F, 0xC0, 0x00,
+0x00, 0x00, 0x00, 0x1A, 0xB1, 0x38, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xCF, 0x5C, 0x40, 0x00,
+0x00, 0x00, 0x00, 0x1C, 0x91, 0x1A, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xAF, 0x3E, 0x40, 0x00,
+0x00, 0x00, 0x00, 0x1E, 0x70, 0xFC, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x1F, 0x8F, 0x20, 0x40, 0x00,
+0x00, 0x00, 0x00, 0x20, 0x7F, 0x03, 0x30, 0x00, 0x00, 0x00, 0x00, 0x21, 0x6F, 0x02, 0x40, 0x00,
+0x00, 0x00, 0x00, 0x22, 0x39, 0xFB, 0x30, 0x00, 0x00, 0x00, 0x00, 0x23, 0x4E, 0xE4, 0x40, 0x00,
+0x00, 0x00, 0x00, 0x24, 0x19, 0xDD, 0x30, 0x00, 0x00, 0x00, 0x00, 0x25, 0x38, 0x00, 0xC0, 0x00,
+0x00, 0x00, 0x00, 0x25, 0xF9, 0xBF, 0x30, 0x00, 0x00, 0x00, 0x00, 0x26, 0xF2, 0xF8, 0xC0, 0x00,
+0x00, 0x00, 0x00, 0x27, 0xD9, 0xA1, 0x30, 0x00, 0x00, 0x00, 0x00, 0x28, 0xF7, 0xC4, 0xC0, 0x00,
+0x00, 0x00, 0x00, 0x29, 0xC2, 0xBD, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xD7, 0xA6, 0xC0, 0x00,
+0x00, 0x00, 0x00, 0x2B, 0xA2, 0x9F, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xB7, 0x88, 0xC0, 0x00,
+0x00, 0x00, 0x00, 0x2D, 0x82, 0x81, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x2E, 0x97, 0x6A, 0xC0, 0x00,
+0x00, 0x00, 0x00, 0x2F, 0x62, 0x63, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x30, 0x80, 0x87, 0x40, 0x00,
+0x00, 0x00, 0x00, 0x31, 0x42, 0x45, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x32, 0x60, 0x69, 0x40, 0x00,
+0x00, 0x00, 0x00, 0x33, 0x3D, 0xD7, 0x30, 0x00, 0x00, 0x00, 0x00, 0x34, 0x40, 0x4B, 0x40, 0x00,
+0x00, 0x00, 0x00, 0x35, 0x0B, 0x44, 0x30, 0x00, 0x00, 0x00, 0x00, 0x36, 0x0D, 0xB8, 0x40, 0x00,
+0x00, 0x00, 0x00, 0x37, 0x06, 0xD5, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x0F, 0x40, 0x00,
+0x00, 0x00, 0x00, 0x38, 0xCB, 0x08, 0x30, 0x00, 0x00, 0x00, 0x00, 0x39, 0xE9, 0x2B, 0xC0, 0x00,
+0x00, 0x00, 0x00, 0x3A, 0xAA, 0xEA, 0x30, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xC9, 0x0D, 0xC0, 0x00,
+0x00, 0x00, 0x00, 0x3C, 0x8A, 0xCC, 0x30, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xA8, 0xEF, 0xC0, 0x00,
+0x00, 0x00, 0x00, 0x3E, 0x6A, 0xAE, 0x30, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x88, 0xD1, 0xC0, 0x00,
+0x00, 0x00, 0x00, 0x40, 0x53, 0xCA, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x41, 0x68, 0xB3, 0xC0, 0x00,
+0x00, 0x00, 0x00, 0x42, 0x33, 0xAC, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x43, 0x48, 0x95, 0xC0, 0x00,
+0x00, 0x00, 0x00, 0x44, 0x13, 0x8E, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x45, 0x31, 0xB2, 0x40, 0x00,
+0x00, 0x00, 0x00, 0x45, 0xF3, 0x70, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x47, 0x11, 0x94, 0x40, 0x00,
+0x00, 0x00, 0x00, 0x47, 0xEF, 0x02, 0x30, 0x00, 0x00, 0x00, 0x00, 0x48, 0xF1, 0x76, 0x40, 0x00,
+0x00, 0x00, 0x00, 0x49, 0xBC, 0x6F, 0x30, 0x00, 0x00, 0x00, 0x00, 0x4A, 0xD1, 0x58, 0x40, 0x00,
+0x00, 0x00, 0x00, 0x4B, 0xB8, 0x00, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x4C, 0xB1, 0x3A, 0x40, 0x00,
+0x00, 0x00, 0x00, 0x4D, 0xC6, 0x07, 0x30, 0x00, 0x00, 0x00, 0x00, 0x4E, 0x50, 0x82, 0xC0, 0x00,
+0x00, 0x00, 0x00, 0x4F, 0x9C, 0xAE, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x50, 0x42, 0xD9, 0xC0, 0x00,
+0x00, 0x00, 0x00, 0x51, 0x7C, 0x90, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x52, 0x2B, 0xF6, 0x40, 0x00,
+0x00, 0x00, 0x00, 0x53, 0x5C, 0x72, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x54, 0x0B, 0xD8, 0x40, 0x00,
+0x00, 0x00, 0x00, 0x57, 0x37, 0xE6, 0x30, 0x00, 0x00, 0x00, 0x00, 0x57, 0xAF, 0xEC, 0xC0, 0x00,
+0x00, 0x00, 0x00, 0x59, 0x17, 0xC8, 0x30, 0x00, 0x00, 0x00, 0x00, 0x59, 0x8F, 0xCE, 0xC0, 0x00,
+0x00, 0x00, 0x00, 0x5A, 0xF7, 0xAA, 0x30, 0x00, 0x00, 0x00, 0x00, 0x5B, 0x6F, 0xB0, 0xC0, 0x00,
+0x00, 0x00, 0x00, 0x5C, 0xA9, 0x67, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x5D, 0x74, 0x7C, 0xC0, 0x00,
+0x00, 0x00, 0x00, 0x5E, 0x89, 0x49, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x5F, 0x54, 0x5E, 0xC0, 0x00,
+0x00, 0x00, 0x00, 0x60, 0x69, 0x2B, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x61, 0x34, 0x40, 0xC0, 0x00,
+0x00, 0x00, 0x00, 0x62, 0x49, 0x0D, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x63, 0x1D, 0x5D, 0x40, 0x00,
+0x00, 0x00, 0x00, 0x64, 0x28, 0xEF, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x64, 0xF4, 0x04, 0xC0, 0x00,
+0x00, 0x00, 0x00, 0x66, 0x12, 0x0C, 0x30, 0x00, 0x00, 0x00, 0x00, 0x66, 0xDD, 0x21, 0x40, 0x00,
+0x00, 0x00, 0x00, 0x67, 0xDB, 0x84, 0xB0, 0x01, 0x02, 0x01, 0x03, 0x01, 0x04, 0x02, 0x04, 0x02,
+0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x03, 0x02, 0x03, 0x04, 0x02, 0x03, 0x05, 0x03, 0x05, 0x03,
+0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03,
+0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03,
+0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03,
+0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03,
+0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03,
+0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03,
+0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x06, 0xFF, 0xFF, 0xBC, 0x70,
+0x00, 0x00, 0xFF, 0xFF, 0xBD, 0xBB, 0x00, 0x04, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x08, 0xFF, 0xFF,
+0xC7, 0xC0, 0x00, 0x0C, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x0C, 0xFF, 0xFF, 0xD5, 0xD0, 0x01, 0x10,
+0xFF, 0xFF, 0xD5, 0xD0, 0x00, 0x10, 0x4C, 0x4D, 0x54, 0x00, 0x53, 0x4D, 0x54, 0x00, 0x2D, 0x30,
+0x35, 0x00, 0x2D, 0x30, 0x34, 0x00, 0x2D, 0x30, 0x33, 0x00, 0x0A, 0x3C, 0x2D, 0x30, 0x33, 0x3E,
+0x33, 0x0A, 0x00, 0x43, 0xCC, 0xC5, 0x00, 0xA4, 0xB1, 0x75, 0x00, 0x00, 0x00, 0x0C, 0x41, 0x79,
+0x73, 0x65, 0x6E, 0x20, 0x52, 0x65, 0x67, 0x69, 0x6F, 0x6E, 
+
 /* America/Creston */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x43, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -4196,13 +4297,16 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x18, 0xFF,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x18, 0xFF,
 0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xA9, 0x79, 0x4F, 0x70, 0xFF,
-0xFF, 0xFF, 0xFF, 0xAF, 0xF2, 0x7C, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x64, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xAF, 0xF1, 0x39, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x64, 0x70, 0xFF,
 0xFF, 0xFF, 0xFF, 0xB7, 0x1B, 0x10, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0x0A, 0xF2, 0xF0, 0xFF,
 0xFF, 0xFF, 0xFF, 0xCB, 0xEA, 0x8D, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x23, 0xF4, 0x70, 0xFF,
-0xFF, 0xFF, 0xFF, 0xD2, 0x99, 0xBA, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD7, 0x1B, 0x59, 0x00, 0xFF,
-0xFF, 0xFF, 0xFF, 0xD8, 0x91, 0xB4, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE2, 0x7E, 0x4B, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD2, 0x9D, 0xAE, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD7, 0x1B, 0x59, 0x00, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD8, 0x91, 0xB4, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xDB, 0x00, 0x07, 0x00, 0xFF,
+0xFF, 0xFF, 0xFF, 0xDB, 0xC0, 0x73, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xDC, 0xDE, 0xB3, 0xA0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xDD, 0xA9, 0xAC, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xDE, 0xBE, 0x95, 0xA0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xDF, 0x89, 0x8E, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE2, 0x7E, 0x4B, 0x90, 0xFF,
 0xFF, 0xFF, 0xFF, 0xE3, 0x49, 0x52, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE4, 0x5E, 0x2D, 0x90, 0xFF,
 0xFF, 0xFF, 0xFF, 0xE5, 0x29, 0x34, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE6, 0x47, 0x4A, 0x10, 0xFF,
 0xFF, 0xFF, 0xFF, 0xE7, 0x12, 0x51, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xE8, 0x27, 0x2C, 0x10, 0xFF,
@@ -4249,13 +4353,14 @@
 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
-0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x02, 0xFF, 0xFF, 0x92,
-0x4C, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x08, 0xFF,
-0xFF, 0x9D, 0x90, 0x01, 0x0C, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x10, 0xFF, 0xFF, 0x9D, 0x90, 0x01,
-0x14, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x50, 0x53, 0x54, 0x00, 0x50, 0x44, 0x54,
-0x00, 0x50, 0x57, 0x54, 0x00, 0x50, 0x50, 0x54, 0x00, 0x0A, 0x50, 0x53, 0x54, 0x38, 0x50, 0x44,
-0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D, 0x31, 0x31, 0x2E, 0x31, 0x2E, 0x30,
-0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
+0x03, 0x02, 0x02, 0xFF, 0xFF, 0x92, 0x4C, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF,
+0xFF, 0x8F, 0x80, 0x00, 0x08, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x0C, 0xFF, 0xFF, 0x9D, 0x90, 0x01,
+0x10, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x14, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x50,
+0x53, 0x54, 0x00, 0x50, 0x44, 0x54, 0x00, 0x50, 0x57, 0x54, 0x00, 0x50, 0x50, 0x54, 0x00, 0x0A,
+0x50, 0x53, 0x54, 0x38, 0x50, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D,
+0x31, 0x31, 0x2E, 0x31, 0x2E, 0x30, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 
 
 /* America/Fort_Nelson */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x43, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -4968,21 +5073,19 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x14, 0xFF,
-0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF2, 0x6E, 0xE0, 0xFF,
-0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x56, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x43, 0xD2, 0x60, 0xFF,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF1, 0x2B, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x56, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x41, 0x3D, 0x70, 0xFF,
 0xFF, 0xFF, 0xFF, 0xB8, 0x0C, 0x36, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0xFD, 0x86, 0xF0, 0xFF,
-0xFF, 0xFF, 0xFF, 0xCB, 0xEA, 0x71, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xD8, 0x91, 0xB4, 0xF0, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x80, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x84, 0x10, 0x00,
+0xFF, 0xFF, 0xFF, 0xCB, 0xEA, 0x71, 0x60, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x84, 0x10, 0x00,
 0x00, 0x00, 0x00, 0x32, 0x73, 0x16, 0x80, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x66, 0x10, 0x00,
 0x00, 0x00, 0x00, 0x34, 0x52, 0xF8, 0x80, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x48, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x36, 0x32, 0xDA, 0x80, 0x01, 0x02, 0x01, 0x03, 0x01, 0x02, 0x01, 0x04, 0x01,
-0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0xFF, 0xFF, 0x97, 0xF8, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90,
-0x00, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x0C, 0xFF, 0xFF,
-0x8F, 0x80, 0x00, 0x10, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00,
-0x4D, 0x44, 0x54, 0x00, 0x50, 0x53, 0x54, 0x00, 0x0A, 0x4D, 0x53, 0x54, 0x37, 0x0A, 0x00, 0xB5,
-0xAE, 0x6A, 0x00, 0x69, 0x56, 0x25, 0x00, 0x00, 0x00, 0x06, 0x53, 0x6F, 0x6E, 0x6F, 0x72, 0x61,
-
+0x00, 0x00, 0x00, 0x36, 0x32, 0xDA, 0x80, 0x01, 0x02, 0x01, 0x03, 0x01, 0x02, 0x01, 0x03, 0x01,
+0x03, 0x01, 0x03, 0x01, 0xFF, 0xFF, 0x97, 0xF8, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04,
+0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x0C, 0x4C, 0x4D, 0x54, 0x00,
+0x4D, 0x53, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x4D, 0x44, 0x54, 0x00, 0x0A, 0x4D, 0x53, 0x54,
+0x37, 0x0A, 0x00, 0xB5, 0xAE, 0x6A, 0x00, 0x69, 0x56, 0x25, 0x00, 0x00, 0x00, 0x06, 0x53, 0x6F,
+0x6E, 0x6F, 0x72, 0x61, 
 
 /* America/Indiana/Indianapolis */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x55, 0x53, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -6208,12 +6311,11 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x14, 0xFF,
-0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF2, 0x6E, 0xE0, 0xFF,
-0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x56, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x43, 0xD2, 0x60, 0xFF,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3D, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF1, 0x2B, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x56, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x41, 0x3D, 0x70, 0xFF,
 0xFF, 0xFF, 0xFF, 0xB8, 0x0C, 0x36, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0xFD, 0x86, 0xF0, 0xFF,
-0xFF, 0xFF, 0xFF, 0xCB, 0xEA, 0x71, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xD8, 0x91, 0xB4, 0xF0, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x80, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x84, 0x10, 0x00,
+0xFF, 0xFF, 0xFF, 0xCB, 0xEA, 0x71, 0x60, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x84, 0x10, 0x00,
 0x00, 0x00, 0x00, 0x32, 0x73, 0x16, 0x80, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x66, 0x10, 0x00,
 0x00, 0x00, 0x00, 0x34, 0x52, 0xF8, 0x80, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x48, 0x10, 0x00,
 0x00, 0x00, 0x00, 0x36, 0x32, 0xDA, 0x80, 0x00, 0x00, 0x00, 0x00, 0x37, 0x07, 0x2A, 0x10, 0x00,
@@ -6240,18 +6342,18 @@
 0x00, 0x00, 0x00, 0x5D, 0xB5, 0x4E, 0x80, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x89, 0x9E, 0x10, 0x00,
 0x00, 0x00, 0x00, 0x5F, 0x95, 0x30, 0x80, 0x00, 0x00, 0x00, 0x00, 0x60, 0x69, 0x80, 0x10, 0x00,
 0x00, 0x00, 0x00, 0x61, 0x7E, 0x4D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x62, 0x49, 0x62, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x63, 0x5E, 0x2F, 0x00, 0x01, 0x02, 0x01, 0x03, 0x01, 0x02, 0x01, 0x04, 0x01,
+0x00, 0x00, 0x00, 0x63, 0x5E, 0x2F, 0x00, 0x01, 0x02, 0x01, 0x03, 0x01, 0x02, 0x01, 0x03, 0x01,
 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01,
 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01,
 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01,
-0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0xFF, 0xFF, 0x9C, 0x3C, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90,
-0x00, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x0C, 0xFF, 0xFF,
-0x8F, 0x80, 0x00, 0x10, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00,
-0x4D, 0x44, 0x54, 0x00, 0x50, 0x53, 0x54, 0x00, 0x0A, 0x4D, 0x53, 0x54, 0x37, 0x0A, 0x00, 0xAC,
-0xC1, 0x42, 0x00, 0x70, 0x47, 0x7D, 0x00, 0x00, 0x00, 0x32, 0x42, 0x61, 0x6A, 0x61, 0x20, 0x43,
-0x61, 0x6C, 0x69, 0x66, 0x6F, 0x72, 0x6E, 0x69, 0x61, 0x20, 0x53, 0x75, 0x72, 0x2C, 0x20, 0x4E,
-0x61, 0x79, 0x61, 0x72, 0x69, 0x74, 0x20, 0x28, 0x6D, 0x6F, 0x73, 0x74, 0x20, 0x61, 0x72, 0x65,
-0x61, 0x73, 0x29, 0x2C, 0x20, 0x53, 0x69, 0x6E, 0x61, 0x6C, 0x6F, 0x61, 
+0x03, 0x01, 0x03, 0x01, 0xFF, 0xFF, 0x9C, 0x3C, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04,
+0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x0C, 0x4C, 0x4D, 0x54, 0x00,
+0x4D, 0x53, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x4D, 0x44, 0x54, 0x00, 0x0A, 0x4D, 0x53, 0x54,
+0x37, 0x0A, 0x00, 0xAC, 0xC1, 0x42, 0x00, 0x70, 0x47, 0x7D, 0x00, 0x00, 0x00, 0x32, 0x42, 0x61,
+0x6A, 0x61, 0x20, 0x43, 0x61, 0x6C, 0x69, 0x66, 0x6F, 0x72, 0x6E, 0x69, 0x61, 0x20, 0x53, 0x75,
+0x72, 0x2C, 0x20, 0x4E, 0x61, 0x79, 0x61, 0x72, 0x69, 0x74, 0x20, 0x28, 0x6D, 0x6F, 0x73, 0x74,
+0x20, 0x61, 0x72, 0x65, 0x61, 0x73, 0x29, 0x2C, 0x20, 0x53, 0x69, 0x6E, 0x61, 0x6C, 0x6F, 0x61,
+
 
 /* America/Mendoza */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -6371,8 +6473,8 @@
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x39, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x10, 0xFF,
-0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xDA, 0x60, 0x00, 0x00, 0x00, 0x00, 0x16, 0x86, 0xD5, 0x60, 0x00,
-0x00, 0x00, 0x00, 0x18, 0x4C, 0x4B, 0x50, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x76, 0x00, 0x00,
+0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xDA, 0x60, 0x00, 0x00, 0x00, 0x00, 0x16, 0x8A, 0xE6, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x18, 0x24, 0xDA, 0x70, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x76, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x32, 0x73, 0x08, 0x70, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x58, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x34, 0x52, 0xEA, 0x70, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x3A, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x36, 0x32, 0xCC, 0x70, 0x00, 0x00, 0x00, 0x00, 0x37, 0x07, 0x1C, 0x00, 0x00,
@@ -6457,8 +6559,8 @@
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x18, 0xFF,
-0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF2, 0x6E, 0xE0, 0xFF,
-0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x56, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x43, 0xD2, 0x60, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF1, 0x2B, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x56, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x41, 0x3D, 0x70, 0xFF,
 0xFF, 0xFF, 0xFF, 0xB8, 0x0C, 0x36, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0xFD, 0x86, 0xF0, 0xFF,
 0xFF, 0xFF, 0xFF, 0xC5, 0xDE, 0xB0, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xC6, 0x97, 0x34, 0x50, 0xFF,
 0xFF, 0xFF, 0xFF, 0xC9, 0x55, 0xF1, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0xEA, 0xDD, 0x50, 0xFF,
@@ -6644,46 +6746,50 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x39, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0C, 0xFF,
-0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xDA, 0x60, 0x00, 0x00, 0x00, 0x00, 0x22, 0x55, 0xF1, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x23, 0x6A, 0xBD, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x76, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x32, 0x73, 0x08, 0x70, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x58, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x34, 0x52, 0xEA, 0x70, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x3A, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x36, 0x32, 0xCC, 0x70, 0x00, 0x00, 0x00, 0x00, 0x37, 0x07, 0x1C, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x38, 0x1B, 0xE8, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x38, 0xE6, 0xFE, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x39, 0xFB, 0xCA, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xF5, 0x04, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x3B, 0xB6, 0xC2, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xAF, 0xFC, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x3D, 0xBB, 0x8E, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x8F, 0xDE, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x3F, 0x9B, 0x70, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x40, 0x6F, 0xC0, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x41, 0x84, 0x8D, 0x70, 0x00, 0x00, 0x00, 0x00, 0x42, 0x4F, 0xA2, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x43, 0x64, 0x6F, 0x70, 0x00, 0x00, 0x00, 0x00, 0x44, 0x2F, 0x84, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x45, 0x44, 0x51, 0x70, 0x00, 0x00, 0x00, 0x00, 0x46, 0x0F, 0x66, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x47, 0x24, 0x33, 0x70, 0x00, 0x00, 0x00, 0x00, 0x47, 0xF8, 0x83, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x49, 0x04, 0x15, 0x70, 0x00, 0x00, 0x00, 0x00, 0x49, 0xD8, 0x65, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x4A, 0xE3, 0xF7, 0x70, 0x00, 0x00, 0x00, 0x00, 0x4B, 0xB8, 0x47, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x4C, 0xCD, 0x13, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x98, 0x29, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x4E, 0xAC, 0xF5, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x78, 0x0B, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x50, 0x8C, 0xD7, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x51, 0x61, 0x27, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x52, 0x6C, 0xB9, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x53, 0x41, 0x09, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x54, 0x4C, 0x9B, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x55, 0x20, 0xEB, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x56, 0x2C, 0x7D, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x57, 0x00, 0xCD, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x58, 0x15, 0x9A, 0x70, 0x00, 0x00, 0x00, 0x00, 0x58, 0xE0, 0xAF, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x59, 0xF5, 0x7C, 0x70, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xC0, 0x91, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x5B, 0xD5, 0x5E, 0x70, 0x00, 0x00, 0x00, 0x00, 0x5C, 0xA9, 0xAE, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x5D, 0xB5, 0x40, 0x70, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x89, 0x90, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x5F, 0x95, 0x22, 0x70, 0x00, 0x00, 0x00, 0x00, 0x60, 0x69, 0x72, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x61, 0x7E, 0x3E, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x62, 0x49, 0x54, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x63, 0x5E, 0x20, 0xF0, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
-0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
-0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
-0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
-0xFF, 0xFF, 0xA1, 0xF4, 0x00, 0x00, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x04, 0xFF, 0xFF, 0xB9, 0xB0,
-0x01, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x0A, 0x43,
-0x53, 0x54, 0x36, 0x0A, 0x00, 0xB0, 0x7E, 0x4A, 0x00, 0x79, 0x96, 0x4D, 0x00, 0x00, 0x00, 0x36,
-0x44, 0x75, 0x72, 0x61, 0x6E, 0x67, 0x6F, 0x3B, 0x20, 0x43, 0x6F, 0x61, 0x68, 0x75, 0x69, 0x6C,
-0x61, 0x2C, 0x20, 0x4E, 0x75, 0x65, 0x76, 0x6F, 0x20, 0x4C, 0x65, 0x6F, 0x6E, 0x2C, 0x20, 0x54,
-0x61, 0x6D, 0x61, 0x75, 0x6C, 0x69, 0x70, 0x61, 0x73, 0x20, 0x28, 0x6D, 0x6F, 0x73, 0x74, 0x20,
-0x61, 0x72, 0x65, 0x61, 0x73, 0x29, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x14, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xDA, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF1, 0x2B, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x56, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x41, 0x3D, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB8, 0x0C, 0x36, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0xFD, 0x86, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x22, 0x55, 0xF1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x23, 0x6A, 0xBD, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x31, 0x67, 0x76, 0x00, 0x00, 0x00, 0x00, 0x00, 0x32, 0x73, 0x08, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x33, 0x47, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x34, 0x52, 0xEA, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x35, 0x27, 0x3A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0xCC, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x37, 0x07, 0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x1B, 0xE8, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x38, 0xE6, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0xCA, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x3A, 0xF5, 0x04, 0x80, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xB6, 0xC2, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x3C, 0xAF, 0xFC, 0x80, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0x8E, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x3E, 0x8F, 0xDE, 0x80, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x70, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x40, 0x6F, 0xC0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0x8D, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x42, 0x4F, 0xA2, 0x80, 0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x6F, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x44, 0x2F, 0x84, 0x80, 0x00, 0x00, 0x00, 0x00, 0x45, 0x44, 0x51, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x46, 0x0F, 0x66, 0x80, 0x00, 0x00, 0x00, 0x00, 0x47, 0x24, 0x33, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x47, 0xF8, 0x83, 0x00, 0x00, 0x00, 0x00, 0x00, 0x49, 0x04, 0x15, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x49, 0xD8, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4A, 0xE3, 0xF7, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x4B, 0xB8, 0x47, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4C, 0xCD, 0x13, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x4D, 0x98, 0x29, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4E, 0xAC, 0xF5, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x4F, 0x78, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x8C, 0xD7, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x51, 0x61, 0x27, 0x80, 0x00, 0x00, 0x00, 0x00, 0x52, 0x6C, 0xB9, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x53, 0x41, 0x09, 0x80, 0x00, 0x00, 0x00, 0x00, 0x54, 0x4C, 0x9B, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x55, 0x20, 0xEB, 0x80, 0x00, 0x00, 0x00, 0x00, 0x56, 0x2C, 0x7D, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x57, 0x00, 0xCD, 0x80, 0x00, 0x00, 0x00, 0x00, 0x58, 0x15, 0x9A, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x58, 0xE0, 0xAF, 0x80, 0x00, 0x00, 0x00, 0x00, 0x59, 0xF5, 0x7C, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x5A, 0xC0, 0x91, 0x80, 0x00, 0x00, 0x00, 0x00, 0x5B, 0xD5, 0x5E, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x5C, 0xA9, 0xAE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5D, 0xB5, 0x40, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x5E, 0x89, 0x90, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5F, 0x95, 0x22, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x60, 0x69, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 0x61, 0x7E, 0x3E, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x62, 0x49, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x63, 0x5E, 0x20, 0xF0, 0x01,
+0x02, 0x01, 0x03, 0x01, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
+0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
+0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
+0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0xFF, 0xFF, 0xA1,
+0xF4, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0xFF,
+0xFF, 0xAB, 0xA0, 0x01, 0x0C, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x10, 0x4C, 0x4D, 0x54, 0x00, 0x4D,
+0x53, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x4D, 0x44, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x0A,
+0x43, 0x53, 0x54, 0x36, 0x0A, 0x00, 0xB0, 0x7E, 0x4A, 0x00, 0x79, 0x96, 0x4D, 0x00, 0x00, 0x00,
+0x36, 0x44, 0x75, 0x72, 0x61, 0x6E, 0x67, 0x6F, 0x3B, 0x20, 0x43, 0x6F, 0x61, 0x68, 0x75, 0x69,
+0x6C, 0x61, 0x2C, 0x20, 0x4E, 0x75, 0x65, 0x76, 0x6F, 0x20, 0x4C, 0x65, 0x6F, 0x6E, 0x2C, 0x20,
+0x54, 0x61, 0x6D, 0x61, 0x75, 0x6C, 0x69, 0x70, 0x61, 0x73, 0x20, 0x28, 0x6D, 0x6F, 0x73, 0x74,
+0x20, 0x61, 0x72, 0x65, 0x61, 0x73, 0x29, 
 
 /* America/Montevideo */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x55, 0x59, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -7537,8 +7643,8 @@
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3D, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x14, 0xFF,
-0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF2, 0x6E, 0xE0, 0xFF,
-0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x56, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x43, 0xD2, 0x60, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF1, 0x2B, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x56, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x41, 0x3D, 0x70, 0xFF,
 0xFF, 0xFF, 0xFF, 0xB8, 0x0C, 0x36, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0xFD, 0x86, 0xF0, 0x00,
 0x00, 0x00, 0x00, 0x31, 0x67, 0x76, 0x00, 0x00, 0x00, 0x00, 0x00, 0x32, 0x73, 0x08, 0x70, 0x00,
 0x00, 0x00, 0x00, 0x33, 0x47, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x34, 0x52, 0xEA, 0x70, 0x00,
@@ -7883,9 +7989,8 @@
 0xC7, 0xC0, 0x00, 0x0C, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x0C, 0xFF, 0xFF, 0xD5, 0xD0, 0x01, 0x10,
 0xFF, 0xFF, 0xD5, 0xD0, 0x00, 0x10, 0x4C, 0x4D, 0x54, 0x00, 0x53, 0x4D, 0x54, 0x00, 0x2D, 0x30,
 0x35, 0x00, 0x2D, 0x30, 0x34, 0x00, 0x2D, 0x30, 0x33, 0x00, 0x0A, 0x3C, 0x2D, 0x30, 0x33, 0x3E,
-0x33, 0x0A, 0x00, 0x38, 0x3A, 0x88, 0x00, 0xA6, 0x72, 0xAD, 0x00, 0x00, 0x00, 0x14, 0x52, 0x65,
-0x67, 0x69, 0x6F, 0x6E, 0x20, 0x6F, 0x66, 0x20, 0x4D, 0x61, 0x67, 0x61, 0x6C, 0x6C, 0x61, 0x6E,
-0x65, 0x73, 
+0x33, 0x0A, 0x00, 0x38, 0x3A, 0x88, 0x00, 0xA6, 0x72, 0xAD, 0x00, 0x00, 0x00, 0x11, 0x4D, 0x61,
+0x67, 0x61, 0x6C, 0x6C, 0x61, 0x6E, 0x65, 0x73, 0x20, 0x52, 0x65, 0x67, 0x69, 0x6F, 0x6E, 
 
 /* America/Rainy_River */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -8243,13 +8348,16 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x18, 0xFF,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x18, 0xFF,
 0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xA9, 0x79, 0x4F, 0x70, 0xFF,
-0xFF, 0xFF, 0xFF, 0xAF, 0xF2, 0x7C, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x64, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xAF, 0xF1, 0x39, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x64, 0x70, 0xFF,
 0xFF, 0xFF, 0xFF, 0xB7, 0x1B, 0x10, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0x0A, 0xF2, 0xF0, 0xFF,
 0xFF, 0xFF, 0xFF, 0xCB, 0xEA, 0x8D, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x23, 0xF4, 0x70, 0xFF,
-0xFF, 0xFF, 0xFF, 0xD2, 0x99, 0xBA, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD7, 0x1B, 0x59, 0x00, 0xFF,
-0xFF, 0xFF, 0xFF, 0xD8, 0x91, 0xB4, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE2, 0x7E, 0x4B, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD2, 0x9D, 0xAE, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD7, 0x1B, 0x59, 0x00, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD8, 0x91, 0xB4, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xDB, 0x00, 0x07, 0x00, 0xFF,
+0xFF, 0xFF, 0xFF, 0xDB, 0xC0, 0x73, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xDC, 0xDE, 0xB3, 0xA0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xDD, 0xA9, 0xAC, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xDE, 0xBE, 0x95, 0xA0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xDF, 0x89, 0x8E, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE2, 0x7E, 0x4B, 0x90, 0xFF,
 0xFF, 0xFF, 0xFF, 0xE3, 0x49, 0x52, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE4, 0x5E, 0x2D, 0x90, 0xFF,
 0xFF, 0xFF, 0xFF, 0xE5, 0x29, 0x34, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE6, 0x47, 0x4A, 0x10, 0xFF,
 0xFF, 0xFF, 0xFF, 0xE7, 0x12, 0x51, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xE8, 0x27, 0x2C, 0x10, 0xFF,
@@ -8296,13 +8404,14 @@
 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
-0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x02, 0xFF, 0xFF, 0x92,
-0x4C, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x08, 0xFF,
-0xFF, 0x9D, 0x90, 0x01, 0x0C, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x10, 0xFF, 0xFF, 0x9D, 0x90, 0x01,
-0x14, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x50, 0x53, 0x54, 0x00, 0x50, 0x44, 0x54,
-0x00, 0x50, 0x57, 0x54, 0x00, 0x50, 0x50, 0x54, 0x00, 0x0A, 0x50, 0x53, 0x54, 0x38, 0x50, 0x44,
-0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D, 0x31, 0x31, 0x2E, 0x31, 0x2E, 0x30,
-0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
+0x03, 0x02, 0x02, 0xFF, 0xFF, 0x92, 0x4C, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF,
+0xFF, 0x8F, 0x80, 0x00, 0x08, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x0C, 0xFF, 0xFF, 0x9D, 0x90, 0x01,
+0x10, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x14, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x50,
+0x53, 0x54, 0x00, 0x50, 0x44, 0x54, 0x00, 0x50, 0x57, 0x54, 0x00, 0x50, 0x50, 0x54, 0x00, 0x0A,
+0x50, 0x53, 0x54, 0x38, 0x50, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D,
+0x31, 0x31, 0x2E, 0x31, 0x2E, 0x30, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 
 
 /* America/Santarem */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x42, 0x52, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -9087,13 +9196,16 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x18, 0xFF,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x18, 0xFF,
 0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xA9, 0x79, 0x4F, 0x70, 0xFF,
-0xFF, 0xFF, 0xFF, 0xAF, 0xF2, 0x7C, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x64, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xAF, 0xF1, 0x39, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x64, 0x70, 0xFF,
 0xFF, 0xFF, 0xFF, 0xB7, 0x1B, 0x10, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0x0A, 0xF2, 0xF0, 0xFF,
 0xFF, 0xFF, 0xFF, 0xCB, 0xEA, 0x8D, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x23, 0xF4, 0x70, 0xFF,
-0xFF, 0xFF, 0xFF, 0xD2, 0x99, 0xBA, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD7, 0x1B, 0x59, 0x00, 0xFF,
-0xFF, 0xFF, 0xFF, 0xD8, 0x91, 0xB4, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE2, 0x7E, 0x4B, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD2, 0x9D, 0xAE, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD7, 0x1B, 0x59, 0x00, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD8, 0x91, 0xB4, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xDB, 0x00, 0x07, 0x00, 0xFF,
+0xFF, 0xFF, 0xFF, 0xDB, 0xC0, 0x73, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xDC, 0xDE, 0xB3, 0xA0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xDD, 0xA9, 0xAC, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xDE, 0xBE, 0x95, 0xA0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xDF, 0x89, 0x8E, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE2, 0x7E, 0x4B, 0x90, 0xFF,
 0xFF, 0xFF, 0xFF, 0xE3, 0x49, 0x52, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE4, 0x5E, 0x2D, 0x90, 0xFF,
 0xFF, 0xFF, 0xFF, 0xE5, 0x29, 0x34, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE6, 0x47, 0x4A, 0x10, 0xFF,
 0xFF, 0xFF, 0xFF, 0xE7, 0x12, 0x51, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xE8, 0x27, 0x2C, 0x10, 0xFF,
@@ -9140,14 +9252,15 @@
 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
-0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x02, 0xFF, 0xFF, 0x92,
-0x4C, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x08, 0xFF,
-0xFF, 0x9D, 0x90, 0x01, 0x0C, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x10, 0xFF, 0xFF, 0x9D, 0x90, 0x01,
-0x14, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x50, 0x53, 0x54, 0x00, 0x50, 0x44, 0x54,
-0x00, 0x50, 0x57, 0x54, 0x00, 0x50, 0x50, 0x54, 0x00, 0x0A, 0x50, 0x53, 0x54, 0x38, 0x50, 0x44,
-0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D, 0x31, 0x31, 0x2E, 0x31, 0x2E, 0x30,
-0x0A, 0x00, 0xBA, 0xF8, 0x95, 0x00, 0x60, 0x1A, 0xDD, 0x00, 0x00, 0x00, 0x0F, 0x42, 0x61, 0x6A,
-0x61, 0x20, 0x43, 0x61, 0x6C, 0x69, 0x66, 0x6F, 0x72, 0x6E, 0x69, 0x61, 
+0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
+0x03, 0x02, 0x02, 0xFF, 0xFF, 0x92, 0x4C, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF,
+0xFF, 0x8F, 0x80, 0x00, 0x08, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x0C, 0xFF, 0xFF, 0x9D, 0x90, 0x01,
+0x10, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x14, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x50,
+0x53, 0x54, 0x00, 0x50, 0x44, 0x54, 0x00, 0x50, 0x57, 0x54, 0x00, 0x50, 0x50, 0x54, 0x00, 0x0A,
+0x50, 0x53, 0x54, 0x38, 0x50, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D,
+0x31, 0x31, 0x2E, 0x31, 0x2E, 0x30, 0x0A, 0x00, 0xBA, 0xF8, 0x95, 0x00, 0x60, 0x1A, 0xDD, 0x00,
+0x00, 0x00, 0x0F, 0x42, 0x61, 0x6A, 0x61, 0x20, 0x43, 0x61, 0x6C, 0x69, 0x66, 0x6F, 0x72, 0x6E,
+0x69, 0x61, 
 
 /* America/Toronto */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x43, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -10758,47 +10871,44 @@
 0x20, 0x2D, 0x20, 0x5A, 0x61, 0x62, 0x61, 0x79, 0x6B, 0x61, 0x6C, 0x73, 0x6B, 0x79, 
 
 /* Asia/Choibalsan */
-0x50, 0x48, 0x50, 0x32, 0x01, 0x4D, 0x4E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x33, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x14, 0xFF,
-0xFF, 0xFF, 0xFF, 0x86, 0xD3, 0xE7, 0x28, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x0B, 0xDC, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x18, 0xE9, 0xC8, 0x80, 0x00, 0x00, 0x00, 0x00, 0x19, 0xDA, 0xEE, 0xE0, 0x00,
-0x00, 0x00, 0x00, 0x1A, 0xCC, 0x3F, 0x70, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xBC, 0x22, 0x60, 0x00,
-0x00, 0x00, 0x00, 0x1C, 0xAC, 0x21, 0x70, 0x00, 0x00, 0x00, 0x00, 0x1D, 0x9C, 0x04, 0x60, 0x00,
-0x00, 0x00, 0x00, 0x1E, 0x8C, 0x03, 0x70, 0x00, 0x00, 0x00, 0x00, 0x1F, 0x7B, 0xE6, 0x60, 0x00,
-0x00, 0x00, 0x00, 0x20, 0x6B, 0xE5, 0x70, 0x00, 0x00, 0x00, 0x00, 0x21, 0x5B, 0xC8, 0x60, 0x00,
-0x00, 0x00, 0x00, 0x22, 0x4B, 0xC7, 0x70, 0x00, 0x00, 0x00, 0x00, 0x23, 0x3B, 0xAA, 0x60, 0x00,
-0x00, 0x00, 0x00, 0x24, 0x2B, 0xA9, 0x70, 0x00, 0x00, 0x00, 0x00, 0x25, 0x1B, 0x8C, 0x60, 0x00,
-0x00, 0x00, 0x00, 0x26, 0x0B, 0x8B, 0x70, 0x00, 0x00, 0x00, 0x00, 0x27, 0x04, 0xA8, 0xE0, 0x00,
-0x00, 0x00, 0x00, 0x27, 0xF4, 0xA7, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x28, 0xE4, 0x8A, 0xE0, 0x00,
-0x00, 0x00, 0x00, 0x29, 0xD4, 0x89, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xC4, 0x6C, 0xE0, 0x00,
-0x00, 0x00, 0x00, 0x2B, 0xB4, 0x6B, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xA4, 0x4E, 0xE0, 0x00,
-0x00, 0x00, 0x00, 0x2D, 0x94, 0x4D, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x2E, 0x84, 0x30, 0xE0, 0x00,
-0x00, 0x00, 0x00, 0x2F, 0x74, 0x2F, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x30, 0x64, 0x12, 0xE0, 0x00,
-0x00, 0x00, 0x00, 0x31, 0x5D, 0x4C, 0x70, 0x00, 0x00, 0x00, 0x00, 0x32, 0x4D, 0x2F, 0x60, 0x00,
-0x00, 0x00, 0x00, 0x33, 0x3D, 0x2E, 0x70, 0x00, 0x00, 0x00, 0x00, 0x34, 0x2D, 0x11, 0x60, 0x00,
-0x00, 0x00, 0x00, 0x35, 0x1D, 0x10, 0x70, 0x00, 0x00, 0x00, 0x00, 0x36, 0x0C, 0xF3, 0x60, 0x00,
-0x00, 0x00, 0x00, 0x3A, 0xE9, 0xA5, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xB4, 0x9E, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x3C, 0xA4, 0x9D, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3D, 0x94, 0x80, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x3E, 0x84, 0x7F, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x74, 0x62, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x40, 0x64, 0x61, 0x90, 0x00, 0x00, 0x00, 0x00, 0x41, 0x54, 0x44, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x42, 0x44, 0x43, 0x90, 0x00, 0x00, 0x00, 0x00, 0x43, 0x34, 0x26, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x44, 0x24, 0x25, 0x90, 0x00, 0x00, 0x00, 0x00, 0x45, 0x1D, 0x43, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x47, 0xEF, 0xAA, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x55, 0x15, 0x9A, 0xA0, 0x00,
-0x00, 0x00, 0x00, 0x56, 0x05, 0x61, 0x70, 0x00, 0x00, 0x00, 0x00, 0x56, 0xF5, 0x7C, 0xA0, 0x00,
-0x00, 0x00, 0x00, 0x57, 0xE5, 0x43, 0x70, 0x01, 0x02, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
-0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
-0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
-0x03, 0x04, 0x03, 0x04, 0x03, 0x02, 0x05, 0x02, 0x05, 0x02, 0x00, 0x00, 0x6B, 0x58, 0x00, 0x00,
-0x00, 0x00, 0x62, 0x70, 0x00, 0x04, 0x00, 0x00, 0x70, 0x80, 0x00, 0x08, 0x00, 0x00, 0x7E, 0x90,
-0x00, 0x0C, 0x00, 0x00, 0x8C, 0xA0, 0x01, 0x10, 0x00, 0x00, 0x7E, 0x90, 0x01, 0x0C, 0x4C, 0x4D,
-0x54, 0x00, 0x2B, 0x30, 0x37, 0x00, 0x2B, 0x30, 0x38, 0x00, 0x2B, 0x30, 0x39, 0x00, 0x2B, 0x31,
-0x30, 0x00, 0x0A, 0x3C, 0x2B, 0x30, 0x38, 0x3E, 0x2D, 0x38, 0x0A, 0x00, 0xD2, 0xAC, 0x4A, 0x01,
-0xC1, 0x5F, 0x10, 0x00, 0x00, 0x00, 0x12, 0x44, 0x6F, 0x72, 0x6E, 0x6F, 0x64, 0x2C, 0x20, 0x53,
-0x75, 0x6B, 0x68, 0x62, 0x61, 0x61, 0x74, 0x61, 0x72, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0x86, 0xD3, 0xEE, 0x4C, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x0B, 0xDC, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x18, 0xE9, 0xC8, 0x80, 0x00, 0x00, 0x00, 0x00, 0x19, 0xDA, 0xFC, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x1A, 0xCC, 0x4D, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xBC, 0x30, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x1C, 0xAC, 0x2F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1D, 0x9C, 0x12, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x1E, 0x8C, 0x11, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1F, 0x7B, 0xF4, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x20, 0x6B, 0xF3, 0x80, 0x00, 0x00, 0x00, 0x00, 0x21, 0x5B, 0xD6, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x22, 0x4B, 0xD5, 0x80, 0x00, 0x00, 0x00, 0x00, 0x23, 0x3B, 0xB8, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x24, 0x2B, 0xB7, 0x80, 0x00, 0x00, 0x00, 0x00, 0x25, 0x1B, 0x9A, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x26, 0x0B, 0x99, 0x80, 0x00, 0x00, 0x00, 0x00, 0x27, 0x04, 0xB6, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x27, 0xF4, 0xB6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0xE4, 0x98, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x29, 0xD4, 0x98, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xC4, 0x7A, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x2B, 0xB4, 0x7A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xA4, 0x5C, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x2D, 0x94, 0x5C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2E, 0x84, 0x3E, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x2F, 0x74, 0x3E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x64, 0x20, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x31, 0x5D, 0x5A, 0x80, 0x00, 0x00, 0x00, 0x00, 0x32, 0x4D, 0x3D, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x33, 0x3D, 0x3C, 0x80, 0x00, 0x00, 0x00, 0x00, 0x34, 0x2D, 0x1F, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x35, 0x1D, 0x1E, 0x80, 0x00, 0x00, 0x00, 0x00, 0x36, 0x0D, 0x01, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x3A, 0xE9, 0xB3, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xB4, 0xAC, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x3C, 0xA4, 0xAB, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x3D, 0x94, 0x8E, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x3E, 0x84, 0x8D, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x74, 0x70, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x40, 0x64, 0x6F, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x41, 0x54, 0x52, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x42, 0x44, 0x51, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x43, 0x34, 0x34, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x44, 0x24, 0x33, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x45, 0x1D, 0x51, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x55, 0x15, 0x9A, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x56, 0x05, 0x61, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x56, 0xF5, 0x7C, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x57, 0xE5, 0x43, 0x70, 0x01,
+0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
+0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
+0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
+0x03, 0x00, 0x00, 0x64, 0x34, 0x00, 0x00, 0x00, 0x00, 0x62, 0x70, 0x00, 0x04, 0x00, 0x00, 0x7E,
+0x90, 0x01, 0x08, 0x00, 0x00, 0x70, 0x80, 0x00, 0x0C, 0x4C, 0x4D, 0x54, 0x00, 0x2B, 0x30, 0x37,
+0x00, 0x2B, 0x30, 0x39, 0x00, 0x2B, 0x30, 0x38, 0x00, 0x0A, 0x3C, 0x2B, 0x30, 0x38, 0x3E, 0x2D,
+0x38, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 
 /* Asia/Chongqing */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -10998,7 +11108,7 @@
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0C, 0xFF,
-0xFF, 0xFF, 0xFF, 0x92, 0xE6, 0x18, 0xC4, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0x99, 0x32, 0xF0, 0x00,
+0xFF, 0xFF, 0xFF, 0x92, 0xE6, 0x1E, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0x99, 0x32, 0xF0, 0x00,
 0x00, 0x00, 0x00, 0x0B, 0xEA, 0x30, 0x70, 0x00, 0x00, 0x00, 0x00, 0x39, 0xC3, 0x99, 0x00, 0x01,
 0x02, 0x01, 0x02, 0x00, 0x00, 0x75, 0xBC, 0x00, 0x00, 0x00, 0x00, 0x70, 0x80, 0x00, 0x04, 0x00,
 0x00, 0x7E, 0x90, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x2B, 0x30, 0x38, 0x00, 0x2B, 0x30, 0x39,
@@ -11619,10 +11729,9 @@
 0x03, 0x00, 0x00, 0x55, 0xEC, 0x00, 0x00, 0x00, 0x00, 0x54, 0x60, 0x00, 0x04, 0x00, 0x00, 0x70,
 0x80, 0x01, 0x08, 0x00, 0x00, 0x62, 0x70, 0x00, 0x0C, 0x4C, 0x4D, 0x54, 0x00, 0x2B, 0x30, 0x36,
 0x00, 0x2B, 0x30, 0x38, 0x00, 0x2B, 0x30, 0x37, 0x00, 0x0A, 0x3C, 0x2B, 0x30, 0x37, 0x3E, 0x2D,
-0x37, 0x0A, 0x00, 0xD2, 0x98, 0xC2, 0x01, 0x9E, 0x81, 0x47, 0x00, 0x00, 0x00, 0x2B, 0x42, 0x61,
-0x79, 0x61, 0x6E, 0x2D, 0x4F, 0x6C, 0x67, 0x69, 0x79, 0x2C, 0x20, 0x47, 0x6F, 0x76, 0x69, 0x2D,
-0x41, 0x6C, 0x74, 0x61, 0x69, 0x2C, 0x20, 0x48, 0x6F, 0x76, 0x64, 0x2C, 0x20, 0x55, 0x76, 0x73,
-0x2C, 0x20, 0x5A, 0x61, 0x76, 0x6B, 0x68, 0x61, 0x6E, 
+0x37, 0x0A, 0x00, 0xD2, 0x98, 0xC2, 0x01, 0x9E, 0x81, 0x47, 0x00, 0x00, 0x00, 0x16, 0x42, 0x61,
+0x79, 0x61, 0x6E, 0x2D, 0x4F, 0x6C, 0x67, 0x69, 0x69, 0x2C, 0x20, 0x48, 0x6F, 0x76, 0x64, 0x2C,
+0x20, 0x55, 0x76, 0x73, 
 
 /* Asia/Irkutsk */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x52, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -12344,17 +12453,19 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x10, 0xFF,
-0xFF, 0xFF, 0xFF, 0x14, 0xE1, 0xDC, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0x7B, 0x1F, 0x3F, 0x90, 0xFF,
-0xFF, 0xFF, 0xFF, 0xC1, 0x9C, 0xF4, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xC2, 0x16, 0x30, 0x70, 0xFF,
-0xFF, 0xFF, 0xFF, 0xCB, 0xF2, 0xE7, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xD0, 0xA9, 0x25, 0x70, 0xFF,
-0xFF, 0xFF, 0xFF, 0xE2, 0x6C, 0x39, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xE2, 0xD5, 0xA2, 0xF0, 0x00,
-0x00, 0x00, 0x00, 0x0F, 0x75, 0x46, 0x80, 0x00, 0x00, 0x00, 0x00, 0x10, 0x66, 0x7A, 0xF0, 0x01,
-0x03, 0x02, 0x03, 0x04, 0x03, 0x02, 0x03, 0x02, 0x03, 0xFF, 0xFF, 0x1F, 0xF0, 0x00, 0x00, 0x00,
-0x00, 0x71, 0x70, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x90, 0x01, 0x04, 0x00, 0x00, 0x70, 0x80, 0x00,
-0x08, 0x00, 0x00, 0x7E, 0x90, 0x00, 0x0C, 0x4C, 0x4D, 0x54, 0x00, 0x50, 0x44, 0x54, 0x00, 0x50,
-0x53, 0x54, 0x00, 0x4A, 0x53, 0x54, 0x00, 0x0A, 0x50, 0x53, 0x54, 0x2D, 0x38, 0x0A, 0x00, 0x9F,
-0x94, 0xDD, 0x01, 0xCB, 0x4A, 0x20, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0x14, 0xE1, 0xDC, 0x18, 0xFF, 0xFF, 0xFF, 0xFF, 0x7B, 0xBB, 0x7A, 0x40, 0xFF,
+0xFF, 0xFF, 0xFF, 0xC1, 0x9C, 0xF4, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xC2, 0x01, 0x18, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xCB, 0x3F, 0x9B, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0x8C, 0x03, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD1, 0x4B, 0x4D, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0xB1, 0xE5, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xE2, 0x6C, 0x39, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xE2, 0xB3, 0x5B, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x0D, 0x9B, 0xFC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x86, 0x98, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x26, 0x56, 0xBF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x26, 0xB1, 0xA8, 0x70, 0x01,
+0x03, 0x02, 0x03, 0x02, 0x04, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0xFF, 0xFF, 0x1F,
+0xE8, 0x00, 0x00, 0x00, 0x00, 0x71, 0x68, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x90, 0x01, 0x04, 0x00,
+0x00, 0x70, 0x80, 0x00, 0x08, 0x00, 0x00, 0x7E, 0x90, 0x00, 0x0C, 0x4C, 0x4D, 0x54, 0x00, 0x50,
+0x44, 0x54, 0x00, 0x50, 0x53, 0x54, 0x00, 0x4A, 0x53, 0x54, 0x00, 0x0A, 0x50, 0x53, 0x54, 0x2D,
+0x38, 0x0A, 0x00, 0x9F, 0x96, 0x2A, 0x01, 0xCB, 0x3D, 0x89, 0x00, 0x00, 0x00, 0x00, 
 
 /* Asia/Muscat */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x4F, 0x4D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -13124,7 +13235,7 @@
 0xFF, 0xFF, 0xFF, 0x9A, 0x6C, 0x7D, 0xC8, 0xFF, 0xFF, 0xFF, 0xFF, 0xBF, 0x00, 0xCC, 0x48, 0x00,
 0x00, 0x00, 0x00, 0x0D, 0x94, 0x44, 0x38, 0x00, 0x00, 0x00, 0x00, 0x0E, 0xAD, 0x13, 0xB8, 0x00,
 0x00, 0x00, 0x00, 0x0F, 0x79, 0x73, 0x40, 0x00, 0x00, 0x00, 0x00, 0x10, 0x28, 0xCA, 0xC0, 0x00,
-0x00, 0x00, 0x00, 0x10, 0xED, 0x3A, 0x40, 0x00, 0x00, 0x00, 0x00, 0x11, 0xAD, 0xBC, 0x48, 0x00,
+0x00, 0x00, 0x00, 0x10, 0xA9, 0xFD, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x11, 0xAD, 0xBC, 0x48, 0x00,
 0x00, 0x00, 0x00, 0x12, 0x45, 0x4A, 0xB8, 0x00, 0x00, 0x00, 0x00, 0x13, 0x37, 0xEC, 0xC8, 0x00,
 0x00, 0x00, 0x00, 0x14, 0x2D, 0x15, 0xB8, 0x00, 0x00, 0x00, 0x00, 0x28, 0x20, 0x76, 0xC8, 0x00,
 0x00, 0x00, 0x00, 0x28, 0xDB, 0x9D, 0xB8, 0x00, 0x00, 0x00, 0x00, 0x29, 0xCB, 0x9C, 0xC8, 0x00,
@@ -13733,15 +13844,15 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8C, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x18, 0xFF,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x85, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x1D, 0xFF,
 0xFF, 0xFF, 0xFF, 0x5E, 0x3D, 0x1B, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0x92, 0xE6, 0xAA, 0xA0, 0xFF,
 0xFF, 0xFF, 0xFF, 0x9B, 0x4B, 0x89, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0x9B, 0xFE, 0xE3, 0xA0, 0xFF,
-0xFF, 0xFF, 0xFF, 0x9C, 0x9D, 0x09, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0x9D, 0xC9, 0x9F, 0x90, 0xFF,
-0xFF, 0xFF, 0xFF, 0x9E, 0x7F, 0x8E, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0x9F, 0xAA, 0xD3, 0x10, 0xFF,
-0xFF, 0xFF, 0xFF, 0xA0, 0x5F, 0x70, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xA1, 0x8C, 0x06, 0x90, 0xFF,
-0xFF, 0xFF, 0xFF, 0xA2, 0x41, 0xF5, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xA3, 0x6E, 0x8B, 0x90, 0xFF,
-0xFF, 0xFF, 0xFF, 0xA4, 0x23, 0x29, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0x4F, 0xBF, 0x10, 0xFF,
-0xFF, 0xFF, 0xFF, 0xAA, 0x06, 0x0B, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xAA, 0xF4, 0xAB, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0x9C, 0x9D, 0x17, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0x9D, 0xC9, 0x9F, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0x9E, 0x7E, 0x4B, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0x9F, 0xAA, 0xD3, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA0, 0x5F, 0x7E, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xA1, 0x8C, 0x06, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA2, 0x42, 0x03, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xA3, 0x6E, 0x8B, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA4, 0x23, 0x37, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0x4F, 0xBF, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xAA, 0x06, 0x0B, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xAA, 0xE7, 0x7C, 0x10, 0xFF,
 0xFF, 0xFF, 0xFF, 0xAD, 0xC9, 0xC4, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xAE, 0xA7, 0x40, 0x10, 0xFF,
 0xFF, 0xFF, 0xFF, 0xAF, 0xA0, 0x6B, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xB0, 0x87, 0x22, 0x10, 0xFF,
 0xFF, 0xFF, 0xFF, 0xB1, 0x89, 0x88, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xB2, 0x70, 0x3E, 0x90, 0xFF,
@@ -13754,7 +13865,7 @@
 0xFF, 0xFF, 0xFF, 0xC2, 0x68, 0x7A, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xC3, 0x58, 0x6B, 0x10, 0xFF,
 0xFF, 0xFF, 0xFF, 0xC4, 0x3F, 0x21, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xC5, 0x38, 0x4D, 0x10, 0xFF,
 0xFF, 0xFF, 0xFF, 0xC6, 0x3A, 0xB3, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xC7, 0x58, 0xC8, 0x90, 0xFF,
-0xFF, 0xFF, 0xFF, 0xC7, 0xD9, 0xFB, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0x01, 0x4B, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xC7, 0xD9, 0xFB, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0x03, 0xEE, 0x90, 0xFF,
 0xFF, 0xFF, 0xFF, 0xC9, 0xF1, 0x3C, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xCA, 0xE2, 0x7F, 0x10, 0xFF,
 0xFF, 0xFF, 0xFF, 0xCB, 0xB5, 0x6F, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0xEC, 0xC0, 0x00, 0xFF,
 0xFF, 0xFF, 0xFF, 0xCC, 0x80, 0x68, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xCC, 0xDC, 0xBF, 0x10, 0xFF,
@@ -13784,42 +13895,39 @@
 0xFF, 0xFF, 0xFF, 0xF3, 0x53, 0xBC, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x43, 0xAD, 0xC0, 0xFF,
 0xFF, 0xFF, 0xFF, 0xF5, 0x33, 0x9E, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF6, 0x23, 0x8F, 0xC0, 0xFF,
 0xFF, 0xFF, 0xFF, 0xF7, 0x13, 0x80, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x03, 0x71, 0xC0, 0xFF,
-0xFF, 0xFF, 0xFF, 0xF8, 0xF3, 0x62, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x0D, 0x9B, 0x29, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x0E, 0x8B, 0x1A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x84, 0x45, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x10, 0x74, 0x36, 0x90, 0x00, 0x00, 0x00, 0x00, 0x11, 0x64, 0x27, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x12, 0x54, 0x26, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x13, 0x44, 0x09, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x14, 0x34, 0x08, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x15, 0x23, 0xF9, 0xA0, 0x00,
-0x00, 0x00, 0x00, 0x16, 0x13, 0xEA, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x17, 0x03, 0xDB, 0xA0, 0x00,
-0x00, 0x00, 0x00, 0x17, 0xF3, 0xCC, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x18, 0xE3, 0xCB, 0xB0, 0x00,
-0x00, 0x00, 0x00, 0x19, 0xD3, 0xAE, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xC3, 0x9F, 0xA0, 0x00,
-0x00, 0x00, 0x00, 0x1B, 0xBC, 0xCB, 0x20, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xAC, 0xBC, 0x20, 0x00,
-0x00, 0x00, 0x00, 0x1D, 0x9C, 0xAD, 0x20, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x8C, 0x9E, 0x20, 0x00,
-0x00, 0x00, 0x00, 0x1F, 0x7C, 0x8F, 0x20, 0x00, 0x00, 0x00, 0x00, 0x20, 0x6C, 0x80, 0x20, 0x00,
-0x00, 0x00, 0x00, 0x21, 0x5C, 0x71, 0x20, 0x00, 0x00, 0x00, 0x00, 0x22, 0x4C, 0x62, 0x20, 0x00,
-0x00, 0x00, 0x00, 0x23, 0x3C, 0x53, 0x20, 0x00, 0x00, 0x00, 0x00, 0x24, 0x2C, 0x44, 0x20, 0x00,
-0x00, 0x00, 0x00, 0x25, 0x1C, 0x35, 0x20, 0x00, 0x00, 0x00, 0x00, 0x26, 0x0C, 0x26, 0x20, 0x00,
-0x00, 0x00, 0x00, 0x27, 0x05, 0x51, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x27, 0xF5, 0x42, 0xA0, 0x00,
-0x00, 0x00, 0x00, 0x28, 0xE5, 0x33, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x29, 0xD5, 0x24, 0xA0, 0x00,
-0x00, 0x00, 0x00, 0x2A, 0xC5, 0x15, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xB4, 0xF8, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x2C, 0xA4, 0xE9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x94, 0xDA, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x2E, 0x84, 0xCB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x74, 0xBC, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x30, 0x64, 0xAD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x31, 0x5D, 0xD9, 0x10, 0x01,
-0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
+0xFF, 0xFF, 0xFF, 0xF8, 0xF3, 0x62, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF9, 0xE3, 0x53, 0xC0, 0x00,
+0x00, 0x00, 0x00, 0x17, 0x03, 0xCD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x17, 0xF3, 0xBE, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x18, 0xE3, 0xAF, 0x90, 0x00, 0x00, 0x00, 0x00, 0x19, 0xD3, 0xA0, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x1A, 0xC3, 0x91, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xBC, 0xBD, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x1C, 0xAC, 0xAE, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1D, 0x9C, 0x9F, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x1E, 0x8C, 0x90, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1F, 0x7C, 0x81, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x20, 0x6C, 0x72, 0x10, 0x00, 0x00, 0x00, 0x00, 0x21, 0x5C, 0x63, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x22, 0x4C, 0x54, 0x10, 0x00, 0x00, 0x00, 0x00, 0x23, 0x3C, 0x45, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x24, 0x2C, 0x36, 0x10, 0x00, 0x00, 0x00, 0x00, 0x25, 0x1C, 0x27, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x26, 0x0C, 0x18, 0x10, 0x00, 0x00, 0x00, 0x00, 0x27, 0x05, 0x43, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x27, 0xF5, 0x34, 0x90, 0x00, 0x00, 0x00, 0x00, 0x28, 0xE5, 0x25, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x29, 0xD5, 0x16, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xC5, 0x07, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x2B, 0x3D, 0x0E, 0x20, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xB4, 0xF8, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x2C, 0x1F, 0xC2, 0x10, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xA4, 0xE9, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x2D, 0x94, 0xDA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2E, 0x84, 0xCB, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x2F, 0x74, 0xBC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x30, 0x64, 0xAD, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x31, 0x5D, 0xD9, 0x10, 0x01, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
-0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x04, 0x02, 0x03, 0x02,
-0x04, 0x02, 0x03, 0x02, 0x04, 0x02, 0x03, 0x02, 0x04, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
+0x03, 0x02, 0x03, 0x02, 0x04, 0x02, 0x03, 0x02, 0x04, 0x02, 0x03, 0x02, 0x04, 0x02, 0x03, 0x02,
+0x04, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
-0x03, 0x02, 0x03, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05,
-0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05,
-0x04, 0x05, 0x04, 0x06, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0xFF, 0xFF, 0xE7, 0xF0, 0x00,
-0x00, 0xFF, 0xFF, 0xE5, 0x28, 0x00, 0x04, 0xFF, 0xFF, 0xF1, 0xF0, 0x01, 0x08, 0xFF, 0xFF, 0xE3,
-0xE0, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x01, 0x10, 0xFF, 0xFF, 0xF1, 0xF0, 0x00, 0x08, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x14, 0x4C, 0x4D, 0x54, 0x00, 0x48, 0x4D, 0x54, 0x00, 0x2D, 0x30, 0x31,
-0x00, 0x2D, 0x30, 0x32, 0x00, 0x2B, 0x30, 0x30, 0x00, 0x57, 0x45, 0x54, 0x00, 0x0A, 0x3C, 0x2D,
-0x30, 0x31, 0x3E, 0x31, 0x3C, 0x2B, 0x30, 0x30, 0x3E, 0x2C, 0x4D, 0x33, 0x2E, 0x35, 0x2E, 0x30,
-0x2F, 0x30, 0x2C, 0x4D, 0x31, 0x30, 0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x31, 0x0A, 0x00, 0xC2, 0xE7,
-0xD5, 0x00, 0xEB, 0x7E, 0x75, 0x00, 0x00, 0x00, 0x06, 0x41, 0x7A, 0x6F, 0x72, 0x65, 0x73, 
+0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x05, 0x04, 0x05, 0x04,
+0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04,
+0x05, 0x04, 0x05, 0x07, 0x06, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0xFF, 0xFF, 0xE7, 0xF0,
+0x00, 0x00, 0xFF, 0xFF, 0xE5, 0x28, 0x00, 0x04, 0xFF, 0xFF, 0xF1, 0xF0, 0x01, 0x08, 0xFF, 0xFF,
+0xE3, 0xE0, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x01, 0x10, 0xFF, 0xFF, 0xF1, 0xF0, 0x00, 0x08,
+0x00, 0x00, 0x0E, 0x10, 0x01, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x19, 0x4C, 0x4D, 0x54, 0x00,
+0x48, 0x4D, 0x54, 0x00, 0x2D, 0x30, 0x31, 0x00, 0x2D, 0x30, 0x32, 0x00, 0x2B, 0x30, 0x30, 0x00,
+0x57, 0x45, 0x53, 0x54, 0x00, 0x57, 0x45, 0x54, 0x00, 0x0A, 0x3C, 0x2D, 0x30, 0x31, 0x3E, 0x31,
+0x3C, 0x2B, 0x30, 0x30, 0x3E, 0x2C, 0x4D, 0x33, 0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x30, 0x2C, 0x4D,
+0x31, 0x30, 0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x31, 0x0A, 0x00, 0xC2, 0xE7, 0xD5, 0x00, 0xEB, 0x7E,
+0x75, 0x00, 0x00, 0x00, 0x06, 0x41, 0x7A, 0x6F, 0x72, 0x65, 0x73, 
 
 /* Atlantic/Bermuda */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x42, 0x4D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -14051,15 +14159,15 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8C, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x1D, 0xFF,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x83, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x1D, 0xFF,
 0xFF, 0xFF, 0xFF, 0x5E, 0x3D, 0x13, 0x58, 0xFF, 0xFF, 0xFF, 0xFF, 0x92, 0xE6, 0x9C, 0x90, 0xFF,
 0xFF, 0xFF, 0xFF, 0x9B, 0x4B, 0x7B, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0x9B, 0xFE, 0xD5, 0x90, 0xFF,
-0xFF, 0xFF, 0xFF, 0x9C, 0x9C, 0xFB, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0x9D, 0xC9, 0x91, 0x80, 0xFF,
-0xFF, 0xFF, 0xFF, 0x9E, 0x7F, 0x80, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0x9F, 0xAA, 0xC5, 0x00, 0xFF,
-0xFF, 0xFF, 0xFF, 0xA0, 0x5F, 0x62, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xA1, 0x8B, 0xF8, 0x80, 0xFF,
-0xFF, 0xFF, 0xFF, 0xA2, 0x41, 0xE7, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xA3, 0x6E, 0x7D, 0x80, 0xFF,
-0xFF, 0xFF, 0xFF, 0xA4, 0x23, 0x1B, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0x4F, 0xB1, 0x00, 0xFF,
-0xFF, 0xFF, 0xFF, 0xAA, 0x05, 0xFD, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xAA, 0xF4, 0x9D, 0x00, 0xFF,
+0xFF, 0xFF, 0xFF, 0x9C, 0x9D, 0x09, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0x9D, 0xC9, 0x91, 0x80, 0xFF,
+0xFF, 0xFF, 0xFF, 0x9E, 0x7E, 0x3D, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0x9F, 0xAA, 0xC5, 0x00, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA0, 0x5F, 0x70, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xA1, 0x8B, 0xF8, 0x80, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA2, 0x41, 0xF5, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xA3, 0x6E, 0x7D, 0x80, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA4, 0x23, 0x29, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0x4F, 0xB1, 0x00, 0xFF,
+0xFF, 0xFF, 0xFF, 0xAA, 0x05, 0xFD, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xAA, 0xE7, 0x6E, 0x00, 0xFF,
 0xFF, 0xFF, 0xFF, 0xAD, 0xC9, 0xB6, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xAE, 0xA7, 0x32, 0x00, 0xFF,
 0xFF, 0xFF, 0xFF, 0xAF, 0xA0, 0x5D, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xB0, 0x87, 0x14, 0x00, 0xFF,
 0xFF, 0xFF, 0xFF, 0xB1, 0x89, 0x7A, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xB2, 0x70, 0x30, 0x80, 0xFF,
@@ -14072,7 +14180,7 @@
 0xFF, 0xFF, 0xFF, 0xC2, 0x68, 0x6C, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xC3, 0x58, 0x5D, 0x00, 0xFF,
 0xFF, 0xFF, 0xFF, 0xC4, 0x3F, 0x13, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xC5, 0x38, 0x3F, 0x00, 0xFF,
 0xFF, 0xFF, 0xFF, 0xC6, 0x3A, 0xA5, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xC7, 0x58, 0xBA, 0x80, 0xFF,
-0xFF, 0xFF, 0xFF, 0xC7, 0xD9, 0xED, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0x01, 0x3D, 0x80, 0xFF,
+0xFF, 0xFF, 0xFF, 0xC7, 0xD9, 0xED, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0x03, 0xE0, 0x80, 0xFF,
 0xFF, 0xFF, 0xFF, 0xC9, 0xF1, 0x2E, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xCA, 0xE2, 0x71, 0x00, 0xFF,
 0xFF, 0xFF, 0xFF, 0xCB, 0xB5, 0x61, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0xEC, 0xB1, 0xF0, 0xFF,
 0xFF, 0xFF, 0xFF, 0xCC, 0x80, 0x59, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCC, 0xDC, 0xB1, 0x00, 0xFF,
@@ -14102,43 +14210,38 @@
 0xFF, 0xFF, 0xFF, 0xF3, 0x53, 0xAE, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x43, 0x9F, 0xB0, 0xFF,
 0xFF, 0xFF, 0xFF, 0xF5, 0x33, 0x90, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF6, 0x23, 0x81, 0xB0, 0xFF,
 0xFF, 0xFF, 0xFF, 0xF7, 0x13, 0x72, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x03, 0x63, 0xB0, 0xFF,
-0xFF, 0xFF, 0xFF, 0xF8, 0xF3, 0x54, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x0D, 0x9B, 0x1B, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x0E, 0x8B, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x84, 0x37, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x10, 0x74, 0x28, 0x80, 0x00, 0x00, 0x00, 0x00, 0x11, 0x64, 0x19, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x12, 0x54, 0x18, 0x90, 0x00, 0x00, 0x00, 0x00, 0x13, 0x43, 0xFB, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x14, 0x33, 0xFA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x15, 0x23, 0xEB, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x16, 0x13, 0xDC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x17, 0x03, 0xCD, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x17, 0xF3, 0xBE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x18, 0xE3, 0xBD, 0xA0, 0x00,
-0x00, 0x00, 0x00, 0x19, 0xD3, 0xA0, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xC3, 0x91, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x1B, 0xBC, 0xBD, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xAC, 0xAE, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x1D, 0x9C, 0x9F, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x8C, 0x90, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x1F, 0x7C, 0x81, 0x10, 0x00, 0x00, 0x00, 0x00, 0x20, 0x6C, 0x72, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x21, 0x5C, 0x63, 0x10, 0x00, 0x00, 0x00, 0x00, 0x22, 0x4C, 0x54, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x23, 0x3C, 0x45, 0x10, 0x00, 0x00, 0x00, 0x00, 0x24, 0x2C, 0x36, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x25, 0x1C, 0x27, 0x10, 0x00, 0x00, 0x00, 0x00, 0x26, 0x0C, 0x18, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x27, 0x05, 0x43, 0x90, 0x00, 0x00, 0x00, 0x00, 0x27, 0xF5, 0x34, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x28, 0xE5, 0x25, 0x90, 0x00, 0x00, 0x00, 0x00, 0x29, 0xD5, 0x16, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x2A, 0xC5, 0x07, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xB4, 0xF8, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x2C, 0xA4, 0xE9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x94, 0xDA, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x2E, 0x84, 0xCB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x74, 0xBC, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x30, 0x64, 0xAD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x31, 0x5D, 0xD9, 0x10, 0x01,
-0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
+0xFF, 0xFF, 0xFF, 0xF8, 0xF3, 0x54, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF9, 0xE3, 0x45, 0xB0, 0x00,
+0x00, 0x00, 0x00, 0x17, 0x0C, 0xFA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x17, 0xF3, 0xB0, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x18, 0xE3, 0xA1, 0x80, 0x00, 0x00, 0x00, 0x00, 0x19, 0xD3, 0x92, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x1A, 0xC3, 0x83, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xBC, 0xAF, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x1C, 0xAC, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1D, 0x9C, 0x91, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x1E, 0x8C, 0x82, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1F, 0x7C, 0x81, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x20, 0x6C, 0x72, 0x10, 0x00, 0x00, 0x00, 0x00, 0x21, 0x5C, 0x63, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x22, 0x4C, 0x54, 0x10, 0x00, 0x00, 0x00, 0x00, 0x23, 0x3C, 0x45, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x24, 0x2C, 0x36, 0x10, 0x00, 0x00, 0x00, 0x00, 0x25, 0x1C, 0x27, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x26, 0x0C, 0x18, 0x10, 0x00, 0x00, 0x00, 0x00, 0x27, 0x05, 0x43, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x27, 0xF5, 0x34, 0x90, 0x00, 0x00, 0x00, 0x00, 0x28, 0xE5, 0x25, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x29, 0xD5, 0x16, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xC5, 0x07, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x2B, 0xB4, 0xF8, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xA4, 0xE9, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x2D, 0x94, 0xDA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2E, 0x84, 0xCB, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x2F, 0x74, 0xBC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x30, 0x64, 0xAD, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x31, 0x5D, 0xD9, 0x10, 0x01, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
-0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x04, 0x02, 0x03, 0x02,
-0x04, 0x02, 0x03, 0x02, 0x04, 0x02, 0x03, 0x02, 0x04, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
+0x03, 0x02, 0x03, 0x02, 0x04, 0x02, 0x03, 0x02, 0x04, 0x02, 0x03, 0x02, 0x04, 0x02, 0x03, 0x02,
+0x04, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
-0x03, 0x02, 0x03, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06,
+0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x05, 0x06, 0x05, 0x06,
 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06,
-0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0xFF, 0xFF, 0xF0, 0x28, 0x00,
-0x00, 0xFF, 0xFF, 0xF0, 0x28, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x01, 0x08, 0xFF, 0xFF, 0xF1,
-0xF0, 0x00, 0x0C, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x10, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x14, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x19, 0x4C, 0x4D, 0x54, 0x00, 0x46, 0x4D, 0x54, 0x00, 0x2B, 0x30, 0x30,
-0x00, 0x2D, 0x30, 0x31, 0x00, 0x2B, 0x30, 0x31, 0x00, 0x57, 0x45, 0x53, 0x54, 0x00, 0x57, 0x45,
-0x54, 0x00, 0x0A, 0x57, 0x45, 0x54, 0x30, 0x57, 0x45, 0x53, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x35,
-0x2E, 0x30, 0x2F, 0x31, 0x2C, 0x4D, 0x31, 0x30, 0x2E, 0x35, 0x2E, 0x30, 0x0A, 0x00, 0xBB, 0x1F,
-0xA5, 0x00, 0xF8, 0xDE, 0xF0, 0x00, 0x00, 0x00, 0x0F, 0x4D, 0x61, 0x64, 0x65, 0x69, 0x72, 0x61,
-0x20, 0x49, 0x73, 0x6C, 0x61, 0x6E, 0x64, 0x73, 
+0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0xFF, 0xFF, 0xF0, 0x28, 0x00, 0x00,
+0xFF, 0xFF, 0xF0, 0x28, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x01, 0x08, 0xFF, 0xFF, 0xF1, 0xF0,
+0x00, 0x0C, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00,
+0x0E, 0x10, 0x01, 0x18, 0x4C, 0x4D, 0x54, 0x00, 0x46, 0x4D, 0x54, 0x00, 0x2B, 0x30, 0x30, 0x00,
+0x2D, 0x30, 0x31, 0x00, 0x2B, 0x30, 0x31, 0x00, 0x57, 0x45, 0x54, 0x00, 0x57, 0x45, 0x53, 0x54,
+0x00, 0x0A, 0x57, 0x45, 0x54, 0x30, 0x57, 0x45, 0x53, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x35, 0x2E,
+0x30, 0x2F, 0x31, 0x2C, 0x4D, 0x31, 0x30, 0x2E, 0x35, 0x2E, 0x30, 0x0A, 0x00, 0xBB, 0x1F, 0xA5,
+0x00, 0xF8, 0xDE, 0xF0, 0x00, 0x00, 0x00, 0x0F, 0x4D, 0x61, 0x64, 0x65, 0x69, 0x72, 0x61, 0x20,
+0x49, 0x73, 0x6C, 0x61, 0x6E, 0x64, 0x73, 
 
 /* Atlantic/Reykjavik */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x49, 0x53, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -16195,41 +16298,71 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x35, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x09, 0xFF,
-0xFF, 0xFF, 0xFF, 0x9B, 0x0C, 0x17, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0x9B, 0xD5, 0xDA, 0xF0, 0xFF,
-0xFF, 0xFF, 0xFF, 0x9C, 0xD9, 0xAE, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0x9D, 0xA4, 0xB5, 0x90, 0xFF,
-0xFF, 0xFF, 0xFF, 0x9E, 0xB9, 0x90, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0x9F, 0x84, 0x97, 0x90, 0xFF,
-0xFF, 0xFF, 0xFF, 0xC8, 0x09, 0x71, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xCC, 0xE7, 0x4B, 0x10, 0xFF,
-0xFF, 0xFF, 0xFF, 0xCD, 0xA9, 0x17, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xCE, 0xA2, 0x43, 0x10, 0xFF,
-0xFF, 0xFF, 0xFF, 0xCF, 0x92, 0x34, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xD0, 0x82, 0x25, 0x10, 0xFF,
-0xFF, 0xFF, 0xFF, 0xD1, 0x72, 0x16, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x4E, 0x40, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x0D, 0xA4, 0x63, 0x90, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x8B, 0x1A, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x0F, 0x84, 0x45, 0x90, 0x00, 0x00, 0x00, 0x00, 0x10, 0x74, 0x36, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x11, 0x64, 0x27, 0x90, 0x00, 0x00, 0x00, 0x00, 0x12, 0x54, 0x18, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x13, 0x4D, 0x44, 0x10, 0x00, 0x00, 0x00, 0x00, 0x14, 0x33, 0xFA, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x15, 0x23, 0xEB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x16, 0x13, 0xDC, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x17, 0x03, 0xCD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x17, 0xF3, 0xBE, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x18, 0xE3, 0xAF, 0x90, 0x00, 0x00, 0x00, 0x00, 0x19, 0xD3, 0xA0, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x1A, 0xC3, 0x91, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xBC, 0xBD, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x1C, 0xAC, 0xAE, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1D, 0x9C, 0x9F, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x1E, 0x8C, 0x90, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1F, 0x7C, 0x81, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x20, 0x6C, 0x72, 0x10, 0x00, 0x00, 0x00, 0x00, 0x21, 0x5C, 0x63, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x22, 0x4C, 0x54, 0x10, 0x00, 0x00, 0x00, 0x00, 0x23, 0x3C, 0x45, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x24, 0x2C, 0x36, 0x10, 0x00, 0x00, 0x00, 0x00, 0x25, 0x1C, 0x27, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x26, 0x0C, 0x18, 0x10, 0x00, 0x00, 0x00, 0x00, 0x27, 0x05, 0x43, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x27, 0xF5, 0x34, 0x90, 0x00, 0x00, 0x00, 0x00, 0x28, 0xE5, 0x25, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x29, 0xD5, 0x16, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xC5, 0x07, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x2B, 0xB4, 0xF8, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xA4, 0xE9, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x2D, 0x94, 0xDA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2E, 0x84, 0xCB, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x2F, 0x74, 0xBC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x30, 0x64, 0xAD, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x31, 0x5D, 0xD9, 0x10, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x0E, 0x10,
-0x00, 0x05, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x00, 0x43, 0x45, 0x53, 0x54, 0x00, 0x43, 0x45, 0x54,
-0x00, 0x0A, 0x43, 0x45, 0x54, 0x2D, 0x31, 0x43, 0x45, 0x53, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x35,
-0x2E, 0x30, 0x2C, 0x4D, 0x31, 0x30, 0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x33, 0x0A, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x1A, 0xFF,
+0xFF, 0xFF, 0xFF, 0x56, 0xB6, 0xDF, 0xE6, 0xFF, 0xFF, 0xFF, 0xFF, 0x6D, 0xE8, 0xC8, 0x00, 0xFF,
+0xFF, 0xFF, 0xFF, 0x98, 0x44, 0x49, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0x9B, 0x0C, 0x25, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0x9B, 0xD5, 0xDA, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0x9C, 0xD9, 0xAE, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0x9D, 0xA4, 0xB5, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0x9E, 0xB9, 0x90, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0x9F, 0x84, 0x97, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0x9F, 0xCE, 0xF8, 0x30, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA0, 0x60, 0xA5, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xA1, 0x7E, 0xBB, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA2, 0x2E, 0x12, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xA3, 0x7A, 0x4C, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA4, 0x35, 0x81, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0x5E, 0x23, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA6, 0x25, 0x35, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xA7, 0x27, 0x9B, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA8, 0x2A, 0x01, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xA9, 0x07, 0x7D, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA9, 0xEE, 0x34, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAA, 0xE7, 0x5F, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xAB, 0xD7, 0x50, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xAC, 0xC7, 0x41, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xAD, 0xC9, 0xA7, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xAE, 0xA7, 0x23, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xAF, 0xA0, 0x4F, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB0, 0x87, 0x05, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB1, 0x89, 0x6B, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB2, 0x70, 0x4C, 0xA0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB3, 0x72, 0xB2, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB4, 0x50, 0x2E, 0xA0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB5, 0x49, 0x5A, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xB6, 0x30, 0x10, 0xA0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB7, 0x32, 0x76, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0x0F, 0xF2, 0xA0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB8, 0xFF, 0xE3, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB9, 0xEF, 0xD4, 0xA0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xBA, 0xD6, 0x8B, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xBB, 0xD8, 0xF1, 0x20, 0xFF,
+0xFF, 0xFF, 0xFF, 0xBC, 0xC8, 0xE2, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xBD, 0xB8, 0xD3, 0x20, 0xFF,
+0xFF, 0xFF, 0xFF, 0xBE, 0x9F, 0x89, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xBF, 0x98, 0xB5, 0x20, 0xFF,
+0xFF, 0xFF, 0xFF, 0xC0, 0x9B, 0x1B, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xC1, 0x78, 0x97, 0x20, 0xFF,
+0xFF, 0xFF, 0xFF, 0xC2, 0x68, 0x88, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xC3, 0x58, 0x79, 0x20, 0xFF,
+0xFF, 0xFF, 0xFF, 0xC4, 0x3F, 0x2F, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC5, 0x38, 0x5B, 0x20, 0xFF,
+0xFF, 0xFF, 0xFF, 0xC6, 0x3A, 0xC1, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xC7, 0x58, 0xD6, 0xA0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xC7, 0xDA, 0x09, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC8, 0x4A, 0x19, 0x20, 0xFF,
+0xFF, 0xFF, 0xFF, 0xCC, 0xE7, 0x4B, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xCD, 0xA9, 0x17, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xCE, 0xA2, 0x43, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xCF, 0x92, 0x34, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD0, 0x6E, 0x5E, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xD1, 0x72, 0x16, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD2, 0x4E, 0x40, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xD3, 0x91, 0x40, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD4, 0x4B, 0x23, 0x90, 0x00, 0x00, 0x00, 0x00, 0x0D, 0xA4, 0x63, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x0E, 0x8B, 0x1A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x84, 0x45, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x10, 0x74, 0x36, 0x90, 0x00, 0x00, 0x00, 0x00, 0x11, 0x64, 0x27, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x12, 0x54, 0x18, 0x90, 0x00, 0x00, 0x00, 0x00, 0x13, 0x4D, 0x44, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x14, 0x33, 0xFA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x15, 0x23, 0xEB, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x16, 0x13, 0xDC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x17, 0x03, 0xCD, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x17, 0xF3, 0xBE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x18, 0xE3, 0xAF, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x19, 0xD3, 0xA0, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xC3, 0x91, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x1B, 0xBC, 0xBD, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xAC, 0xAE, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x1D, 0x9C, 0x9F, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x8C, 0x90, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x1F, 0x7C, 0x81, 0x10, 0x00, 0x00, 0x00, 0x00, 0x20, 0x6C, 0x72, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x21, 0x5C, 0x63, 0x10, 0x00, 0x00, 0x00, 0x00, 0x22, 0x4C, 0x54, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x23, 0x3C, 0x45, 0x10, 0x00, 0x00, 0x00, 0x00, 0x24, 0x2C, 0x36, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x25, 0x1C, 0x27, 0x10, 0x00, 0x00, 0x00, 0x00, 0x26, 0x0C, 0x18, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x27, 0x05, 0x43, 0x90, 0x00, 0x00, 0x00, 0x00, 0x27, 0xF5, 0x34, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x28, 0xE5, 0x25, 0x90, 0x00, 0x00, 0x00, 0x00, 0x29, 0xD5, 0x16, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x2A, 0xC5, 0x07, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xB4, 0xF8, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x2C, 0xA4, 0xE9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x94, 0xDA, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x2E, 0x84, 0xCB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x74, 0xBC, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x30, 0x64, 0xAD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x31, 0x5D, 0xD9, 0x10, 0x01,
+0x02, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05,
+0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05,
+0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05,
+0x02, 0x05, 0x02, 0x05, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
+0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
+0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
+0x04, 0x03, 0x04, 0x03, 0x04, 0x00, 0x00, 0x04, 0x1A, 0x00, 0x00, 0x00, 0x00, 0x04, 0x1A, 0x00,
+0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x0C, 0x00, 0x00, 0x1C,
+0x20, 0x01, 0x10, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x15, 0x4C, 0x4D, 0x54, 0x00, 0x42, 0x4D, 0x54,
+0x00, 0x57, 0x45, 0x54, 0x00, 0x43, 0x45, 0x54, 0x00, 0x43, 0x45, 0x53, 0x54, 0x00, 0x57, 0x45,
+0x53, 0x54, 0x00, 0x0A, 0x43, 0x45, 0x54, 0x2D, 0x31, 0x43, 0x45, 0x53, 0x54, 0x2C, 0x4D, 0x33,
+0x2E, 0x35, 0x2E, 0x30, 0x2C, 0x4D, 0x31, 0x30, 0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x33, 0x0A, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 
 /* Chile/Continental */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -16402,62 +16535,112 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x58, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x10, 0xFF,
-0xFF, 0xFF, 0xFF, 0x9E, 0xA6, 0x2C, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0x9F, 0xBA, 0xF9, 0x70, 0xFF,
-0xFF, 0xFF, 0xFF, 0xA0, 0x86, 0x0E, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xA1, 0x9A, 0xDB, 0x70, 0xFF,
-0xFF, 0xFF, 0xFF, 0xCB, 0x88, 0xFE, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x23, 0xF4, 0x70, 0xFF,
-0xFF, 0xFF, 0xFF, 0xD2, 0x61, 0x09, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0xF8, 0x67, 0x00, 0xFF,
-0xFF, 0xFF, 0xFF, 0xFB, 0xE8, 0x49, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0xD8, 0x49, 0x00, 0xFF,
-0xFF, 0xFF, 0xFF, 0xFD, 0xC8, 0x2B, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xB8, 0x2B, 0x00, 0xFF,
-0xFF, 0xFF, 0xFF, 0xFF, 0xA8, 0x0D, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x98, 0x0D, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x01, 0x87, 0xEF, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x02, 0x77, 0xEF, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x03, 0x71, 0x0C, 0x70, 0x00, 0x00, 0x00, 0x00, 0x04, 0x61, 0x0B, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x05, 0x50, 0xEE, 0x70, 0x00, 0x00, 0x00, 0x00, 0x06, 0x40, 0xED, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x07, 0x30, 0xD0, 0x70, 0x00, 0x00, 0x00, 0x00, 0x07, 0x8D, 0x27, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x09, 0x10, 0xB2, 0x70, 0x00, 0x00, 0x00, 0x00, 0x09, 0xAD, 0xA3, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x0A, 0xF0, 0x94, 0x70, 0x00, 0x00, 0x00, 0x00, 0x0B, 0xE0, 0x93, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x0C, 0xD9, 0xB0, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x0D, 0xC0, 0x75, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x0E, 0xB9, 0x92, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xA9, 0x92, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x10, 0x99, 0x74, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x11, 0x89, 0x74, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x12, 0x79, 0x56, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x13, 0x69, 0x56, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x14, 0x59, 0x38, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x15, 0x49, 0x38, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x16, 0x39, 0x1A, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x17, 0x29, 0x1A, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x18, 0x22, 0x37, 0x70, 0x00, 0x00, 0x00, 0x00, 0x19, 0x08, 0xFC, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x1A, 0x02, 0x19, 0x70, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xF2, 0x18, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x1B, 0xE1, 0xFB, 0x70, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xD1, 0xFA, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x1D, 0xC1, 0xDD, 0x70, 0x00, 0x00, 0x00, 0x00, 0x1E, 0xB1, 0xDC, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x1F, 0xA1, 0xBF, 0x70, 0x00, 0x00, 0x00, 0x00, 0x20, 0x76, 0x0F, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x21, 0x81, 0xA1, 0x70, 0x00, 0x00, 0x00, 0x00, 0x22, 0x55, 0xF1, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x23, 0x6A, 0xBD, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x24, 0x35, 0xD3, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x25, 0x4A, 0x9F, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x26, 0x15, 0xB5, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x27, 0x2A, 0x81, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x27, 0xFE, 0xD1, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x29, 0x0A, 0x63, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x29, 0xDE, 0xB3, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x2A, 0xEA, 0x45, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xBE, 0x95, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x2C, 0xD3, 0x62, 0x70, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x9E, 0x77, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x2E, 0xB3, 0x44, 0x70, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x7E, 0x59, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x30, 0x93, 0x26, 0x70, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x76, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x32, 0x73, 0x08, 0x70, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x58, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x34, 0x52, 0xEA, 0x70, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x3A, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x36, 0x32, 0xCC, 0x70, 0x00, 0x00, 0x00, 0x00, 0x37, 0x07, 0x1C, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x38, 0x1B, 0xE8, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x38, 0xE6, 0xFE, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x39, 0xFB, 0xCA, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xC6, 0xE0, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x3B, 0xDB, 0xAC, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xAF, 0xFC, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x3D, 0xBB, 0x8E, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x8F, 0xDE, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x3F, 0x9B, 0x70, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x40, 0x6F, 0xC0, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x41, 0x84, 0x8D, 0x70, 0x00, 0x00, 0x00, 0x00, 0x42, 0x4F, 0xA2, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x43, 0x64, 0x6F, 0x70, 0x00, 0x00, 0x00, 0x00, 0x44, 0x2F, 0x84, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x45, 0x44, 0x51, 0x70, 0x00, 0x00, 0x00, 0x00, 0x45, 0xF3, 0xB7, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x02, 0x03, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x04, 0xFF, 0xFF, 0xB9,
-0xB0, 0x01, 0x00, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x08, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x0C, 0x43,
-0x44, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x43, 0x57, 0x54, 0x00, 0x43, 0x50, 0x54, 0x00, 0x0A,
-0x43, 0x53, 0x54, 0x36, 0x43, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D,
-0x31, 0x31, 0x2E, 0x31, 0x2E, 0x30, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAF, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x18, 0xFF,
+0xFF, 0xFF, 0xFF, 0x5E, 0x03, 0xFE, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0x9E, 0xA6, 0x2C, 0x80, 0xFF,
+0xFF, 0xFF, 0xFF, 0x9F, 0xBA, 0xF9, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xA0, 0x86, 0x0E, 0x80, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA1, 0x9A, 0xDB, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xA2, 0xCB, 0x74, 0x00, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA3, 0x83, 0xF7, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xA4, 0x45, 0xD2, 0x80, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA5, 0x63, 0xD9, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xA6, 0x53, 0xD9, 0x00, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA7, 0x15, 0x97, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xA8, 0x33, 0xBB, 0x00, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA8, 0xFE, 0xB3, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xAA, 0x13, 0x9D, 0x00, 0xFF,
+0xFF, 0xFF, 0xFF, 0xAA, 0xDE, 0x95, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xAB, 0xF3, 0x7F, 0x00, 0xFF,
+0xFF, 0xFF, 0xFF, 0xAC, 0xBE, 0x77, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xAD, 0xD3, 0x61, 0x00, 0xFF,
+0xFF, 0xFF, 0xFF, 0xAE, 0x9E, 0x59, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xB3, 0x43, 0x00, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB0, 0x7E, 0x3B, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB1, 0x9C, 0x5F, 0x80, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB2, 0x67, 0x58, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB3, 0x7C, 0x41, 0x80, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB4, 0x47, 0x3A, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB5, 0x5C, 0x23, 0x80, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB6, 0x27, 0x1C, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x3C, 0x05, 0x80, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB8, 0x06, 0xFE, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB9, 0x1B, 0xE7, 0x80, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB9, 0xE6, 0xE0, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xBB, 0x05, 0x04, 0x00, 0xFF,
+0xFF, 0xFF, 0xFF, 0xBB, 0xC6, 0xC2, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xBC, 0xE4, 0xE6, 0x00, 0xFF,
+0xFF, 0xFF, 0xFF, 0xBD, 0xAF, 0xDE, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xBE, 0xC4, 0xC8, 0x00, 0xFF,
+0xFF, 0xFF, 0xFF, 0xBF, 0x8F, 0xC0, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC0, 0x5A, 0xD6, 0x00, 0xFF,
+0xFF, 0xFF, 0xFF, 0xC1, 0xB0, 0x3C, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xC2, 0x84, 0x8C, 0x00, 0xFF,
+0xFF, 0xFF, 0xFF, 0xC3, 0x4F, 0x84, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC4, 0x64, 0x6E, 0x00, 0xFF,
+0xFF, 0xFF, 0xFF, 0xC5, 0x2F, 0x66, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC6, 0x4D, 0x8A, 0x80, 0xFF,
+0xFF, 0xFF, 0xFF, 0xC7, 0x0F, 0x48, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC8, 0x2D, 0x6C, 0x80, 0xFF,
+0xFF, 0xFF, 0xFF, 0xC8, 0xF8, 0x65, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xCA, 0x0D, 0x4E, 0x80, 0xFF,
+0xFF, 0xFF, 0xFF, 0xCA, 0xD8, 0x47, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0x88, 0xFE, 0x80, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD2, 0x23, 0xF4, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x61, 0x09, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD3, 0x75, 0xF3, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xD4, 0x40, 0xEB, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD5, 0x55, 0xD5, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xD6, 0x20, 0xCD, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD7, 0x35, 0xB7, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xD8, 0x00, 0xAF, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD9, 0x15, 0x99, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xD9, 0xE0, 0x91, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xDA, 0xFE, 0xB5, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xDB, 0xC0, 0x73, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xDC, 0xDE, 0x97, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xDD, 0xA9, 0x90, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xDE, 0xBE, 0x79, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0x89, 0x72, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xE0, 0x9E, 0x5B, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xE1, 0x69, 0x54, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xE2, 0x7E, 0x3D, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xE3, 0x49, 0x36, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xE4, 0x5E, 0x1F, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xE5, 0x57, 0x3C, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xE6, 0x47, 0x3C, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xE7, 0x37, 0x1E, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xE8, 0x27, 0x1E, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xE9, 0x17, 0x00, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xEA, 0x07, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xEA, 0xF6, 0xE2, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xEB, 0xE6, 0xE2, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xEC, 0xD6, 0xC4, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xED, 0xC6, 0xC4, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xEE, 0xBF, 0xE1, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xEF, 0xAF, 0xE0, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xF0, 0x9F, 0xC3, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xF1, 0x8F, 0xC2, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xF2, 0x7F, 0xA5, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xF3, 0x6F, 0xA4, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x5F, 0x87, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xF5, 0x4F, 0x86, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xF6, 0x3F, 0x69, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xF7, 0x2F, 0x68, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x28, 0x85, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xF9, 0x0F, 0x4A, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x08, 0x67, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xFA, 0xF8, 0x67, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFB, 0xE8, 0x49, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xFC, 0xD8, 0x49, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFD, 0xC8, 0x2B, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xFE, 0xB8, 0x2B, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xA8, 0x0D, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x98, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x87, 0xEF, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x02, 0x77, 0xEF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x71, 0x0C, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x04, 0x61, 0x0B, 0x80, 0x00, 0x00, 0x00, 0x00, 0x05, 0x50, 0xEE, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x06, 0x40, 0xED, 0x80, 0x00, 0x00, 0x00, 0x00, 0x07, 0x30, 0xD0, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x07, 0x8D, 0x27, 0x80, 0x00, 0x00, 0x00, 0x00, 0x09, 0x10, 0xB2, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x09, 0xAD, 0xA3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0xF0, 0x94, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x0B, 0xE0, 0x93, 0x80, 0x00, 0x00, 0x00, 0x00, 0x0C, 0xD9, 0xB0, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x0D, 0xC0, 0x75, 0x80, 0x00, 0x00, 0x00, 0x00, 0x0E, 0xB9, 0x92, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x0F, 0xA9, 0x92, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x99, 0x74, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x11, 0x89, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x79, 0x56, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x13, 0x69, 0x56, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x59, 0x38, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x15, 0x49, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16, 0x39, 0x1A, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x17, 0x29, 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x22, 0x37, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x19, 0x08, 0xFC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1A, 0x02, 0x19, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x1A, 0xF2, 0x18, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xE1, 0xFB, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x1C, 0xD1, 0xFA, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC1, 0xDD, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x1E, 0xB1, 0xDC, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA1, 0xBF, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x20, 0x76, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x21, 0x81, 0xA1, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x22, 0x55, 0xF1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x23, 0x6A, 0xBD, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x24, 0x35, 0xD3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x25, 0x4A, 0x9F, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x26, 0x15, 0xB5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x27, 0x2A, 0x81, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x27, 0xFE, 0xD1, 0x80, 0x00, 0x00, 0x00, 0x00, 0x29, 0x0A, 0x63, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x29, 0xDE, 0xB3, 0x80, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xEA, 0x45, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x2B, 0xBE, 0x95, 0x80, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xD3, 0x62, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x2D, 0x9E, 0x77, 0x80, 0x00, 0x00, 0x00, 0x00, 0x2E, 0xB3, 0x44, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x2F, 0x7E, 0x59, 0x80, 0x00, 0x00, 0x00, 0x00, 0x30, 0x93, 0x26, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x31, 0x67, 0x76, 0x00, 0x00, 0x00, 0x00, 0x00, 0x32, 0x73, 0x08, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x33, 0x47, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x34, 0x52, 0xEA, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x35, 0x27, 0x3A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0xCC, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x37, 0x07, 0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x1B, 0xE8, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x38, 0xE6, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0xCA, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x3A, 0xC6, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xDB, 0xAC, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x3C, 0xAF, 0xFC, 0x80, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0x8E, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x3E, 0x8F, 0xDE, 0x80, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x70, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x40, 0x6F, 0xC0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0x8D, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x42, 0x4F, 0xA2, 0x80, 0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x6F, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x44, 0x2F, 0x84, 0x80, 0x00, 0x00, 0x00, 0x00, 0x45, 0x44, 0x51, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x45, 0xF3, 0xB7, 0x00, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x03, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x04, 0x05, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0xFF, 0xFF, 0xAD, 0xD4, 0x00, 0x00, 0xFF, 0xFF, 0xB9, 0xB0,
+0x01, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x0C, 0xFF, 0xFF,
+0xB9, 0xB0, 0x01, 0x10, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x14, 0x4C, 0x4D, 0x54, 0x00, 0x43, 0x44,
+0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x45, 0x53, 0x54, 0x00, 0x43, 0x57, 0x54, 0x00, 0x43, 0x50,
+0x54, 0x00, 0x0A, 0x43, 0x53, 0x54, 0x36, 0x43, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E,
+0x30, 0x2C, 0x4D, 0x31, 0x31, 0x2E, 0x31, 0x2E, 0x30, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 
 /* Cuba */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -16538,11 +16721,19 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x27, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x09, 0x00,
-0x00, 0x00, 0x00, 0x0D, 0xA4, 0x63, 0x90, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x8B, 0x1A, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x0F, 0x84, 0x45, 0x90, 0x00, 0x00, 0x00, 0x00, 0x10, 0x74, 0x36, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x11, 0x64, 0x27, 0x90, 0x00, 0x00, 0x00, 0x00, 0x12, 0x54, 0x18, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x13, 0x4D, 0x44, 0x10, 0x00, 0x00, 0x00, 0x00, 0x14, 0x33, 0xFA, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x37, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x1A, 0xFF,
+0xFF, 0xFF, 0xFF, 0x74, 0x3F, 0x98, 0x44, 0xFF, 0xFF, 0xFF, 0xFF, 0x9B, 0x80, 0x21, 0x80, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB9, 0x7C, 0xE9, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB9, 0xC6, 0xAF, 0xD0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xC9, 0xF2, 0x63, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCA, 0x10, 0xA8, 0x50, 0xFF,
+0xFF, 0xFF, 0xFF, 0xCC, 0xE7, 0x4B, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xCD, 0xAA, 0x4C, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xCE, 0xA2, 0x18, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCF, 0x93, 0x69, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xDF, 0x13, 0x9E, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0xB7, 0x0A, 0x50, 0x00,
+0x00, 0x00, 0x00, 0x09, 0xEC, 0x5E, 0x60, 0x00, 0x00, 0x00, 0x00, 0x0B, 0x18, 0xF4, 0x60, 0x00,
+0x00, 0x00, 0x00, 0x0B, 0xCD, 0xAE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0xBD, 0x9F, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x0D, 0xA4, 0x55, 0x80, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x8C, 0x5D, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x0F, 0x84, 0x37, 0x80, 0x00, 0x00, 0x00, 0x00, 0x10, 0x6A, 0xFC, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x11, 0x64, 0x7B, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x12, 0x52, 0xAA, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x13, 0x46, 0x82, 0x60, 0x00, 0x00, 0x00, 0x00, 0x14, 0x33, 0xC2, 0x50, 0x00,
 0x00, 0x00, 0x00, 0x15, 0x23, 0xEB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x16, 0x13, 0xDC, 0x90, 0x00,
 0x00, 0x00, 0x00, 0x17, 0x03, 0xCD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x17, 0xF3, 0xBE, 0x90, 0x00,
 0x00, 0x00, 0x00, 0x18, 0xE3, 0xAF, 0x90, 0x00, 0x00, 0x00, 0x00, 0x19, 0xD3, 0xA0, 0x90, 0x00,
@@ -16558,13 +16749,17 @@
 0x00, 0x00, 0x00, 0x2B, 0xB4, 0xF8, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xA4, 0xE9, 0x90, 0x00,
 0x00, 0x00, 0x00, 0x2D, 0x94, 0xDA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2E, 0x84, 0xCB, 0x90, 0x00,
 0x00, 0x00, 0x00, 0x2F, 0x74, 0xBC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x30, 0x64, 0xAD, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x31, 0x5D, 0xD9, 0x10, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00,
-0x1C, 0x20, 0x00, 0x05, 0x00, 0x00, 0x2A, 0x30, 0x01, 0x00, 0x45, 0x45, 0x53, 0x54, 0x00, 0x45,
-0x45, 0x54, 0x00, 0x0A, 0x45, 0x45, 0x54, 0x2D, 0x32, 0x45, 0x45, 0x53, 0x54, 0x2C, 0x4D, 0x33,
-0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x33, 0x2C, 0x4D, 0x31, 0x30, 0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x34,
-0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x31, 0x5D, 0xD9, 0x10, 0x01, 0x03, 0x02, 0x03, 0x02, 0x05, 0x04, 0x05, 0x04,
+0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
+0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
+0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x00, 0x00,
+0x16, 0x3C, 0x00, 0x00, 0x00, 0x00, 0x16, 0x3C, 0x00, 0x04, 0x00, 0x00, 0x2A, 0x30, 0x01, 0x08,
+0x00, 0x00, 0x1C, 0x20, 0x00, 0x0D, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x11, 0x00, 0x00, 0x1C, 0x20,
+0x01, 0x15, 0x4C, 0x4D, 0x54, 0x00, 0x41, 0x4D, 0x54, 0x00, 0x45, 0x45, 0x53, 0x54, 0x00, 0x45,
+0x45, 0x54, 0x00, 0x43, 0x45, 0x54, 0x00, 0x43, 0x45, 0x53, 0x54, 0x00, 0x0A, 0x45, 0x45, 0x54,
+0x2D, 0x32, 0x45, 0x45, 0x53, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x33, 0x2C,
+0x4D, 0x31, 0x30, 0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x34, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 
 /* Egypt */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -16754,9 +16949,12 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x04, 0xFF,
-0xFF, 0xB9, 0xB0, 0x00, 0x00, 0x45, 0x53, 0x54, 0x00, 0x0A, 0x45, 0x53, 0x54, 0x35, 0x0A, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0C, 0xFF,
+0xFF, 0xFF, 0xFF, 0x69, 0x87, 0x26, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0x8B, 0xF4, 0x61, 0xE8, 0x01,
+0x02, 0xFF, 0xFF, 0xB5, 0x70, 0x00, 0x00, 0xFF, 0xFF, 0xB5, 0x18, 0x00, 0x04, 0xFF, 0xFF, 0xB9,
+0xB0, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x43, 0x4D, 0x54, 0x00, 0x45, 0x53, 0x54, 0x00, 0x0A,
+0x45, 0x53, 0x54, 0x35, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 
 
 /* EST5EDT */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -16764,62 +16962,111 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x58, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x10, 0xFF,
-0xFF, 0xFF, 0xFF, 0x9E, 0xA6, 0x1E, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0x9F, 0xBA, 0xEB, 0x60, 0xFF,
-0xFF, 0xFF, 0xFF, 0xA0, 0x86, 0x00, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xA1, 0x9A, 0xCD, 0x60, 0xFF,
-0xFF, 0xFF, 0xFF, 0xCB, 0x88, 0xF0, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x23, 0xF4, 0x70, 0xFF,
-0xFF, 0xFF, 0xFF, 0xD2, 0x60, 0xFB, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0xF8, 0x58, 0xF0, 0xFF,
-0xFF, 0xFF, 0xFF, 0xFB, 0xE8, 0x3B, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0xD8, 0x3A, 0xF0, 0xFF,
-0xFF, 0xFF, 0xFF, 0xFD, 0xC8, 0x1D, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xB8, 0x1C, 0xF0, 0xFF,
-0xFF, 0xFF, 0xFF, 0xFF, 0xA7, 0xFF, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x97, 0xFE, 0xF0, 0x00,
-0x00, 0x00, 0x00, 0x01, 0x87, 0xE1, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x02, 0x77, 0xE0, 0xF0, 0x00,
-0x00, 0x00, 0x00, 0x03, 0x70, 0xFE, 0x60, 0x00, 0x00, 0x00, 0x00, 0x04, 0x60, 0xFD, 0x70, 0x00,
-0x00, 0x00, 0x00, 0x05, 0x50, 0xE0, 0x60, 0x00, 0x00, 0x00, 0x00, 0x06, 0x40, 0xDF, 0x70, 0x00,
-0x00, 0x00, 0x00, 0x07, 0x30, 0xC2, 0x60, 0x00, 0x00, 0x00, 0x00, 0x07, 0x8D, 0x19, 0x70, 0x00,
-0x00, 0x00, 0x00, 0x09, 0x10, 0xA4, 0x60, 0x00, 0x00, 0x00, 0x00, 0x09, 0xAD, 0x94, 0xF0, 0x00,
-0x00, 0x00, 0x00, 0x0A, 0xF0, 0x86, 0x60, 0x00, 0x00, 0x00, 0x00, 0x0B, 0xE0, 0x85, 0x70, 0x00,
-0x00, 0x00, 0x00, 0x0C, 0xD9, 0xA2, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x0D, 0xC0, 0x67, 0x70, 0x00,
-0x00, 0x00, 0x00, 0x0E, 0xB9, 0x84, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xA9, 0x83, 0xF0, 0x00,
-0x00, 0x00, 0x00, 0x10, 0x99, 0x66, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x11, 0x89, 0x65, 0xF0, 0x00,
-0x00, 0x00, 0x00, 0x12, 0x79, 0x48, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x13, 0x69, 0x47, 0xF0, 0x00,
-0x00, 0x00, 0x00, 0x14, 0x59, 0x2A, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x15, 0x49, 0x29, 0xF0, 0x00,
-0x00, 0x00, 0x00, 0x16, 0x39, 0x0C, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x17, 0x29, 0x0B, 0xF0, 0x00,
-0x00, 0x00, 0x00, 0x18, 0x22, 0x29, 0x60, 0x00, 0x00, 0x00, 0x00, 0x19, 0x08, 0xED, 0xF0, 0x00,
-0x00, 0x00, 0x00, 0x1A, 0x02, 0x0B, 0x60, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xF2, 0x0A, 0x70, 0x00,
-0x00, 0x00, 0x00, 0x1B, 0xE1, 0xED, 0x60, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xD1, 0xEC, 0x70, 0x00,
-0x00, 0x00, 0x00, 0x1D, 0xC1, 0xCF, 0x60, 0x00, 0x00, 0x00, 0x00, 0x1E, 0xB1, 0xCE, 0x70, 0x00,
-0x00, 0x00, 0x00, 0x1F, 0xA1, 0xB1, 0x60, 0x00, 0x00, 0x00, 0x00, 0x20, 0x76, 0x00, 0xF0, 0x00,
-0x00, 0x00, 0x00, 0x21, 0x81, 0x93, 0x60, 0x00, 0x00, 0x00, 0x00, 0x22, 0x55, 0xE2, 0xF0, 0x00,
-0x00, 0x00, 0x00, 0x23, 0x6A, 0xAF, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x24, 0x35, 0xC4, 0xF0, 0x00,
-0x00, 0x00, 0x00, 0x25, 0x4A, 0x91, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x26, 0x15, 0xA6, 0xF0, 0x00,
-0x00, 0x00, 0x00, 0x27, 0x2A, 0x73, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x27, 0xFE, 0xC3, 0x70, 0x00,
-0x00, 0x00, 0x00, 0x29, 0x0A, 0x55, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x29, 0xDE, 0xA5, 0x70, 0x00,
-0x00, 0x00, 0x00, 0x2A, 0xEA, 0x37, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xBE, 0x87, 0x70, 0x00,
-0x00, 0x00, 0x00, 0x2C, 0xD3, 0x54, 0x60, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x9E, 0x69, 0x70, 0x00,
-0x00, 0x00, 0x00, 0x2E, 0xB3, 0x36, 0x60, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x7E, 0x4B, 0x70, 0x00,
-0x00, 0x00, 0x00, 0x30, 0x93, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x67, 0xF0, 0x00,
-0x00, 0x00, 0x00, 0x32, 0x72, 0xFA, 0x60, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x49, 0xF0, 0x00,
-0x00, 0x00, 0x00, 0x34, 0x52, 0xDC, 0x60, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x2B, 0xF0, 0x00,
-0x00, 0x00, 0x00, 0x36, 0x32, 0xBE, 0x60, 0x00, 0x00, 0x00, 0x00, 0x37, 0x07, 0x0D, 0xF0, 0x00,
-0x00, 0x00, 0x00, 0x38, 0x1B, 0xDA, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x38, 0xE6, 0xEF, 0xF0, 0x00,
-0x00, 0x00, 0x00, 0x39, 0xFB, 0xBC, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xC6, 0xD1, 0xF0, 0x00,
-0x00, 0x00, 0x00, 0x3B, 0xDB, 0x9E, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xAF, 0xEE, 0x70, 0x00,
-0x00, 0x00, 0x00, 0x3D, 0xBB, 0x80, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x8F, 0xD0, 0x70, 0x00,
-0x00, 0x00, 0x00, 0x3F, 0x9B, 0x62, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x40, 0x6F, 0xB2, 0x70, 0x00,
-0x00, 0x00, 0x00, 0x41, 0x84, 0x7F, 0x60, 0x00, 0x00, 0x00, 0x00, 0x42, 0x4F, 0x94, 0x70, 0x00,
-0x00, 0x00, 0x00, 0x43, 0x64, 0x61, 0x60, 0x00, 0x00, 0x00, 0x00, 0x44, 0x2F, 0x76, 0x70, 0x00,
-0x00, 0x00, 0x00, 0x45, 0x44, 0x43, 0x60, 0x00, 0x00, 0x00, 0x00, 0x45, 0xF3, 0xA8, 0xF0, 0x01,
-0x00, 0x01, 0x00, 0x02, 0x03, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x04, 0xFF, 0xFF, 0xC7,
-0xC0, 0x01, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x08, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x0C, 0x45,
-0x44, 0x54, 0x00, 0x45, 0x53, 0x54, 0x00, 0x45, 0x57, 0x54, 0x00, 0x45, 0x50, 0x54, 0x00, 0x0A,
-0x45, 0x53, 0x54, 0x35, 0x45, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D,
-0x31, 0x31, 0x2E, 0x31, 0x2E, 0x30, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAF, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x14, 0xFF,
+0xFF, 0xFF, 0xFF, 0x5E, 0x03, 0xF0, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0x9E, 0xA6, 0x1E, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0x9F, 0xBA, 0xEB, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xA0, 0x86, 0x00, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA1, 0x9A, 0xCD, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xA2, 0x65, 0xE2, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA3, 0x83, 0xE9, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xA4, 0x6A, 0xAE, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA5, 0x35, 0xA7, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xA6, 0x53, 0xCA, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA7, 0x15, 0x89, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xA8, 0x33, 0xAC, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA8, 0xFE, 0xA5, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xAA, 0x13, 0x8E, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xAA, 0xDE, 0x87, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xAB, 0xF3, 0x70, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xAC, 0xBE, 0x69, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xAD, 0xD3, 0x52, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xAE, 0x9E, 0x4B, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xB3, 0x34, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB0, 0x7E, 0x2D, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB1, 0x9C, 0x51, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB2, 0x67, 0x4A, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB3, 0x7C, 0x33, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB4, 0x47, 0x2C, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB5, 0x5C, 0x15, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB6, 0x27, 0x0E, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x3B, 0xF7, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB8, 0x06, 0xF0, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB9, 0x1B, 0xD9, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB9, 0xE6, 0xD2, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xBB, 0x04, 0xF5, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xBB, 0xC6, 0xB4, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xBC, 0xE4, 0xD7, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xBD, 0xAF, 0xD0, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xBE, 0xC4, 0xB9, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xBF, 0x8F, 0xB2, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC0, 0xA4, 0x9B, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xC1, 0x6F, 0x94, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC2, 0x84, 0x7D, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xC3, 0x4F, 0x76, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC4, 0x64, 0x5F, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xC5, 0x2F, 0x58, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC6, 0x4D, 0x7C, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xC7, 0x0F, 0x3A, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC8, 0x2D, 0x5E, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xC8, 0xF8, 0x57, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xCA, 0x0D, 0x40, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xCA, 0xD8, 0x39, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0x88, 0xF0, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD2, 0x23, 0xF4, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x60, 0xFB, 0xE0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD3, 0x75, 0xE4, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD4, 0x40, 0xDD, 0xE0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD5, 0x55, 0xC6, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD6, 0x20, 0xBF, 0xE0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD7, 0x35, 0xA8, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD8, 0x00, 0xA1, 0xE0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD9, 0x15, 0x8A, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD9, 0xE0, 0x83, 0xE0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xDA, 0xFE, 0xA7, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xDB, 0xC0, 0x65, 0xE0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xDC, 0xDE, 0x89, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xDD, 0xA9, 0x82, 0x60, 0xFF,
+0xFF, 0xFF, 0xFF, 0xDE, 0xBE, 0x6B, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0x89, 0x64, 0x60, 0xFF,
+0xFF, 0xFF, 0xFF, 0xE0, 0x9E, 0x4D, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xE1, 0x69, 0x46, 0x60, 0xFF,
+0xFF, 0xFF, 0xFF, 0xE2, 0x7E, 0x2F, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xE3, 0x49, 0x28, 0x60, 0xFF,
+0xFF, 0xFF, 0xFF, 0xE4, 0x5E, 0x11, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xE5, 0x57, 0x2E, 0xE0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xE6, 0x47, 0x2D, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE7, 0x37, 0x10, 0xE0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xE8, 0x27, 0x0F, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE9, 0x16, 0xF2, 0xE0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xEA, 0x06, 0xF1, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xEA, 0xF6, 0xD4, 0xE0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xEB, 0xE6, 0xD3, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xEC, 0xD6, 0xB6, 0xE0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xED, 0xC6, 0xB5, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xEE, 0xBF, 0xD3, 0x60, 0xFF,
+0xFF, 0xFF, 0xFF, 0xEF, 0xAF, 0xD2, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xF0, 0x9F, 0xB5, 0x60, 0xFF,
+0xFF, 0xFF, 0xFF, 0xF1, 0x8F, 0xB4, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xF2, 0x7F, 0x97, 0x60, 0xFF,
+0xFF, 0xFF, 0xFF, 0xF3, 0x6F, 0x96, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x5F, 0x79, 0x60, 0xFF,
+0xFF, 0xFF, 0xFF, 0xF5, 0x4F, 0x78, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xF6, 0x3F, 0x5B, 0x60, 0xFF,
+0xFF, 0xFF, 0xFF, 0xF7, 0x2F, 0x5A, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x28, 0x77, 0xE0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xF9, 0x0F, 0x3C, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x08, 0x59, 0xE0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xFA, 0xF8, 0x58, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFB, 0xE8, 0x3B, 0xE0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xFC, 0xD8, 0x3A, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFD, 0xC8, 0x1D, 0xE0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xFE, 0xB8, 0x1C, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xA7, 0xFF, 0xE0, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x97, 0xFE, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x01, 0x87, 0xE1, 0xE0, 0x00,
+0x00, 0x00, 0x00, 0x02, 0x77, 0xE0, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x03, 0x70, 0xFE, 0x60, 0x00,
+0x00, 0x00, 0x00, 0x04, 0x60, 0xFD, 0x70, 0x00, 0x00, 0x00, 0x00, 0x05, 0x50, 0xE0, 0x60, 0x00,
+0x00, 0x00, 0x00, 0x06, 0x40, 0xDF, 0x70, 0x00, 0x00, 0x00, 0x00, 0x07, 0x30, 0xC2, 0x60, 0x00,
+0x00, 0x00, 0x00, 0x07, 0x8D, 0x19, 0x70, 0x00, 0x00, 0x00, 0x00, 0x09, 0x10, 0xA4, 0x60, 0x00,
+0x00, 0x00, 0x00, 0x09, 0xAD, 0x94, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x0A, 0xF0, 0x86, 0x60, 0x00,
+0x00, 0x00, 0x00, 0x0B, 0xE0, 0x85, 0x70, 0x00, 0x00, 0x00, 0x00, 0x0C, 0xD9, 0xA2, 0xE0, 0x00,
+0x00, 0x00, 0x00, 0x0D, 0xC0, 0x67, 0x70, 0x00, 0x00, 0x00, 0x00, 0x0E, 0xB9, 0x84, 0xE0, 0x00,
+0x00, 0x00, 0x00, 0x0F, 0xA9, 0x83, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x10, 0x99, 0x66, 0xE0, 0x00,
+0x00, 0x00, 0x00, 0x11, 0x89, 0x65, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x12, 0x79, 0x48, 0xE0, 0x00,
+0x00, 0x00, 0x00, 0x13, 0x69, 0x47, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x14, 0x59, 0x2A, 0xE0, 0x00,
+0x00, 0x00, 0x00, 0x15, 0x49, 0x29, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x16, 0x39, 0x0C, 0xE0, 0x00,
+0x00, 0x00, 0x00, 0x17, 0x29, 0x0B, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x18, 0x22, 0x29, 0x60, 0x00,
+0x00, 0x00, 0x00, 0x19, 0x08, 0xED, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x1A, 0x02, 0x0B, 0x60, 0x00,
+0x00, 0x00, 0x00, 0x1A, 0xF2, 0x0A, 0x70, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xE1, 0xED, 0x60, 0x00,
+0x00, 0x00, 0x00, 0x1C, 0xD1, 0xEC, 0x70, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC1, 0xCF, 0x60, 0x00,
+0x00, 0x00, 0x00, 0x1E, 0xB1, 0xCE, 0x70, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA1, 0xB1, 0x60, 0x00,
+0x00, 0x00, 0x00, 0x20, 0x76, 0x00, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x21, 0x81, 0x93, 0x60, 0x00,
+0x00, 0x00, 0x00, 0x22, 0x55, 0xE2, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x23, 0x6A, 0xAF, 0xE0, 0x00,
+0x00, 0x00, 0x00, 0x24, 0x35, 0xC4, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x25, 0x4A, 0x91, 0xE0, 0x00,
+0x00, 0x00, 0x00, 0x26, 0x15, 0xA6, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x27, 0x2A, 0x73, 0xE0, 0x00,
+0x00, 0x00, 0x00, 0x27, 0xFE, 0xC3, 0x70, 0x00, 0x00, 0x00, 0x00, 0x29, 0x0A, 0x55, 0xE0, 0x00,
+0x00, 0x00, 0x00, 0x29, 0xDE, 0xA5, 0x70, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xEA, 0x37, 0xE0, 0x00,
+0x00, 0x00, 0x00, 0x2B, 0xBE, 0x87, 0x70, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xD3, 0x54, 0x60, 0x00,
+0x00, 0x00, 0x00, 0x2D, 0x9E, 0x69, 0x70, 0x00, 0x00, 0x00, 0x00, 0x2E, 0xB3, 0x36, 0x60, 0x00,
+0x00, 0x00, 0x00, 0x2F, 0x7E, 0x4B, 0x70, 0x00, 0x00, 0x00, 0x00, 0x30, 0x93, 0x18, 0x60, 0x00,
+0x00, 0x00, 0x00, 0x31, 0x67, 0x67, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x32, 0x72, 0xFA, 0x60, 0x00,
+0x00, 0x00, 0x00, 0x33, 0x47, 0x49, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x34, 0x52, 0xDC, 0x60, 0x00,
+0x00, 0x00, 0x00, 0x35, 0x27, 0x2B, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0xBE, 0x60, 0x00,
+0x00, 0x00, 0x00, 0x37, 0x07, 0x0D, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x38, 0x1B, 0xDA, 0xE0, 0x00,
+0x00, 0x00, 0x00, 0x38, 0xE6, 0xEF, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0xBC, 0xE0, 0x00,
+0x00, 0x00, 0x00, 0x3A, 0xC6, 0xD1, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xDB, 0x9E, 0xE0, 0x00,
+0x00, 0x00, 0x00, 0x3C, 0xAF, 0xEE, 0x70, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0x80, 0xE0, 0x00,
+0x00, 0x00, 0x00, 0x3E, 0x8F, 0xD0, 0x70, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x62, 0xE0, 0x00,
+0x00, 0x00, 0x00, 0x40, 0x6F, 0xB2, 0x70, 0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0x7F, 0x60, 0x00,
+0x00, 0x00, 0x00, 0x42, 0x4F, 0x94, 0x70, 0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x61, 0x60, 0x00,
+0x00, 0x00, 0x00, 0x44, 0x2F, 0x76, 0x70, 0x00, 0x00, 0x00, 0x00, 0x45, 0x44, 0x43, 0x60, 0x00,
+0x00, 0x00, 0x00, 0x45, 0xF3, 0xA8, 0xF0, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x03, 0x04, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0xFF, 0xFF, 0xBA, 0x9E, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0,
+0x01, 0x04, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x08, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x0C, 0xFF, 0xFF,
+0xC7, 0xC0, 0x01, 0x10, 0x4C, 0x4D, 0x54, 0x00, 0x45, 0x44, 0x54, 0x00, 0x45, 0x53, 0x54, 0x00,
+0x45, 0x57, 0x54, 0x00, 0x45, 0x50, 0x54, 0x00, 0x0A, 0x45, 0x53, 0x54, 0x35, 0x45, 0x44, 0x54,
+0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D, 0x31, 0x31, 0x2E, 0x31, 0x2E, 0x30, 0x0A,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 
 /* Etc/GMT */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -18685,15 +18932,15 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8D, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x1B, 0xFF,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8E, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x1B, 0xFF,
 0xFF, 0xFF, 0xFF, 0x5E, 0x3D, 0x0C, 0x1D, 0xFF, 0xFF, 0xFF, 0xFF, 0x92, 0xE6, 0x8E, 0x80, 0xFF,
 0xFF, 0xFF, 0xFF, 0x9B, 0x4B, 0x6D, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0x9B, 0xFE, 0xC7, 0x80, 0xFF,
-0xFF, 0xFF, 0xFF, 0x9C, 0x9C, 0xED, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0x9D, 0xC9, 0x83, 0x70, 0xFF,
-0xFF, 0xFF, 0xFF, 0x9E, 0x7F, 0x72, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0x9F, 0xAA, 0xB6, 0xF0, 0xFF,
-0xFF, 0xFF, 0xFF, 0xA0, 0x5F, 0x54, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xA1, 0x8B, 0xEA, 0x70, 0xFF,
-0xFF, 0xFF, 0xFF, 0xA2, 0x41, 0xD9, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xA3, 0x6E, 0x6F, 0x70, 0xFF,
-0xFF, 0xFF, 0xFF, 0xA4, 0x23, 0x0C, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0x4F, 0xA2, 0xF0, 0xFF,
-0xFF, 0xFF, 0xFF, 0xAA, 0x05, 0xEF, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAA, 0xF4, 0x8E, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0x9C, 0x9C, 0xFB, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0x9D, 0xC9, 0x83, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0x9E, 0x7E, 0x2F, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x9F, 0xAA, 0xB6, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA0, 0x5F, 0x62, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xA1, 0x8B, 0xEA, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA2, 0x41, 0xE7, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xA3, 0x6E, 0x6F, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA4, 0x23, 0x1B, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0x4F, 0xA2, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xAA, 0x05, 0xEF, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAA, 0xE7, 0x5F, 0xF0, 0xFF,
 0xFF, 0xFF, 0xFF, 0xAD, 0xC9, 0xA7, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xAE, 0xA7, 0x23, 0xF0, 0xFF,
 0xFF, 0xFF, 0xFF, 0xAF, 0xA0, 0x4F, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB0, 0x87, 0x05, 0xF0, 0xFF,
 0xFF, 0xFF, 0xFF, 0xB1, 0x89, 0x6B, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB2, 0x70, 0x22, 0x70, 0xFF,
@@ -18706,7 +18953,7 @@
 0xFF, 0xFF, 0xFF, 0xC2, 0x68, 0x5D, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC3, 0x58, 0x4E, 0xF0, 0xFF,
 0xFF, 0xFF, 0xFF, 0xC4, 0x3F, 0x05, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xC5, 0x38, 0x30, 0xF0, 0xFF,
 0xFF, 0xFF, 0xFF, 0xC6, 0x3A, 0x96, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC7, 0x58, 0xAC, 0x70, 0xFF,
-0xFF, 0xFF, 0xFF, 0xC7, 0xD9, 0xDF, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0x01, 0x2F, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xC7, 0xD9, 0xDF, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0x03, 0xD2, 0x70, 0xFF,
 0xFF, 0xFF, 0xFF, 0xC9, 0xF1, 0x20, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xCA, 0xE2, 0x62, 0xF0, 0xFF,
 0xFF, 0xFF, 0xFF, 0xCB, 0xB5, 0x52, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0xEC, 0xA3, 0xE0, 0xFF,
 0xFF, 0xFF, 0xFF, 0xCC, 0x80, 0x4B, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCC, 0xDC, 0xA2, 0xF0, 0xFF,
@@ -18736,43 +18983,44 @@
 0xFF, 0xFF, 0xFF, 0xF3, 0x53, 0xA0, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x43, 0x91, 0xA0, 0xFF,
 0xFF, 0xFF, 0xFF, 0xF5, 0x33, 0x82, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF6, 0x23, 0x73, 0xA0, 0xFF,
 0xFF, 0xFF, 0xFF, 0xF7, 0x13, 0x64, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x03, 0x55, 0xA0, 0xFF,
-0xFF, 0xFF, 0xFF, 0xF8, 0xF3, 0x46, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x0C, 0xAB, 0x2A, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x0D, 0x9B, 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x8B, 0x0C, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x0F, 0x84, 0x37, 0x80, 0x00, 0x00, 0x00, 0x00, 0x10, 0x74, 0x28, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x11, 0x64, 0x19, 0x80, 0x00, 0x00, 0x00, 0x00, 0x12, 0x54, 0x18, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x13, 0x43, 0xFB, 0x80, 0x00, 0x00, 0x00, 0x00, 0x14, 0x33, 0xFA, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x15, 0x23, 0xEB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x16, 0x13, 0xDC, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x17, 0x03, 0xCD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x17, 0xF3, 0xBE, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x18, 0xE3, 0xBD, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x19, 0xD3, 0xA0, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x1A, 0xC3, 0x91, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xBC, 0xBD, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x1C, 0xAC, 0xAE, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1D, 0x9C, 0x9F, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x1E, 0x8C, 0x90, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1F, 0x7C, 0x81, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x20, 0x6C, 0x72, 0x10, 0x00, 0x00, 0x00, 0x00, 0x21, 0x5C, 0x63, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x22, 0x4C, 0x54, 0x10, 0x00, 0x00, 0x00, 0x00, 0x23, 0x3C, 0x45, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x24, 0x2C, 0x36, 0x10, 0x00, 0x00, 0x00, 0x00, 0x25, 0x1C, 0x27, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x26, 0x0C, 0x18, 0x10, 0x00, 0x00, 0x00, 0x00, 0x27, 0x05, 0x43, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x27, 0xF5, 0x34, 0x90, 0x00, 0x00, 0x00, 0x00, 0x28, 0xE5, 0x25, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x29, 0xD5, 0x16, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xC5, 0x07, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x2B, 0xB4, 0xF8, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xA4, 0xE9, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x2D, 0x94, 0xDA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2E, 0x84, 0xCB, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x2F, 0x74, 0xBC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x30, 0x64, 0xAD, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x31, 0x5D, 0xD9, 0x10, 0x00, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0xFF, 0xFF, 0xFF, 0xF8, 0xF3, 0x46, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF9, 0xE3, 0x37, 0xA0, 0x00,
+0x00, 0x00, 0x00, 0x0C, 0xAB, 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0D, 0x9B, 0x1B, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x0E, 0x8B, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x84, 0x45, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x10, 0x74, 0x36, 0x90, 0x00, 0x00, 0x00, 0x00, 0x11, 0x64, 0x27, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x12, 0x54, 0x18, 0x90, 0x00, 0x00, 0x00, 0x00, 0x13, 0x4D, 0x44, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x14, 0x33, 0xFA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x15, 0x23, 0xDD, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x16, 0x13, 0xCE, 0x80, 0x00, 0x00, 0x00, 0x00, 0x17, 0x03, 0xBF, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x17, 0xF3, 0xB0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x18, 0xE3, 0xA1, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x19, 0xD3, 0x92, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xC3, 0x83, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x1B, 0xBC, 0xAF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xAC, 0xA0, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x1D, 0x9C, 0x91, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x8C, 0x90, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x1F, 0x7C, 0x81, 0x10, 0x00, 0x00, 0x00, 0x00, 0x20, 0x6C, 0x72, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x21, 0x5C, 0x63, 0x10, 0x00, 0x00, 0x00, 0x00, 0x22, 0x4C, 0x54, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x23, 0x3C, 0x45, 0x10, 0x00, 0x00, 0x00, 0x00, 0x24, 0x2C, 0x36, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x25, 0x1C, 0x27, 0x10, 0x00, 0x00, 0x00, 0x00, 0x26, 0x0C, 0x18, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x27, 0x05, 0x43, 0x90, 0x00, 0x00, 0x00, 0x00, 0x27, 0xF5, 0x34, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x28, 0xE5, 0x25, 0x90, 0x00, 0x00, 0x00, 0x00, 0x29, 0xD5, 0x16, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x2A, 0xC5, 0x07, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xB4, 0xF8, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x2C, 0xA4, 0xE9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x94, 0xDA, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x2E, 0x84, 0xCB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x74, 0xBC, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x30, 0x64, 0xAD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x31, 0x5D, 0xD9, 0x10, 0x00,
 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
-0x02, 0x01, 0x02, 0x01, 0x03, 0x01, 0x02, 0x01, 0x03, 0x01, 0x02, 0x01, 0x03, 0x01, 0x02, 0x01,
-0x03, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x03, 0x01, 0x02, 0x01,
+0x03, 0x01, 0x02, 0x01, 0x03, 0x01, 0x02, 0x01, 0x03, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
-0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x04, 0x02, 0x01, 0x02, 0x01,
 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
-0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x04, 0x05, 0x04, 0x05,
-0x04, 0x05, 0x04, 0x01, 0xFF, 0xFF, 0xF7, 0x63, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x04,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x0D, 0x00, 0x00, 0x0E, 0x10,
-0x00, 0x12, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x16, 0x4C, 0x4D, 0x54, 0x00, 0x57, 0x45, 0x53, 0x54,
-0x00, 0x57, 0x45, 0x54, 0x00, 0x57, 0x45, 0x4D, 0x54, 0x00, 0x43, 0x45, 0x54, 0x00, 0x43, 0x45,
-0x53, 0x54, 0x00, 0x0A, 0x57, 0x45, 0x54, 0x30, 0x57, 0x45, 0x53, 0x54, 0x2C, 0x4D, 0x33, 0x2E,
-0x35, 0x2E, 0x30, 0x2F, 0x31, 0x2C, 0x4D, 0x31, 0x30, 0x2E, 0x35, 0x2E, 0x30, 0x0A, 0x00, 0xC4,
-0x67, 0xF2, 0x01, 0x04, 0xB8, 0xCA, 0x00, 0x00, 0x00, 0x13, 0x50, 0x6F, 0x72, 0x74, 0x75, 0x67,
-0x61, 0x6C, 0x20, 0x28, 0x6D, 0x61, 0x69, 0x6E, 0x6C, 0x61, 0x6E, 0x64, 0x29, 
+0x02, 0x01, 0x02, 0x01, 0x04, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x01, 0xFF, 0xFF, 0xF7,
+0x63, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00,
+0x00, 0x1C, 0x20, 0x01, 0x0D, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x12, 0x00, 0x00, 0x1C, 0x20, 0x01,
+0x16, 0x4C, 0x4D, 0x54, 0x00, 0x57, 0x45, 0x53, 0x54, 0x00, 0x57, 0x45, 0x54, 0x00, 0x57, 0x45,
+0x4D, 0x54, 0x00, 0x43, 0x45, 0x54, 0x00, 0x43, 0x45, 0x53, 0x54, 0x00, 0x0A, 0x57, 0x45, 0x54,
+0x30, 0x57, 0x45, 0x53, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x31, 0x2C, 0x4D,
+0x31, 0x30, 0x2E, 0x35, 0x2E, 0x30, 0x0A, 0x00, 0xC4, 0x67, 0xF2, 0x01, 0x04, 0xB8, 0xCA, 0x00,
+0x00, 0x00, 0x13, 0x50, 0x6F, 0x72, 0x74, 0x75, 0x67, 0x61, 0x6C, 0x20, 0x28, 0x6D, 0x61, 0x69,
+0x6E, 0x6C, 0x61, 0x6E, 0x64, 0x29, 
 
 /* Europe/Ljubljana */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x53, 0x49, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -20985,9 +21233,16 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x04, 0xFF,
-0xFF, 0x73, 0x60, 0x00, 0x00, 0x48, 0x53, 0x54, 0x00, 0x0A, 0x48, 0x53, 0x54, 0x31, 0x30, 0x0A,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x14, 0xFF,
+0xFF, 0xFF, 0xFF, 0x74, 0xE0, 0x70, 0xBE, 0xFF, 0xFF, 0xFF, 0xFF, 0xBB, 0x05, 0x43, 0x48, 0xFF,
+0xFF, 0xFF, 0xFF, 0xBB, 0x21, 0x71, 0x58, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0x89, 0x3D, 0xC8, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD2, 0x23, 0xF4, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x61, 0x49, 0x38, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD5, 0x8D, 0x73, 0x48, 0x01, 0x02, 0x01, 0x03, 0x04, 0x01, 0x05, 0xFF, 0xFF,
+0x6C, 0x02, 0x00, 0x00, 0xFF, 0xFF, 0x6C, 0x58, 0x00, 0x04, 0xFF, 0xFF, 0x7A, 0x68, 0x01, 0x08,
+0xFF, 0xFF, 0x7A, 0x68, 0x01, 0x0C, 0xFF, 0xFF, 0x7A, 0x68, 0x01, 0x10, 0xFF, 0xFF, 0x73, 0x60,
+0x00, 0x04, 0x4C, 0x4D, 0x54, 0x00, 0x48, 0x53, 0x54, 0x00, 0x48, 0x44, 0x54, 0x00, 0x48, 0x57,
+0x54, 0x00, 0x48, 0x50, 0x54, 0x00, 0x0A, 0x48, 0x53, 0x54, 0x31, 0x30, 0x0A, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 
 /* Iceland */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -21145,7 +21400,7 @@
 0xFF, 0xFF, 0xFF, 0x9A, 0x6C, 0x7D, 0xC8, 0xFF, 0xFF, 0xFF, 0xFF, 0xBF, 0x00, 0xCC, 0x48, 0x00,
 0x00, 0x00, 0x00, 0x0D, 0x94, 0x44, 0x38, 0x00, 0x00, 0x00, 0x00, 0x0E, 0xAD, 0x13, 0xB8, 0x00,
 0x00, 0x00, 0x00, 0x0F, 0x79, 0x73, 0x40, 0x00, 0x00, 0x00, 0x00, 0x10, 0x28, 0xCA, 0xC0, 0x00,
-0x00, 0x00, 0x00, 0x10, 0xED, 0x3A, 0x40, 0x00, 0x00, 0x00, 0x00, 0x11, 0xAD, 0xBC, 0x48, 0x00,
+0x00, 0x00, 0x00, 0x10, 0xA9, 0xFD, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x11, 0xAD, 0xBC, 0x48, 0x00,
 0x00, 0x00, 0x00, 0x12, 0x45, 0x4A, 0xB8, 0x00, 0x00, 0x00, 0x00, 0x13, 0x37, 0xEC, 0xC8, 0x00,
 0x00, 0x00, 0x00, 0x14, 0x2D, 0x15, 0xB8, 0x00, 0x00, 0x00, 0x00, 0x28, 0x20, 0x76, 0xC8, 0x00,
 0x00, 0x00, 0x00, 0x28, 0xDB, 0x9D, 0xB8, 0x00, 0x00, 0x00, 0x00, 0x29, 0xCB, 0x9C, 0xC8, 0x00,
@@ -21353,41 +21608,71 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x35, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x09, 0xFF,
-0xFF, 0xFF, 0xFF, 0x9B, 0x0C, 0x17, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0x9B, 0xD5, 0xDA, 0xF0, 0xFF,
-0xFF, 0xFF, 0xFF, 0x9C, 0xD9, 0xAE, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0x9D, 0xA4, 0xB5, 0x90, 0xFF,
-0xFF, 0xFF, 0xFF, 0x9E, 0xB9, 0x90, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0x9F, 0x84, 0x97, 0x90, 0xFF,
-0xFF, 0xFF, 0xFF, 0xC8, 0x09, 0x71, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xCC, 0xE7, 0x4B, 0x10, 0xFF,
-0xFF, 0xFF, 0xFF, 0xCD, 0xA9, 0x17, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xCE, 0xA2, 0x43, 0x10, 0xFF,
-0xFF, 0xFF, 0xFF, 0xCF, 0x92, 0x34, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xD0, 0x82, 0x25, 0x10, 0xFF,
-0xFF, 0xFF, 0xFF, 0xD1, 0x72, 0x16, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x4E, 0x40, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x0D, 0xA4, 0x63, 0x90, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x8B, 0x1A, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x0F, 0x84, 0x45, 0x90, 0x00, 0x00, 0x00, 0x00, 0x10, 0x74, 0x36, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x11, 0x64, 0x27, 0x90, 0x00, 0x00, 0x00, 0x00, 0x12, 0x54, 0x18, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x13, 0x4D, 0x44, 0x10, 0x00, 0x00, 0x00, 0x00, 0x14, 0x33, 0xFA, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x15, 0x23, 0xEB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x16, 0x13, 0xDC, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x17, 0x03, 0xCD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x17, 0xF3, 0xBE, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x18, 0xE3, 0xAF, 0x90, 0x00, 0x00, 0x00, 0x00, 0x19, 0xD3, 0xA0, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x1A, 0xC3, 0x91, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xBC, 0xBD, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x1C, 0xAC, 0xAE, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1D, 0x9C, 0x9F, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x1E, 0x8C, 0x90, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1F, 0x7C, 0x81, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x20, 0x6C, 0x72, 0x10, 0x00, 0x00, 0x00, 0x00, 0x21, 0x5C, 0x63, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x22, 0x4C, 0x54, 0x10, 0x00, 0x00, 0x00, 0x00, 0x23, 0x3C, 0x45, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x24, 0x2C, 0x36, 0x10, 0x00, 0x00, 0x00, 0x00, 0x25, 0x1C, 0x27, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x26, 0x0C, 0x18, 0x10, 0x00, 0x00, 0x00, 0x00, 0x27, 0x05, 0x43, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x27, 0xF5, 0x34, 0x90, 0x00, 0x00, 0x00, 0x00, 0x28, 0xE5, 0x25, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x29, 0xD5, 0x16, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xC5, 0x07, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x2B, 0xB4, 0xF8, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xA4, 0xE9, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x2D, 0x94, 0xDA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2E, 0x84, 0xCB, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x2F, 0x74, 0xBC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x30, 0x64, 0xAD, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x31, 0x5D, 0xD9, 0x10, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x0E, 0x10,
-0x00, 0x05, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x00, 0x4D, 0x45, 0x53, 0x54, 0x00, 0x4D, 0x45, 0x54,
-0x00, 0x0A, 0x4D, 0x45, 0x54, 0x2D, 0x31, 0x4D, 0x45, 0x53, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x35,
-0x2E, 0x30, 0x2C, 0x4D, 0x31, 0x30, 0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x33, 0x0A, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x1A, 0xFF,
+0xFF, 0xFF, 0xFF, 0x56, 0xB6, 0xDF, 0xE6, 0xFF, 0xFF, 0xFF, 0xFF, 0x6D, 0xE8, 0xC8, 0x00, 0xFF,
+0xFF, 0xFF, 0xFF, 0x98, 0x44, 0x49, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0x9B, 0x0C, 0x25, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0x9B, 0xD5, 0xDA, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0x9C, 0xD9, 0xAE, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0x9D, 0xA4, 0xB5, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0x9E, 0xB9, 0x90, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0x9F, 0x84, 0x97, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0x9F, 0xCE, 0xF8, 0x30, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA0, 0x60, 0xA5, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xA1, 0x7E, 0xBB, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA2, 0x2E, 0x12, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xA3, 0x7A, 0x4C, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA4, 0x35, 0x81, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0x5E, 0x23, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA6, 0x25, 0x35, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xA7, 0x27, 0x9B, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA8, 0x2A, 0x01, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xA9, 0x07, 0x7D, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA9, 0xEE, 0x34, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAA, 0xE7, 0x5F, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xAB, 0xD7, 0x50, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xAC, 0xC7, 0x41, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xAD, 0xC9, 0xA7, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xAE, 0xA7, 0x23, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xAF, 0xA0, 0x4F, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB0, 0x87, 0x05, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB1, 0x89, 0x6B, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB2, 0x70, 0x4C, 0xA0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB3, 0x72, 0xB2, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB4, 0x50, 0x2E, 0xA0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB5, 0x49, 0x5A, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xB6, 0x30, 0x10, 0xA0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB7, 0x32, 0x76, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0x0F, 0xF2, 0xA0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB8, 0xFF, 0xE3, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB9, 0xEF, 0xD4, 0xA0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xBA, 0xD6, 0x8B, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xBB, 0xD8, 0xF1, 0x20, 0xFF,
+0xFF, 0xFF, 0xFF, 0xBC, 0xC8, 0xE2, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xBD, 0xB8, 0xD3, 0x20, 0xFF,
+0xFF, 0xFF, 0xFF, 0xBE, 0x9F, 0x89, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xBF, 0x98, 0xB5, 0x20, 0xFF,
+0xFF, 0xFF, 0xFF, 0xC0, 0x9B, 0x1B, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xC1, 0x78, 0x97, 0x20, 0xFF,
+0xFF, 0xFF, 0xFF, 0xC2, 0x68, 0x88, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xC3, 0x58, 0x79, 0x20, 0xFF,
+0xFF, 0xFF, 0xFF, 0xC4, 0x3F, 0x2F, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC5, 0x38, 0x5B, 0x20, 0xFF,
+0xFF, 0xFF, 0xFF, 0xC6, 0x3A, 0xC1, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xC7, 0x58, 0xD6, 0xA0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xC7, 0xDA, 0x09, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC8, 0x4A, 0x19, 0x20, 0xFF,
+0xFF, 0xFF, 0xFF, 0xCC, 0xE7, 0x4B, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xCD, 0xA9, 0x17, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xCE, 0xA2, 0x43, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xCF, 0x92, 0x34, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD0, 0x6E, 0x5E, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xD1, 0x72, 0x16, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD2, 0x4E, 0x40, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xD3, 0x91, 0x40, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD4, 0x4B, 0x23, 0x90, 0x00, 0x00, 0x00, 0x00, 0x0D, 0xA4, 0x63, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x0E, 0x8B, 0x1A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x84, 0x45, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x10, 0x74, 0x36, 0x90, 0x00, 0x00, 0x00, 0x00, 0x11, 0x64, 0x27, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x12, 0x54, 0x18, 0x90, 0x00, 0x00, 0x00, 0x00, 0x13, 0x4D, 0x44, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x14, 0x33, 0xFA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x15, 0x23, 0xEB, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x16, 0x13, 0xDC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x17, 0x03, 0xCD, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x17, 0xF3, 0xBE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x18, 0xE3, 0xAF, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x19, 0xD3, 0xA0, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xC3, 0x91, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x1B, 0xBC, 0xBD, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xAC, 0xAE, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x1D, 0x9C, 0x9F, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x8C, 0x90, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x1F, 0x7C, 0x81, 0x10, 0x00, 0x00, 0x00, 0x00, 0x20, 0x6C, 0x72, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x21, 0x5C, 0x63, 0x10, 0x00, 0x00, 0x00, 0x00, 0x22, 0x4C, 0x54, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x23, 0x3C, 0x45, 0x10, 0x00, 0x00, 0x00, 0x00, 0x24, 0x2C, 0x36, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x25, 0x1C, 0x27, 0x10, 0x00, 0x00, 0x00, 0x00, 0x26, 0x0C, 0x18, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x27, 0x05, 0x43, 0x90, 0x00, 0x00, 0x00, 0x00, 0x27, 0xF5, 0x34, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x28, 0xE5, 0x25, 0x90, 0x00, 0x00, 0x00, 0x00, 0x29, 0xD5, 0x16, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x2A, 0xC5, 0x07, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xB4, 0xF8, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x2C, 0xA4, 0xE9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x94, 0xDA, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x2E, 0x84, 0xCB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x74, 0xBC, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x30, 0x64, 0xAD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x31, 0x5D, 0xD9, 0x10, 0x01,
+0x02, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05,
+0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05,
+0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05,
+0x02, 0x05, 0x02, 0x05, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
+0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
+0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
+0x04, 0x03, 0x04, 0x03, 0x04, 0x00, 0x00, 0x04, 0x1A, 0x00, 0x00, 0x00, 0x00, 0x04, 0x1A, 0x00,
+0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x0C, 0x00, 0x00, 0x1C,
+0x20, 0x01, 0x10, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x15, 0x4C, 0x4D, 0x54, 0x00, 0x42, 0x4D, 0x54,
+0x00, 0x57, 0x45, 0x54, 0x00, 0x43, 0x45, 0x54, 0x00, 0x43, 0x45, 0x53, 0x54, 0x00, 0x57, 0x45,
+0x53, 0x54, 0x00, 0x0A, 0x43, 0x45, 0x54, 0x2D, 0x31, 0x43, 0x45, 0x53, 0x54, 0x2C, 0x4D, 0x33,
+0x2E, 0x35, 0x2E, 0x30, 0x2C, 0x4D, 0x31, 0x30, 0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x33, 0x0A, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 
 /* Mexico/BajaNorte */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -21395,13 +21680,16 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x18, 0xFF,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x18, 0xFF,
 0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xA9, 0x79, 0x4F, 0x70, 0xFF,
-0xFF, 0xFF, 0xFF, 0xAF, 0xF2, 0x7C, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x64, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xAF, 0xF1, 0x39, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x64, 0x70, 0xFF,
 0xFF, 0xFF, 0xFF, 0xB7, 0x1B, 0x10, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0x0A, 0xF2, 0xF0, 0xFF,
 0xFF, 0xFF, 0xFF, 0xCB, 0xEA, 0x8D, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x23, 0xF4, 0x70, 0xFF,
-0xFF, 0xFF, 0xFF, 0xD2, 0x99, 0xBA, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD7, 0x1B, 0x59, 0x00, 0xFF,
-0xFF, 0xFF, 0xFF, 0xD8, 0x91, 0xB4, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE2, 0x7E, 0x4B, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD2, 0x9D, 0xAE, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD7, 0x1B, 0x59, 0x00, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD8, 0x91, 0xB4, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xDB, 0x00, 0x07, 0x00, 0xFF,
+0xFF, 0xFF, 0xFF, 0xDB, 0xC0, 0x73, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xDC, 0xDE, 0xB3, 0xA0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xDD, 0xA9, 0xAC, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xDE, 0xBE, 0x95, 0xA0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xDF, 0x89, 0x8E, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE2, 0x7E, 0x4B, 0x90, 0xFF,
 0xFF, 0xFF, 0xFF, 0xE3, 0x49, 0x52, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE4, 0x5E, 0x2D, 0x90, 0xFF,
 0xFF, 0xFF, 0xFF, 0xE5, 0x29, 0x34, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE6, 0x47, 0x4A, 0x10, 0xFF,
 0xFF, 0xFF, 0xFF, 0xE7, 0x12, 0x51, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xE8, 0x27, 0x2C, 0x10, 0xFF,
@@ -21448,13 +21736,14 @@
 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
-0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x02, 0xFF, 0xFF, 0x92,
-0x4C, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x08, 0xFF,
-0xFF, 0x9D, 0x90, 0x01, 0x0C, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x10, 0xFF, 0xFF, 0x9D, 0x90, 0x01,
-0x14, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x50, 0x53, 0x54, 0x00, 0x50, 0x44, 0x54,
-0x00, 0x50, 0x57, 0x54, 0x00, 0x50, 0x50, 0x54, 0x00, 0x0A, 0x50, 0x53, 0x54, 0x38, 0x50, 0x44,
-0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D, 0x31, 0x31, 0x2E, 0x31, 0x2E, 0x30,
-0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
+0x03, 0x02, 0x02, 0xFF, 0xFF, 0x92, 0x4C, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF,
+0xFF, 0x8F, 0x80, 0x00, 0x08, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x0C, 0xFF, 0xFF, 0x9D, 0x90, 0x01,
+0x10, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x14, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x50,
+0x53, 0x54, 0x00, 0x50, 0x44, 0x54, 0x00, 0x50, 0x57, 0x54, 0x00, 0x50, 0x50, 0x54, 0x00, 0x0A,
+0x50, 0x53, 0x54, 0x38, 0x50, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D,
+0x31, 0x31, 0x2E, 0x31, 0x2E, 0x30, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 
 
 /* Mexico/BajaSur */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -21462,12 +21751,11 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x14, 0xFF,
-0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF2, 0x6E, 0xE0, 0xFF,
-0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x56, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x43, 0xD2, 0x60, 0xFF,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3D, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF1, 0x2B, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x56, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x41, 0x3D, 0x70, 0xFF,
 0xFF, 0xFF, 0xFF, 0xB8, 0x0C, 0x36, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0xFD, 0x86, 0xF0, 0xFF,
-0xFF, 0xFF, 0xFF, 0xCB, 0xEA, 0x71, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xD8, 0x91, 0xB4, 0xF0, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x80, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x84, 0x10, 0x00,
+0xFF, 0xFF, 0xFF, 0xCB, 0xEA, 0x71, 0x60, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x84, 0x10, 0x00,
 0x00, 0x00, 0x00, 0x32, 0x73, 0x16, 0x80, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x66, 0x10, 0x00,
 0x00, 0x00, 0x00, 0x34, 0x52, 0xF8, 0x80, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x48, 0x10, 0x00,
 0x00, 0x00, 0x00, 0x36, 0x32, 0xDA, 0x80, 0x00, 0x00, 0x00, 0x00, 0x37, 0x07, 0x2A, 0x10, 0x00,
@@ -21494,15 +21782,14 @@
 0x00, 0x00, 0x00, 0x5D, 0xB5, 0x4E, 0x80, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x89, 0x9E, 0x10, 0x00,
 0x00, 0x00, 0x00, 0x5F, 0x95, 0x30, 0x80, 0x00, 0x00, 0x00, 0x00, 0x60, 0x69, 0x80, 0x10, 0x00,
 0x00, 0x00, 0x00, 0x61, 0x7E, 0x4D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x62, 0x49, 0x62, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x63, 0x5E, 0x2F, 0x00, 0x01, 0x02, 0x01, 0x03, 0x01, 0x02, 0x01, 0x04, 0x01,
+0x00, 0x00, 0x00, 0x63, 0x5E, 0x2F, 0x00, 0x01, 0x02, 0x01, 0x03, 0x01, 0x02, 0x01, 0x03, 0x01,
 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01,
 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01,
 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01,
-0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0xFF, 0xFF, 0x9C, 0x3C, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90,
-0x00, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x0C, 0xFF, 0xFF,
-0x8F, 0x80, 0x00, 0x10, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00,
-0x4D, 0x44, 0x54, 0x00, 0x50, 0x53, 0x54, 0x00, 0x0A, 0x4D, 0x53, 0x54, 0x37, 0x0A, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x03, 0x01, 0x03, 0x01, 0xFF, 0xFF, 0x9C, 0x3C, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04,
+0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x0C, 0x4C, 0x4D, 0x54, 0x00,
+0x4D, 0x53, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x4D, 0x44, 0x54, 0x00, 0x0A, 0x4D, 0x53, 0x54,
+0x37, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 
 /* Mexico/General */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -21511,8 +21798,8 @@
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x18, 0xFF,
-0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF2, 0x6E, 0xE0, 0xFF,
-0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x56, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x43, 0xD2, 0x60, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF1, 0x2B, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x56, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x41, 0x3D, 0x70, 0xFF,
 0xFF, 0xFF, 0xFF, 0xB8, 0x0C, 0x36, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0xFD, 0x86, 0xF0, 0xFF,
 0xFF, 0xFF, 0xFF, 0xC5, 0xDE, 0xB0, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xC6, 0x97, 0x34, 0x50, 0xFF,
 0xFF, 0xFF, 0xFF, 0xC9, 0x55, 0xF1, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0xEA, 0xDD, 0x50, 0xFF,
@@ -21562,9 +21849,17 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x04, 0xFF,
-0xFF, 0x9D, 0x90, 0x00, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x0A, 0x4D, 0x53, 0x54, 0x37, 0x0A, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0x5E, 0x04, 0x0C, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0x9E, 0xA6, 0x3A, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0x9F, 0xBB, 0x07, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xA0, 0x86, 0x1C, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA1, 0x9A, 0xE9, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0x89, 0x0C, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xCF, 0x17, 0xDF, 0x1C, 0xFF, 0xFF, 0xFF, 0xFF, 0xCF, 0x8F, 0xE5, 0xAC, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD0, 0x81, 0x1A, 0x1C, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0xF8, 0x75, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xFB, 0xE8, 0x58, 0x00, 0x02, 0x01, 0x02, 0x01, 0x02, 0x03, 0x02, 0x03, 0x02,
+0x01, 0x02, 0xFF, 0xFF, 0x96, 0xEE, 0x00, 0x00, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x04, 0xFF, 0xFF,
+0x9D, 0x90, 0x00, 0x08, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x0C, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x44,
+0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x4D, 0x57, 0x54, 0x00, 0x0A, 0x4D, 0x53, 0x54, 0x37, 0x0A,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 
 /* MST7MDT */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -21572,62 +21867,67 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x58, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x10, 0xFF,
-0xFF, 0xFF, 0xFF, 0x9E, 0xA6, 0x3A, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0x9F, 0xBB, 0x07, 0x80, 0xFF,
-0xFF, 0xFF, 0xFF, 0xA0, 0x86, 0x1C, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xA1, 0x9A, 0xE9, 0x80, 0xFF,
-0xFF, 0xFF, 0xFF, 0xCB, 0x89, 0x0C, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x23, 0xF4, 0x70, 0xFF,
-0xFF, 0xFF, 0xFF, 0xD2, 0x61, 0x18, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0xF8, 0x75, 0x10, 0xFF,
-0xFF, 0xFF, 0xFF, 0xFB, 0xE8, 0x58, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0xD8, 0x57, 0x10, 0xFF,
-0xFF, 0xFF, 0xFF, 0xFD, 0xC8, 0x3A, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xB8, 0x39, 0x10, 0xFF,
-0xFF, 0xFF, 0xFF, 0xFF, 0xA8, 0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x98, 0x1B, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x01, 0x87, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x77, 0xFD, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x03, 0x71, 0x1A, 0x80, 0x00, 0x00, 0x00, 0x00, 0x04, 0x61, 0x19, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x05, 0x50, 0xFC, 0x80, 0x00, 0x00, 0x00, 0x00, 0x06, 0x40, 0xFB, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x07, 0x30, 0xDE, 0x80, 0x00, 0x00, 0x00, 0x00, 0x07, 0x8D, 0x35, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x09, 0x10, 0xC0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x09, 0xAD, 0xB1, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x0A, 0xF0, 0xA2, 0x80, 0x00, 0x00, 0x00, 0x00, 0x0B, 0xE0, 0xA1, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x0C, 0xD9, 0xBF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0D, 0xC0, 0x83, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x0E, 0xB9, 0xA1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xA9, 0xA0, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x10, 0x99, 0x83, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x89, 0x82, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x12, 0x79, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0x69, 0x64, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x14, 0x59, 0x47, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x49, 0x46, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x16, 0x39, 0x29, 0x00, 0x00, 0x00, 0x00, 0x00, 0x17, 0x29, 0x28, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x18, 0x22, 0x45, 0x80, 0x00, 0x00, 0x00, 0x00, 0x19, 0x09, 0x0A, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x1A, 0x02, 0x27, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xF2, 0x26, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x1B, 0xE2, 0x09, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xD2, 0x08, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x1D, 0xC1, 0xEB, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1E, 0xB1, 0xEA, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x1F, 0xA1, 0xCD, 0x80, 0x00, 0x00, 0x00, 0x00, 0x20, 0x76, 0x1D, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x21, 0x81, 0xAF, 0x80, 0x00, 0x00, 0x00, 0x00, 0x22, 0x55, 0xFF, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x23, 0x6A, 0xCC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x35, 0xE1, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x25, 0x4A, 0xAE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x26, 0x15, 0xC3, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x27, 0x2A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x00, 0x27, 0xFE, 0xDF, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x29, 0x0A, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 0x29, 0xDE, 0xC1, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x2A, 0xEA, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xBE, 0xA3, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x2C, 0xD3, 0x70, 0x80, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x9E, 0x85, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x2E, 0xB3, 0x52, 0x80, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x7E, 0x67, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x30, 0x93, 0x34, 0x80, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x84, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x32, 0x73, 0x16, 0x80, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x66, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x34, 0x52, 0xF8, 0x80, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x48, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x36, 0x32, 0xDA, 0x80, 0x00, 0x00, 0x00, 0x00, 0x37, 0x07, 0x2A, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x38, 0x1B, 0xF7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0xE7, 0x0C, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x39, 0xFB, 0xD9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xC6, 0xEE, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x3B, 0xDB, 0xBB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xB0, 0x0A, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x3D, 0xBB, 0x9D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x8F, 0xEC, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x3F, 0x9B, 0x7F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x6F, 0xCE, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x41, 0x84, 0x9B, 0x80, 0x00, 0x00, 0x00, 0x00, 0x42, 0x4F, 0xB0, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x43, 0x64, 0x7D, 0x80, 0x00, 0x00, 0x00, 0x00, 0x44, 0x2F, 0x92, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x45, 0x44, 0x5F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x45, 0xF3, 0xC5, 0x10, 0x01,
-0x00, 0x01, 0x00, 0x02, 0x03, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0xAB,
-0xA0, 0x01, 0x00, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x08, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x0C, 0x4D,
-0x44, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x4D, 0x57, 0x54, 0x00, 0x4D, 0x50, 0x54, 0x00, 0x0A,
-0x4D, 0x53, 0x54, 0x37, 0x4D, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D,
-0x31, 0x31, 0x2E, 0x31, 0x2E, 0x30, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x61, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x14, 0xFF,
+0xFF, 0xFF, 0xFF, 0x5E, 0x04, 0x0C, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0x9E, 0xA6, 0x3A, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0x9F, 0xBB, 0x07, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xA0, 0x86, 0x1C, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA1, 0x9A, 0xE9, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xA2, 0x65, 0xFE, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA3, 0x84, 0x06, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xA4, 0x45, 0xE0, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA4, 0x8F, 0xA6, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0x89, 0x0C, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD2, 0x23, 0xF4, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x61, 0x18, 0x00, 0xFF,
+0xFF, 0xFF, 0xFF, 0xF7, 0x2F, 0x76, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x28, 0x94, 0x00, 0xFF,
+0xFF, 0xFF, 0xFF, 0xF9, 0x0F, 0x58, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x08, 0x76, 0x00, 0xFF,
+0xFF, 0xFF, 0xFF, 0xFA, 0xF8, 0x75, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xFB, 0xE8, 0x58, 0x00, 0xFF,
+0xFF, 0xFF, 0xFF, 0xFC, 0xD8, 0x57, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xFD, 0xC8, 0x3A, 0x00, 0xFF,
+0xFF, 0xFF, 0xFF, 0xFE, 0xB8, 0x39, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xA8, 0x1C, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x98, 0x1B, 0x10, 0x00, 0x00, 0x00, 0x00, 0x01, 0x87, 0xFE, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x02, 0x77, 0xFD, 0x10, 0x00, 0x00, 0x00, 0x00, 0x03, 0x71, 0x1A, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x04, 0x61, 0x19, 0x90, 0x00, 0x00, 0x00, 0x00, 0x05, 0x50, 0xFC, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x06, 0x40, 0xFB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x07, 0x30, 0xDE, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x07, 0x8D, 0x35, 0x90, 0x00, 0x00, 0x00, 0x00, 0x09, 0x10, 0xC0, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x09, 0xAD, 0xB1, 0x10, 0x00, 0x00, 0x00, 0x00, 0x0A, 0xF0, 0xA2, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x0B, 0xE0, 0xA1, 0x90, 0x00, 0x00, 0x00, 0x00, 0x0C, 0xD9, 0xBF, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x0D, 0xC0, 0x83, 0x90, 0x00, 0x00, 0x00, 0x00, 0x0E, 0xB9, 0xA1, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x0F, 0xA9, 0xA0, 0x10, 0x00, 0x00, 0x00, 0x00, 0x10, 0x99, 0x83, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x11, 0x89, 0x82, 0x10, 0x00, 0x00, 0x00, 0x00, 0x12, 0x79, 0x65, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x13, 0x69, 0x64, 0x10, 0x00, 0x00, 0x00, 0x00, 0x14, 0x59, 0x47, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x15, 0x49, 0x46, 0x10, 0x00, 0x00, 0x00, 0x00, 0x16, 0x39, 0x29, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x17, 0x29, 0x28, 0x10, 0x00, 0x00, 0x00, 0x00, 0x18, 0x22, 0x45, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x19, 0x09, 0x0A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1A, 0x02, 0x27, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x1A, 0xF2, 0x26, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xE2, 0x09, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x1C, 0xD2, 0x08, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC1, 0xEB, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x1E, 0xB1, 0xEA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA1, 0xCD, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x20, 0x76, 0x1D, 0x10, 0x00, 0x00, 0x00, 0x00, 0x21, 0x81, 0xAF, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x22, 0x55, 0xFF, 0x10, 0x00, 0x00, 0x00, 0x00, 0x23, 0x6A, 0xCC, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x24, 0x35, 0xE1, 0x10, 0x00, 0x00, 0x00, 0x00, 0x25, 0x4A, 0xAE, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x26, 0x15, 0xC3, 0x10, 0x00, 0x00, 0x00, 0x00, 0x27, 0x2A, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x27, 0xFE, 0xDF, 0x90, 0x00, 0x00, 0x00, 0x00, 0x29, 0x0A, 0x72, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x29, 0xDE, 0xC1, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xEA, 0x54, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x2B, 0xBE, 0xA3, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xD3, 0x70, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x2D, 0x9E, 0x85, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2E, 0xB3, 0x52, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x2F, 0x7E, 0x67, 0x90, 0x00, 0x00, 0x00, 0x00, 0x30, 0x93, 0x34, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x31, 0x67, 0x84, 0x10, 0x00, 0x00, 0x00, 0x00, 0x32, 0x73, 0x16, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x33, 0x47, 0x66, 0x10, 0x00, 0x00, 0x00, 0x00, 0x34, 0x52, 0xF8, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x35, 0x27, 0x48, 0x10, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0xDA, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x37, 0x07, 0x2A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x38, 0x1B, 0xF7, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x38, 0xE7, 0x0C, 0x10, 0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0xD9, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x3A, 0xC6, 0xEE, 0x10, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xDB, 0xBB, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x3C, 0xB0, 0x0A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0x9D, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x3E, 0x8F, 0xEC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x7F, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x40, 0x6F, 0xCE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0x9B, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x42, 0x4F, 0xB0, 0x90, 0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x7D, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x44, 0x2F, 0x92, 0x90, 0x00, 0x00, 0x00, 0x00, 0x45, 0x44, 0x5F, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x45, 0xF3, 0xC5, 0x10, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x03, 0x04, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0xFF, 0xFF, 0x9D, 0x94, 0x00, 0x00, 0xFF, 0xFF,
+0xAB, 0xA0, 0x01, 0x04, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x08, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x0C,
+0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x10, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x44, 0x54, 0x00, 0x4D, 0x53,
+0x54, 0x00, 0x4D, 0x57, 0x54, 0x00, 0x4D, 0x50, 0x54, 0x00, 0x0A, 0x4D, 0x53, 0x54, 0x37, 0x4D,
+0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D, 0x31, 0x31, 0x2E, 0x31, 0x2E,
+0x30, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 
 /* Navajo */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -22757,15 +23057,15 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8D, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x1B, 0xFF,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8E, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x1B, 0xFF,
 0xFF, 0xFF, 0xFF, 0x5E, 0x3D, 0x0C, 0x1D, 0xFF, 0xFF, 0xFF, 0xFF, 0x92, 0xE6, 0x8E, 0x80, 0xFF,
 0xFF, 0xFF, 0xFF, 0x9B, 0x4B, 0x6D, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0x9B, 0xFE, 0xC7, 0x80, 0xFF,
-0xFF, 0xFF, 0xFF, 0x9C, 0x9C, 0xED, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0x9D, 0xC9, 0x83, 0x70, 0xFF,
-0xFF, 0xFF, 0xFF, 0x9E, 0x7F, 0x72, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0x9F, 0xAA, 0xB6, 0xF0, 0xFF,
-0xFF, 0xFF, 0xFF, 0xA0, 0x5F, 0x54, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xA1, 0x8B, 0xEA, 0x70, 0xFF,
-0xFF, 0xFF, 0xFF, 0xA2, 0x41, 0xD9, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xA3, 0x6E, 0x6F, 0x70, 0xFF,
-0xFF, 0xFF, 0xFF, 0xA4, 0x23, 0x0C, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0x4F, 0xA2, 0xF0, 0xFF,
-0xFF, 0xFF, 0xFF, 0xAA, 0x05, 0xEF, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAA, 0xF4, 0x8E, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0x9C, 0x9C, 0xFB, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0x9D, 0xC9, 0x83, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0x9E, 0x7E, 0x2F, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x9F, 0xAA, 0xB6, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA0, 0x5F, 0x62, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xA1, 0x8B, 0xEA, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA2, 0x41, 0xE7, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xA3, 0x6E, 0x6F, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA4, 0x23, 0x1B, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0x4F, 0xA2, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xAA, 0x05, 0xEF, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAA, 0xE7, 0x5F, 0xF0, 0xFF,
 0xFF, 0xFF, 0xFF, 0xAD, 0xC9, 0xA7, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xAE, 0xA7, 0x23, 0xF0, 0xFF,
 0xFF, 0xFF, 0xFF, 0xAF, 0xA0, 0x4F, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB0, 0x87, 0x05, 0xF0, 0xFF,
 0xFF, 0xFF, 0xFF, 0xB1, 0x89, 0x6B, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB2, 0x70, 0x22, 0x70, 0xFF,
@@ -22778,7 +23078,7 @@
 0xFF, 0xFF, 0xFF, 0xC2, 0x68, 0x5D, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC3, 0x58, 0x4E, 0xF0, 0xFF,
 0xFF, 0xFF, 0xFF, 0xC4, 0x3F, 0x05, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xC5, 0x38, 0x30, 0xF0, 0xFF,
 0xFF, 0xFF, 0xFF, 0xC6, 0x3A, 0x96, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC7, 0x58, 0xAC, 0x70, 0xFF,
-0xFF, 0xFF, 0xFF, 0xC7, 0xD9, 0xDF, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0x01, 0x2F, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xC7, 0xD9, 0xDF, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0x03, 0xD2, 0x70, 0xFF,
 0xFF, 0xFF, 0xFF, 0xC9, 0xF1, 0x20, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xCA, 0xE2, 0x62, 0xF0, 0xFF,
 0xFF, 0xFF, 0xFF, 0xCB, 0xB5, 0x52, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0xEC, 0xA3, 0xE0, 0xFF,
 0xFF, 0xFF, 0xFF, 0xCC, 0x80, 0x4B, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCC, 0xDC, 0xA2, 0xF0, 0xFF,
@@ -22808,42 +23108,43 @@
 0xFF, 0xFF, 0xFF, 0xF3, 0x53, 0xA0, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x43, 0x91, 0xA0, 0xFF,
 0xFF, 0xFF, 0xFF, 0xF5, 0x33, 0x82, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF6, 0x23, 0x73, 0xA0, 0xFF,
 0xFF, 0xFF, 0xFF, 0xF7, 0x13, 0x64, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x03, 0x55, 0xA0, 0xFF,
-0xFF, 0xFF, 0xFF, 0xF8, 0xF3, 0x46, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x0C, 0xAB, 0x2A, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x0D, 0x9B, 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x8B, 0x0C, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x0F, 0x84, 0x37, 0x80, 0x00, 0x00, 0x00, 0x00, 0x10, 0x74, 0x28, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x11, 0x64, 0x19, 0x80, 0x00, 0x00, 0x00, 0x00, 0x12, 0x54, 0x18, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x13, 0x43, 0xFB, 0x80, 0x00, 0x00, 0x00, 0x00, 0x14, 0x33, 0xFA, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x15, 0x23, 0xEB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x16, 0x13, 0xDC, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x17, 0x03, 0xCD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x17, 0xF3, 0xBE, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x18, 0xE3, 0xBD, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x19, 0xD3, 0xA0, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x1A, 0xC3, 0x91, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xBC, 0xBD, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x1C, 0xAC, 0xAE, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1D, 0x9C, 0x9F, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x1E, 0x8C, 0x90, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1F, 0x7C, 0x81, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x20, 0x6C, 0x72, 0x10, 0x00, 0x00, 0x00, 0x00, 0x21, 0x5C, 0x63, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x22, 0x4C, 0x54, 0x10, 0x00, 0x00, 0x00, 0x00, 0x23, 0x3C, 0x45, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x24, 0x2C, 0x36, 0x10, 0x00, 0x00, 0x00, 0x00, 0x25, 0x1C, 0x27, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x26, 0x0C, 0x18, 0x10, 0x00, 0x00, 0x00, 0x00, 0x27, 0x05, 0x43, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x27, 0xF5, 0x34, 0x90, 0x00, 0x00, 0x00, 0x00, 0x28, 0xE5, 0x25, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x29, 0xD5, 0x16, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xC5, 0x07, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x2B, 0xB4, 0xF8, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xA4, 0xE9, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x2D, 0x94, 0xDA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2E, 0x84, 0xCB, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x2F, 0x74, 0xBC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x30, 0x64, 0xAD, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x31, 0x5D, 0xD9, 0x10, 0x00, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0xFF, 0xFF, 0xFF, 0xF8, 0xF3, 0x46, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF9, 0xE3, 0x37, 0xA0, 0x00,
+0x00, 0x00, 0x00, 0x0C, 0xAB, 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0D, 0x9B, 0x1B, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x0E, 0x8B, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x84, 0x45, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x10, 0x74, 0x36, 0x90, 0x00, 0x00, 0x00, 0x00, 0x11, 0x64, 0x27, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x12, 0x54, 0x18, 0x90, 0x00, 0x00, 0x00, 0x00, 0x13, 0x4D, 0x44, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x14, 0x33, 0xFA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x15, 0x23, 0xDD, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x16, 0x13, 0xCE, 0x80, 0x00, 0x00, 0x00, 0x00, 0x17, 0x03, 0xBF, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x17, 0xF3, 0xB0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x18, 0xE3, 0xA1, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x19, 0xD3, 0x92, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xC3, 0x83, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x1B, 0xBC, 0xAF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xAC, 0xA0, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x1D, 0x9C, 0x91, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x8C, 0x90, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x1F, 0x7C, 0x81, 0x10, 0x00, 0x00, 0x00, 0x00, 0x20, 0x6C, 0x72, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x21, 0x5C, 0x63, 0x10, 0x00, 0x00, 0x00, 0x00, 0x22, 0x4C, 0x54, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x23, 0x3C, 0x45, 0x10, 0x00, 0x00, 0x00, 0x00, 0x24, 0x2C, 0x36, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x25, 0x1C, 0x27, 0x10, 0x00, 0x00, 0x00, 0x00, 0x26, 0x0C, 0x18, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x27, 0x05, 0x43, 0x90, 0x00, 0x00, 0x00, 0x00, 0x27, 0xF5, 0x34, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x28, 0xE5, 0x25, 0x90, 0x00, 0x00, 0x00, 0x00, 0x29, 0xD5, 0x16, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x2A, 0xC5, 0x07, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xB4, 0xF8, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x2C, 0xA4, 0xE9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x94, 0xDA, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x2E, 0x84, 0xCB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x74, 0xBC, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x30, 0x64, 0xAD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x31, 0x5D, 0xD9, 0x10, 0x00,
 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
-0x02, 0x01, 0x02, 0x01, 0x03, 0x01, 0x02, 0x01, 0x03, 0x01, 0x02, 0x01, 0x03, 0x01, 0x02, 0x01,
-0x03, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x03, 0x01, 0x02, 0x01,
+0x03, 0x01, 0x02, 0x01, 0x03, 0x01, 0x02, 0x01, 0x03, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
-0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x04, 0x02, 0x01, 0x02, 0x01,
 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
-0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x04, 0x05, 0x04, 0x05,
-0x04, 0x05, 0x04, 0x01, 0xFF, 0xFF, 0xF7, 0x63, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x04,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x0D, 0x00, 0x00, 0x0E, 0x10,
-0x00, 0x12, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x16, 0x4C, 0x4D, 0x54, 0x00, 0x57, 0x45, 0x53, 0x54,
-0x00, 0x57, 0x45, 0x54, 0x00, 0x57, 0x45, 0x4D, 0x54, 0x00, 0x43, 0x45, 0x54, 0x00, 0x43, 0x45,
-0x53, 0x54, 0x00, 0x0A, 0x57, 0x45, 0x54, 0x30, 0x57, 0x45, 0x53, 0x54, 0x2C, 0x4D, 0x33, 0x2E,
-0x35, 0x2E, 0x30, 0x2F, 0x31, 0x2C, 0x4D, 0x31, 0x30, 0x2E, 0x35, 0x2E, 0x30, 0x0A, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x02, 0x01, 0x02, 0x01, 0x04, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x01, 0xFF, 0xFF, 0xF7,
+0x63, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00,
+0x00, 0x1C, 0x20, 0x01, 0x0D, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x12, 0x00, 0x00, 0x1C, 0x20, 0x01,
+0x16, 0x4C, 0x4D, 0x54, 0x00, 0x57, 0x45, 0x53, 0x54, 0x00, 0x57, 0x45, 0x54, 0x00, 0x57, 0x45,
+0x4D, 0x54, 0x00, 0x43, 0x45, 0x54, 0x00, 0x43, 0x45, 0x53, 0x54, 0x00, 0x0A, 0x57, 0x45, 0x54,
+0x30, 0x57, 0x45, 0x53, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x31, 0x2C, 0x4D,
+0x31, 0x30, 0x2E, 0x35, 0x2E, 0x30, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 
 
 /* PRC */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -22879,62 +23180,83 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x58, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x10, 0xFF,
-0xFF, 0xFF, 0xFF, 0x9E, 0xA6, 0x48, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0x9F, 0xBB, 0x15, 0x90, 0xFF,
-0xFF, 0xFF, 0xFF, 0xA0, 0x86, 0x2A, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xA1, 0x9A, 0xF7, 0x90, 0xFF,
-0xFF, 0xFF, 0xFF, 0xCB, 0x89, 0x1A, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x23, 0xF4, 0x70, 0xFF,
-0xFF, 0xFF, 0xFF, 0xD2, 0x61, 0x26, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0xF8, 0x83, 0x20, 0xFF,
-0xFF, 0xFF, 0xFF, 0xFB, 0xE8, 0x66, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0xD8, 0x65, 0x20, 0xFF,
-0xFF, 0xFF, 0xFF, 0xFD, 0xC8, 0x48, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xB8, 0x47, 0x20, 0xFF,
-0xFF, 0xFF, 0xFF, 0xFF, 0xA8, 0x2A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x98, 0x29, 0x20, 0x00,
-0x00, 0x00, 0x00, 0x01, 0x88, 0x0C, 0x10, 0x00, 0x00, 0x00, 0x00, 0x02, 0x78, 0x0B, 0x20, 0x00,
-0x00, 0x00, 0x00, 0x03, 0x71, 0x28, 0x90, 0x00, 0x00, 0x00, 0x00, 0x04, 0x61, 0x27, 0xA0, 0x00,
-0x00, 0x00, 0x00, 0x05, 0x51, 0x0A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x06, 0x41, 0x09, 0xA0, 0x00,
-0x00, 0x00, 0x00, 0x07, 0x30, 0xEC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x07, 0x8D, 0x43, 0xA0, 0x00,
-0x00, 0x00, 0x00, 0x09, 0x10, 0xCE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x09, 0xAD, 0xBF, 0x20, 0x00,
-0x00, 0x00, 0x00, 0x0A, 0xF0, 0xB0, 0x90, 0x00, 0x00, 0x00, 0x00, 0x0B, 0xE0, 0xAF, 0xA0, 0x00,
-0x00, 0x00, 0x00, 0x0C, 0xD9, 0xCD, 0x10, 0x00, 0x00, 0x00, 0x00, 0x0D, 0xC0, 0x91, 0xA0, 0x00,
-0x00, 0x00, 0x00, 0x0E, 0xB9, 0xAF, 0x10, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xA9, 0xAE, 0x20, 0x00,
-0x00, 0x00, 0x00, 0x10, 0x99, 0x91, 0x10, 0x00, 0x00, 0x00, 0x00, 0x11, 0x89, 0x90, 0x20, 0x00,
-0x00, 0x00, 0x00, 0x12, 0x79, 0x73, 0x10, 0x00, 0x00, 0x00, 0x00, 0x13, 0x69, 0x72, 0x20, 0x00,
-0x00, 0x00, 0x00, 0x14, 0x59, 0x55, 0x10, 0x00, 0x00, 0x00, 0x00, 0x15, 0x49, 0x54, 0x20, 0x00,
-0x00, 0x00, 0x00, 0x16, 0x39, 0x37, 0x10, 0x00, 0x00, 0x00, 0x00, 0x17, 0x29, 0x36, 0x20, 0x00,
-0x00, 0x00, 0x00, 0x18, 0x22, 0x53, 0x90, 0x00, 0x00, 0x00, 0x00, 0x19, 0x09, 0x18, 0x20, 0x00,
-0x00, 0x00, 0x00, 0x1A, 0x02, 0x35, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xF2, 0x34, 0xA0, 0x00,
-0x00, 0x00, 0x00, 0x1B, 0xE2, 0x17, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xD2, 0x16, 0xA0, 0x00,
-0x00, 0x00, 0x00, 0x1D, 0xC1, 0xF9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1E, 0xB1, 0xF8, 0xA0, 0x00,
-0x00, 0x00, 0x00, 0x1F, 0xA1, 0xDB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x20, 0x76, 0x2B, 0x20, 0x00,
-0x00, 0x00, 0x00, 0x21, 0x81, 0xBD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x22, 0x56, 0x0D, 0x20, 0x00,
-0x00, 0x00, 0x00, 0x23, 0x6A, 0xDA, 0x10, 0x00, 0x00, 0x00, 0x00, 0x24, 0x35, 0xEF, 0x20, 0x00,
-0x00, 0x00, 0x00, 0x25, 0x4A, 0xBC, 0x10, 0x00, 0x00, 0x00, 0x00, 0x26, 0x15, 0xD1, 0x20, 0x00,
-0x00, 0x00, 0x00, 0x27, 0x2A, 0x9E, 0x10, 0x00, 0x00, 0x00, 0x00, 0x27, 0xFE, 0xED, 0xA0, 0x00,
-0x00, 0x00, 0x00, 0x29, 0x0A, 0x80, 0x10, 0x00, 0x00, 0x00, 0x00, 0x29, 0xDE, 0xCF, 0xA0, 0x00,
-0x00, 0x00, 0x00, 0x2A, 0xEA, 0x62, 0x10, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xBE, 0xB1, 0xA0, 0x00,
-0x00, 0x00, 0x00, 0x2C, 0xD3, 0x7E, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x9E, 0x93, 0xA0, 0x00,
-0x00, 0x00, 0x00, 0x2E, 0xB3, 0x60, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x7E, 0x75, 0xA0, 0x00,
-0x00, 0x00, 0x00, 0x30, 0x93, 0x42, 0x90, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x92, 0x20, 0x00,
-0x00, 0x00, 0x00, 0x32, 0x73, 0x24, 0x90, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x74, 0x20, 0x00,
-0x00, 0x00, 0x00, 0x34, 0x53, 0x06, 0x90, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x56, 0x20, 0x00,
-0x00, 0x00, 0x00, 0x36, 0x32, 0xE8, 0x90, 0x00, 0x00, 0x00, 0x00, 0x37, 0x07, 0x38, 0x20, 0x00,
-0x00, 0x00, 0x00, 0x38, 0x1C, 0x05, 0x10, 0x00, 0x00, 0x00, 0x00, 0x38, 0xE7, 0x1A, 0x20, 0x00,
-0x00, 0x00, 0x00, 0x39, 0xFB, 0xE7, 0x10, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xC6, 0xFC, 0x20, 0x00,
-0x00, 0x00, 0x00, 0x3B, 0xDB, 0xC9, 0x10, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xB0, 0x18, 0xA0, 0x00,
-0x00, 0x00, 0x00, 0x3D, 0xBB, 0xAB, 0x10, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x8F, 0xFA, 0xA0, 0x00,
-0x00, 0x00, 0x00, 0x3F, 0x9B, 0x8D, 0x10, 0x00, 0x00, 0x00, 0x00, 0x40, 0x6F, 0xDC, 0xA0, 0x00,
-0x00, 0x00, 0x00, 0x41, 0x84, 0xA9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x42, 0x4F, 0xBE, 0xA0, 0x00,
-0x00, 0x00, 0x00, 0x43, 0x64, 0x8B, 0x90, 0x00, 0x00, 0x00, 0x00, 0x44, 0x2F, 0xA0, 0xA0, 0x00,
-0x00, 0x00, 0x00, 0x45, 0x44, 0x6D, 0x90, 0x00, 0x00, 0x00, 0x00, 0x45, 0xF3, 0xD3, 0x20, 0x01,
-0x00, 0x01, 0x00, 0x02, 0x03, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x04, 0xFF, 0xFF, 0x9D,
-0x90, 0x01, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x08, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x0C, 0x50,
-0x44, 0x54, 0x00, 0x50, 0x53, 0x54, 0x00, 0x50, 0x57, 0x54, 0x00, 0x50, 0x50, 0x54, 0x00, 0x0A,
-0x50, 0x53, 0x54, 0x38, 0x50, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D,
-0x31, 0x31, 0x2E, 0x31, 0x2E, 0x30, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7D, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x14, 0xFF,
+0xFF, 0xFF, 0xFF, 0x5E, 0x04, 0x1A, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0x9E, 0xA6, 0x48, 0xA0, 0xFF,
+0xFF, 0xFF, 0xFF, 0x9F, 0xBB, 0x15, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xA0, 0x86, 0x2A, 0xA0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA1, 0x9A, 0xF7, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0x89, 0x1A, 0xA0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD2, 0x23, 0xF4, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x61, 0x26, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD6, 0xFE, 0x74, 0x5C, 0xFF, 0xFF, 0xFF, 0xFF, 0xD8, 0x80, 0xAD, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xDA, 0xFE, 0xC3, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xDB, 0xC0, 0x90, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xDC, 0xDE, 0xA5, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xDD, 0xA9, 0xAC, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xDE, 0xBE, 0x87, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0x89, 0x8E, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xE0, 0x9E, 0x69, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE1, 0x69, 0x70, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xE2, 0x7E, 0x4B, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE3, 0x49, 0x52, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xE4, 0x5E, 0x2D, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE5, 0x29, 0x34, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xE6, 0x47, 0x4A, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xE7, 0x12, 0x51, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xE8, 0x27, 0x2C, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xE8, 0xF2, 0x33, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xEA, 0x07, 0x0E, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xEA, 0xD2, 0x15, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xEB, 0xE6, 0xF0, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xEC, 0xB1, 0xF7, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xED, 0xC6, 0xD2, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xEE, 0x91, 0xD9, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xEF, 0xAF, 0xEE, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xF0, 0x71, 0xBB, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xF1, 0x8F, 0xD0, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xF2, 0x7F, 0xC1, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xF3, 0x6F, 0xB2, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x5F, 0xA3, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xF5, 0x4F, 0x94, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xF6, 0x3F, 0x85, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xF7, 0x2F, 0x76, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x28, 0xA2, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xF9, 0x0F, 0x58, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x08, 0x84, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xFA, 0xF8, 0x83, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xFB, 0xE8, 0x66, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xFC, 0xD8, 0x65, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xFD, 0xC8, 0x48, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xFE, 0xB8, 0x47, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xA8, 0x2A, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x98, 0x29, 0x20, 0x00, 0x00, 0x00, 0x00, 0x01, 0x88, 0x0C, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x02, 0x78, 0x0B, 0x20, 0x00, 0x00, 0x00, 0x00, 0x03, 0x71, 0x28, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x04, 0x61, 0x27, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x05, 0x51, 0x0A, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x06, 0x41, 0x09, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x07, 0x30, 0xEC, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x07, 0x8D, 0x43, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x09, 0x10, 0xCE, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x09, 0xAD, 0xBF, 0x20, 0x00, 0x00, 0x00, 0x00, 0x0A, 0xF0, 0xB0, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x0B, 0xE0, 0xAF, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x0C, 0xD9, 0xCD, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x0D, 0xC0, 0x91, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x0E, 0xB9, 0xAF, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x0F, 0xA9, 0xAE, 0x20, 0x00, 0x00, 0x00, 0x00, 0x10, 0x99, 0x91, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x11, 0x89, 0x90, 0x20, 0x00, 0x00, 0x00, 0x00, 0x12, 0x79, 0x73, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x13, 0x69, 0x72, 0x20, 0x00, 0x00, 0x00, 0x00, 0x14, 0x59, 0x55, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x15, 0x49, 0x54, 0x20, 0x00, 0x00, 0x00, 0x00, 0x16, 0x39, 0x37, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x17, 0x29, 0x36, 0x20, 0x00, 0x00, 0x00, 0x00, 0x18, 0x22, 0x53, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x19, 0x09, 0x18, 0x20, 0x00, 0x00, 0x00, 0x00, 0x1A, 0x02, 0x35, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x1A, 0xF2, 0x34, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xE2, 0x17, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x1C, 0xD2, 0x16, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC1, 0xF9, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x1E, 0xB1, 0xF8, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA1, 0xDB, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x20, 0x76, 0x2B, 0x20, 0x00, 0x00, 0x00, 0x00, 0x21, 0x81, 0xBD, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x22, 0x56, 0x0D, 0x20, 0x00, 0x00, 0x00, 0x00, 0x23, 0x6A, 0xDA, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x24, 0x35, 0xEF, 0x20, 0x00, 0x00, 0x00, 0x00, 0x25, 0x4A, 0xBC, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x26, 0x15, 0xD1, 0x20, 0x00, 0x00, 0x00, 0x00, 0x27, 0x2A, 0x9E, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x27, 0xFE, 0xED, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x29, 0x0A, 0x80, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x29, 0xDE, 0xCF, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xEA, 0x62, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x2B, 0xBE, 0xB1, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xD3, 0x7E, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x2D, 0x9E, 0x93, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x2E, 0xB3, 0x60, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x2F, 0x7E, 0x75, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x30, 0x93, 0x42, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x31, 0x67, 0x92, 0x20, 0x00, 0x00, 0x00, 0x00, 0x32, 0x73, 0x24, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x33, 0x47, 0x74, 0x20, 0x00, 0x00, 0x00, 0x00, 0x34, 0x53, 0x06, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x35, 0x27, 0x56, 0x20, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0xE8, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x37, 0x07, 0x38, 0x20, 0x00, 0x00, 0x00, 0x00, 0x38, 0x1C, 0x05, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x38, 0xE7, 0x1A, 0x20, 0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0xE7, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x3A, 0xC6, 0xFC, 0x20, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xDB, 0xC9, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x3C, 0xB0, 0x18, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0xAB, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x3E, 0x8F, 0xFA, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x8D, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x40, 0x6F, 0xDC, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0xA9, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x42, 0x4F, 0xBE, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x8B, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x44, 0x2F, 0xA0, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x45, 0x44, 0x6D, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x45, 0xF3, 0xD3, 0x20, 0x02, 0x01, 0x02, 0x01, 0x02, 0x03, 0x04, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0xFF, 0xFF, 0x91, 0x26, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x04,
+0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x08, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x0C, 0xFF, 0xFF, 0x9D, 0x90,
+0x01, 0x10, 0x4C, 0x4D, 0x54, 0x00, 0x50, 0x44, 0x54, 0x00, 0x50, 0x53, 0x54, 0x00, 0x50, 0x57,
+0x54, 0x00, 0x50, 0x50, 0x54, 0x00, 0x0A, 0x50, 0x53, 0x54, 0x38, 0x50, 0x44, 0x54, 0x2C, 0x4D,
+0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D, 0x31, 0x31, 0x2E, 0x31, 0x2E, 0x30, 0x0A, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 
 /* ROC */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -23907,33 +24229,94 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x27, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x09, 0x00,
-0x00, 0x00, 0x00, 0x0D, 0xA4, 0x63, 0x90, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x8B, 0x1A, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x0F, 0x84, 0x45, 0x90, 0x00, 0x00, 0x00, 0x00, 0x10, 0x74, 0x36, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x11, 0x64, 0x27, 0x90, 0x00, 0x00, 0x00, 0x00, 0x12, 0x54, 0x18, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x13, 0x4D, 0x44, 0x10, 0x00, 0x00, 0x00, 0x00, 0x14, 0x33, 0xFA, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x15, 0x23, 0xEB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x16, 0x13, 0xDC, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x17, 0x03, 0xCD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x17, 0xF3, 0xBE, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x18, 0xE3, 0xAF, 0x90, 0x00, 0x00, 0x00, 0x00, 0x19, 0xD3, 0xA0, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x1A, 0xC3, 0x91, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xBC, 0xBD, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x1C, 0xAC, 0xAE, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1D, 0x9C, 0x9F, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x1E, 0x8C, 0x90, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1F, 0x7C, 0x81, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x20, 0x6C, 0x72, 0x10, 0x00, 0x00, 0x00, 0x00, 0x21, 0x5C, 0x63, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x22, 0x4C, 0x54, 0x10, 0x00, 0x00, 0x00, 0x00, 0x23, 0x3C, 0x45, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x24, 0x2C, 0x36, 0x10, 0x00, 0x00, 0x00, 0x00, 0x25, 0x1C, 0x27, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x26, 0x0C, 0x18, 0x10, 0x00, 0x00, 0x00, 0x00, 0x27, 0x05, 0x43, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x27, 0xF5, 0x34, 0x90, 0x00, 0x00, 0x00, 0x00, 0x28, 0xE5, 0x25, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x29, 0xD5, 0x16, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xC5, 0x07, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x2B, 0xB4, 0xF8, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xA4, 0xE9, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x2D, 0x94, 0xDA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2E, 0x84, 0xCB, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x2F, 0x74, 0xBC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x30, 0x64, 0xAD, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x31, 0x5D, 0xD9, 0x10, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x00, 0x57, 0x45, 0x53, 0x54, 0x00, 0x57,
-0x45, 0x54, 0x00, 0x0A, 0x57, 0x45, 0x54, 0x30, 0x57, 0x45, 0x53, 0x54, 0x2C, 0x4D, 0x33, 0x2E,
-0x35, 0x2E, 0x30, 0x2F, 0x31, 0x2C, 0x4D, 0x31, 0x30, 0x2E, 0x35, 0x2E, 0x30, 0x0A, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8E, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x1B, 0xFF,
+0xFF, 0xFF, 0xFF, 0x5E, 0x3D, 0x0C, 0x1D, 0xFF, 0xFF, 0xFF, 0xFF, 0x92, 0xE6, 0x8E, 0x80, 0xFF,
+0xFF, 0xFF, 0xFF, 0x9B, 0x4B, 0x6D, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0x9B, 0xFE, 0xC7, 0x80, 0xFF,
+0xFF, 0xFF, 0xFF, 0x9C, 0x9C, 0xFB, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0x9D, 0xC9, 0x83, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0x9E, 0x7E, 0x2F, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x9F, 0xAA, 0xB6, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA0, 0x5F, 0x62, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xA1, 0x8B, 0xEA, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA2, 0x41, 0xE7, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xA3, 0x6E, 0x6F, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA4, 0x23, 0x1B, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0x4F, 0xA2, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xAA, 0x05, 0xEF, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAA, 0xE7, 0x5F, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xAD, 0xC9, 0xA7, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xAE, 0xA7, 0x23, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xAF, 0xA0, 0x4F, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB0, 0x87, 0x05, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB1, 0x89, 0x6B, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB2, 0x70, 0x22, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB3, 0x72, 0x88, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB4, 0x50, 0x04, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB7, 0x32, 0x4C, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0x0F, 0xC8, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB8, 0xFF, 0xB9, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB9, 0xEF, 0xAA, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xBC, 0xC8, 0xB7, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xBD, 0xB8, 0xA8, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xBE, 0x9F, 0x5F, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xBF, 0x98, 0x8A, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xC0, 0x9A, 0xF0, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC1, 0x78, 0x6C, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xC2, 0x68, 0x5D, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC3, 0x58, 0x4E, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xC4, 0x3F, 0x05, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xC5, 0x38, 0x30, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xC6, 0x3A, 0x96, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC7, 0x58, 0xAC, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xC7, 0xD9, 0xDF, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0x03, 0xD2, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xC9, 0xF1, 0x20, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xCA, 0xE2, 0x62, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xCB, 0xB5, 0x52, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0xEC, 0xA3, 0xE0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xCC, 0x80, 0x4B, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCC, 0xDC, 0xA2, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xCD, 0x95, 0x34, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCD, 0xC3, 0x4B, 0x60, 0xFF,
+0xFF, 0xFF, 0xFF, 0xCE, 0x72, 0xA2, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCE, 0xC5, 0xBF, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xCF, 0x75, 0x16, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCF, 0xAC, 0x67, 0xE0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD0, 0x52, 0x84, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD0, 0xA5, 0xA1, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD1, 0x54, 0xF8, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD1, 0x8C, 0x49, 0xE0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD2, 0x32, 0x66, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x85, 0x83, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD3, 0x59, 0xC4, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD4, 0x49, 0xB5, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD5, 0x39, 0xD1, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xD6, 0x29, 0xC2, 0x20, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD7, 0x19, 0xB3, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xD8, 0x09, 0xA4, 0x20, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD8, 0xF9, 0x95, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xD9, 0xE9, 0x86, 0x20, 0xFF,
+0xFF, 0xFF, 0xFF, 0xDA, 0xD9, 0x77, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xDB, 0xC9, 0x68, 0x20, 0xFF,
+0xFF, 0xFF, 0xFF, 0xDC, 0xB9, 0x59, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xDD, 0xB2, 0x84, 0xA0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xDE, 0xA2, 0x75, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0x92, 0x66, 0xA0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xE0, 0x82, 0x57, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE1, 0x72, 0x48, 0xA0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xE2, 0x62, 0x39, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE3, 0x52, 0x2A, 0xA0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xE4, 0x42, 0x1B, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE5, 0x32, 0x0C, 0xA0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xE6, 0x21, 0xFD, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE7, 0x1B, 0x29, 0x20, 0xFF,
+0xFF, 0xFF, 0xFF, 0xE8, 0x0B, 0x1A, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xE8, 0xFB, 0x0B, 0x20, 0xFF,
+0xFF, 0xFF, 0xFF, 0xE9, 0xEA, 0xFC, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xEA, 0xDA, 0xED, 0x20, 0xFF,
+0xFF, 0xFF, 0xFF, 0xEB, 0xCA, 0xDE, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xEC, 0xBA, 0xCF, 0x20, 0xFF,
+0xFF, 0xFF, 0xFF, 0xED, 0xAA, 0xC0, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xEE, 0x9A, 0xB1, 0x20, 0xFF,
+0xFF, 0xFF, 0xFF, 0xEF, 0x8A, 0xA2, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF0, 0x7A, 0x93, 0x20, 0xFF,
+0xFF, 0xFF, 0xFF, 0xF1, 0x6A, 0x84, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF2, 0x63, 0xAF, 0xA0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xF3, 0x53, 0xA0, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x43, 0x91, 0xA0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xF5, 0x33, 0x82, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF6, 0x23, 0x73, 0xA0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xF7, 0x13, 0x64, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x03, 0x55, 0xA0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xF8, 0xF3, 0x46, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF9, 0xE3, 0x37, 0xA0, 0x00,
+0x00, 0x00, 0x00, 0x0C, 0xAB, 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0D, 0x9B, 0x1B, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x0E, 0x8B, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x84, 0x45, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x10, 0x74, 0x36, 0x90, 0x00, 0x00, 0x00, 0x00, 0x11, 0x64, 0x27, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x12, 0x54, 0x18, 0x90, 0x00, 0x00, 0x00, 0x00, 0x13, 0x4D, 0x44, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x14, 0x33, 0xFA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x15, 0x23, 0xDD, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x16, 0x13, 0xCE, 0x80, 0x00, 0x00, 0x00, 0x00, 0x17, 0x03, 0xBF, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x17, 0xF3, 0xB0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x18, 0xE3, 0xA1, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x19, 0xD3, 0x92, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xC3, 0x83, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x1B, 0xBC, 0xAF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xAC, 0xA0, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x1D, 0x9C, 0x91, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x8C, 0x90, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x1F, 0x7C, 0x81, 0x10, 0x00, 0x00, 0x00, 0x00, 0x20, 0x6C, 0x72, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x21, 0x5C, 0x63, 0x10, 0x00, 0x00, 0x00, 0x00, 0x22, 0x4C, 0x54, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x23, 0x3C, 0x45, 0x10, 0x00, 0x00, 0x00, 0x00, 0x24, 0x2C, 0x36, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x25, 0x1C, 0x27, 0x10, 0x00, 0x00, 0x00, 0x00, 0x26, 0x0C, 0x18, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x27, 0x05, 0x43, 0x90, 0x00, 0x00, 0x00, 0x00, 0x27, 0xF5, 0x34, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x28, 0xE5, 0x25, 0x90, 0x00, 0x00, 0x00, 0x00, 0x29, 0xD5, 0x16, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x2A, 0xC5, 0x07, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xB4, 0xF8, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x2C, 0xA4, 0xE9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x94, 0xDA, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x2E, 0x84, 0xCB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x74, 0xBC, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x30, 0x64, 0xAD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x31, 0x5D, 0xD9, 0x10, 0x00,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x03, 0x01, 0x02, 0x01,
+0x03, 0x01, 0x02, 0x01, 0x03, 0x01, 0x02, 0x01, 0x03, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x04, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x01, 0xFF, 0xFF, 0xF7,
+0x63, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00,
+0x00, 0x1C, 0x20, 0x01, 0x0D, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x12, 0x00, 0x00, 0x1C, 0x20, 0x01,
+0x16, 0x4C, 0x4D, 0x54, 0x00, 0x57, 0x45, 0x53, 0x54, 0x00, 0x57, 0x45, 0x54, 0x00, 0x57, 0x45,
+0x4D, 0x54, 0x00, 0x43, 0x45, 0x54, 0x00, 0x43, 0x45, 0x53, 0x54, 0x00, 0x0A, 0x57, 0x45, 0x54,
+0x30, 0x57, 0x45, 0x53, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x31, 0x2C, 0x4D,
+0x31, 0x30, 0x2E, 0x35, 0x2E, 0x30, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 
 
 /* Zulu */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -23946,7 +24329,7 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 };
 #else
-const timelib_tzdb_index_entry timezonedb_idx_builtin597 = {
+const timelib_tzdb_index_entry timezonedb_idx_builtin598 = {
 	{ (char*) "Africa/Abidjan"                    , 0x000000 },
 	{ (char*) "Africa/Accra"                      , 0x0000A0 },
 	{ (char*) "Africa/Addis_Ababa"                , 0x0004D0 },
@@ -24021,533 +24404,534 @@
 	{ (char*) "America/Argentina/Ushuaia"         , 0x00A772 },
 	{ (char*) "America/Aruba"                     , 0x00ABB9 },
 	{ (char*) "America/Asuncion"                  , 0x00AC7F },
-	{ (char*) "America/Atikokan"                  , 0x00B479 },
-	{ (char*) "America/Atka"                      , 0x00B5F6 },
-	{ (char*) "America/Bahia"                     , 0x00BF36 },
-	{ (char*) "America/Bahia_Banderas"            , 0x00C339 },
-	{ (char*) "America/Barbados"                  , 0x00C7D6 },
-	{ (char*) "America/Belem"                     , 0x00C996 },
-	{ (char*) "America/Belize"                    , 0x00CBE6 },
-	{ (char*) "America/Blanc-Sablon"              , 0x00D240 },
-	{ (char*) "America/Boa_Vista"                 , 0x00D392 },
-	{ (char*) "America/Bogota"                    , 0x00D60F },
-	{ (char*) "America/Boise"                     , 0x00D703 },
-	{ (char*) "America/Buenos_Aires"              , 0x00E099 },
-	{ (char*) "America/Cambridge_Bay"             , 0x00E4CB },
-	{ (char*) "America/Campo_Grande"              , 0x00EDB9 },
-	{ (char*) "America/Cancun"                    , 0x00F36D },
-	{ (char*) "America/Caracas"                   , 0x00F6C7 },
-	{ (char*) "America/Catamarca"                 , 0x00F7CD },
-	{ (char*) "America/Cayenne"                   , 0x00FBFF },
-	{ (char*) "America/Cayman"                    , 0x00FCC3 },
-	{ (char*) "America/Chicago"                   , 0x00FD85 },
-	{ (char*) "America/Chihuahua"                 , 0x010BAD },
-	{ (char*) "America/Ciudad_Juarez"             , 0x01101D },
-	{ (char*) "America/Coral_Harbour"             , 0x011647 },
-	{ (char*) "America/Cordoba"                   , 0x011709 },
-	{ (char*) "America/Costa_Rica"                , 0x011B3B },
-	{ (char*) "America/Creston"                   , 0x011C83 },
-	{ (char*) "America/Cuiaba"                    , 0x011D71 },
-	{ (char*) "America/Curacao"                   , 0x012302 },
-	{ (char*) "America/Danmarkshavn"              , 0x0123C8 },
-	{ (char*) "America/Dawson"                    , 0x0126A8 },
-	{ (char*) "America/Dawson_Creek"              , 0x012D14 },
-	{ (char*) "America/Denver"                    , 0x01315A },
-	{ (char*) "America/Detroit"                   , 0x013B17 },
-	{ (char*) "America/Dominica"                  , 0x0143F2 },
-	{ (char*) "America/Edmonton"                  , 0x014492 },
-	{ (char*) "America/Eirunepe"                  , 0x014DDC },
-	{ (char*) "America/El_Salvador"               , 0x015079 },
-	{ (char*) "America/Ensenada"                  , 0x015165 },
-	{ (char*) "America/Fort_Nelson"               , 0x015AB7 },
-	{ (char*) "America/Fort_Wayne"                , 0x016397 },
-	{ (char*) "America/Fortaleza"                 , 0x016A35 },
-	{ (char*) "America/Glace_Bay"                 , 0x016D25 },
-	{ (char*) "America/Godthab"                   , 0x0175DC },
-	{ (char*) "America/Goose_Bay"                 , 0x017D49 },
-	{ (char*) "America/Grand_Turk"                , 0x0189FF },
-	{ (char*) "America/Grenada"                   , 0x019135 },
-	{ (char*) "America/Guadeloupe"                , 0x0191D5 },
-	{ (char*) "America/Guatemala"                 , 0x019275 },
-	{ (char*) "America/Guayaquil"                 , 0x019399 },
-	{ (char*) "America/Guyana"                    , 0x01949F },
-	{ (char*) "America/Halifax"                   , 0x0195A3 },
-	{ (char*) "America/Havana"                    , 0x01A32D },
-	{ (char*) "America/Hermosillo"                , 0x01ACA9 },
-	{ (char*) "America/Indiana/Indianapolis"      , 0x01AE83 },
-	{ (char*) "America/Indiana/Knox"              , 0x01B53A },
-	{ (char*) "America/Indiana/Marengo"           , 0x01BEE7 },
-	{ (char*) "America/Indiana/Petersburg"        , 0x01C5D4 },
-	{ (char*) "America/Indiana/Tell_City"         , 0x01CD73 },
-	{ (char*) "America/Indiana/Vevay"             , 0x01D437 },
-	{ (char*) "America/Indiana/Vincennes"         , 0x01D9F3 },
-	{ (char*) "America/Indiana/Winamac"           , 0x01E0C9 },
-	{ (char*) "America/Indianapolis"              , 0x01E7ED },
-	{ (char*) "America/Inuvik"                    , 0x01EE8B },
-	{ (char*) "America/Iqaluit"                   , 0x01F6C5 },
-	{ (char*) "America/Jamaica"                   , 0x01FF84 },
-	{ (char*) "America/Jujuy"                     , 0x020172 },
-	{ (char*) "America/Juneau"                    , 0x020588 },
-	{ (char*) "America/Kentucky/Louisville"       , 0x020ED9 },
-	{ (char*) "America/Kentucky/Monticello"       , 0x0219E7 },
-	{ (char*) "America/Knox_IN"                   , 0x022347 },
-	{ (char*) "America/Kralendijk"                , 0x022CDF },
-	{ (char*) "America/La_Paz"                    , 0x022DE1 },
-	{ (char*) "America/Lima"                      , 0x022EC7 },
-	{ (char*) "America/Los_Angeles"               , 0x02305B },
-	{ (char*) "America/Louisville"                , 0x023B92 },
-	{ (char*) "America/Lower_Princes"             , 0x024682 },
-	{ (char*) "America/Maceio"                    , 0x024784 },
-	{ (char*) "America/Managua"                   , 0x024A7A },
-	{ (char*) "America/Manaus"                    , 0x024C34 },
-	{ (char*) "America/Marigot"                   , 0x024E9D },
-	{ (char*) "America/Martinique"                , 0x024F9F },
-	{ (char*) "America/Matamoros"                 , 0x025093 },
-	{ (char*) "America/Mazatlan"                  , 0x025655 },
-	{ (char*) "America/Mendoza"                   , 0x025AFB },
-	{ (char*) "America/Menominee"                 , 0x025F2D },
-	{ (char*) "America/Merida"                    , 0x02683A },
-	{ (char*) "America/Metlakatla"                , 0x026C43 },
-	{ (char*) "America/Mexico_City"               , 0x0271F5 },
-	{ (char*) "America/Miquelon"                  , 0x0276D5 },
-	{ (char*) "America/Moncton"                   , 0x027D55 },
-	{ (char*) "America/Monterrey"                 , 0x0289CB },
-	{ (char*) "America/Montevideo"                , 0x028DE1 },
-	{ (char*) "America/Montreal"                  , 0x0293C5 },
-	{ (char*) "America/Montserrat"                , 0x02A177 },
-	{ (char*) "America/Nassau"                    , 0x02A217 },
-	{ (char*) "America/New_York"                  , 0x02AB77 },
-	{ (char*) "America/Nipigon"                   , 0x02B977 },
-	{ (char*) "America/Nome"                      , 0x02C729 },
-	{ (char*) "America/Noronha"                   , 0x02D081 },
-	{ (char*) "America/North_Dakota/Beulah"       , 0x02D35B },
-	{ (char*) "America/North_Dakota/Center"       , 0x02DCD8 },
-	{ (char*) "America/North_Dakota/New_Salem"    , 0x02E655 },
-	{ (char*) "America/Nuuk"                      , 0x02EFD8 },
-	{ (char*) "America/Ojinaga"                   , 0x02F756 },
-	{ (char*) "America/Panama"                    , 0x02FD72 },
-	{ (char*) "America/Pangnirtung"               , 0x02FE34 },
-	{ (char*) "America/Paramaribo"                , 0x0306DA },
-	{ (char*) "America/Phoenix"                   , 0x0307DE },
-	{ (char*) "America/Port-au-Prince"            , 0x03096A },
-	{ (char*) "America/Port_of_Spain"             , 0x030F10 },
-	{ (char*) "America/Porto_Acre"                , 0x030FB0 },
-	{ (char*) "America/Porto_Velho"               , 0x031222 },
-	{ (char*) "America/Puerto_Rico"               , 0x031468 },
-	{ (char*) "America/Punta_Arenas"              , 0x03156A },
-	{ (char*) "America/Rainy_River"               , 0x031CF8 },
-	{ (char*) "America/Rankin_Inlet"              , 0x032838 },
-	{ (char*) "America/Recife"                    , 0x03306C },
-	{ (char*) "America/Regina"                    , 0x033340 },
-	{ (char*) "America/Resolute"                  , 0x033735 },
-	{ (char*) "America/Rio_Branco"                , 0x033F6A },
-	{ (char*) "America/Rosario"                   , 0x0341E0 },
-	{ (char*) "America/Santa_Isabel"              , 0x034612 },
-	{ (char*) "America/Santarem"                  , 0x034F64 },
-	{ (char*) "America/Santiago"                  , 0x0351C7 },
-	{ (char*) "America/Santo_Domingo"             , 0x035BB3 },
-	{ (char*) "America/Sao_Paulo"                 , 0x035D89 },
-	{ (char*) "America/Scoresbysund"              , 0x036361 },
-	{ (char*) "America/Shiprock"                  , 0x036B19 },
-	{ (char*) "America/Sitka"                     , 0x0374C1 },
-	{ (char*) "America/St_Barthelemy"             , 0x037DF9 },
-	{ (char*) "America/St_Johns"                  , 0x037EFB },
-	{ (char*) "America/St_Kitts"                  , 0x038D69 },
-	{ (char*) "America/St_Lucia"                  , 0x038E09 },
-	{ (char*) "America/St_Thomas"                 , 0x038ECB },
-	{ (char*) "America/St_Vincent"                , 0x038F6B },
-	{ (char*) "America/Swift_Current"             , 0x03902D },
-	{ (char*) "America/Tegucigalpa"               , 0x03927B },
-	{ (char*) "America/Thule"                     , 0x039383 },
-	{ (char*) "America/Thunder_Bay"               , 0x03997B },
-	{ (char*) "America/Tijuana"                   , 0x03A72D },
-	{ (char*) "America/Toronto"                   , 0x03B08E },
-	{ (char*) "America/Tortola"                   , 0x03BE5E },
-	{ (char*) "America/Vancouver"                 , 0x03BEFE },
-	{ (char*) "America/Virgin"                    , 0x03CA6F },
-	{ (char*) "America/Whitehorse"                , 0x03CB71 },
-	{ (char*) "America/Winnipeg"                  , 0x03D1DD },
-	{ (char*) "America/Yakutat"                   , 0x03DD3A },
-	{ (char*) "America/Yellowknife"               , 0x03E657 },
-	{ (char*) "Antarctica/Casey"                  , 0x03EF7F },
-	{ (char*) "Antarctica/Davis"                  , 0x03F137 },
-	{ (char*) "Antarctica/DumontDUrville"         , 0x03F263 },
-	{ (char*) "Antarctica/Macquarie"              , 0x03F333 },
-	{ (char*) "Antarctica/Mawson"                 , 0x03FC23 },
-	{ (char*) "Antarctica/McMurdo"                , 0x03FCEE },
-	{ (char*) "Antarctica/Palmer"                 , 0x0404E9 },
-	{ (char*) "Antarctica/Rothera"                , 0x040A77 },
-	{ (char*) "Antarctica/South_Pole"             , 0x040B20 },
-	{ (char*) "Antarctica/Syowa"                  , 0x0414B1 },
-	{ (char*) "Antarctica/Troll"                  , 0x041559 },
-	{ (char*) "Antarctica/Vostok"                 , 0x0419E6 },
-	{ (char*) "Arctic/Longyearbyen"               , 0x041ACD },
-	{ (char*) "Asia/Aden"                         , 0x0423D3 },
-	{ (char*) "Asia/Almaty"                       , 0x042476 },
-	{ (char*) "Asia/Amman"                        , 0x04286B },
-	{ (char*) "Asia/Anadyr"                       , 0x042E10 },
-	{ (char*) "Asia/Aqtau"                        , 0x0432C5 },
-	{ (char*) "Asia/Aqtobe"                       , 0x0436AF },
-	{ (char*) "Asia/Ashgabat"                     , 0x043AAD },
-	{ (char*) "Asia/Ashkhabad"                    , 0x043D16 },
-	{ (char*) "Asia/Atyrau"                       , 0x043F7F },
-	{ (char*) "Asia/Baghdad"                      , 0x044371 },
-	{ (char*) "Asia/Bahrain"                      , 0x044746 },
-	{ (char*) "Asia/Baku"                         , 0x044831 },
-	{ (char*) "Asia/Bangkok"                      , 0x044CFA },
-	{ (char*) "Asia/Barnaul"                      , 0x044DBF },
-	{ (char*) "Asia/Beirut"                       , 0x045290 },
-	{ (char*) "Asia/Bishkek"                      , 0x045B06 },
-	{ (char*) "Asia/Brunei"                       , 0x045EDB },
-	{ (char*) "Asia/Calcutta"                     , 0x045FA4 },
-	{ (char*) "Asia/Chita"                        , 0x0460CD },
-	{ (char*) "Asia/Choibalsan"                   , 0x0465A4 },
-	{ (char*) "Asia/Chongqing"                    , 0x046969 },
-	{ (char*) "Asia/Chungking"                    , 0x046BA6 },
-	{ (char*) "Asia/Colombo"                      , 0x046DE3 },
-	{ (char*) "Asia/Dacca"                        , 0x046F55 },
-	{ (char*) "Asia/Damascus"                     , 0x0470A4 },
-	{ (char*) "Asia/Dhaka"                        , 0x047801 },
-	{ (char*) "Asia/Dili"                         , 0x047950 },
-	{ (char*) "Asia/Dubai"                        , 0x047A31 },
-	{ (char*) "Asia/Dushanbe"                     , 0x047AD4 },
-	{ (char*) "Asia/Famagusta"                    , 0x047D21 },
-	{ (char*) "Asia/Gaza"                         , 0x048528 },
-	{ (char*) "Asia/Harbin"                       , 0x049442 },
-	{ (char*) "Asia/Hebron"                       , 0x04967F },
-	{ (char*) "Asia/Ho_Chi_Minh"                  , 0x04A5B4 },
-	{ (char*) "Asia/Hong_Kong"                    , 0x04A711 },
-	{ (char*) "Asia/Hovd"                         , 0x04ABEE },
-	{ (char*) "Asia/Irkutsk"                      , 0x04AF92 },
-	{ (char*) "Asia/Istanbul"                     , 0x04B485 },
-	{ (char*) "Asia/Jakarta"                      , 0x04BC1E },
-	{ (char*) "Asia/Jayapura"                     , 0x04BDB6 },
-	{ (char*) "Asia/Jerusalem"                    , 0x04BED5 },
-	{ (char*) "Asia/Kabul"                        , 0x04C835 },
-	{ (char*) "Asia/Kamchatka"                    , 0x04C903 },
-	{ (char*) "Asia/Karachi"                      , 0x04CDA1 },
-	{ (char*) "Asia/Kashgar"                      , 0x04CF28 },
-	{ (char*) "Asia/Kathmandu"                    , 0x04CFCB },
-	{ (char*) "Asia/Katmandu"                     , 0x04D09D },
-	{ (char*) "Asia/Khandyga"                     , 0x04D16F },
-	{ (char*) "Asia/Kolkata"                      , 0x04D682 },
-	{ (char*) "Asia/Krasnoyarsk"                  , 0x04D7AB },
-	{ (char*) "Asia/Kuala_Lumpur"                 , 0x04DC79 },
-	{ (char*) "Asia/Kuching"                      , 0x04DE2A },
-	{ (char*) "Asia/Kuwait"                       , 0x04E019 },
-	{ (char*) "Asia/Macao"                        , 0x04E0BC },
-	{ (char*) "Asia/Macau"                        , 0x04E593 },
-	{ (char*) "Asia/Magadan"                      , 0x04EA6A },
-	{ (char*) "Asia/Makassar"                     , 0x04EF3E },
-	{ (char*) "Asia/Manila"                       , 0x04F091 },
-	{ (char*) "Asia/Muscat"                       , 0x04F1E5 },
-	{ (char*) "Asia/Nicosia"                      , 0x04F288 },
-	{ (char*) "Asia/Novokuznetsk"                 , 0x04FA74 },
-	{ (char*) "Asia/Novosibirsk"                  , 0x04FF10 },
-	{ (char*) "Asia/Omsk"                         , 0x0503E7 },
-	{ (char*) "Asia/Oral"                         , 0x0508A9 },
-	{ (char*) "Asia/Phnom_Penh"                   , 0x050CA3 },
-	{ (char*) "Asia/Pontianak"                    , 0x050DC8 },
-	{ (char*) "Asia/Pyongyang"                    , 0x050F4B },
-	{ (char*) "Asia/Qatar"                        , 0x051044 },
-	{ (char*) "Asia/Qostanay"                     , 0x051109 },
-	{ (char*) "Asia/Qyzylorda"                    , 0x051530 },
-	{ (char*) "Asia/Rangoon"                      , 0x05194C },
-	{ (char*) "Asia/Riyadh"                       , 0x051A56 },
-	{ (char*) "Asia/Saigon"                       , 0x051AF9 },
-	{ (char*) "Asia/Sakhalin"                     , 0x051C56 },
-	{ (char*) "Asia/Samarkand"                    , 0x05211E },
-	{ (char*) "Asia/Seoul"                        , 0x05236E },
-	{ (char*) "Asia/Shanghai"                     , 0x0525E3 },
-	{ (char*) "Asia/Singapore"                    , 0x05282C },
-	{ (char*) "Asia/Srednekolymsk"                , 0x0529C9 },
-	{ (char*) "Asia/Taipei"                       , 0x052E9D },
-	{ (char*) "Asia/Tashkent"                     , 0x0531A2 },
-	{ (char*) "Asia/Tbilisi"                      , 0x053400 },
-	{ (char*) "Asia/Tehran"                       , 0x053809 },
-	{ (char*) "Asia/Tel_Aviv"                     , 0x053CF5 },
-	{ (char*) "Asia/Thimbu"                       , 0x054655 },
-	{ (char*) "Asia/Thimphu"                      , 0x05471E },
-	{ (char*) "Asia/Tokyo"                        , 0x0547E7 },
-	{ (char*) "Asia/Tomsk"                        , 0x054928 },
-	{ (char*) "Asia/Ujung_Pandang"                , 0x054DF9 },
-	{ (char*) "Asia/Ulaanbaatar"                  , 0x054F03 },
-	{ (char*) "Asia/Ulan_Bator"                   , 0x05528C },
-	{ (char*) "Asia/Urumqi"                       , 0x055605 },
-	{ (char*) "Asia/Ust-Nera"                     , 0x0556B5 },
-	{ (char*) "Asia/Vientiane"                    , 0x055BAB },
-	{ (char*) "Asia/Vladivostok"                  , 0x055CEC },
-	{ (char*) "Asia/Yakutsk"                      , 0x0561B5 },
-	{ (char*) "Asia/Yangon"                       , 0x05667D },
-	{ (char*) "Asia/Yekaterinburg"                , 0x056787 },
-	{ (char*) "Asia/Yerevan"                      , 0x056C6E },
-	{ (char*) "Atlantic/Azores"                   , 0x0570EB },
-	{ (char*) "Atlantic/Bermuda"                  , 0x057EA7 },
-	{ (char*) "Atlantic/Canary"                   , 0x05880F },
-	{ (char*) "Atlantic/Cape_Verde"               , 0x058F92 },
-	{ (char*) "Atlantic/Faeroe"                   , 0x05909E },
-	{ (char*) "Atlantic/Faroe"                    , 0x0597C1 },
-	{ (char*) "Atlantic/Jan_Mayen"                , 0x059EE4 },
-	{ (char*) "Atlantic/Madeira"                  , 0x05A7EA },
-	{ (char*) "Atlantic/Reykjavik"                , 0x05B5B4 },
-	{ (char*) "Atlantic/South_Georgia"            , 0x05BA4A },
-	{ (char*) "Atlantic/St_Helena"                , 0x05BAEC },
-	{ (char*) "Atlantic/Stanley"                  , 0x05BBAE },
-	{ (char*) "Australia/ACT"                     , 0x05C06A },
-	{ (char*) "Australia/Adelaide"                , 0x05C904 },
-	{ (char*) "Australia/Brisbane"                , 0x05D1BF },
-	{ (char*) "Australia/Broken_Hill"             , 0x05D385 },
-	{ (char*) "Australia/Canberra"                , 0x05DC62 },
-	{ (char*) "Australia/Currie"                  , 0x05E4FC },
-	{ (char*) "Australia/Darwin"                  , 0x05EE3E },
-	{ (char*) "Australia/Eucla"                   , 0x05EFA1 },
-	{ (char*) "Australia/Hobart"                  , 0x05F18E },
-	{ (char*) "Australia/LHI"                     , 0x05FAD8 },
-	{ (char*) "Australia/Lindeman"                , 0x06021A },
-	{ (char*) "Australia/Lord_Howe"               , 0x060420 },
-	{ (char*) "Australia/Melbourne"               , 0x060B72 },
-	{ (char*) "Australia/North"                   , 0x061414 },
-	{ (char*) "Australia/NSW"                     , 0x061565 },
-	{ (char*) "Australia/Perth"                   , 0x061DFF },
-	{ (char*) "Australia/Queensland"              , 0x061FE7 },
-	{ (char*) "Australia/South"                   , 0x062196 },
-	{ (char*) "Australia/Sydney"                  , 0x062A42 },
-	{ (char*) "Australia/Tasmania"                , 0x0632F8 },
-	{ (char*) "Australia/Victoria"                , 0x063C3A },
-	{ (char*) "Australia/West"                    , 0x0644D4 },
-	{ (char*) "Australia/Yancowinna"              , 0x06469E },
-	{ (char*) "Brazil/Acre"                       , 0x064F5F },
-	{ (char*) "Brazil/DeNoronha"                  , 0x0651D1 },
-	{ (char*) "Brazil/East"                       , 0x06549B },
-	{ (char*) "Brazil/West"                       , 0x065A3D },
-	{ (char*) "Canada/Atlantic"                   , 0x065C97 },
-	{ (char*) "Canada/Central"                    , 0x066A03 },
-	{ (char*) "Canada/Eastern"                    , 0x067543 },
-	{ (char*) "Canada/Mountain"                   , 0x0682F5 },
-	{ (char*) "Canada/Newfoundland"               , 0x068C1D },
-	{ (char*) "Canada/Pacific"                    , 0x069A70 },
-	{ (char*) "Canada/Saskatchewan"               , 0x06A5C8 },
-	{ (char*) "Canada/Yukon"                      , 0x06A9A8 },
-	{ (char*) "CET"                               , 0x06B002 },
-	{ (char*) "Chile/Continental"                 , 0x06B83C },
-	{ (char*) "Chile/EasterIsland"                , 0x06C21B },
-	{ (char*) "CST6CDT"                           , 0x06CAD2 },
-	{ (char*) "Cuba"                              , 0x06D3E4 },
-	{ (char*) "EET"                               , 0x06DD60 },
-	{ (char*) "Egypt"                             , 0x06E4E0 },
-	{ (char*) "Eire"                              , 0x06EE4B },
-	{ (char*) "EST"                               , 0x06FBFB },
-	{ (char*) "EST5EDT"                           , 0x06FC79 },
-	{ (char*) "Etc/GMT"                           , 0x07058B },
-	{ (char*) "Etc/GMT+0"                         , 0x070609 },
-	{ (char*) "Etc/GMT+1"                         , 0x070687 },
-	{ (char*) "Etc/GMT+10"                        , 0x070707 },
-	{ (char*) "Etc/GMT+11"                        , 0x070788 },
-	{ (char*) "Etc/GMT+12"                        , 0x070809 },
-	{ (char*) "Etc/GMT+2"                         , 0x07088A },
-	{ (char*) "Etc/GMT+3"                         , 0x07090A },
-	{ (char*) "Etc/GMT+4"                         , 0x07098A },
-	{ (char*) "Etc/GMT+5"                         , 0x070A0A },
-	{ (char*) "Etc/GMT+6"                         , 0x070A8A },
-	{ (char*) "Etc/GMT+7"                         , 0x070B0A },
-	{ (char*) "Etc/GMT+8"                         , 0x070B8A },
-	{ (char*) "Etc/GMT+9"                         , 0x070C0A },
-	{ (char*) "Etc/GMT-0"                         , 0x070C8A },
-	{ (char*) "Etc/GMT-1"                         , 0x070D08 },
-	{ (char*) "Etc/GMT-10"                        , 0x070D89 },
-	{ (char*) "Etc/GMT-11"                        , 0x070E0B },
-	{ (char*) "Etc/GMT-12"                        , 0x070E8D },
-	{ (char*) "Etc/GMT-13"                        , 0x070F0F },
-	{ (char*) "Etc/GMT-14"                        , 0x070F91 },
-	{ (char*) "Etc/GMT-2"                         , 0x071013 },
-	{ (char*) "Etc/GMT-3"                         , 0x071094 },
-	{ (char*) "Etc/GMT-4"                         , 0x071115 },
-	{ (char*) "Etc/GMT-5"                         , 0x071196 },
-	{ (char*) "Etc/GMT-6"                         , 0x071217 },
-	{ (char*) "Etc/GMT-7"                         , 0x071298 },
-	{ (char*) "Etc/GMT-8"                         , 0x071319 },
-	{ (char*) "Etc/GMT-9"                         , 0x07139A },
-	{ (char*) "Etc/GMT0"                          , 0x07141B },
-	{ (char*) "Etc/Greenwich"                     , 0x071499 },
-	{ (char*) "Etc/UCT"                           , 0x071517 },
-	{ (char*) "Etc/Universal"                     , 0x071595 },
-	{ (char*) "Etc/UTC"                           , 0x071613 },
-	{ (char*) "Etc/Zulu"                          , 0x071691 },
-	{ (char*) "Europe/Amsterdam"                  , 0x07170F },
-	{ (char*) "Europe/Andorra"                    , 0x072279 },
-	{ (char*) "Europe/Astrakhan"                  , 0x072953 },
-	{ (char*) "Europe/Athens"                     , 0x072DF0 },
-	{ (char*) "Europe/Belfast"                    , 0x0736D2 },
-	{ (char*) "Europe/Belgrade"                   , 0x07452E },
-	{ (char*) "Europe/Berlin"                     , 0x074CBA },
-	{ (char*) "Europe/Bratislava"                 , 0x0755CF },
-	{ (char*) "Europe/Brussels"                   , 0x075ED8 },
-	{ (char*) "Europe/Bucharest"                  , 0x076A59 },
-	{ (char*) "Europe/Budapest"                   , 0x0772ED },
-	{ (char*) "Europe/Busingen"                   , 0x077C39 },
-	{ (char*) "Europe/Chisinau"                   , 0x0783C2 },
-	{ (char*) "Europe/Copenhagen"                 , 0x078D24 },
-	{ (char*) "Europe/Dublin"                     , 0x079589 },
-	{ (char*) "Europe/Gibraltar"                  , 0x07A339 },
-	{ (char*) "Europe/Guernsey"                   , 0x07AF41 },
-	{ (char*) "Europe/Helsinki"                   , 0x07BDE1 },
-	{ (char*) "Europe/Isle_of_Man"                , 0x07C559 },
-	{ (char*) "Europe/Istanbul"                   , 0x07D3A5 },
-	{ (char*) "Europe/Jersey"                     , 0x07DB3E },
-	{ (char*) "Europe/Kaliningrad"                , 0x07E9DE },
-	{ (char*) "Europe/Kiev"                       , 0x07EFD3 },
-	{ (char*) "Europe/Kirov"                      , 0x07F827 },
-	{ (char*) "Europe/Kyiv"                       , 0x07FCE2 },
-	{ (char*) "Europe/Lisbon"                     , 0x080545 },
-	{ (char*) "Europe/Ljubljana"                  , 0x08130D },
-	{ (char*) "Europe/London"                     , 0x081A99 },
-	{ (char*) "Europe/Luxembourg"                 , 0x0828F5 },
-	{ (char*) "Europe/Madrid"                     , 0x083483 },
-	{ (char*) "Europe/Malta"                      , 0x083ED5 },
-	{ (char*) "Europe/Mariehamn"                  , 0x08491D },
-	{ (char*) "Europe/Minsk"                      , 0x085095 },
-	{ (char*) "Europe/Monaco"                     , 0x0855BC },
-	{ (char*) "Europe/Moscow"                     , 0x086148 },
-	{ (char*) "Europe/Nicosia"                    , 0x086767 },
-	{ (char*) "Europe/Oslo"                       , 0x086F45 },
-	{ (char*) "Europe/Paris"                      , 0x087805 },
-	{ (char*) "Europe/Podgorica"                  , 0x0883A3 },
-	{ (char*) "Europe/Prague"                     , 0x088B2F },
-	{ (char*) "Europe/Riga"                       , 0x089438 },
-	{ (char*) "Europe/Rome"                       , 0x089CDA },
-	{ (char*) "Europe/Samara"                     , 0x08A737 },
-	{ (char*) "Europe/San_Marino"                 , 0x08AC0D },
-	{ (char*) "Europe/Sarajevo"                   , 0x08B66A },
-	{ (char*) "Europe/Saratov"                    , 0x08BDF6 },
-	{ (char*) "Europe/Simferopol"                 , 0x08C2A3 },
-	{ (char*) "Europe/Skopje"                     , 0x08C872 },
-	{ (char*) "Europe/Sofia"                      , 0x08CFFE },
-	{ (char*) "Europe/Stockholm"                  , 0x08D827 },
-	{ (char*) "Europe/Tallinn"                    , 0x08DFA8 },
-	{ (char*) "Europe/Tirane"                     , 0x08E818 },
-	{ (char*) "Europe/Tiraspol"                   , 0x08F048 },
-	{ (char*) "Europe/Ulyanovsk"                  , 0x08F9AA },
-	{ (char*) "Europe/Uzhgorod"                   , 0x08FEAD },
-	{ (char*) "Europe/Vaduz"                      , 0x090701 },
-	{ (char*) "Europe/Vatican"                    , 0x090E6D },
-	{ (char*) "Europe/Vienna"                     , 0x0918CA },
-	{ (char*) "Europe/Vilnius"                    , 0x09216E },
-	{ (char*) "Europe/Volgograd"                  , 0x0929EC },
-	{ (char*) "Europe/Warsaw"                     , 0x092EB3 },
-	{ (char*) "Europe/Zagreb"                     , 0x09391D },
-	{ (char*) "Europe/Zaporozhye"                 , 0x0940A9 },
-	{ (char*) "Europe/Zurich"                     , 0x0948FD },
-	{ (char*) "Factory"                           , 0x09507E },
-	{ (char*) "GB"                                , 0x0950FE },
-	{ (char*) "GB-Eire"                           , 0x095F5A },
-	{ (char*) "GMT"                               , 0x096DB6 },
-	{ (char*) "GMT+0"                             , 0x096E34 },
-	{ (char*) "GMT-0"                             , 0x096EB2 },
-	{ (char*) "GMT0"                              , 0x096F30 },
-	{ (char*) "Greenwich"                         , 0x096FAE },
-	{ (char*) "Hongkong"                          , 0x09702C },
-	{ (char*) "HST"                               , 0x097509 },
-	{ (char*) "Iceland"                           , 0x097588 },
-	{ (char*) "Indian/Antananarivo"               , 0x097628 },
-	{ (char*) "Indian/Chagos"                     , 0x09770F },
-	{ (char*) "Indian/Christmas"                  , 0x0977D4 },
-	{ (char*) "Indian/Cocos"                      , 0x097877 },
-	{ (char*) "Indian/Comoro"                     , 0x097923 },
-	{ (char*) "Indian/Kerguelen"                  , 0x0979C4 },
-	{ (char*) "Indian/Mahe"                       , 0x097A67 },
-	{ (char*) "Indian/Maldives"                   , 0x097B0A },
-	{ (char*) "Indian/Mauritius"                  , 0x097BCF },
-	{ (char*) "Indian/Mayotte"                    , 0x097CBE },
-	{ (char*) "Indian/Reunion"                    , 0x097D5F },
-	{ (char*) "Iran"                              , 0x097E02 },
-	{ (char*) "Israel"                            , 0x0982EE },
-	{ (char*) "Jamaica"                           , 0x098C4E },
-	{ (char*) "Japan"                             , 0x098E3C },
-	{ (char*) "Kwajalein"                         , 0x098F7D },
-	{ (char*) "Libya"                             , 0x0990B7 },
-	{ (char*) "MET"                               , 0x099334 },
-	{ (char*) "Mexico/BajaNorte"                  , 0x099B6E },
-	{ (char*) "Mexico/BajaSur"                    , 0x09A4C0 },
-	{ (char*) "Mexico/General"                    , 0x09A934 },
-	{ (char*) "MST"                               , 0x09AE06 },
-	{ (char*) "MST7MDT"                           , 0x09AE84 },
-	{ (char*) "Navajo"                            , 0x09B796 },
-	{ (char*) "NZ"                                , 0x09C13E },
-	{ (char*) "NZ-CHAT"                           , 0x09CACF },
-	{ (char*) "Pacific/Apia"                      , 0x09D2E1 },
-	{ (char*) "Pacific/Auckland"                  , 0x09D543 },
-	{ (char*) "Pacific/Bougainville"              , 0x09DEE7 },
-	{ (char*) "Pacific/Chatham"                   , 0x09DFFD },
-	{ (char*) "Pacific/Chuuk"                     , 0x09E81E },
-	{ (char*) "Pacific/Easter"                    , 0x09E938 },
-	{ (char*) "Pacific/Efate"                     , 0x09F1FC },
-	{ (char*) "Pacific/Enderbury"                 , 0x09F414 },
-	{ (char*) "Pacific/Fakaofo"                   , 0x09F4FC },
-	{ (char*) "Pacific/Fiji"                      , 0x09F5C2 },
-	{ (char*) "Pacific/Funafuti"                  , 0x09F802 },
-	{ (char*) "Pacific/Galapagos"                 , 0x09F8A6 },
-	{ (char*) "Pacific/Gambier"                   , 0x09F9A3 },
-	{ (char*) "Pacific/Guadalcanal"               , 0x09FA54 },
-	{ (char*) "Pacific/Guam"                      , 0x09FAF8 },
-	{ (char*) "Pacific/Honolulu"                  , 0x09FCF2 },
-	{ (char*) "Pacific/Johnston"                  , 0x09FE4D },
-	{ (char*) "Pacific/Kanton"                    , 0x09FFA2 },
-	{ (char*) "Pacific/Kiritimati"                , 0x0A0099 },
-	{ (char*) "Pacific/Kosrae"                    , 0x0A0191 },
-	{ (char*) "Pacific/Kwajalein"                 , 0x0A02F4 },
-	{ (char*) "Pacific/Majuro"                    , 0x0A0437 },
-	{ (char*) "Pacific/Marquesas"                 , 0x0A0583 },
-	{ (char*) "Pacific/Midway"                    , 0x0A063F },
-	{ (char*) "Pacific/Nauru"                     , 0x0A0732 },
-	{ (char*) "Pacific/Niue"                      , 0x0A082C },
-	{ (char*) "Pacific/Norfolk"                   , 0x0A08F5 },
-	{ (char*) "Pacific/Noumea"                    , 0x0A0C63 },
-	{ (char*) "Pacific/Pago_Pago"                 , 0x0A0D91 },
-	{ (char*) "Pacific/Palau"                     , 0x0A0E4C },
-	{ (char*) "Pacific/Pitcairn"                  , 0x0A0EFE },
-	{ (char*) "Pacific/Pohnpei"                   , 0x0A0FC6 },
-	{ (char*) "Pacific/Ponape"                    , 0x0A1101 },
-	{ (char*) "Pacific/Port_Moresby"              , 0x0A11A5 },
-	{ (char*) "Pacific/Rarotonga"                 , 0x0A1275 },
-	{ (char*) "Pacific/Saipan"                    , 0x0A14CE },
-	{ (char*) "Pacific/Samoa"                     , 0x0A16BA },
-	{ (char*) "Pacific/Tahiti"                    , 0x0A1775 },
-	{ (char*) "Pacific/Tarawa"                    , 0x0A1827 },
-	{ (char*) "Pacific/Tongatapu"                 , 0x0A18DA },
-	{ (char*) "Pacific/Truk"                      , 0x0A1A4C },
-	{ (char*) "Pacific/Wake"                      , 0x0A1B04 },
-	{ (char*) "Pacific/Wallis"                    , 0x0A1BB3 },
-	{ (char*) "Pacific/Yap"                       , 0x0A1C57 },
-	{ (char*) "Poland"                            , 0x0A1D0F },
-	{ (char*) "Portugal"                          , 0x0A2779 },
-	{ (char*) "PRC"                               , 0x0A352E },
-	{ (char*) "PST8PDT"                           , 0x0A376B },
-	{ (char*) "ROC"                               , 0x0A407D },
-	{ (char*) "ROK"                               , 0x0A4382 },
-	{ (char*) "Singapore"                         , 0x0A45F7 },
-	{ (char*) "Turkey"                            , 0x0A4794 },
-	{ (char*) "UCT"                               , 0x0A4F2D },
-	{ (char*) "Universal"                         , 0x0A4FAB },
-	{ (char*) "US/Alaska"                         , 0x0A5029 },
-	{ (char*) "US/Aleutian"                       , 0x0A5978 },
-	{ (char*) "US/Arizona"                        , 0x0A62B8 },
-	{ (char*) "US/Central"                        , 0x0A642C },
-	{ (char*) "US/East-Indiana"                   , 0x0A7240 },
-	{ (char*) "US/Eastern"                        , 0x0A78DE },
-	{ (char*) "US/Hawaii"                         , 0x0A86CA },
-	{ (char*) "US/Indiana-Starke"                 , 0x0A881F },
-	{ (char*) "US/Michigan"                       , 0x0A91B7 },
-	{ (char*) "US/Mountain"                       , 0x0A9A79 },
-	{ (char*) "US/Pacific"                        , 0x0AA421 },
-	{ (char*) "US/Samoa"                          , 0x0AAF51 },
-	{ (char*) "UTC"                               , 0x0AB00C },
-	{ (char*) "W-SU"                              , 0x0AB08A },
-	{ (char*) "WET"                               , 0x0AB695 },
-	{ (char*) "Zulu"                              , 0x0ABE12 },
+	{ (char*) "America/Atikokan"                  , 0x00B2F7 },
+	{ (char*) "America/Atka"                      , 0x00B474 },
+	{ (char*) "America/Bahia"                     , 0x00BDB4 },
+	{ (char*) "America/Bahia_Banderas"            , 0x00C1B7 },
+	{ (char*) "America/Barbados"                  , 0x00C620 },
+	{ (char*) "America/Belem"                     , 0x00C7E0 },
+	{ (char*) "America/Belize"                    , 0x00CA30 },
+	{ (char*) "America/Blanc-Sablon"              , 0x00D08A },
+	{ (char*) "America/Boa_Vista"                 , 0x00D1DC },
+	{ (char*) "America/Bogota"                    , 0x00D459 },
+	{ (char*) "America/Boise"                     , 0x00D54D },
+	{ (char*) "America/Buenos_Aires"              , 0x00DEE3 },
+	{ (char*) "America/Cambridge_Bay"             , 0x00E315 },
+	{ (char*) "America/Campo_Grande"              , 0x00EC03 },
+	{ (char*) "America/Cancun"                    , 0x00F1B7 },
+	{ (char*) "America/Caracas"                   , 0x00F52F },
+	{ (char*) "America/Catamarca"                 , 0x00F635 },
+	{ (char*) "America/Cayenne"                   , 0x00FA67 },
+	{ (char*) "America/Cayman"                    , 0x00FB2B },
+	{ (char*) "America/Chicago"                   , 0x00FBED },
+	{ (char*) "America/Chihuahua"                 , 0x010A15 },
+	{ (char*) "America/Ciudad_Juarez"             , 0x010E85 },
+	{ (char*) "America/Coral_Harbour"             , 0x0114AF },
+	{ (char*) "America/Cordoba"                   , 0x011571 },
+	{ (char*) "America/Costa_Rica"                , 0x0119A3 },
+	{ (char*) "America/Coyhaique"                 , 0x011AEB },
+	{ (char*) "America/Creston"                   , 0x012351 },
+	{ (char*) "America/Cuiaba"                    , 0x01243F },
+	{ (char*) "America/Curacao"                   , 0x0129D0 },
+	{ (char*) "America/Danmarkshavn"              , 0x012A96 },
+	{ (char*) "America/Dawson"                    , 0x012D76 },
+	{ (char*) "America/Dawson_Creek"              , 0x0133E2 },
+	{ (char*) "America/Denver"                    , 0x013828 },
+	{ (char*) "America/Detroit"                   , 0x0141E5 },
+	{ (char*) "America/Dominica"                  , 0x014AC0 },
+	{ (char*) "America/Edmonton"                  , 0x014B60 },
+	{ (char*) "America/Eirunepe"                  , 0x0154AA },
+	{ (char*) "America/El_Salvador"               , 0x015747 },
+	{ (char*) "America/Ensenada"                  , 0x015833 },
+	{ (char*) "America/Fort_Nelson"               , 0x0161D9 },
+	{ (char*) "America/Fort_Wayne"                , 0x016AB9 },
+	{ (char*) "America/Fortaleza"                 , 0x017157 },
+	{ (char*) "America/Glace_Bay"                 , 0x017447 },
+	{ (char*) "America/Godthab"                   , 0x017CFE },
+	{ (char*) "America/Goose_Bay"                 , 0x01846B },
+	{ (char*) "America/Grand_Turk"                , 0x019121 },
+	{ (char*) "America/Grenada"                   , 0x019857 },
+	{ (char*) "America/Guadeloupe"                , 0x0198F7 },
+	{ (char*) "America/Guatemala"                 , 0x019997 },
+	{ (char*) "America/Guayaquil"                 , 0x019ABB },
+	{ (char*) "America/Guyana"                    , 0x019BC1 },
+	{ (char*) "America/Halifax"                   , 0x019CC5 },
+	{ (char*) "America/Havana"                    , 0x01AA4F },
+	{ (char*) "America/Hermosillo"                , 0x01B3CB },
+	{ (char*) "America/Indiana/Indianapolis"      , 0x01B561 },
+	{ (char*) "America/Indiana/Knox"              , 0x01BC18 },
+	{ (char*) "America/Indiana/Marengo"           , 0x01C5C5 },
+	{ (char*) "America/Indiana/Petersburg"        , 0x01CCB2 },
+	{ (char*) "America/Indiana/Tell_City"         , 0x01D451 },
+	{ (char*) "America/Indiana/Vevay"             , 0x01DB15 },
+	{ (char*) "America/Indiana/Vincennes"         , 0x01E0D1 },
+	{ (char*) "America/Indiana/Winamac"           , 0x01E7A7 },
+	{ (char*) "America/Indianapolis"              , 0x01EECB },
+	{ (char*) "America/Inuvik"                    , 0x01F569 },
+	{ (char*) "America/Iqaluit"                   , 0x01FDA3 },
+	{ (char*) "America/Jamaica"                   , 0x020662 },
+	{ (char*) "America/Jujuy"                     , 0x020850 },
+	{ (char*) "America/Juneau"                    , 0x020C66 },
+	{ (char*) "America/Kentucky/Louisville"       , 0x0215B7 },
+	{ (char*) "America/Kentucky/Monticello"       , 0x0220C5 },
+	{ (char*) "America/Knox_IN"                   , 0x022A25 },
+	{ (char*) "America/Kralendijk"                , 0x0233BD },
+	{ (char*) "America/La_Paz"                    , 0x0234BF },
+	{ (char*) "America/Lima"                      , 0x0235A5 },
+	{ (char*) "America/Los_Angeles"               , 0x023739 },
+	{ (char*) "America/Louisville"                , 0x024270 },
+	{ (char*) "America/Lower_Princes"             , 0x024D60 },
+	{ (char*) "America/Maceio"                    , 0x024E62 },
+	{ (char*) "America/Managua"                   , 0x025158 },
+	{ (char*) "America/Manaus"                    , 0x025312 },
+	{ (char*) "America/Marigot"                   , 0x02557B },
+	{ (char*) "America/Martinique"                , 0x02567D },
+	{ (char*) "America/Matamoros"                 , 0x025771 },
+	{ (char*) "America/Mazatlan"                  , 0x025D33 },
+	{ (char*) "America/Mendoza"                   , 0x026195 },
+	{ (char*) "America/Menominee"                 , 0x0265C7 },
+	{ (char*) "America/Merida"                    , 0x026ED4 },
+	{ (char*) "America/Metlakatla"                , 0x0272DD },
+	{ (char*) "America/Mexico_City"               , 0x02788F },
+	{ (char*) "America/Miquelon"                  , 0x027D6F },
+	{ (char*) "America/Moncton"                   , 0x0283EF },
+	{ (char*) "America/Monterrey"                 , 0x029065 },
+	{ (char*) "America/Montevideo"                , 0x029501 },
+	{ (char*) "America/Montreal"                  , 0x029AE5 },
+	{ (char*) "America/Montserrat"                , 0x02A897 },
+	{ (char*) "America/Nassau"                    , 0x02A937 },
+	{ (char*) "America/New_York"                  , 0x02B297 },
+	{ (char*) "America/Nipigon"                   , 0x02C097 },
+	{ (char*) "America/Nome"                      , 0x02CE49 },
+	{ (char*) "America/Noronha"                   , 0x02D7A1 },
+	{ (char*) "America/North_Dakota/Beulah"       , 0x02DA7B },
+	{ (char*) "America/North_Dakota/Center"       , 0x02E3F8 },
+	{ (char*) "America/North_Dakota/New_Salem"    , 0x02ED75 },
+	{ (char*) "America/Nuuk"                      , 0x02F6F8 },
+	{ (char*) "America/Ojinaga"                   , 0x02FE76 },
+	{ (char*) "America/Panama"                    , 0x030492 },
+	{ (char*) "America/Pangnirtung"               , 0x030554 },
+	{ (char*) "America/Paramaribo"                , 0x030DFA },
+	{ (char*) "America/Phoenix"                   , 0x030EFE },
+	{ (char*) "America/Port-au-Prince"            , 0x03108A },
+	{ (char*) "America/Port_of_Spain"             , 0x031630 },
+	{ (char*) "America/Porto_Acre"                , 0x0316D0 },
+	{ (char*) "America/Porto_Velho"               , 0x031942 },
+	{ (char*) "America/Puerto_Rico"               , 0x031B88 },
+	{ (char*) "America/Punta_Arenas"              , 0x031C8A },
+	{ (char*) "America/Rainy_River"               , 0x032415 },
+	{ (char*) "America/Rankin_Inlet"              , 0x032F55 },
+	{ (char*) "America/Recife"                    , 0x033789 },
+	{ (char*) "America/Regina"                    , 0x033A5D },
+	{ (char*) "America/Resolute"                  , 0x033E52 },
+	{ (char*) "America/Rio_Branco"                , 0x034687 },
+	{ (char*) "America/Rosario"                   , 0x0348FD },
+	{ (char*) "America/Santa_Isabel"              , 0x034D2F },
+	{ (char*) "America/Santarem"                  , 0x0356D5 },
+	{ (char*) "America/Santiago"                  , 0x035938 },
+	{ (char*) "America/Santo_Domingo"             , 0x036324 },
+	{ (char*) "America/Sao_Paulo"                 , 0x0364FA },
+	{ (char*) "America/Scoresbysund"              , 0x036AD2 },
+	{ (char*) "America/Shiprock"                  , 0x03728A },
+	{ (char*) "America/Sitka"                     , 0x037C32 },
+	{ (char*) "America/St_Barthelemy"             , 0x03856A },
+	{ (char*) "America/St_Johns"                  , 0x03866C },
+	{ (char*) "America/St_Kitts"                  , 0x0394DA },
+	{ (char*) "America/St_Lucia"                  , 0x03957A },
+	{ (char*) "America/St_Thomas"                 , 0x03963C },
+	{ (char*) "America/St_Vincent"                , 0x0396DC },
+	{ (char*) "America/Swift_Current"             , 0x03979E },
+	{ (char*) "America/Tegucigalpa"               , 0x0399EC },
+	{ (char*) "America/Thule"                     , 0x039AF4 },
+	{ (char*) "America/Thunder_Bay"               , 0x03A0EC },
+	{ (char*) "America/Tijuana"                   , 0x03AE9E },
+	{ (char*) "America/Toronto"                   , 0x03B853 },
+	{ (char*) "America/Tortola"                   , 0x03C623 },
+	{ (char*) "America/Vancouver"                 , 0x03C6C3 },
+	{ (char*) "America/Virgin"                    , 0x03D234 },
+	{ (char*) "America/Whitehorse"                , 0x03D336 },
+	{ (char*) "America/Winnipeg"                  , 0x03D9A2 },
+	{ (char*) "America/Yakutat"                   , 0x03E4FF },
+	{ (char*) "America/Yellowknife"               , 0x03EE1C },
+	{ (char*) "Antarctica/Casey"                  , 0x03F744 },
+	{ (char*) "Antarctica/Davis"                  , 0x03F8FC },
+	{ (char*) "Antarctica/DumontDUrville"         , 0x03FA28 },
+	{ (char*) "Antarctica/Macquarie"              , 0x03FAF8 },
+	{ (char*) "Antarctica/Mawson"                 , 0x0403E8 },
+	{ (char*) "Antarctica/McMurdo"                , 0x0404B3 },
+	{ (char*) "Antarctica/Palmer"                 , 0x040CAE },
+	{ (char*) "Antarctica/Rothera"                , 0x04123C },
+	{ (char*) "Antarctica/South_Pole"             , 0x0412E5 },
+	{ (char*) "Antarctica/Syowa"                  , 0x041C76 },
+	{ (char*) "Antarctica/Troll"                  , 0x041D1E },
+	{ (char*) "Antarctica/Vostok"                 , 0x0421AB },
+	{ (char*) "Arctic/Longyearbyen"               , 0x042292 },
+	{ (char*) "Asia/Aden"                         , 0x042B98 },
+	{ (char*) "Asia/Almaty"                       , 0x042C3B },
+	{ (char*) "Asia/Amman"                        , 0x043030 },
+	{ (char*) "Asia/Anadyr"                       , 0x0435D5 },
+	{ (char*) "Asia/Aqtau"                        , 0x043A8A },
+	{ (char*) "Asia/Aqtobe"                       , 0x043E74 },
+	{ (char*) "Asia/Ashgabat"                     , 0x044272 },
+	{ (char*) "Asia/Ashkhabad"                    , 0x0444DB },
+	{ (char*) "Asia/Atyrau"                       , 0x044744 },
+	{ (char*) "Asia/Baghdad"                      , 0x044B36 },
+	{ (char*) "Asia/Bahrain"                      , 0x044F0B },
+	{ (char*) "Asia/Baku"                         , 0x044FF6 },
+	{ (char*) "Asia/Bangkok"                      , 0x0454BF },
+	{ (char*) "Asia/Barnaul"                      , 0x045584 },
+	{ (char*) "Asia/Beirut"                       , 0x045A55 },
+	{ (char*) "Asia/Bishkek"                      , 0x0462CB },
+	{ (char*) "Asia/Brunei"                       , 0x0466A0 },
+	{ (char*) "Asia/Calcutta"                     , 0x046769 },
+	{ (char*) "Asia/Chita"                        , 0x046892 },
+	{ (char*) "Asia/Choibalsan"                   , 0x046D69 },
+	{ (char*) "Asia/Chongqing"                    , 0x0470E2 },
+	{ (char*) "Asia/Chungking"                    , 0x04731F },
+	{ (char*) "Asia/Colombo"                      , 0x04755C },
+	{ (char*) "Asia/Dacca"                        , 0x0476CE },
+	{ (char*) "Asia/Damascus"                     , 0x04781D },
+	{ (char*) "Asia/Dhaka"                        , 0x047F7A },
+	{ (char*) "Asia/Dili"                         , 0x0480C9 },
+	{ (char*) "Asia/Dubai"                        , 0x0481D6 },
+	{ (char*) "Asia/Dushanbe"                     , 0x048279 },
+	{ (char*) "Asia/Famagusta"                    , 0x0484C6 },
+	{ (char*) "Asia/Gaza"                         , 0x048CCD },
+	{ (char*) "Asia/Harbin"                       , 0x049BE7 },
+	{ (char*) "Asia/Hebron"                       , 0x049E24 },
+	{ (char*) "Asia/Ho_Chi_Minh"                  , 0x04AD59 },
+	{ (char*) "Asia/Hong_Kong"                    , 0x04AEB6 },
+	{ (char*) "Asia/Hovd"                         , 0x04B393 },
+	{ (char*) "Asia/Irkutsk"                      , 0x04B722 },
+	{ (char*) "Asia/Istanbul"                     , 0x04BC15 },
+	{ (char*) "Asia/Jakarta"                      , 0x04C3AE },
+	{ (char*) "Asia/Jayapura"                     , 0x04C546 },
+	{ (char*) "Asia/Jerusalem"                    , 0x04C665 },
+	{ (char*) "Asia/Kabul"                        , 0x04CFC5 },
+	{ (char*) "Asia/Kamchatka"                    , 0x04D093 },
+	{ (char*) "Asia/Karachi"                      , 0x04D531 },
+	{ (char*) "Asia/Kashgar"                      , 0x04D6B8 },
+	{ (char*) "Asia/Kathmandu"                    , 0x04D75B },
+	{ (char*) "Asia/Katmandu"                     , 0x04D82D },
+	{ (char*) "Asia/Khandyga"                     , 0x04D8FF },
+	{ (char*) "Asia/Kolkata"                      , 0x04DE12 },
+	{ (char*) "Asia/Krasnoyarsk"                  , 0x04DF3B },
+	{ (char*) "Asia/Kuala_Lumpur"                 , 0x04E409 },
+	{ (char*) "Asia/Kuching"                      , 0x04E5BA },
+	{ (char*) "Asia/Kuwait"                       , 0x04E7A9 },
+	{ (char*) "Asia/Macao"                        , 0x04E84C },
+	{ (char*) "Asia/Macau"                        , 0x04ED23 },
+	{ (char*) "Asia/Magadan"                      , 0x04F1FA },
+	{ (char*) "Asia/Makassar"                     , 0x04F6CE },
+	{ (char*) "Asia/Manila"                       , 0x04F821 },
+	{ (char*) "Asia/Muscat"                       , 0x04F9D3 },
+	{ (char*) "Asia/Nicosia"                      , 0x04FA76 },
+	{ (char*) "Asia/Novokuznetsk"                 , 0x050262 },
+	{ (char*) "Asia/Novosibirsk"                  , 0x0506FE },
+	{ (char*) "Asia/Omsk"                         , 0x050BD5 },
+	{ (char*) "Asia/Oral"                         , 0x051097 },
+	{ (char*) "Asia/Phnom_Penh"                   , 0x051491 },
+	{ (char*) "Asia/Pontianak"                    , 0x0515B6 },
+	{ (char*) "Asia/Pyongyang"                    , 0x051739 },
+	{ (char*) "Asia/Qatar"                        , 0x051832 },
+	{ (char*) "Asia/Qostanay"                     , 0x0518F7 },
+	{ (char*) "Asia/Qyzylorda"                    , 0x051D1E },
+	{ (char*) "Asia/Rangoon"                      , 0x05213A },
+	{ (char*) "Asia/Riyadh"                       , 0x052244 },
+	{ (char*) "Asia/Saigon"                       , 0x0522E7 },
+	{ (char*) "Asia/Sakhalin"                     , 0x052444 },
+	{ (char*) "Asia/Samarkand"                    , 0x05290C },
+	{ (char*) "Asia/Seoul"                        , 0x052B5C },
+	{ (char*) "Asia/Shanghai"                     , 0x052DD1 },
+	{ (char*) "Asia/Singapore"                    , 0x05301A },
+	{ (char*) "Asia/Srednekolymsk"                , 0x0531B7 },
+	{ (char*) "Asia/Taipei"                       , 0x05368B },
+	{ (char*) "Asia/Tashkent"                     , 0x053990 },
+	{ (char*) "Asia/Tbilisi"                      , 0x053BEE },
+	{ (char*) "Asia/Tehran"                       , 0x053FF7 },
+	{ (char*) "Asia/Tel_Aviv"                     , 0x0544E3 },
+	{ (char*) "Asia/Thimbu"                       , 0x054E43 },
+	{ (char*) "Asia/Thimphu"                      , 0x054F0C },
+	{ (char*) "Asia/Tokyo"                        , 0x054FD5 },
+	{ (char*) "Asia/Tomsk"                        , 0x055116 },
+	{ (char*) "Asia/Ujung_Pandang"                , 0x0555E7 },
+	{ (char*) "Asia/Ulaanbaatar"                  , 0x0556F1 },
+	{ (char*) "Asia/Ulan_Bator"                   , 0x055A7A },
+	{ (char*) "Asia/Urumqi"                       , 0x055DF3 },
+	{ (char*) "Asia/Ust-Nera"                     , 0x055EA3 },
+	{ (char*) "Asia/Vientiane"                    , 0x056399 },
+	{ (char*) "Asia/Vladivostok"                  , 0x0564DA },
+	{ (char*) "Asia/Yakutsk"                      , 0x0569A3 },
+	{ (char*) "Asia/Yangon"                       , 0x056E6B },
+	{ (char*) "Asia/Yekaterinburg"                , 0x056F75 },
+	{ (char*) "Asia/Yerevan"                      , 0x05745C },
+	{ (char*) "Atlantic/Azores"                   , 0x0578D9 },
+	{ (char*) "Atlantic/Bermuda"                  , 0x05865D },
+	{ (char*) "Atlantic/Canary"                   , 0x058FC5 },
+	{ (char*) "Atlantic/Cape_Verde"               , 0x059748 },
+	{ (char*) "Atlantic/Faeroe"                   , 0x059854 },
+	{ (char*) "Atlantic/Faroe"                    , 0x059F77 },
+	{ (char*) "Atlantic/Jan_Mayen"                , 0x05A69A },
+	{ (char*) "Atlantic/Madeira"                  , 0x05AFA0 },
+	{ (char*) "Atlantic/Reykjavik"                , 0x05BCEC },
+	{ (char*) "Atlantic/South_Georgia"            , 0x05C182 },
+	{ (char*) "Atlantic/St_Helena"                , 0x05C224 },
+	{ (char*) "Atlantic/Stanley"                  , 0x05C2E6 },
+	{ (char*) "Australia/ACT"                     , 0x05C7A2 },
+	{ (char*) "Australia/Adelaide"                , 0x05D03C },
+	{ (char*) "Australia/Brisbane"                , 0x05D8F7 },
+	{ (char*) "Australia/Broken_Hill"             , 0x05DABD },
+	{ (char*) "Australia/Canberra"                , 0x05E39A },
+	{ (char*) "Australia/Currie"                  , 0x05EC34 },
+	{ (char*) "Australia/Darwin"                  , 0x05F576 },
+	{ (char*) "Australia/Eucla"                   , 0x05F6D9 },
+	{ (char*) "Australia/Hobart"                  , 0x05F8C6 },
+	{ (char*) "Australia/LHI"                     , 0x060210 },
+	{ (char*) "Australia/Lindeman"                , 0x060952 },
+	{ (char*) "Australia/Lord_Howe"               , 0x060B58 },
+	{ (char*) "Australia/Melbourne"               , 0x0612AA },
+	{ (char*) "Australia/North"                   , 0x061B4C },
+	{ (char*) "Australia/NSW"                     , 0x061C9D },
+	{ (char*) "Australia/Perth"                   , 0x062537 },
+	{ (char*) "Australia/Queensland"              , 0x06271F },
+	{ (char*) "Australia/South"                   , 0x0628CE },
+	{ (char*) "Australia/Sydney"                  , 0x06317A },
+	{ (char*) "Australia/Tasmania"                , 0x063A30 },
+	{ (char*) "Australia/Victoria"                , 0x064372 },
+	{ (char*) "Australia/West"                    , 0x064C0C },
+	{ (char*) "Australia/Yancowinna"              , 0x064DD6 },
+	{ (char*) "Brazil/Acre"                       , 0x065697 },
+	{ (char*) "Brazil/DeNoronha"                  , 0x065909 },
+	{ (char*) "Brazil/East"                       , 0x065BD3 },
+	{ (char*) "Brazil/West"                       , 0x066175 },
+	{ (char*) "Canada/Atlantic"                   , 0x0663CF },
+	{ (char*) "Canada/Central"                    , 0x06713B },
+	{ (char*) "Canada/Eastern"                    , 0x067C7B },
+	{ (char*) "Canada/Mountain"                   , 0x068A2D },
+	{ (char*) "Canada/Newfoundland"               , 0x069355 },
+	{ (char*) "Canada/Pacific"                    , 0x06A1A8 },
+	{ (char*) "Canada/Saskatchewan"               , 0x06AD00 },
+	{ (char*) "Canada/Yukon"                      , 0x06B0E0 },
+	{ (char*) "CET"                               , 0x06B73A },
+	{ (char*) "Chile/Continental"                 , 0x06C2BB },
+	{ (char*) "Chile/EasterIsland"                , 0x06CC9A },
+	{ (char*) "CST6CDT"                           , 0x06D551 },
+	{ (char*) "Cuba"                              , 0x06E365 },
+	{ (char*) "EET"                               , 0x06ECE1 },
+	{ (char*) "Egypt"                             , 0x06F5C3 },
+	{ (char*) "Eire"                              , 0x06FF2E },
+	{ (char*) "EST"                               , 0x070CDE },
+	{ (char*) "EST5EDT"                           , 0x070DA0 },
+	{ (char*) "Etc/GMT"                           , 0x071B8C },
+	{ (char*) "Etc/GMT+0"                         , 0x071C0A },
+	{ (char*) "Etc/GMT+1"                         , 0x071C88 },
+	{ (char*) "Etc/GMT+10"                        , 0x071D08 },
+	{ (char*) "Etc/GMT+11"                        , 0x071D89 },
+	{ (char*) "Etc/GMT+12"                        , 0x071E0A },
+	{ (char*) "Etc/GMT+2"                         , 0x071E8B },
+	{ (char*) "Etc/GMT+3"                         , 0x071F0B },
+	{ (char*) "Etc/GMT+4"                         , 0x071F8B },
+	{ (char*) "Etc/GMT+5"                         , 0x07200B },
+	{ (char*) "Etc/GMT+6"                         , 0x07208B },
+	{ (char*) "Etc/GMT+7"                         , 0x07210B },
+	{ (char*) "Etc/GMT+8"                         , 0x07218B },
+	{ (char*) "Etc/GMT+9"                         , 0x07220B },
+	{ (char*) "Etc/GMT-0"                         , 0x07228B },
+	{ (char*) "Etc/GMT-1"                         , 0x072309 },
+	{ (char*) "Etc/GMT-10"                        , 0x07238A },
+	{ (char*) "Etc/GMT-11"                        , 0x07240C },
+	{ (char*) "Etc/GMT-12"                        , 0x07248E },
+	{ (char*) "Etc/GMT-13"                        , 0x072510 },
+	{ (char*) "Etc/GMT-14"                        , 0x072592 },
+	{ (char*) "Etc/GMT-2"                         , 0x072614 },
+	{ (char*) "Etc/GMT-3"                         , 0x072695 },
+	{ (char*) "Etc/GMT-4"                         , 0x072716 },
+	{ (char*) "Etc/GMT-5"                         , 0x072797 },
+	{ (char*) "Etc/GMT-6"                         , 0x072818 },
+	{ (char*) "Etc/GMT-7"                         , 0x072899 },
+	{ (char*) "Etc/GMT-8"                         , 0x07291A },
+	{ (char*) "Etc/GMT-9"                         , 0x07299B },
+	{ (char*) "Etc/GMT0"                          , 0x072A1C },
+	{ (char*) "Etc/Greenwich"                     , 0x072A9A },
+	{ (char*) "Etc/UCT"                           , 0x072B18 },
+	{ (char*) "Etc/Universal"                     , 0x072B96 },
+	{ (char*) "Etc/UTC"                           , 0x072C14 },
+	{ (char*) "Etc/Zulu"                          , 0x072C92 },
+	{ (char*) "Europe/Amsterdam"                  , 0x072D10 },
+	{ (char*) "Europe/Andorra"                    , 0x07387A },
+	{ (char*) "Europe/Astrakhan"                  , 0x073F54 },
+	{ (char*) "Europe/Athens"                     , 0x0743F1 },
+	{ (char*) "Europe/Belfast"                    , 0x074CD3 },
+	{ (char*) "Europe/Belgrade"                   , 0x075B2F },
+	{ (char*) "Europe/Berlin"                     , 0x0762BB },
+	{ (char*) "Europe/Bratislava"                 , 0x076BD0 },
+	{ (char*) "Europe/Brussels"                   , 0x0774D9 },
+	{ (char*) "Europe/Bucharest"                  , 0x07805A },
+	{ (char*) "Europe/Budapest"                   , 0x0788EE },
+	{ (char*) "Europe/Busingen"                   , 0x07923A },
+	{ (char*) "Europe/Chisinau"                   , 0x0799C3 },
+	{ (char*) "Europe/Copenhagen"                 , 0x07A325 },
+	{ (char*) "Europe/Dublin"                     , 0x07AB8A },
+	{ (char*) "Europe/Gibraltar"                  , 0x07B93A },
+	{ (char*) "Europe/Guernsey"                   , 0x07C542 },
+	{ (char*) "Europe/Helsinki"                   , 0x07D3E2 },
+	{ (char*) "Europe/Isle_of_Man"                , 0x07DB5A },
+	{ (char*) "Europe/Istanbul"                   , 0x07E9A6 },
+	{ (char*) "Europe/Jersey"                     , 0x07F13F },
+	{ (char*) "Europe/Kaliningrad"                , 0x07FFDF },
+	{ (char*) "Europe/Kiev"                       , 0x0805D4 },
+	{ (char*) "Europe/Kirov"                      , 0x080E28 },
+	{ (char*) "Europe/Kyiv"                       , 0x0812E3 },
+	{ (char*) "Europe/Lisbon"                     , 0x081B46 },
+	{ (char*) "Europe/Ljubljana"                  , 0x08292C },
+	{ (char*) "Europe/London"                     , 0x0830B8 },
+	{ (char*) "Europe/Luxembourg"                 , 0x083F14 },
+	{ (char*) "Europe/Madrid"                     , 0x084AA2 },
+	{ (char*) "Europe/Malta"                      , 0x0854F4 },
+	{ (char*) "Europe/Mariehamn"                  , 0x085F3C },
+	{ (char*) "Europe/Minsk"                      , 0x0866B4 },
+	{ (char*) "Europe/Monaco"                     , 0x086BDB },
+	{ (char*) "Europe/Moscow"                     , 0x087767 },
+	{ (char*) "Europe/Nicosia"                    , 0x087D86 },
+	{ (char*) "Europe/Oslo"                       , 0x088564 },
+	{ (char*) "Europe/Paris"                      , 0x088E24 },
+	{ (char*) "Europe/Podgorica"                  , 0x0899C2 },
+	{ (char*) "Europe/Prague"                     , 0x08A14E },
+	{ (char*) "Europe/Riga"                       , 0x08AA57 },
+	{ (char*) "Europe/Rome"                       , 0x08B2F9 },
+	{ (char*) "Europe/Samara"                     , 0x08BD56 },
+	{ (char*) "Europe/San_Marino"                 , 0x08C22C },
+	{ (char*) "Europe/Sarajevo"                   , 0x08CC89 },
+	{ (char*) "Europe/Saratov"                    , 0x08D415 },
+	{ (char*) "Europe/Simferopol"                 , 0x08D8C2 },
+	{ (char*) "Europe/Skopje"                     , 0x08DE91 },
+	{ (char*) "Europe/Sofia"                      , 0x08E61D },
+	{ (char*) "Europe/Stockholm"                  , 0x08EE46 },
+	{ (char*) "Europe/Tallinn"                    , 0x08F5C7 },
+	{ (char*) "Europe/Tirane"                     , 0x08FE37 },
+	{ (char*) "Europe/Tiraspol"                   , 0x090667 },
+	{ (char*) "Europe/Ulyanovsk"                  , 0x090FC9 },
+	{ (char*) "Europe/Uzhgorod"                   , 0x0914CC },
+	{ (char*) "Europe/Vaduz"                      , 0x091D20 },
+	{ (char*) "Europe/Vatican"                    , 0x09248C },
+	{ (char*) "Europe/Vienna"                     , 0x092EE9 },
+	{ (char*) "Europe/Vilnius"                    , 0x09378D },
+	{ (char*) "Europe/Volgograd"                  , 0x09400B },
+	{ (char*) "Europe/Warsaw"                     , 0x0944D2 },
+	{ (char*) "Europe/Zagreb"                     , 0x094F3C },
+	{ (char*) "Europe/Zaporozhye"                 , 0x0956C8 },
+	{ (char*) "Europe/Zurich"                     , 0x095F1C },
+	{ (char*) "Factory"                           , 0x09669D },
+	{ (char*) "GB"                                , 0x09671D },
+	{ (char*) "GB-Eire"                           , 0x097579 },
+	{ (char*) "GMT"                               , 0x0983D5 },
+	{ (char*) "GMT+0"                             , 0x098453 },
+	{ (char*) "GMT-0"                             , 0x0984D1 },
+	{ (char*) "GMT0"                              , 0x09854F },
+	{ (char*) "Greenwich"                         , 0x0985CD },
+	{ (char*) "Hongkong"                          , 0x09864B },
+	{ (char*) "HST"                               , 0x098B28 },
+	{ (char*) "Iceland"                           , 0x098C7D },
+	{ (char*) "Indian/Antananarivo"               , 0x098D1D },
+	{ (char*) "Indian/Chagos"                     , 0x098E04 },
+	{ (char*) "Indian/Christmas"                  , 0x098EC9 },
+	{ (char*) "Indian/Cocos"                      , 0x098F6C },
+	{ (char*) "Indian/Comoro"                     , 0x099018 },
+	{ (char*) "Indian/Kerguelen"                  , 0x0990B9 },
+	{ (char*) "Indian/Mahe"                       , 0x09915C },
+	{ (char*) "Indian/Maldives"                   , 0x0991FF },
+	{ (char*) "Indian/Mauritius"                  , 0x0992C4 },
+	{ (char*) "Indian/Mayotte"                    , 0x0993B3 },
+	{ (char*) "Indian/Reunion"                    , 0x099454 },
+	{ (char*) "Iran"                              , 0x0994F7 },
+	{ (char*) "Israel"                            , 0x0999E3 },
+	{ (char*) "Jamaica"                           , 0x09A343 },
+	{ (char*) "Japan"                             , 0x09A531 },
+	{ (char*) "Kwajalein"                         , 0x09A672 },
+	{ (char*) "Libya"                             , 0x09A7AC },
+	{ (char*) "MET"                               , 0x09AA29 },
+	{ (char*) "Mexico/BajaNorte"                  , 0x09B5AA },
+	{ (char*) "Mexico/BajaSur"                    , 0x09BF50 },
+	{ (char*) "Mexico/General"                    , 0x09C380 },
+	{ (char*) "MST"                               , 0x09C852 },
+	{ (char*) "MST7MDT"                           , 0x09C9C6 },
+	{ (char*) "Navajo"                            , 0x09D36E },
+	{ (char*) "NZ"                                , 0x09DD16 },
+	{ (char*) "NZ-CHAT"                           , 0x09E6A7 },
+	{ (char*) "Pacific/Apia"                      , 0x09EEB9 },
+	{ (char*) "Pacific/Auckland"                  , 0x09F11B },
+	{ (char*) "Pacific/Bougainville"              , 0x09FABF },
+	{ (char*) "Pacific/Chatham"                   , 0x09FBD5 },
+	{ (char*) "Pacific/Chuuk"                     , 0x0A03F6 },
+	{ (char*) "Pacific/Easter"                    , 0x0A0510 },
+	{ (char*) "Pacific/Efate"                     , 0x0A0DD4 },
+	{ (char*) "Pacific/Enderbury"                 , 0x0A0FEC },
+	{ (char*) "Pacific/Fakaofo"                   , 0x0A10D4 },
+	{ (char*) "Pacific/Fiji"                      , 0x0A119A },
+	{ (char*) "Pacific/Funafuti"                  , 0x0A13DA },
+	{ (char*) "Pacific/Galapagos"                 , 0x0A147E },
+	{ (char*) "Pacific/Gambier"                   , 0x0A157B },
+	{ (char*) "Pacific/Guadalcanal"               , 0x0A162C },
+	{ (char*) "Pacific/Guam"                      , 0x0A16D0 },
+	{ (char*) "Pacific/Honolulu"                  , 0x0A18CA },
+	{ (char*) "Pacific/Johnston"                  , 0x0A1A25 },
+	{ (char*) "Pacific/Kanton"                    , 0x0A1B7A },
+	{ (char*) "Pacific/Kiritimati"                , 0x0A1C71 },
+	{ (char*) "Pacific/Kosrae"                    , 0x0A1D69 },
+	{ (char*) "Pacific/Kwajalein"                 , 0x0A1ECC },
+	{ (char*) "Pacific/Majuro"                    , 0x0A200F },
+	{ (char*) "Pacific/Marquesas"                 , 0x0A215B },
+	{ (char*) "Pacific/Midway"                    , 0x0A2217 },
+	{ (char*) "Pacific/Nauru"                     , 0x0A230A },
+	{ (char*) "Pacific/Niue"                      , 0x0A2404 },
+	{ (char*) "Pacific/Norfolk"                   , 0x0A24CD },
+	{ (char*) "Pacific/Noumea"                    , 0x0A283B },
+	{ (char*) "Pacific/Pago_Pago"                 , 0x0A2969 },
+	{ (char*) "Pacific/Palau"                     , 0x0A2A24 },
+	{ (char*) "Pacific/Pitcairn"                  , 0x0A2AD6 },
+	{ (char*) "Pacific/Pohnpei"                   , 0x0A2B9E },
+	{ (char*) "Pacific/Ponape"                    , 0x0A2CD9 },
+	{ (char*) "Pacific/Port_Moresby"              , 0x0A2D7D },
+	{ (char*) "Pacific/Rarotonga"                 , 0x0A2E4D },
+	{ (char*) "Pacific/Saipan"                    , 0x0A30A6 },
+	{ (char*) "Pacific/Samoa"                     , 0x0A3292 },
+	{ (char*) "Pacific/Tahiti"                    , 0x0A334D },
+	{ (char*) "Pacific/Tarawa"                    , 0x0A33FF },
+	{ (char*) "Pacific/Tongatapu"                 , 0x0A34B2 },
+	{ (char*) "Pacific/Truk"                      , 0x0A3624 },
+	{ (char*) "Pacific/Wake"                      , 0x0A36DC },
+	{ (char*) "Pacific/Wallis"                    , 0x0A378B },
+	{ (char*) "Pacific/Yap"                       , 0x0A382F },
+	{ (char*) "Poland"                            , 0x0A38E7 },
+	{ (char*) "Portugal"                          , 0x0A4351 },
+	{ (char*) "PRC"                               , 0x0A5124 },
+	{ (char*) "PST8PDT"                           , 0x0A5361 },
+	{ (char*) "ROC"                               , 0x0A5E91 },
+	{ (char*) "ROK"                               , 0x0A6196 },
+	{ (char*) "Singapore"                         , 0x0A640B },
+	{ (char*) "Turkey"                            , 0x0A65A8 },
+	{ (char*) "UCT"                               , 0x0A6D41 },
+	{ (char*) "Universal"                         , 0x0A6DBF },
+	{ (char*) "US/Alaska"                         , 0x0A6E3D },
+	{ (char*) "US/Aleutian"                       , 0x0A778C },
+	{ (char*) "US/Arizona"                        , 0x0A80CC },
+	{ (char*) "US/Central"                        , 0x0A8240 },
+	{ (char*) "US/East-Indiana"                   , 0x0A9054 },
+	{ (char*) "US/Eastern"                        , 0x0A96F2 },
+	{ (char*) "US/Hawaii"                         , 0x0AA4DE },
+	{ (char*) "US/Indiana-Starke"                 , 0x0AA633 },
+	{ (char*) "US/Michigan"                       , 0x0AAFCB },
+	{ (char*) "US/Mountain"                       , 0x0AB88D },
+	{ (char*) "US/Pacific"                        , 0x0AC235 },
+	{ (char*) "US/Samoa"                          , 0x0ACD65 },
+	{ (char*) "UTC"                               , 0x0ACE20 },
+	{ (char*) "W-SU"                              , 0x0ACE9E },
+	{ (char*) "WET"                               , 0x0AD4A9 },
+	{ (char*) "Zulu"                              , 0x0AE27C },
 };
 
 
-const unsigned char timelib_timezone_db_data_builtin704144 = {
+const unsigned char timelib_timezone_db_data_builtin713466 = {
 
 /* Africa/Abidjan */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x43, 0x49, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -25822,12 +26206,12 @@
 /* Africa/Maputo */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x4D, 0x5A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x82, 0x46, 0xC5, 0xF4,
-0x01, 0x00, 0x00, 0x1E, 0x8C, 0x00, 0x00, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x04, 0x4C, 0x4D, 0x54,
+0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x8D, 0x42, 0xD5, 0x76,
+0x01, 0x00, 0x00, 0x1E, 0x8A, 0x00, 0x00, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x04, 0x4C, 0x4D, 0x54,
 0x00, 0x43, 0x41, 0x54, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
-0x08, 0xFF, 0xFF, 0xFF, 0xFF, 0x82, 0x46, 0xC5, 0xF4, 0x01, 0x00, 0x00, 0x1E, 0x8C, 0x00, 0x00,
+0x08, 0xFF, 0xFF, 0xFF, 0xFF, 0x8D, 0x42, 0xD5, 0x76, 0x01, 0x00, 0x00, 0x1E, 0x8A, 0x00, 0x00,
 0x00, 0x00, 0x1C, 0x20, 0x00, 0x04, 0x4C, 0x4D, 0x54, 0x00, 0x43, 0x41, 0x54, 0x00, 0x0A, 0x43,
 0x41, 0x54, 0x2D, 0x32, 0x0A, 0x00, 0x61, 0xB5, 0x05, 0x01, 0x44, 0x60, 0x5D, 0x00, 0x00, 0x00,
 0x00, 
@@ -27503,7 +27887,7 @@
 /* America/Asuncion */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x50, 0x59, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x81, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x10, 0x80, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x68, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x10, 0x80, 0x00, 0x00, 0x00,
 0xB8, 0x17, 0xF5, 0x90, 0x05, 0x2B, 0xDA, 0x40, 0x07, 0xFC, 0xF0, 0xB0, 0x0A, 0xCF, 0x74, 0xC0,
 0x0B, 0x97, 0xCA, 0xB0, 0x0C, 0xB1, 0xF9, 0xC0, 0x0D, 0x78, 0xFE, 0x30, 0x0E, 0x93, 0x2D, 0x40,
 0x0F, 0x5A, 0x31, 0xB0, 0x10, 0x74, 0x60, 0xC0, 0x11, 0x64, 0x43, 0xB0, 0x12, 0x55, 0x94, 0x40,
@@ -27529,106 +27913,82 @@
 0x5A, 0xB7, 0x10, 0xB0, 0x5B, 0xB9, 0x84, 0xC0, 0x5C, 0x96, 0xF2, 0xB0, 0x5D, 0x99, 0x66, 0xC0,
 0x5E, 0x76, 0xD4, 0xB0, 0x5F, 0x79, 0x48, 0xC0, 0x60, 0x5F, 0xF1, 0x30, 0x61, 0x59, 0x2A, 0xC0,
 0x62, 0x3F, 0xD3, 0x30, 0x63, 0x39, 0x0C, 0xC0, 0x64, 0x1F, 0xB5, 0x30, 0x65, 0x18, 0xEE, 0xC0,
-0x65, 0xFF, 0x97, 0x30, 0x67, 0x02, 0x0B, 0x40, 0x67, 0xDF, 0x79, 0x30, 0x68, 0xE1, 0xED, 0x40,
-0x69, 0xBF, 0x5B, 0x30, 0x6A, 0xC1, 0xCF, 0x40, 0x6B, 0xA8, 0x77, 0xB0, 0x6C, 0xA1, 0xB1, 0x40,
-0x6D, 0x88, 0x59, 0xB0, 0x6E, 0x81, 0x93, 0x40, 0x6F, 0x68, 0x3B, 0xB0, 0x70, 0x6A, 0xAF, 0xC0,
-0x71, 0x48, 0x1D, 0xB0, 0x72, 0x4A, 0x91, 0xC0, 0x73, 0x27, 0xFF, 0xB0, 0x74, 0x2A, 0x73, 0xC0,
-0x75, 0x11, 0x1C, 0x30, 0x76, 0x0A, 0x55, 0xC0, 0x76, 0xF0, 0xFE, 0x30, 0x77, 0xEA, 0x37, 0xC0,
-0x78, 0xD0, 0xE0, 0x30, 0x79, 0xCA, 0x19, 0xC0, 0x7A, 0xB0, 0xC2, 0x30, 0x7B, 0xB3, 0x36, 0x40,
-0x7C, 0x90, 0xA4, 0x30, 0x7D, 0x93, 0x18, 0x40, 0x7E, 0x70, 0x86, 0x30, 0x7F, 0x72, 0xFA, 0x40,
-0x01, 0x02, 0x03, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
-0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
+0x65, 0xFF, 0x97, 0x30, 0x67, 0x02, 0x0B, 0x40, 0x67, 0x0D, 0xDA, 0xB0, 0x01, 0x02, 0x03, 0x02,
 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
-0x04, 0xFF, 0xFF, 0xC9, 0xF0, 0x00, 0x00, 0xFF, 0xFF, 0xC9, 0xF0, 0x00, 0x04, 0xFF, 0xFF, 0xC7,
-0xC0, 0x00, 0x08, 0xFF, 0xFF, 0xD5, 0xD0, 0x00, 0x0C, 0xFF, 0xFF, 0xD5, 0xD0, 0x01, 0x0C, 0xFF,
-0xFF, 0xC7, 0xC0, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x41, 0x4D, 0x54, 0x00, 0x2D, 0x30, 0x34,
-0x00, 0x2D, 0x30, 0x33, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x04, 0x02, 0x04, 0x03, 0xFF, 0xFF, 0xC9, 0xF0, 0x00, 0x00, 0xFF, 0xFF, 0xC9, 0xF0, 0x00, 0x04,
+0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x08, 0xFF, 0xFF, 0xD5, 0xD0, 0x00, 0x0C, 0xFF, 0xFF, 0xD5, 0xD0,
+0x01, 0x0C, 0x4C, 0x4D, 0x54, 0x00, 0x41, 0x4D, 0x54, 0x00, 0x2D, 0x30, 0x34, 0x00, 0x2D, 0x30,
+0x33, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x81, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
-0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0x69, 0x87, 0x11, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0x17, 0xF5,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x05, 0x2B, 0xDA, 0x40, 0x00, 0x00, 0x00, 0x00, 0x07, 0xFC, 0xF0,
-0xB0, 0x00, 0x00, 0x00, 0x00, 0x0A, 0xCF, 0x74, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x0B, 0x97, 0xCA,
-0xB0, 0x00, 0x00, 0x00, 0x00, 0x0C, 0xB1, 0xF9, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x0D, 0x78, 0xFE,
-0x30, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x93, 0x2D, 0x40, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x5A, 0x31,
-0xB0, 0x00, 0x00, 0x00, 0x00, 0x10, 0x74, 0x60, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x11, 0x64, 0x43,
-0xB0, 0x00, 0x00, 0x00, 0x00, 0x12, 0x55, 0x94, 0x40, 0x00, 0x00, 0x00, 0x00, 0x13, 0x46, 0xC8,
-0xB0, 0x00, 0x00, 0x00, 0x00, 0x14, 0x38, 0x19, 0x40, 0x00, 0x00, 0x00, 0x00, 0x15, 0x27, 0xFC,
-0x30, 0x00, 0x00, 0x00, 0x00, 0x16, 0x19, 0x4C, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x17, 0x09, 0x2F,
-0xB0, 0x00, 0x00, 0x00, 0x00, 0x17, 0xFA, 0x80, 0x40, 0x00, 0x00, 0x00, 0x00, 0x18, 0xEA, 0x63,
-0x30, 0x00, 0x00, 0x00, 0x00, 0x19, 0xDB, 0xB3, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xCC, 0xE8,
-0x30, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xBE, 0x38, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xAE, 0x1B,
-0xB0, 0x00, 0x00, 0x00, 0x00, 0x1D, 0x9F, 0x6C, 0x40, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x8F, 0x4F,
-0x30, 0x00, 0x00, 0x00, 0x00, 0x1F, 0x80, 0x9F, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x20, 0x70, 0x82,
-0xB0, 0x00, 0x00, 0x00, 0x00, 0x21, 0x61, 0xD3, 0x40, 0x00, 0x00, 0x00, 0x00, 0x22, 0x53, 0x07,
-0xB0, 0x00, 0x00, 0x00, 0x00, 0x23, 0x44, 0x58, 0x40, 0x00, 0x00, 0x00, 0x00, 0x24, 0x34, 0x3B,
-0x30, 0x00, 0x00, 0x00, 0x00, 0x25, 0x41, 0x3B, 0x40, 0x00, 0x00, 0x00, 0x00, 0x26, 0x15, 0x6E,
-0xB0, 0x00, 0x00, 0x00, 0x00, 0x27, 0x06, 0xBF, 0x40, 0x00, 0x00, 0x00, 0x00, 0x27, 0xF6, 0xA2,
-0x30, 0x00, 0x00, 0x00, 0x00, 0x28, 0xEE, 0x8A, 0x40, 0x00, 0x00, 0x00, 0x00, 0x29, 0xB0, 0x48,
-0xB0, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xCF, 0xBD, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xB9, 0x09,
-0x30, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xAB, 0xAB, 0x40, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x70, 0x0C,
-0xB0, 0x00, 0x00, 0x00, 0x00, 0x2E, 0x8C, 0xDE, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x4F, 0xEE,
-0xB0, 0x00, 0x00, 0x00, 0x00, 0x30, 0x6E, 0x12, 0x40, 0x00, 0x00, 0x00, 0x00, 0x31, 0x36, 0x68,
-0x30, 0x00, 0x00, 0x00, 0x00, 0x32, 0x57, 0x2E, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x33, 0x0F, 0xB2,
-0xB0, 0x00, 0x00, 0x00, 0x00, 0x34, 0x37, 0x10, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x34, 0xF8, 0xCF,
-0x30, 0x00, 0x00, 0x00, 0x00, 0x36, 0x16, 0xF2, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x36, 0xE1, 0xEB,
-0xB0, 0x00, 0x00, 0x00, 0x00, 0x37, 0xF6, 0xD4, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x38, 0xC1, 0xCD,
-0xB0, 0x00, 0x00, 0x00, 0x00, 0x39, 0xD6, 0xB6, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xA1, 0xAF,
-0xB0, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xBF, 0xD3, 0x40, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xAF, 0xB6,
-0x30, 0x00, 0x00, 0x00, 0x00, 0x3D, 0x71, 0x90, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x8F, 0x98,
-0x30, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x5A, 0xAD, 0x40, 0x00, 0x00, 0x00, 0x00, 0x40, 0x6F, 0x7A,
-0x30, 0x00, 0x00, 0x00, 0x00, 0x41, 0x71, 0xEE, 0x40, 0x00, 0x00, 0x00, 0x00, 0x42, 0x33, 0xAC,
-0xB0, 0x00, 0x00, 0x00, 0x00, 0x43, 0x51, 0xD0, 0x40, 0x00, 0x00, 0x00, 0x00, 0x44, 0x13, 0x8E,
-0xB0, 0x00, 0x00, 0x00, 0x00, 0x45, 0x31, 0xB2, 0x40, 0x00, 0x00, 0x00, 0x00, 0x45, 0xF3, 0x70,
-0xB0, 0x00, 0x00, 0x00, 0x00, 0x47, 0x1A, 0xCE, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x47, 0xD3, 0x52,
-0xB0, 0x00, 0x00, 0x00, 0x00, 0x48, 0xFA, 0xB0, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x49, 0xB3, 0x34,
-0xB0, 0x00, 0x00, 0x00, 0x00, 0x4A, 0xDA, 0x92, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x4B, 0xC1, 0x3B,
-0x30, 0x00, 0x00, 0x00, 0x00, 0x4C, 0xA7, 0xFF, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x4D, 0xA1, 0x1D,
-0x30, 0x00, 0x00, 0x00, 0x00, 0x4E, 0x87, 0xE1, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x80, 0xFF,
-0x30, 0x00, 0x00, 0x00, 0x00, 0x50, 0x70, 0xFE, 0x40, 0x00, 0x00, 0x00, 0x00, 0x51, 0x4E, 0x6C,
-0x30, 0x00, 0x00, 0x00, 0x00, 0x52, 0x50, 0xE0, 0x40, 0x00, 0x00, 0x00, 0x00, 0x53, 0x2E, 0x4E,
-0x30, 0x00, 0x00, 0x00, 0x00, 0x54, 0x30, 0xC2, 0x40, 0x00, 0x00, 0x00, 0x00, 0x55, 0x0E, 0x30,
-0x30, 0x00, 0x00, 0x00, 0x00, 0x56, 0x10, 0xA4, 0x40, 0x00, 0x00, 0x00, 0x00, 0x56, 0xF7, 0x4C,
-0xB0, 0x00, 0x00, 0x00, 0x00, 0x57, 0xF0, 0x86, 0x40, 0x00, 0x00, 0x00, 0x00, 0x58, 0xD7, 0x2E,
-0xB0, 0x00, 0x00, 0x00, 0x00, 0x59, 0xD0, 0x68, 0x40, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xB7, 0x10,
-0xB0, 0x00, 0x00, 0x00, 0x00, 0x5B, 0xB9, 0x84, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x5C, 0x96, 0xF2,
-0xB0, 0x00, 0x00, 0x00, 0x00, 0x5D, 0x99, 0x66, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x76, 0xD4,
-0xB0, 0x00, 0x00, 0x00, 0x00, 0x5F, 0x79, 0x48, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x60, 0x5F, 0xF1,
-0x30, 0x00, 0x00, 0x00, 0x00, 0x61, 0x59, 0x2A, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x62, 0x3F, 0xD3,
-0x30, 0x00, 0x00, 0x00, 0x00, 0x63, 0x39, 0x0C, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x64, 0x1F, 0xB5,
-0x30, 0x00, 0x00, 0x00, 0x00, 0x65, 0x18, 0xEE, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x65, 0xFF, 0x97,
-0x30, 0x00, 0x00, 0x00, 0x00, 0x67, 0x02, 0x0B, 0x40, 0x00, 0x00, 0x00, 0x00, 0x67, 0xDF, 0x79,
-0x30, 0x00, 0x00, 0x00, 0x00, 0x68, 0xE1, 0xED, 0x40, 0x00, 0x00, 0x00, 0x00, 0x69, 0xBF, 0x5B,
-0x30, 0x00, 0x00, 0x00, 0x00, 0x6A, 0xC1, 0xCF, 0x40, 0x00, 0x00, 0x00, 0x00, 0x6B, 0xA8, 0x77,
-0xB0, 0x00, 0x00, 0x00, 0x00, 0x6C, 0xA1, 0xB1, 0x40, 0x00, 0x00, 0x00, 0x00, 0x6D, 0x88, 0x59,
-0xB0, 0x00, 0x00, 0x00, 0x00, 0x6E, 0x81, 0x93, 0x40, 0x00, 0x00, 0x00, 0x00, 0x6F, 0x68, 0x3B,
-0xB0, 0x00, 0x00, 0x00, 0x00, 0x70, 0x6A, 0xAF, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x71, 0x48, 0x1D,
-0xB0, 0x00, 0x00, 0x00, 0x00, 0x72, 0x4A, 0x91, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x73, 0x27, 0xFF,
-0xB0, 0x00, 0x00, 0x00, 0x00, 0x74, 0x2A, 0x73, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x75, 0x11, 0x1C,
-0x30, 0x00, 0x00, 0x00, 0x00, 0x76, 0x0A, 0x55, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x76, 0xF0, 0xFE,
-0x30, 0x00, 0x00, 0x00, 0x00, 0x77, 0xEA, 0x37, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x78, 0xD0, 0xE0,
-0x30, 0x00, 0x00, 0x00, 0x00, 0x79, 0xCA, 0x19, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x7A, 0xB0, 0xC2,
-0x30, 0x00, 0x00, 0x00, 0x00, 0x7B, 0xB3, 0x36, 0x40, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x90, 0xA4,
-0x30, 0x00, 0x00, 0x00, 0x00, 0x7D, 0x93, 0x18, 0x40, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x70, 0x86,
-0x30, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x72, 0xFA, 0x40, 0x01, 0x02, 0x03, 0x02, 0x04, 0x02, 0x04,
-0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
-0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
-0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
-0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
-0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
-0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
-0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
-0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0xFF, 0xFF, 0xC9, 0xF0, 0x00, 0x00,
-0xFF, 0xFF, 0xC9, 0xF0, 0x00, 0x04, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x08, 0xFF, 0xFF, 0xD5, 0xD0,
-0x00, 0x0C, 0xFF, 0xFF, 0xD5, 0xD0, 0x01, 0x0C, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x08, 0x4C, 0x4D,
-0x54, 0x00, 0x41, 0x4D, 0x54, 0x00, 0x2D, 0x30, 0x34, 0x00, 0x2D, 0x30, 0x33, 0x00, 0x0A, 0x3C,
-0x2D, 0x30, 0x34, 0x3E, 0x34, 0x3C, 0x2D, 0x30, 0x33, 0x3E, 0x2C, 0x4D, 0x31, 0x30, 0x2E, 0x31,
-0x2E, 0x30, 0x2F, 0x30, 0x2C, 0x4D, 0x33, 0x2E, 0x34, 0x2E, 0x30, 0x2F, 0x30, 0x0A, 0x00, 0x62,
-0xC6, 0x75, 0x00, 0xBA, 0xAA, 0x75, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x68, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x10, 0xFF, 0xFF,
+0xFF, 0xFF, 0x69, 0x87, 0x11, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0x17, 0xF5, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x05, 0x2B, 0xDA, 0x40, 0x00, 0x00, 0x00, 0x00, 0x07, 0xFC, 0xF0, 0xB0, 0x00, 0x00,
+0x00, 0x00, 0x0A, 0xCF, 0x74, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x0B, 0x97, 0xCA, 0xB0, 0x00, 0x00,
+0x00, 0x00, 0x0C, 0xB1, 0xF9, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x0D, 0x78, 0xFE, 0x30, 0x00, 0x00,
+0x00, 0x00, 0x0E, 0x93, 0x2D, 0x40, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x5A, 0x31, 0xB0, 0x00, 0x00,
+0x00, 0x00, 0x10, 0x74, 0x60, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x11, 0x64, 0x43, 0xB0, 0x00, 0x00,
+0x00, 0x00, 0x12, 0x55, 0x94, 0x40, 0x00, 0x00, 0x00, 0x00, 0x13, 0x46, 0xC8, 0xB0, 0x00, 0x00,
+0x00, 0x00, 0x14, 0x38, 0x19, 0x40, 0x00, 0x00, 0x00, 0x00, 0x15, 0x27, 0xFC, 0x30, 0x00, 0x00,
+0x00, 0x00, 0x16, 0x19, 0x4C, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x17, 0x09, 0x2F, 0xB0, 0x00, 0x00,
+0x00, 0x00, 0x17, 0xFA, 0x80, 0x40, 0x00, 0x00, 0x00, 0x00, 0x18, 0xEA, 0x63, 0x30, 0x00, 0x00,
+0x00, 0x00, 0x19, 0xDB, 0xB3, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xCC, 0xE8, 0x30, 0x00, 0x00,
+0x00, 0x00, 0x1B, 0xBE, 0x38, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xAE, 0x1B, 0xB0, 0x00, 0x00,
+0x00, 0x00, 0x1D, 0x9F, 0x6C, 0x40, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x8F, 0x4F, 0x30, 0x00, 0x00,
+0x00, 0x00, 0x1F, 0x80, 0x9F, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x20, 0x70, 0x82, 0xB0, 0x00, 0x00,
+0x00, 0x00, 0x21, 0x61, 0xD3, 0x40, 0x00, 0x00, 0x00, 0x00, 0x22, 0x53, 0x07, 0xB0, 0x00, 0x00,
+0x00, 0x00, 0x23, 0x44, 0x58, 0x40, 0x00, 0x00, 0x00, 0x00, 0x24, 0x34, 0x3B, 0x30, 0x00, 0x00,
+0x00, 0x00, 0x25, 0x41, 0x3B, 0x40, 0x00, 0x00, 0x00, 0x00, 0x26, 0x15, 0x6E, 0xB0, 0x00, 0x00,
+0x00, 0x00, 0x27, 0x06, 0xBF, 0x40, 0x00, 0x00, 0x00, 0x00, 0x27, 0xF6, 0xA2, 0x30, 0x00, 0x00,
+0x00, 0x00, 0x28, 0xEE, 0x8A, 0x40, 0x00, 0x00, 0x00, 0x00, 0x29, 0xB0, 0x48, 0xB0, 0x00, 0x00,
+0x00, 0x00, 0x2A, 0xCF, 0xBD, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xB9, 0x09, 0x30, 0x00, 0x00,
+0x00, 0x00, 0x2C, 0xAB, 0xAB, 0x40, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x70, 0x0C, 0xB0, 0x00, 0x00,
+0x00, 0x00, 0x2E, 0x8C, 0xDE, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x4F, 0xEE, 0xB0, 0x00, 0x00,
+0x00, 0x00, 0x30, 0x6E, 0x12, 0x40, 0x00, 0x00, 0x00, 0x00, 0x31, 0x36, 0x68, 0x30, 0x00, 0x00,
+0x00, 0x00, 0x32, 0x57, 0x2E, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x33, 0x0F, 0xB2, 0xB0, 0x00, 0x00,
+0x00, 0x00, 0x34, 0x37, 0x10, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x34, 0xF8, 0xCF, 0x30, 0x00, 0x00,
+0x00, 0x00, 0x36, 0x16, 0xF2, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x36, 0xE1, 0xEB, 0xB0, 0x00, 0x00,
+0x00, 0x00, 0x37, 0xF6, 0xD4, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x38, 0xC1, 0xCD, 0xB0, 0x00, 0x00,
+0x00, 0x00, 0x39, 0xD6, 0xB6, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xA1, 0xAF, 0xB0, 0x00, 0x00,
+0x00, 0x00, 0x3B, 0xBF, 0xD3, 0x40, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xAF, 0xB6, 0x30, 0x00, 0x00,
+0x00, 0x00, 0x3D, 0x71, 0x90, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x8F, 0x98, 0x30, 0x00, 0x00,
+0x00, 0x00, 0x3F, 0x5A, 0xAD, 0x40, 0x00, 0x00, 0x00, 0x00, 0x40, 0x6F, 0x7A, 0x30, 0x00, 0x00,
+0x00, 0x00, 0x41, 0x71, 0xEE, 0x40, 0x00, 0x00, 0x00, 0x00, 0x42, 0x33, 0xAC, 0xB0, 0x00, 0x00,
+0x00, 0x00, 0x43, 0x51, 0xD0, 0x40, 0x00, 0x00, 0x00, 0x00, 0x44, 0x13, 0x8E, 0xB0, 0x00, 0x00,
+0x00, 0x00, 0x45, 0x31, 0xB2, 0x40, 0x00, 0x00, 0x00, 0x00, 0x45, 0xF3, 0x70, 0xB0, 0x00, 0x00,
+0x00, 0x00, 0x47, 0x1A, 0xCE, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x47, 0xD3, 0x52, 0xB0, 0x00, 0x00,
+0x00, 0x00, 0x48, 0xFA, 0xB0, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x49, 0xB3, 0x34, 0xB0, 0x00, 0x00,
+0x00, 0x00, 0x4A, 0xDA, 0x92, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x4B, 0xC1, 0x3B, 0x30, 0x00, 0x00,
+0x00, 0x00, 0x4C, 0xA7, 0xFF, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x4D, 0xA1, 0x1D, 0x30, 0x00, 0x00,
+0x00, 0x00, 0x4E, 0x87, 0xE1, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x80, 0xFF, 0x30, 0x00, 0x00,
+0x00, 0x00, 0x50, 0x70, 0xFE, 0x40, 0x00, 0x00, 0x00, 0x00, 0x51, 0x4E, 0x6C, 0x30, 0x00, 0x00,
+0x00, 0x00, 0x52, 0x50, 0xE0, 0x40, 0x00, 0x00, 0x00, 0x00, 0x53, 0x2E, 0x4E, 0x30, 0x00, 0x00,
+0x00, 0x00, 0x54, 0x30, 0xC2, 0x40, 0x00, 0x00, 0x00, 0x00, 0x55, 0x0E, 0x30, 0x30, 0x00, 0x00,
+0x00, 0x00, 0x56, 0x10, 0xA4, 0x40, 0x00, 0x00, 0x00, 0x00, 0x56, 0xF7, 0x4C, 0xB0, 0x00, 0x00,
+0x00, 0x00, 0x57, 0xF0, 0x86, 0x40, 0x00, 0x00, 0x00, 0x00, 0x58, 0xD7, 0x2E, 0xB0, 0x00, 0x00,
+0x00, 0x00, 0x59, 0xD0, 0x68, 0x40, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xB7, 0x10, 0xB0, 0x00, 0x00,
+0x00, 0x00, 0x5B, 0xB9, 0x84, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x5C, 0x96, 0xF2, 0xB0, 0x00, 0x00,
+0x00, 0x00, 0x5D, 0x99, 0x66, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x76, 0xD4, 0xB0, 0x00, 0x00,
+0x00, 0x00, 0x5F, 0x79, 0x48, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x60, 0x5F, 0xF1, 0x30, 0x00, 0x00,
+0x00, 0x00, 0x61, 0x59, 0x2A, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x62, 0x3F, 0xD3, 0x30, 0x00, 0x00,
+0x00, 0x00, 0x63, 0x39, 0x0C, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x64, 0x1F, 0xB5, 0x30, 0x00, 0x00,
+0x00, 0x00, 0x65, 0x18, 0xEE, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x65, 0xFF, 0x97, 0x30, 0x00, 0x00,
+0x00, 0x00, 0x67, 0x02, 0x0B, 0x40, 0x00, 0x00, 0x00, 0x00, 0x67, 0x0D, 0xDA, 0xB0, 0x01, 0x02,
+0x03, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
+0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
+0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
+0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
+0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
+0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
+0x04, 0x02, 0x04, 0x02, 0x04, 0x03, 0xFF, 0xFF, 0xC9, 0xF0, 0x00, 0x00, 0xFF, 0xFF, 0xC9, 0xF0,
+0x00, 0x04, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x08, 0xFF, 0xFF, 0xD5, 0xD0, 0x00, 0x0C, 0xFF, 0xFF,
+0xD5, 0xD0, 0x01, 0x0C, 0x4C, 0x4D, 0x54, 0x00, 0x41, 0x4D, 0x54, 0x00, 0x2D, 0x30, 0x34, 0x00,
+0x2D, 0x30, 0x33, 0x00, 0x0A, 0x3C, 0x2D, 0x30, 0x33, 0x3E, 0x33, 0x0A, 0x00, 0x62, 0xC6, 0x75,
+0x00, 0xBA, 0xAA, 0x75, 0x00, 0x00, 0x00, 0x00, 
 
 /* America/Atikokan */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x43, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -27876,79 +28236,76 @@
 
 /* America/Bahia_Banderas */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x4D, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x18, 0xA5, 0xB6, 0xE8, 0x70,
-0xAF, 0xF2, 0x6E, 0xE0, 0xB6, 0x66, 0x56, 0x60, 0xB7, 0x43, 0xD2, 0x60, 0xB8, 0x0C, 0x36, 0x60,
-0xB8, 0xFD, 0x86, 0xF0, 0xCB, 0xEA, 0x71, 0x60, 0xD8, 0x91, 0xB4, 0xF0, 0x00, 0x00, 0x70, 0x80,
-0x31, 0x67, 0x84, 0x10, 0x32, 0x73, 0x16, 0x80, 0x33, 0x47, 0x66, 0x10, 0x34, 0x52, 0xF8, 0x80,
-0x35, 0x27, 0x48, 0x10, 0x36, 0x32, 0xDA, 0x80, 0x37, 0x07, 0x2A, 0x10, 0x38, 0x1B, 0xF7, 0x00,
-0x38, 0xE7, 0x0C, 0x10, 0x39, 0xFB, 0xD9, 0x00, 0x3A, 0xF5, 0x12, 0x90, 0x3B, 0xB6, 0xD1, 0x00,
-0x3C, 0xB0, 0x0A, 0x90, 0x3D, 0xBB, 0x9D, 0x00, 0x3E, 0x8F, 0xEC, 0x90, 0x3F, 0x9B, 0x7F, 0x00,
-0x40, 0x6F, 0xCE, 0x90, 0x41, 0x84, 0x9B, 0x80, 0x42, 0x4F, 0xB0, 0x90, 0x43, 0x64, 0x7D, 0x80,
-0x44, 0x2F, 0x92, 0x90, 0x45, 0x44, 0x5F, 0x80, 0x46, 0x0F, 0x74, 0x90, 0x47, 0x24, 0x41, 0x80,
-0x47, 0xF8, 0x91, 0x10, 0x49, 0x04, 0x23, 0x80, 0x49, 0xD8, 0x73, 0x10, 0x4A, 0xE4, 0x05, 0x80,
-0x4B, 0xB8, 0x55, 0x10, 0x4C, 0xCD, 0x13, 0xF0, 0x4D, 0x98, 0x29, 0x00, 0x4E, 0xAC, 0xF5, 0xF0,
-0x4F, 0x78, 0x0B, 0x00, 0x50, 0x8C, 0xD7, 0xF0, 0x51, 0x61, 0x27, 0x80, 0x52, 0x6C, 0xB9, 0xF0,
-0x53, 0x41, 0x09, 0x80, 0x54, 0x4C, 0x9B, 0xF0, 0x55, 0x20, 0xEB, 0x80, 0x56, 0x2C, 0x7D, 0xF0,
-0x57, 0x00, 0xCD, 0x80, 0x58, 0x15, 0x9A, 0x70, 0x58, 0xE0, 0xAF, 0x80, 0x59, 0xF5, 0x7C, 0x70,
-0x5A, 0xC0, 0x91, 0x80, 0x5B, 0xD5, 0x5E, 0x70, 0x5C, 0xA9, 0xAE, 0x00, 0x5D, 0xB5, 0x40, 0x70,
-0x5E, 0x89, 0x90, 0x00, 0x5F, 0x95, 0x22, 0x70, 0x60, 0x69, 0x72, 0x00, 0x61, 0x7E, 0x3E, 0xF0,
-0x62, 0x49, 0x54, 0x00, 0x63, 0x5E, 0x20, 0xF0, 0x01, 0x02, 0x04, 0x03, 0x04, 0x02, 0x04, 0x05,
-0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
-0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x06, 0x02, 0x06,
-0x02, 0x06, 0x02, 0x06, 0x02, 0x06, 0x02, 0x06, 0x02, 0x06, 0x02, 0x06, 0x02, 0x06, 0x02, 0x06,
-0x02, 0x06, 0x02, 0x06, 0x02, 0x06, 0x02, 0xFF, 0xFF, 0x9D, 0x54, 0x00, 0x00, 0xFF, 0xFF, 0x9D,
-0x90, 0x00, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x0C, 0xFF,
-0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x10, 0xFF, 0xFF, 0xB9, 0xB0, 0x01,
-0x14, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x43,
-0x53, 0x54, 0x00, 0x4D, 0x44, 0x54, 0x00, 0x50, 0x53, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x00,
-0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x54,
-0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x18, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5,
-0xB6, 0xE8, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF2, 0x6E, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB6,
-0x66, 0x56, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x43, 0xD2, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8,
-0x0C, 0x36, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0xFD, 0x86, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB,
-0xEA, 0x71, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xD8, 0x91, 0xB4, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x70, 0x80, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x84, 0x10, 0x00, 0x00, 0x00, 0x00, 0x32,
-0x73, 0x16, 0x80, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x66, 0x10, 0x00, 0x00, 0x00, 0x00, 0x34,
-0x52, 0xF8, 0x80, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x48, 0x10, 0x00, 0x00, 0x00, 0x00, 0x36,
-0x32, 0xDA, 0x80, 0x00, 0x00, 0x00, 0x00, 0x37, 0x07, 0x2A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x38,
-0x1B, 0xF7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0xE7, 0x0C, 0x10, 0x00, 0x00, 0x00, 0x00, 0x39,
-0xFB, 0xD9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xF5, 0x12, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3B,
-0xB6, 0xD1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xB0, 0x0A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3D,
-0xBB, 0x9D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x8F, 0xEC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3F,
-0x9B, 0x7F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x6F, 0xCE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x41,
-0x84, 0x9B, 0x80, 0x00, 0x00, 0x00, 0x00, 0x42, 0x4F, 0xB0, 0x90, 0x00, 0x00, 0x00, 0x00, 0x43,
-0x64, 0x7D, 0x80, 0x00, 0x00, 0x00, 0x00, 0x44, 0x2F, 0x92, 0x90, 0x00, 0x00, 0x00, 0x00, 0x45,
-0x44, 0x5F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x46, 0x0F, 0x74, 0x90, 0x00, 0x00, 0x00, 0x00, 0x47,
-0x24, 0x41, 0x80, 0x00, 0x00, 0x00, 0x00, 0x47, 0xF8, 0x91, 0x10, 0x00, 0x00, 0x00, 0x00, 0x49,
-0x04, 0x23, 0x80, 0x00, 0x00, 0x00, 0x00, 0x49, 0xD8, 0x73, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4A,
-0xE4, 0x05, 0x80, 0x00, 0x00, 0x00, 0x00, 0x4B, 0xB8, 0x55, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4C,
-0xCD, 0x13, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x98, 0x29, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4E,
-0xAC, 0xF5, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x78, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50,
-0x8C, 0xD7, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x51, 0x61, 0x27, 0x80, 0x00, 0x00, 0x00, 0x00, 0x52,
-0x6C, 0xB9, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x53, 0x41, 0x09, 0x80, 0x00, 0x00, 0x00, 0x00, 0x54,
-0x4C, 0x9B, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x55, 0x20, 0xEB, 0x80, 0x00, 0x00, 0x00, 0x00, 0x56,
-0x2C, 0x7D, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x57, 0x00, 0xCD, 0x80, 0x00, 0x00, 0x00, 0x00, 0x58,
-0x15, 0x9A, 0x70, 0x00, 0x00, 0x00, 0x00, 0x58, 0xE0, 0xAF, 0x80, 0x00, 0x00, 0x00, 0x00, 0x59,
-0xF5, 0x7C, 0x70, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xC0, 0x91, 0x80, 0x00, 0x00, 0x00, 0x00, 0x5B,
-0xD5, 0x5E, 0x70, 0x00, 0x00, 0x00, 0x00, 0x5C, 0xA9, 0xAE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5D,
-0xB5, 0x40, 0x70, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x89, 0x90, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5F,
-0x95, 0x22, 0x70, 0x00, 0x00, 0x00, 0x00, 0x60, 0x69, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 0x61,
-0x7E, 0x3E, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x62, 0x49, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x63,
-0x5E, 0x20, 0xF0, 0x01, 0x02, 0x04, 0x03, 0x04, 0x02, 0x04, 0x05, 0x04, 0x03, 0x04, 0x03, 0x04,
-0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
-0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x06, 0x02, 0x06, 0x02, 0x06, 0x02, 0x06, 0x02,
-0x06, 0x02, 0x06, 0x02, 0x06, 0x02, 0x06, 0x02, 0x06, 0x02, 0x06, 0x02, 0x06, 0x02, 0x06, 0x02,
-0x06, 0x02, 0xFF, 0xFF, 0x9D, 0x54, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF,
-0xAB, 0xA0, 0x00, 0x08, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x0C, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04,
-0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x10, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x14, 0xFF, 0xFF, 0xAB, 0xA0,
-0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x4D, 0x44,
-0x54, 0x00, 0x50, 0x53, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x43, 0x53, 0x54, 0x36, 0x0A,
-0x00, 0xA9, 0x11, 0x40, 0x00, 0x72, 0x0F, 0x38, 0x00, 0x00, 0x00, 0x11, 0x42, 0x61, 0x68, 0x69,
-0x61, 0x20, 0x64, 0x65, 0x20, 0x42, 0x61, 0x6E, 0x64, 0x65, 0x72, 0x61, 0x73, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x3D, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x14, 0xA5, 0xB6, 0xE8, 0x70,
+0xAF, 0xF1, 0x2B, 0x70, 0xB6, 0x66, 0x56, 0x60, 0xB7, 0x41, 0x3D, 0x70, 0xB8, 0x0C, 0x36, 0x60,
+0xB8, 0xFD, 0x86, 0xF0, 0xCB, 0xEA, 0x71, 0x60, 0x31, 0x67, 0x84, 0x10, 0x32, 0x73, 0x16, 0x80,
+0x33, 0x47, 0x66, 0x10, 0x34, 0x52, 0xF8, 0x80, 0x35, 0x27, 0x48, 0x10, 0x36, 0x32, 0xDA, 0x80,
+0x37, 0x07, 0x2A, 0x10, 0x38, 0x1B, 0xF7, 0x00, 0x38, 0xE7, 0x0C, 0x10, 0x39, 0xFB, 0xD9, 0x00,
+0x3A, 0xF5, 0x12, 0x90, 0x3B, 0xB6, 0xD1, 0x00, 0x3C, 0xB0, 0x0A, 0x90, 0x3D, 0xBB, 0x9D, 0x00,
+0x3E, 0x8F, 0xEC, 0x90, 0x3F, 0x9B, 0x7F, 0x00, 0x40, 0x6F, 0xCE, 0x90, 0x41, 0x84, 0x9B, 0x80,
+0x42, 0x4F, 0xB0, 0x90, 0x43, 0x64, 0x7D, 0x80, 0x44, 0x2F, 0x92, 0x90, 0x45, 0x44, 0x5F, 0x80,
+0x46, 0x0F, 0x74, 0x90, 0x47, 0x24, 0x41, 0x80, 0x47, 0xF8, 0x91, 0x10, 0x49, 0x04, 0x23, 0x80,
+0x49, 0xD8, 0x73, 0x10, 0x4A, 0xE4, 0x05, 0x80, 0x4B, 0xB8, 0x55, 0x10, 0x4C, 0xCD, 0x13, 0xF0,
+0x4D, 0x98, 0x29, 0x00, 0x4E, 0xAC, 0xF5, 0xF0, 0x4F, 0x78, 0x0B, 0x00, 0x50, 0x8C, 0xD7, 0xF0,
+0x51, 0x61, 0x27, 0x80, 0x52, 0x6C, 0xB9, 0xF0, 0x53, 0x41, 0x09, 0x80, 0x54, 0x4C, 0x9B, 0xF0,
+0x55, 0x20, 0xEB, 0x80, 0x56, 0x2C, 0x7D, 0xF0, 0x57, 0x00, 0xCD, 0x80, 0x58, 0x15, 0x9A, 0x70,
+0x58, 0xE0, 0xAF, 0x80, 0x59, 0xF5, 0x7C, 0x70, 0x5A, 0xC0, 0x91, 0x80, 0x5B, 0xD5, 0x5E, 0x70,
+0x5C, 0xA9, 0xAE, 0x00, 0x5D, 0xB5, 0x40, 0x70, 0x5E, 0x89, 0x90, 0x00, 0x5F, 0x95, 0x22, 0x70,
+0x60, 0x69, 0x72, 0x00, 0x61, 0x7E, 0x3E, 0xF0, 0x62, 0x49, 0x54, 0x00, 0x63, 0x5E, 0x20, 0xF0,
+0x01, 0x02, 0x04, 0x03, 0x04, 0x02, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
+0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
+0x04, 0x03, 0x04, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05,
+0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0xFF, 0xFF, 0x9D,
+0x54, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0xFF,
+0xFF, 0xAB, 0xA0, 0x01, 0x0C, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0xB9, 0xB0, 0x01,
+0x10, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x43,
+0x53, 0x54, 0x00, 0x4D, 0x44, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x07, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3D, 0x00, 0x00, 0x00,
+0x07, 0x00, 0x00, 0x00, 0x14, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8, 0x70, 0xFF, 0xFF, 0xFF,
+0xFF, 0xAF, 0xF1, 0x2B, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x56, 0x60, 0xFF, 0xFF, 0xFF,
+0xFF, 0xB7, 0x41, 0x3D, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0x0C, 0x36, 0x60, 0xFF, 0xFF, 0xFF,
+0xFF, 0xB8, 0xFD, 0x86, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0xEA, 0x71, 0x60, 0x00, 0x00, 0x00,
+0x00, 0x31, 0x67, 0x84, 0x10, 0x00, 0x00, 0x00, 0x00, 0x32, 0x73, 0x16, 0x80, 0x00, 0x00, 0x00,
+0x00, 0x33, 0x47, 0x66, 0x10, 0x00, 0x00, 0x00, 0x00, 0x34, 0x52, 0xF8, 0x80, 0x00, 0x00, 0x00,
+0x00, 0x35, 0x27, 0x48, 0x10, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0xDA, 0x80, 0x00, 0x00, 0x00,
+0x00, 0x37, 0x07, 0x2A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x38, 0x1B, 0xF7, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x38, 0xE7, 0x0C, 0x10, 0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0xD9, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x3A, 0xF5, 0x12, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xB6, 0xD1, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x3C, 0xB0, 0x0A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0x9D, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x3E, 0x8F, 0xEC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x7F, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x40, 0x6F, 0xCE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0x9B, 0x80, 0x00, 0x00, 0x00,
+0x00, 0x42, 0x4F, 0xB0, 0x90, 0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x7D, 0x80, 0x00, 0x00, 0x00,
+0x00, 0x44, 0x2F, 0x92, 0x90, 0x00, 0x00, 0x00, 0x00, 0x45, 0x44, 0x5F, 0x80, 0x00, 0x00, 0x00,
+0x00, 0x46, 0x0F, 0x74, 0x90, 0x00, 0x00, 0x00, 0x00, 0x47, 0x24, 0x41, 0x80, 0x00, 0x00, 0x00,
+0x00, 0x47, 0xF8, 0x91, 0x10, 0x00, 0x00, 0x00, 0x00, 0x49, 0x04, 0x23, 0x80, 0x00, 0x00, 0x00,
+0x00, 0x49, 0xD8, 0x73, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4A, 0xE4, 0x05, 0x80, 0x00, 0x00, 0x00,
+0x00, 0x4B, 0xB8, 0x55, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4C, 0xCD, 0x13, 0xF0, 0x00, 0x00, 0x00,
+0x00, 0x4D, 0x98, 0x29, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4E, 0xAC, 0xF5, 0xF0, 0x00, 0x00, 0x00,
+0x00, 0x4F, 0x78, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x8C, 0xD7, 0xF0, 0x00, 0x00, 0x00,
+0x00, 0x51, 0x61, 0x27, 0x80, 0x00, 0x00, 0x00, 0x00, 0x52, 0x6C, 0xB9, 0xF0, 0x00, 0x00, 0x00,
+0x00, 0x53, 0x41, 0x09, 0x80, 0x00, 0x00, 0x00, 0x00, 0x54, 0x4C, 0x9B, 0xF0, 0x00, 0x00, 0x00,
+0x00, 0x55, 0x20, 0xEB, 0x80, 0x00, 0x00, 0x00, 0x00, 0x56, 0x2C, 0x7D, 0xF0, 0x00, 0x00, 0x00,
+0x00, 0x57, 0x00, 0xCD, 0x80, 0x00, 0x00, 0x00, 0x00, 0x58, 0x15, 0x9A, 0x70, 0x00, 0x00, 0x00,
+0x00, 0x58, 0xE0, 0xAF, 0x80, 0x00, 0x00, 0x00, 0x00, 0x59, 0xF5, 0x7C, 0x70, 0x00, 0x00, 0x00,
+0x00, 0x5A, 0xC0, 0x91, 0x80, 0x00, 0x00, 0x00, 0x00, 0x5B, 0xD5, 0x5E, 0x70, 0x00, 0x00, 0x00,
+0x00, 0x5C, 0xA9, 0xAE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5D, 0xB5, 0x40, 0x70, 0x00, 0x00, 0x00,
+0x00, 0x5E, 0x89, 0x90, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5F, 0x95, 0x22, 0x70, 0x00, 0x00, 0x00,
+0x00, 0x60, 0x69, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 0x61, 0x7E, 0x3E, 0xF0, 0x00, 0x00, 0x00,
+0x00, 0x62, 0x49, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x63, 0x5E, 0x20, 0xF0, 0x01, 0x02, 0x04,
+0x03, 0x04, 0x02, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02,
+0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0xFF, 0xFF, 0x9D, 0x54, 0x00, 0x00,
+0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0xFF, 0xFF, 0xAB, 0xA0,
+0x01, 0x0C, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x10, 0xFF, 0xFF,
+0xAB, 0xA0, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00,
+0x4D, 0x44, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x43, 0x53, 0x54, 0x36, 0x0A, 0x00, 0xA9, 0x11, 0x40,
+0x00, 0x72, 0x0F, 0x38, 0x00, 0x00, 0x00, 0x11, 0x42, 0x61, 0x68, 0x69, 0x61, 0x20, 0x64, 0x65,
+0x20, 0x42, 0x61, 0x6E, 0x64, 0x65, 0x72, 0x61, 0x73, 
 
 /* America/Barbados */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x42, 0x42, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -28676,59 +29033,61 @@
 
 /* America/Cancun */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x4D, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x2A, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x14, 0xA5, 0xB6, 0xDA, 0x60,
-0x16, 0x86, 0xD5, 0x60, 0x31, 0x67, 0x67, 0xF0, 0x32, 0x72, 0xFA, 0x60, 0x33, 0x47, 0x49, 0xF0,
-0x34, 0x52, 0xDC, 0x60, 0x35, 0x27, 0x2B, 0xF0, 0x35, 0xC4, 0x00, 0x60, 0x36, 0x32, 0xCC, 0x70,
-0x37, 0x07, 0x1C, 0x00, 0x38, 0x1B, 0xE8, 0xF0, 0x38, 0xE6, 0xFE, 0x00, 0x39, 0xFB, 0xCA, 0xF0,
-0x3A, 0xF5, 0x04, 0x80, 0x3B, 0xB6, 0xC2, 0xF0, 0x3C, 0xAF, 0xFC, 0x80, 0x3D, 0xBB, 0x8E, 0xF0,
-0x3E, 0x8F, 0xDE, 0x80, 0x3F, 0x9B, 0x70, 0xF0, 0x40, 0x6F, 0xC0, 0x80, 0x41, 0x84, 0x8D, 0x70,
-0x42, 0x4F, 0xA2, 0x80, 0x43, 0x64, 0x6F, 0x70, 0x44, 0x2F, 0x84, 0x80, 0x45, 0x44, 0x51, 0x70,
-0x46, 0x0F, 0x66, 0x80, 0x47, 0x24, 0x33, 0x70, 0x47, 0xF8, 0x83, 0x00, 0x49, 0x04, 0x15, 0x70,
-0x49, 0xD8, 0x65, 0x00, 0x4A, 0xE3, 0xF7, 0x70, 0x4B, 0xB8, 0x47, 0x00, 0x4C, 0xCD, 0x13, 0xF0,
-0x4D, 0x98, 0x29, 0x00, 0x4E, 0xAC, 0xF5, 0xF0, 0x4F, 0x78, 0x0B, 0x00, 0x50, 0x8C, 0xD7, 0xF0,
-0x51, 0x61, 0x27, 0x80, 0x52, 0x6C, 0xB9, 0xF0, 0x53, 0x41, 0x09, 0x80, 0x54, 0x4C, 0x9B, 0xF0,
-0x54, 0xCD, 0xDD, 0x00, 0x01, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x05, 0x04, 0x05, 0x04, 0x05,
-0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05,
-0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x03, 0xFF, 0xFF,
-0xAE, 0xA8, 0x00, 0x00, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x04, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x08,
-0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x0C, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x04, 0xFF, 0xFF, 0xB9, 0xB0,
-0x01, 0x10, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x0C, 0x4C, 0x4D, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00,
-0x45, 0x44, 0x54, 0x00, 0x45, 0x53, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x07, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2A, 0x00, 0x00,
-0x00, 0x07, 0x00, 0x00, 0x00, 0x14, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xDA, 0x60, 0x00, 0x00,
-0x00, 0x00, 0x16, 0x86, 0xD5, 0x60, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x67, 0xF0, 0x00, 0x00,
-0x00, 0x00, 0x32, 0x72, 0xFA, 0x60, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x49, 0xF0, 0x00, 0x00,
-0x00, 0x00, 0x34, 0x52, 0xDC, 0x60, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x2B, 0xF0, 0x00, 0x00,
-0x00, 0x00, 0x35, 0xC4, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0xCC, 0x70, 0x00, 0x00,
-0x00, 0x00, 0x37, 0x07, 0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x1B, 0xE8, 0xF0, 0x00, 0x00,
-0x00, 0x00, 0x38, 0xE6, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0xCA, 0xF0, 0x00, 0x00,
-0x00, 0x00, 0x3A, 0xF5, 0x04, 0x80, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xB6, 0xC2, 0xF0, 0x00, 0x00,
-0x00, 0x00, 0x3C, 0xAF, 0xFC, 0x80, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0x8E, 0xF0, 0x00, 0x00,
-0x00, 0x00, 0x3E, 0x8F, 0xDE, 0x80, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x70, 0xF0, 0x00, 0x00,
-0x00, 0x00, 0x40, 0x6F, 0xC0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0x8D, 0x70, 0x00, 0x00,
-0x00, 0x00, 0x42, 0x4F, 0xA2, 0x80, 0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x6F, 0x70, 0x00, 0x00,
-0x00, 0x00, 0x44, 0x2F, 0x84, 0x80, 0x00, 0x00, 0x00, 0x00, 0x45, 0x44, 0x51, 0x70, 0x00, 0x00,
-0x00, 0x00, 0x46, 0x0F, 0x66, 0x80, 0x00, 0x00, 0x00, 0x00, 0x47, 0x24, 0x33, 0x70, 0x00, 0x00,
-0x00, 0x00, 0x47, 0xF8, 0x83, 0x00, 0x00, 0x00, 0x00, 0x00, 0x49, 0x04, 0x15, 0x70, 0x00, 0x00,
-0x00, 0x00, 0x49, 0xD8, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4A, 0xE3, 0xF7, 0x70, 0x00, 0x00,
-0x00, 0x00, 0x4B, 0xB8, 0x47, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4C, 0xCD, 0x13, 0xF0, 0x00, 0x00,
-0x00, 0x00, 0x4D, 0x98, 0x29, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4E, 0xAC, 0xF5, 0xF0, 0x00, 0x00,
-0x00, 0x00, 0x4F, 0x78, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x8C, 0xD7, 0xF0, 0x00, 0x00,
-0x00, 0x00, 0x51, 0x61, 0x27, 0x80, 0x00, 0x00, 0x00, 0x00, 0x52, 0x6C, 0xB9, 0xF0, 0x00, 0x00,
-0x00, 0x00, 0x53, 0x41, 0x09, 0x80, 0x00, 0x00, 0x00, 0x00, 0x54, 0x4C, 0x9B, 0xF0, 0x00, 0x00,
-0x00, 0x00, 0x54, 0xCD, 0xDD, 0x00, 0x01, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x05, 0x04, 0x05,
-0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05,
-0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x03,
-0xFF, 0xFF, 0xAE, 0xA8, 0x00, 0x00, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x04, 0xFF, 0xFF, 0xC7, 0xC0,
-0x01, 0x08, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x0C, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x04, 0xFF, 0xFF,
-0xB9, 0xB0, 0x01, 0x10, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x0C, 0x4C, 0x4D, 0x54, 0x00, 0x43, 0x53,
-0x54, 0x00, 0x45, 0x44, 0x54, 0x00, 0x45, 0x53, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x00, 0x01,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x45, 0x53, 0x54,
-0x35, 0x0A, 0x00, 0xA9, 0x7F, 0xED, 0x00, 0x8E, 0x43, 0x45, 0x00, 0x00, 0x00, 0x0C, 0x51, 0x75,
-0x69, 0x6E, 0x74, 0x61, 0x6E, 0x61, 0x20, 0x52, 0x6F, 0x6F, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x2B, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x14, 0xA5, 0xB6, 0xDA, 0x60,
+0x16, 0x8A, 0xE6, 0x00, 0x18, 0x77, 0xCC, 0xD0, 0x31, 0x67, 0x76, 0x00, 0x32, 0x73, 0x08, 0x70,
+0x33, 0x47, 0x58, 0x00, 0x34, 0x52, 0xEA, 0x70, 0x35, 0x27, 0x2B, 0xF0, 0x35, 0xC4, 0x00, 0x60,
+0x36, 0x32, 0xCC, 0x70, 0x37, 0x07, 0x1C, 0x00, 0x38, 0x1B, 0xE8, 0xF0, 0x38, 0xE6, 0xFE, 0x00,
+0x39, 0xFB, 0xCA, 0xF0, 0x3A, 0xF5, 0x04, 0x80, 0x3B, 0xB6, 0xC2, 0xF0, 0x3C, 0xAF, 0xFC, 0x80,
+0x3D, 0xBB, 0x8E, 0xF0, 0x3E, 0x8F, 0xDE, 0x80, 0x3F, 0x9B, 0x70, 0xF0, 0x40, 0x6F, 0xC0, 0x80,
+0x41, 0x84, 0x8D, 0x70, 0x42, 0x4F, 0xA2, 0x80, 0x43, 0x64, 0x6F, 0x70, 0x44, 0x2F, 0x84, 0x80,
+0x45, 0x44, 0x51, 0x70, 0x46, 0x0F, 0x66, 0x80, 0x47, 0x24, 0x33, 0x70, 0x47, 0xF8, 0x83, 0x00,
+0x49, 0x04, 0x15, 0x70, 0x49, 0xD8, 0x65, 0x00, 0x4A, 0xE3, 0xF7, 0x70, 0x4B, 0xB8, 0x47, 0x00,
+0x4C, 0xCD, 0x13, 0xF0, 0x4D, 0x98, 0x29, 0x00, 0x4E, 0xAC, 0xF5, 0xF0, 0x4F, 0x78, 0x0B, 0x00,
+0x50, 0x8C, 0xD7, 0xF0, 0x51, 0x61, 0x27, 0x80, 0x52, 0x6C, 0xB9, 0xF0, 0x53, 0x41, 0x09, 0x80,
+0x54, 0x4C, 0x9B, 0xF0, 0x54, 0xCD, 0xDD, 0x00, 0x01, 0x02, 0x04, 0x03, 0x04, 0x03, 0x02, 0x05,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x03, 0x04, 0x02, 0xFF, 0xFF, 0xAE, 0xA8, 0x00, 0x00, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x04, 0xFF,
+0xFF, 0xB9, 0xB0, 0x00, 0x08, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x0C, 0xFF, 0xFF, 0xAB, 0xA0, 0x00,
+0x04, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x10, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x0C, 0xFF, 0xFF, 0xB9,
+0xB0, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x45, 0x53, 0x54, 0x00, 0x43,
+0x44, 0x54, 0x00, 0x45, 0x44, 0x54, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00,
+0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2B, 0x00, 0x00, 0x00, 0x08, 0x00,
+0x00, 0x00, 0x14, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xDA, 0x60, 0x00, 0x00, 0x00, 0x00, 0x16,
+0x8A, 0xE6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x77, 0xCC, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x31,
+0x67, 0x76, 0x00, 0x00, 0x00, 0x00, 0x00, 0x32, 0x73, 0x08, 0x70, 0x00, 0x00, 0x00, 0x00, 0x33,
+0x47, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x34, 0x52, 0xEA, 0x70, 0x00, 0x00, 0x00, 0x00, 0x35,
+0x27, 0x2B, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x35, 0xC4, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x36,
+0x32, 0xCC, 0x70, 0x00, 0x00, 0x00, 0x00, 0x37, 0x07, 0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38,
+0x1B, 0xE8, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x38, 0xE6, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x39,
+0xFB, 0xCA, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xF5, 0x04, 0x80, 0x00, 0x00, 0x00, 0x00, 0x3B,
+0xB6, 0xC2, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xAF, 0xFC, 0x80, 0x00, 0x00, 0x00, 0x00, 0x3D,
+0xBB, 0x8E, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x8F, 0xDE, 0x80, 0x00, 0x00, 0x00, 0x00, 0x3F,
+0x9B, 0x70, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x40, 0x6F, 0xC0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x41,
+0x84, 0x8D, 0x70, 0x00, 0x00, 0x00, 0x00, 0x42, 0x4F, 0xA2, 0x80, 0x00, 0x00, 0x00, 0x00, 0x43,
+0x64, 0x6F, 0x70, 0x00, 0x00, 0x00, 0x00, 0x44, 0x2F, 0x84, 0x80, 0x00, 0x00, 0x00, 0x00, 0x45,
+0x44, 0x51, 0x70, 0x00, 0x00, 0x00, 0x00, 0x46, 0x0F, 0x66, 0x80, 0x00, 0x00, 0x00, 0x00, 0x47,
+0x24, 0x33, 0x70, 0x00, 0x00, 0x00, 0x00, 0x47, 0xF8, 0x83, 0x00, 0x00, 0x00, 0x00, 0x00, 0x49,
+0x04, 0x15, 0x70, 0x00, 0x00, 0x00, 0x00, 0x49, 0xD8, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4A,
+0xE3, 0xF7, 0x70, 0x00, 0x00, 0x00, 0x00, 0x4B, 0xB8, 0x47, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4C,
+0xCD, 0x13, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x98, 0x29, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4E,
+0xAC, 0xF5, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x78, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50,
+0x8C, 0xD7, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x51, 0x61, 0x27, 0x80, 0x00, 0x00, 0x00, 0x00, 0x52,
+0x6C, 0xB9, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x53, 0x41, 0x09, 0x80, 0x00, 0x00, 0x00, 0x00, 0x54,
+0x4C, 0x9B, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x54, 0xCD, 0xDD, 0x00, 0x01, 0x02, 0x04, 0x03, 0x04,
+0x03, 0x02, 0x05, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
+0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
+0x04, 0x03, 0x04, 0x03, 0x04, 0x02, 0xFF, 0xFF, 0xAE, 0xA8, 0x00, 0x00, 0xFF, 0xFF, 0xAB, 0xA0,
+0x00, 0x04, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x08, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x0C, 0xFF, 0xFF,
+0xAB, 0xA0, 0x00, 0x04, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x10, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x0C,
+0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x45, 0x53,
+0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x45, 0x44, 0x54, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x45, 0x53, 0x54, 0x35, 0x0A,
+0x00, 0xA9, 0x7F, 0xED, 0x00, 0x8E, 0x43, 0x45, 0x00, 0x00, 0x00, 0x0C, 0x51, 0x75, 0x69, 0x6E,
+0x74, 0x61, 0x6E, 0x61, 0x20, 0x52, 0x6F, 0x6F, 
 
 /* America/Caracas */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x56, 0x45, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -29082,7 +29441,7 @@
 0x50, 0x48, 0x50, 0x32, 0x01, 0x4D, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x3C, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x14, 0xA5, 0xB6, 0xE8, 0x70,
-0xAF, 0xF2, 0x6E, 0xE0, 0xB6, 0x66, 0x56, 0x60, 0xB7, 0x43, 0xD2, 0x60, 0xB8, 0x0C, 0x36, 0x60,
+0xAF, 0xF1, 0x2B, 0x70, 0xB6, 0x66, 0x56, 0x60, 0xB7, 0x41, 0x3D, 0x70, 0xB8, 0x0C, 0x36, 0x60,
 0xB8, 0xFD, 0x86, 0xF0, 0x31, 0x67, 0x76, 0x00, 0x32, 0x73, 0x08, 0x70, 0x33, 0x47, 0x58, 0x00,
 0x34, 0x52, 0xEA, 0x70, 0x35, 0x27, 0x48, 0x10, 0x36, 0x32, 0xDA, 0x80, 0x37, 0x07, 0x2A, 0x10,
 0x38, 0x1B, 0xF7, 0x00, 0x38, 0xE7, 0x0C, 0x10, 0x39, 0xFB, 0xD9, 0x00, 0x3A, 0xF5, 0x12, 0x90,
@@ -29109,8 +29468,8 @@
 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3C,
 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x14, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8, 0x70,
-0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF2, 0x6E, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x56, 0x60,
-0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x43, 0xD2, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0x0C, 0x36, 0x60,
+0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF1, 0x2B, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x56, 0x60,
+0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x41, 0x3D, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0x0C, 0x36, 0x60,
 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0xFD, 0x86, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x76, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x32, 0x73, 0x08, 0x70, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x58, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x34, 0x52, 0xEA, 0x70, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x48, 0x10,
@@ -29156,7 +29515,7 @@
 0x50, 0x48, 0x50, 0x32, 0x01, 0x4D, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x5B, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x14, 0xA5, 0xB6, 0xE8, 0x70,
-0xAF, 0xF2, 0x6E, 0xE0, 0xB6, 0x66, 0x56, 0x60, 0xB7, 0x43, 0xD2, 0x60, 0xB8, 0x0C, 0x36, 0x60,
+0xAF, 0xF1, 0x2B, 0x70, 0xB6, 0x66, 0x56, 0x60, 0xB7, 0x41, 0x3D, 0x70, 0xB8, 0x0C, 0x36, 0x60,
 0xB8, 0xFD, 0x86, 0xF0, 0x31, 0x67, 0x76, 0x00, 0x32, 0x73, 0x08, 0x70, 0x33, 0x47, 0x58, 0x00,
 0x34, 0x52, 0xEA, 0x70, 0x35, 0x27, 0x48, 0x10, 0x36, 0x32, 0xDA, 0x80, 0x37, 0x07, 0x2A, 0x10,
 0x38, 0x1B, 0xF7, 0x00, 0x38, 0xE7, 0x0C, 0x10, 0x39, 0xFB, 0xD9, 0x00, 0x3A, 0xF5, 0x12, 0x90,
@@ -29192,8 +29551,8 @@
 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x5B, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x14, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5,
-0xB6, 0xE8, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF2, 0x6E, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB6,
-0x66, 0x56, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x43, 0xD2, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8,
+0xB6, 0xE8, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF1, 0x2B, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB6,
+0x66, 0x56, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x41, 0x3D, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8,
 0x0C, 0x36, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0xFD, 0x86, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x31,
 0x67, 0x76, 0x00, 0x00, 0x00, 0x00, 0x00, 0x32, 0x73, 0x08, 0x70, 0x00, 0x00, 0x00, 0x00, 0x33,
 0x47, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x34, 0x52, 0xEA, 0x70, 0x00, 0x00, 0x00, 0x00, 0x35,
@@ -29361,6 +29720,143 @@
 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x0A, 0x43, 0x53, 0x54, 0x36, 0x0A, 0x00, 0x98, 0x7C, 0x75,
 0x00, 0x92, 0x5B, 0x72, 0x00, 0x00, 0x00, 0x00, 
 
+/* America/Coyhaique */
+0x50, 0x48, 0x50, 0x32, 0x01, 0x43, 0x4C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x85, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x14, 0x80, 0x00, 0x00, 0x00,
+0x8F, 0x30, 0x47, 0x45, 0x9B, 0x5C, 0xE5, 0x50, 0x9F, 0x7C, 0xE2, 0xC5, 0xA1, 0x00, 0x71, 0xC0,
+0xB0, 0x5E, 0x77, 0xC5, 0xB1, 0x77, 0x3D, 0x40, 0xB2, 0x41, 0x00, 0xD0, 0xB3, 0x58, 0x70, 0xC0,
+0xB4, 0x22, 0x34, 0x50, 0xB5, 0x39, 0xA4, 0x40, 0xB6, 0x03, 0x67, 0xD0, 0xB7, 0x1A, 0xD7, 0xC0,
+0xB7, 0xE4, 0x9B, 0x50, 0xB8, 0xFD, 0x5C, 0xC0, 0xB9, 0xC7, 0x20, 0x50, 0xCC, 0x1C, 0x6E, 0x40,
+0xCC, 0x6C, 0xE7, 0xD0, 0xD4, 0x17, 0xE3, 0x40, 0xD5, 0x33, 0x55, 0xC0, 0xD5, 0x76, 0x92, 0x40,
+0xFD, 0xD1, 0x3C, 0x40, 0xFE, 0x92, 0xFA, 0xB0, 0xFF, 0xCC, 0xCD, 0xC0, 0x00, 0x72, 0xDC, 0xB0,
+0x01, 0x75, 0x50, 0xC0, 0x02, 0x40, 0x49, 0xB0, 0x03, 0x55, 0x32, 0xC0, 0x04, 0x20, 0x2B, 0xB0,
+0x05, 0x3E, 0x4F, 0x40, 0x06, 0x00, 0x0D, 0xB0, 0x07, 0x0B, 0xBC, 0x40, 0x07, 0xDF, 0xEF, 0xB0,
+0x08, 0xFE, 0x13, 0x40, 0x09, 0xBF, 0xD1, 0xB0, 0x0A, 0xDD, 0xF5, 0x40, 0x0B, 0xA8, 0xEE, 0x30,
+0x0C, 0xBD, 0xD7, 0x40, 0x0D, 0x88, 0xD0, 0x30, 0x0E, 0x9D, 0xB9, 0x40, 0x0F, 0x68, 0xB2, 0x30,
+0x10, 0x86, 0xD5, 0xC0, 0x11, 0x48, 0x94, 0x30, 0x12, 0x66, 0xB7, 0xC0, 0x13, 0x28, 0x76, 0x30,
+0x14, 0x46, 0x99, 0xC0, 0x15, 0x11, 0x92, 0xB0, 0x16, 0x26, 0x7B, 0xC0, 0x16, 0xF1, 0x74, 0xB0,
+0x18, 0x06, 0x5D, 0xC0, 0x18, 0xD1, 0x56, 0xB0, 0x19, 0xE6, 0x3F, 0xC0, 0x1A, 0xB1, 0x38, 0xB0,
+0x1B, 0xCF, 0x5C, 0x40, 0x1C, 0x91, 0x1A, 0xB0, 0x1D, 0xAF, 0x3E, 0x40, 0x1E, 0x70, 0xFC, 0xB0,
+0x1F, 0x8F, 0x20, 0x40, 0x20, 0x7F, 0x03, 0x30, 0x21, 0x6F, 0x02, 0x40, 0x22, 0x39, 0xFB, 0x30,
+0x23, 0x4E, 0xE4, 0x40, 0x24, 0x19, 0xDD, 0x30, 0x25, 0x38, 0x00, 0xC0, 0x25, 0xF9, 0xBF, 0x30,
+0x26, 0xF2, 0xF8, 0xC0, 0x27, 0xD9, 0xA1, 0x30, 0x28, 0xF7, 0xC4, 0xC0, 0x29, 0xC2, 0xBD, 0xB0,
+0x2A, 0xD7, 0xA6, 0xC0, 0x2B, 0xA2, 0x9F, 0xB0, 0x2C, 0xB7, 0x88, 0xC0, 0x2D, 0x82, 0x81, 0xB0,
+0x2E, 0x97, 0x6A, 0xC0, 0x2F, 0x62, 0x63, 0xB0, 0x30, 0x80, 0x87, 0x40, 0x31, 0x42, 0x45, 0xB0,
+0x32, 0x60, 0x69, 0x40, 0x33, 0x3D, 0xD7, 0x30, 0x34, 0x40, 0x4B, 0x40, 0x35, 0x0B, 0x44, 0x30,
+0x36, 0x0D, 0xB8, 0x40, 0x37, 0x06, 0xD5, 0xB0, 0x38, 0x00, 0x0F, 0x40, 0x38, 0xCB, 0x08, 0x30,
+0x39, 0xE9, 0x2B, 0xC0, 0x3A, 0xAA, 0xEA, 0x30, 0x3B, 0xC9, 0x0D, 0xC0, 0x3C, 0x8A, 0xCC, 0x30,
+0x3D, 0xA8, 0xEF, 0xC0, 0x3E, 0x6A, 0xAE, 0x30, 0x3F, 0x88, 0xD1, 0xC0, 0x40, 0x53, 0xCA, 0xB0,
+0x41, 0x68, 0xB3, 0xC0, 0x42, 0x33, 0xAC, 0xB0, 0x43, 0x48, 0x95, 0xC0, 0x44, 0x13, 0x8E, 0xB0,
+0x45, 0x31, 0xB2, 0x40, 0x45, 0xF3, 0x70, 0xB0, 0x47, 0x11, 0x94, 0x40, 0x47, 0xEF, 0x02, 0x30,
+0x48, 0xF1, 0x76, 0x40, 0x49, 0xBC, 0x6F, 0x30, 0x4A, 0xD1, 0x58, 0x40, 0x4B, 0xB8, 0x00, 0xB0,
+0x4C, 0xB1, 0x3A, 0x40, 0x4D, 0xC6, 0x07, 0x30, 0x4E, 0x50, 0x82, 0xC0, 0x4F, 0x9C, 0xAE, 0xB0,
+0x50, 0x42, 0xD9, 0xC0, 0x51, 0x7C, 0x90, 0xB0, 0x52, 0x2B, 0xF6, 0x40, 0x53, 0x5C, 0x72, 0xB0,
+0x54, 0x0B, 0xD8, 0x40, 0x57, 0x37, 0xE6, 0x30, 0x57, 0xAF, 0xEC, 0xC0, 0x59, 0x17, 0xC8, 0x30,
+0x59, 0x8F, 0xCE, 0xC0, 0x5A, 0xF7, 0xAA, 0x30, 0x5B, 0x6F, 0xB0, 0xC0, 0x5C, 0xA9, 0x67, 0xB0,
+0x5D, 0x74, 0x7C, 0xC0, 0x5E, 0x89, 0x49, 0xB0, 0x5F, 0x54, 0x5E, 0xC0, 0x60, 0x69, 0x2B, 0xB0,
+0x61, 0x34, 0x40, 0xC0, 0x62, 0x49, 0x0D, 0xB0, 0x63, 0x1D, 0x5D, 0x40, 0x64, 0x28, 0xEF, 0xB0,
+0x64, 0xF4, 0x04, 0xC0, 0x66, 0x12, 0x0C, 0x30, 0x66, 0xDD, 0x21, 0x40, 0x67, 0xDB, 0x84, 0xB0,
+0x01, 0x02, 0x01, 0x03, 0x01, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x03,
+0x02, 0x03, 0x04, 0x02, 0x03, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05,
+0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05,
+0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05,
+0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05,
+0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05,
+0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05,
+0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05,
+0x06, 0x05, 0x06, 0x05, 0x07, 0xFF, 0xFF, 0xBC, 0x70, 0x00, 0x00, 0xFF, 0xFF, 0xBD, 0xBB, 0x00,
+0x04, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x08, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x0C, 0xFF, 0xFF, 0xC7,
+0xC0, 0x01, 0x0C, 0xFF, 0xFF, 0xD5, 0xD0, 0x01, 0x10, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x0C, 0xFF,
+0xFF, 0xD5, 0xD0, 0x00, 0x10, 0x4C, 0x4D, 0x54, 0x00, 0x53, 0x4D, 0x54, 0x00, 0x2D, 0x30, 0x35,
+0x00, 0x2D, 0x30, 0x34, 0x00, 0x2D, 0x30, 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x85, 0x00, 0x00, 0x00,
+0x08, 0x00, 0x00, 0x00, 0x14, 0xFF, 0xFF, 0xFF, 0xFF, 0x69, 0x87, 0x1F, 0x10, 0xFF, 0xFF, 0xFF,
+0xFF, 0x8F, 0x30, 0x47, 0x45, 0xFF, 0xFF, 0xFF, 0xFF, 0x9B, 0x5C, 0xE5, 0x50, 0xFF, 0xFF, 0xFF,
+0xFF, 0x9F, 0x7C, 0xE2, 0xC5, 0xFF, 0xFF, 0xFF, 0xFF, 0xA1, 0x00, 0x71, 0xC0, 0xFF, 0xFF, 0xFF,
+0xFF, 0xB0, 0x5E, 0x77, 0xC5, 0xFF, 0xFF, 0xFF, 0xFF, 0xB1, 0x77, 0x3D, 0x40, 0xFF, 0xFF, 0xFF,
+0xFF, 0xB2, 0x41, 0x00, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB3, 0x58, 0x70, 0xC0, 0xFF, 0xFF, 0xFF,
+0xFF, 0xB4, 0x22, 0x34, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, 0xB5, 0x39, 0xA4, 0x40, 0xFF, 0xFF, 0xFF,
+0xFF, 0xB6, 0x03, 0x67, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x1A, 0xD7, 0xC0, 0xFF, 0xFF, 0xFF,
+0xFF, 0xB7, 0xE4, 0x9B, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0xFD, 0x5C, 0xC0, 0xFF, 0xFF, 0xFF,
+0xFF, 0xB9, 0xC7, 0x20, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, 0xCC, 0x1C, 0x6E, 0x40, 0xFF, 0xFF, 0xFF,
+0xFF, 0xCC, 0x6C, 0xE7, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD4, 0x17, 0xE3, 0x40, 0xFF, 0xFF, 0xFF,
+0xFF, 0xD5, 0x33, 0x55, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD5, 0x76, 0x92, 0x40, 0xFF, 0xFF, 0xFF,
+0xFF, 0xFD, 0xD1, 0x3C, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0x92, 0xFA, 0xB0, 0xFF, 0xFF, 0xFF,
+0xFF, 0xFF, 0xCC, 0xCD, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x72, 0xDC, 0xB0, 0x00, 0x00, 0x00,
+0x00, 0x01, 0x75, 0x50, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x02, 0x40, 0x49, 0xB0, 0x00, 0x00, 0x00,
+0x00, 0x03, 0x55, 0x32, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x04, 0x20, 0x2B, 0xB0, 0x00, 0x00, 0x00,
+0x00, 0x05, 0x3E, 0x4F, 0x40, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x0D, 0xB0, 0x00, 0x00, 0x00,
+0x00, 0x07, 0x0B, 0xBC, 0x40, 0x00, 0x00, 0x00, 0x00, 0x07, 0xDF, 0xEF, 0xB0, 0x00, 0x00, 0x00,
+0x00, 0x08, 0xFE, 0x13, 0x40, 0x00, 0x00, 0x00, 0x00, 0x09, 0xBF, 0xD1, 0xB0, 0x00, 0x00, 0x00,
+0x00, 0x0A, 0xDD, 0xF5, 0x40, 0x00, 0x00, 0x00, 0x00, 0x0B, 0xA8, 0xEE, 0x30, 0x00, 0x00, 0x00,
+0x00, 0x0C, 0xBD, 0xD7, 0x40, 0x00, 0x00, 0x00, 0x00, 0x0D, 0x88, 0xD0, 0x30, 0x00, 0x00, 0x00,
+0x00, 0x0E, 0x9D, 0xB9, 0x40, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x68, 0xB2, 0x30, 0x00, 0x00, 0x00,
+0x00, 0x10, 0x86, 0xD5, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x11, 0x48, 0x94, 0x30, 0x00, 0x00, 0x00,
+0x00, 0x12, 0x66, 0xB7, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x13, 0x28, 0x76, 0x30, 0x00, 0x00, 0x00,
+0x00, 0x14, 0x46, 0x99, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x15, 0x11, 0x92, 0xB0, 0x00, 0x00, 0x00,
+0x00, 0x16, 0x26, 0x7B, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x16, 0xF1, 0x74, 0xB0, 0x00, 0x00, 0x00,
+0x00, 0x18, 0x06, 0x5D, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x18, 0xD1, 0x56, 0xB0, 0x00, 0x00, 0x00,
+0x00, 0x19, 0xE6, 0x3F, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xB1, 0x38, 0xB0, 0x00, 0x00, 0x00,
+0x00, 0x1B, 0xCF, 0x5C, 0x40, 0x00, 0x00, 0x00, 0x00, 0x1C, 0x91, 0x1A, 0xB0, 0x00, 0x00, 0x00,
+0x00, 0x1D, 0xAF, 0x3E, 0x40, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x70, 0xFC, 0xB0, 0x00, 0x00, 0x00,
+0x00, 0x1F, 0x8F, 0x20, 0x40, 0x00, 0x00, 0x00, 0x00, 0x20, 0x7F, 0x03, 0x30, 0x00, 0x00, 0x00,
+0x00, 0x21, 0x6F, 0x02, 0x40, 0x00, 0x00, 0x00, 0x00, 0x22, 0x39, 0xFB, 0x30, 0x00, 0x00, 0x00,
+0x00, 0x23, 0x4E, 0xE4, 0x40, 0x00, 0x00, 0x00, 0x00, 0x24, 0x19, 0xDD, 0x30, 0x00, 0x00, 0x00,
+0x00, 0x25, 0x38, 0x00, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x25, 0xF9, 0xBF, 0x30, 0x00, 0x00, 0x00,
+0x00, 0x26, 0xF2, 0xF8, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x27, 0xD9, 0xA1, 0x30, 0x00, 0x00, 0x00,
+0x00, 0x28, 0xF7, 0xC4, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x29, 0xC2, 0xBD, 0xB0, 0x00, 0x00, 0x00,
+0x00, 0x2A, 0xD7, 0xA6, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xA2, 0x9F, 0xB0, 0x00, 0x00, 0x00,
+0x00, 0x2C, 0xB7, 0x88, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x82, 0x81, 0xB0, 0x00, 0x00, 0x00,
+0x00, 0x2E, 0x97, 0x6A, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x62, 0x63, 0xB0, 0x00, 0x00, 0x00,
+0x00, 0x30, 0x80, 0x87, 0x40, 0x00, 0x00, 0x00, 0x00, 0x31, 0x42, 0x45, 0xB0, 0x00, 0x00, 0x00,
+0x00, 0x32, 0x60, 0x69, 0x40, 0x00, 0x00, 0x00, 0x00, 0x33, 0x3D, 0xD7, 0x30, 0x00, 0x00, 0x00,
+0x00, 0x34, 0x40, 0x4B, 0x40, 0x00, 0x00, 0x00, 0x00, 0x35, 0x0B, 0x44, 0x30, 0x00, 0x00, 0x00,
+0x00, 0x36, 0x0D, 0xB8, 0x40, 0x00, 0x00, 0x00, 0x00, 0x37, 0x06, 0xD5, 0xB0, 0x00, 0x00, 0x00,
+0x00, 0x38, 0x00, 0x0F, 0x40, 0x00, 0x00, 0x00, 0x00, 0x38, 0xCB, 0x08, 0x30, 0x00, 0x00, 0x00,
+0x00, 0x39, 0xE9, 0x2B, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xAA, 0xEA, 0x30, 0x00, 0x00, 0x00,
+0x00, 0x3B, 0xC9, 0x0D, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x3C, 0x8A, 0xCC, 0x30, 0x00, 0x00, 0x00,
+0x00, 0x3D, 0xA8, 0xEF, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x6A, 0xAE, 0x30, 0x00, 0x00, 0x00,
+0x00, 0x3F, 0x88, 0xD1, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x40, 0x53, 0xCA, 0xB0, 0x00, 0x00, 0x00,
+0x00, 0x41, 0x68, 0xB3, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x42, 0x33, 0xAC, 0xB0, 0x00, 0x00, 0x00,
+0x00, 0x43, 0x48, 0x95, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x44, 0x13, 0x8E, 0xB0, 0x00, 0x00, 0x00,
+0x00, 0x45, 0x31, 0xB2, 0x40, 0x00, 0x00, 0x00, 0x00, 0x45, 0xF3, 0x70, 0xB0, 0x00, 0x00, 0x00,
+0x00, 0x47, 0x11, 0x94, 0x40, 0x00, 0x00, 0x00, 0x00, 0x47, 0xEF, 0x02, 0x30, 0x00, 0x00, 0x00,
+0x00, 0x48, 0xF1, 0x76, 0x40, 0x00, 0x00, 0x00, 0x00, 0x49, 0xBC, 0x6F, 0x30, 0x00, 0x00, 0x00,
+0x00, 0x4A, 0xD1, 0x58, 0x40, 0x00, 0x00, 0x00, 0x00, 0x4B, 0xB8, 0x00, 0xB0, 0x00, 0x00, 0x00,
+0x00, 0x4C, 0xB1, 0x3A, 0x40, 0x00, 0x00, 0x00, 0x00, 0x4D, 0xC6, 0x07, 0x30, 0x00, 0x00, 0x00,
+0x00, 0x4E, 0x50, 0x82, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x9C, 0xAE, 0xB0, 0x00, 0x00, 0x00,
+0x00, 0x50, 0x42, 0xD9, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x51, 0x7C, 0x90, 0xB0, 0x00, 0x00, 0x00,
+0x00, 0x52, 0x2B, 0xF6, 0x40, 0x00, 0x00, 0x00, 0x00, 0x53, 0x5C, 0x72, 0xB0, 0x00, 0x00, 0x00,
+0x00, 0x54, 0x0B, 0xD8, 0x40, 0x00, 0x00, 0x00, 0x00, 0x57, 0x37, 0xE6, 0x30, 0x00, 0x00, 0x00,
+0x00, 0x57, 0xAF, 0xEC, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x59, 0x17, 0xC8, 0x30, 0x00, 0x00, 0x00,
+0x00, 0x59, 0x8F, 0xCE, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xF7, 0xAA, 0x30, 0x00, 0x00, 0x00,
+0x00, 0x5B, 0x6F, 0xB0, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x5C, 0xA9, 0x67, 0xB0, 0x00, 0x00, 0x00,
+0x00, 0x5D, 0x74, 0x7C, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x89, 0x49, 0xB0, 0x00, 0x00, 0x00,
+0x00, 0x5F, 0x54, 0x5E, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x60, 0x69, 0x2B, 0xB0, 0x00, 0x00, 0x00,
+0x00, 0x61, 0x34, 0x40, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x62, 0x49, 0x0D, 0xB0, 0x00, 0x00, 0x00,
+0x00, 0x63, 0x1D, 0x5D, 0x40, 0x00, 0x00, 0x00, 0x00, 0x64, 0x28, 0xEF, 0xB0, 0x00, 0x00, 0x00,
+0x00, 0x64, 0xF4, 0x04, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x66, 0x12, 0x0C, 0x30, 0x00, 0x00, 0x00,
+0x00, 0x66, 0xDD, 0x21, 0x40, 0x00, 0x00, 0x00, 0x00, 0x67, 0xDB, 0x84, 0xB0, 0x01, 0x02, 0x01,
+0x03, 0x01, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x03, 0x02, 0x03, 0x04,
+0x02, 0x03, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06,
+0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06,
+0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06,
+0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06,
+0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06,
+0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06,
+0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06,
+0x05, 0x07, 0xFF, 0xFF, 0xBC, 0x70, 0x00, 0x00, 0xFF, 0xFF, 0xBD, 0xBB, 0x00, 0x04, 0xFF, 0xFF,
+0xB9, 0xB0, 0x00, 0x08, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x0C, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x0C,
+0xFF, 0xFF, 0xD5, 0xD0, 0x01, 0x10, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x0C, 0xFF, 0xFF, 0xD5, 0xD0,
+0x00, 0x10, 0x4C, 0x4D, 0x54, 0x00, 0x53, 0x4D, 0x54, 0x00, 0x2D, 0x30, 0x35, 0x00, 0x2D, 0x30,
+0x34, 0x00, 0x2D, 0x30, 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x0A, 0x3C, 0x2D, 0x30, 0x33, 0x3E, 0x33, 0x0A, 0x00, 0x43,
+0xCC, 0xC5, 0x00, 0xA4, 0xB1, 0x75, 0x00, 0x00, 0x00, 0x0C, 0x41, 0x79, 0x73, 0x65, 0x6E, 0x20,
+0x52, 0x65, 0x67, 0x69, 0x6F, 0x6E, 
+
 /* America/Creston */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x43, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -30240,45 +30736,46 @@
 /* America/Ensenada */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x95, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x18, 0xA5, 0xB6, 0xE8, 0x70,
-0xA9, 0x79, 0x4F, 0x70, 0xAF, 0xF2, 0x7C, 0xF0, 0xB6, 0x66, 0x64, 0x70, 0xB7, 0x1B, 0x10, 0x00,
-0xB8, 0x0A, 0xF2, 0xF0, 0xCB, 0xEA, 0x8D, 0x80, 0xD2, 0x23, 0xF4, 0x70, 0xD2, 0x99, 0xBA, 0x70,
-0xD7, 0x1B, 0x59, 0x00, 0xD8, 0x91, 0xB4, 0xF0, 0xE2, 0x7E, 0x4B, 0x90, 0xE3, 0x49, 0x52, 0x90,
-0xE4, 0x5E, 0x2D, 0x90, 0xE5, 0x29, 0x34, 0x90, 0xE6, 0x47, 0x4A, 0x10, 0xE7, 0x12, 0x51, 0x10,
-0xE8, 0x27, 0x2C, 0x10, 0xE8, 0xF2, 0x33, 0x10, 0xEA, 0x07, 0x0E, 0x10, 0xEA, 0xD2, 0x15, 0x10,
-0xEB, 0xE6, 0xF0, 0x10, 0xEC, 0xB1, 0xF7, 0x10, 0xED, 0xC6, 0xD2, 0x10, 0xEE, 0x91, 0xD9, 0x10,
-0x0B, 0xE0, 0xAF, 0xA0, 0x0C, 0xD9, 0xCD, 0x10, 0x0D, 0xC0, 0x91, 0xA0, 0x0E, 0xB9, 0xAF, 0x10,
-0x0F, 0xA9, 0xAE, 0x20, 0x10, 0x99, 0x91, 0x10, 0x11, 0x89, 0x90, 0x20, 0x12, 0x79, 0x73, 0x10,
-0x13, 0x69, 0x72, 0x20, 0x14, 0x59, 0x55, 0x10, 0x15, 0x49, 0x54, 0x20, 0x16, 0x39, 0x37, 0x10,
-0x17, 0x29, 0x36, 0x20, 0x18, 0x22, 0x53, 0x90, 0x19, 0x09, 0x18, 0x20, 0x1A, 0x02, 0x35, 0x90,
-0x1A, 0xF2, 0x34, 0xA0, 0x1B, 0xE2, 0x17, 0x90, 0x1C, 0xD2, 0x16, 0xA0, 0x1D, 0xC1, 0xF9, 0x90,
-0x1E, 0xB1, 0xF8, 0xA0, 0x1F, 0xA1, 0xDB, 0x90, 0x20, 0x76, 0x2B, 0x20, 0x21, 0x81, 0xBD, 0x90,
-0x22, 0x56, 0x0D, 0x20, 0x23, 0x6A, 0xDA, 0x10, 0x24, 0x35, 0xEF, 0x20, 0x25, 0x4A, 0xBC, 0x10,
-0x26, 0x15, 0xD1, 0x20, 0x27, 0x2A, 0x9E, 0x10, 0x27, 0xFE, 0xED, 0xA0, 0x29, 0x0A, 0x80, 0x10,
-0x29, 0xDE, 0xCF, 0xA0, 0x2A, 0xEA, 0x62, 0x10, 0x2B, 0xBE, 0xB1, 0xA0, 0x2C, 0xD3, 0x7E, 0x90,
-0x2D, 0x9E, 0x93, 0xA0, 0x2E, 0xB3, 0x60, 0x90, 0x2F, 0x7E, 0x75, 0xA0, 0x30, 0x93, 0x42, 0x90,
-0x31, 0x67, 0x92, 0x20, 0x32, 0x73, 0x24, 0x90, 0x33, 0x47, 0x74, 0x20, 0x34, 0x53, 0x06, 0x90,
-0x35, 0x27, 0x56, 0x20, 0x36, 0x32, 0xE8, 0x90, 0x37, 0x07, 0x38, 0x20, 0x38, 0x1C, 0x05, 0x10,
-0x38, 0xE7, 0x1A, 0x20, 0x39, 0xFB, 0xE7, 0x10, 0x3A, 0xC6, 0xFC, 0x20, 0x3B, 0xDB, 0xC9, 0x10,
-0x3C, 0xB0, 0x18, 0xA0, 0x3D, 0xBB, 0xAB, 0x10, 0x3E, 0x8F, 0xFA, 0xA0, 0x3F, 0x9B, 0x8D, 0x10,
-0x40, 0x6F, 0xDC, 0xA0, 0x41, 0x84, 0xA9, 0x90, 0x42, 0x4F, 0xBE, 0xA0, 0x43, 0x64, 0x8B, 0x90,
-0x44, 0x2F, 0xA0, 0xA0, 0x45, 0x44, 0x6D, 0x90, 0x46, 0x0F, 0x82, 0xA0, 0x47, 0x24, 0x4F, 0x90,
-0x47, 0xF8, 0x9F, 0x20, 0x49, 0x04, 0x31, 0x90, 0x49, 0xD8, 0x81, 0x20, 0x4A, 0xE4, 0x13, 0x90,
-0x4B, 0x9C, 0xB3, 0xA0, 0x4C, 0xD6, 0x6A, 0x90, 0x4D, 0x7C, 0x95, 0xA0, 0x4E, 0xB6, 0x4C, 0x90,
-0x4F, 0x5C, 0x77, 0xA0, 0x50, 0x96, 0x2E, 0x90, 0x51, 0x3C, 0x59, 0xA0, 0x52, 0x76, 0x10, 0x90,
-0x53, 0x1C, 0x3B, 0xA0, 0x54, 0x55, 0xF2, 0x90, 0x54, 0xFC, 0x1D, 0xA0, 0x56, 0x35, 0xD4, 0x90,
-0x56, 0xE5, 0x3A, 0x20, 0x58, 0x1E, 0xF1, 0x10, 0x58, 0xC5, 0x1C, 0x20, 0x59, 0xFE, 0xD3, 0x10,
-0x5A, 0xA4, 0xFE, 0x20, 0x5B, 0xDE, 0xB5, 0x10, 0x5C, 0x84, 0xE0, 0x20, 0x5D, 0xBE, 0x97, 0x10,
-0x5E, 0x64, 0xC2, 0x20, 0x5F, 0x9E, 0x79, 0x10, 0x60, 0x4D, 0xDE, 0xA0, 0x61, 0x87, 0x95, 0x90,
-0x62, 0x2D, 0xC0, 0xA0, 0x63, 0x67, 0x77, 0x90, 0x64, 0x0D, 0xA2, 0xA0, 0x65, 0x47, 0x59, 0x90,
-0x65, 0xED, 0x84, 0xA0, 0x67, 0x27, 0x3B, 0x90, 0x67, 0xCD, 0x66, 0xA0, 0x69, 0x07, 0x1D, 0x90,
-0x69, 0xAD, 0x48, 0xA0, 0x6A, 0xE6, 0xFF, 0x90, 0x6B, 0x96, 0x65, 0x20, 0x6C, 0xD0, 0x1C, 0x10,
-0x6D, 0x76, 0x47, 0x20, 0x6E, 0xAF, 0xFE, 0x10, 0x6F, 0x56, 0x29, 0x20, 0x70, 0x8F, 0xE0, 0x10,
-0x71, 0x36, 0x0B, 0x20, 0x72, 0x6F, 0xC2, 0x10, 0x73, 0x15, 0xED, 0x20, 0x74, 0x4F, 0xA4, 0x10,
-0x74, 0xFF, 0x09, 0xA0, 0x76, 0x38, 0xC0, 0x90, 0x76, 0xDE, 0xEB, 0xA0, 0x78, 0x18, 0xA2, 0x90,
-0x78, 0xBE, 0xCD, 0xA0, 0x79, 0xF8, 0x84, 0x90, 0x7A, 0x9E, 0xAF, 0xA0, 0x7B, 0xD8, 0x66, 0x90,
-0x7C, 0x7E, 0x91, 0xA0, 0x7D, 0xB8, 0x48, 0x90, 0x7E, 0x5E, 0x73, 0xA0, 0x7F, 0x98, 0x2A, 0x90,
-0x01, 0x02, 0x03, 0x02, 0x04, 0x02, 0x05, 0x06, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
+0x00, 0x00, 0x00, 0x9B, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x18, 0xA5, 0xB6, 0xE8, 0x70,
+0xA9, 0x79, 0x4F, 0x70, 0xAF, 0xF1, 0x39, 0x80, 0xB6, 0x66, 0x64, 0x70, 0xB7, 0x1B, 0x10, 0x00,
+0xB8, 0x0A, 0xF2, 0xF0, 0xCB, 0xEA, 0x8D, 0x80, 0xD2, 0x23, 0xF4, 0x70, 0xD2, 0x9D, 0xAE, 0xF0,
+0xD7, 0x1B, 0x59, 0x00, 0xD8, 0x91, 0xB4, 0xF0, 0xDB, 0x00, 0x07, 0x00, 0xDB, 0xC0, 0x73, 0xF0,
+0xDC, 0xDE, 0xB3, 0xA0, 0xDD, 0xA9, 0xAC, 0x90, 0xDE, 0xBE, 0x95, 0xA0, 0xDF, 0x89, 0x8E, 0x90,
+0xE2, 0x7E, 0x4B, 0x90, 0xE3, 0x49, 0x52, 0x90, 0xE4, 0x5E, 0x2D, 0x90, 0xE5, 0x29, 0x34, 0x90,
+0xE6, 0x47, 0x4A, 0x10, 0xE7, 0x12, 0x51, 0x10, 0xE8, 0x27, 0x2C, 0x10, 0xE8, 0xF2, 0x33, 0x10,
+0xEA, 0x07, 0x0E, 0x10, 0xEA, 0xD2, 0x15, 0x10, 0xEB, 0xE6, 0xF0, 0x10, 0xEC, 0xB1, 0xF7, 0x10,
+0xED, 0xC6, 0xD2, 0x10, 0xEE, 0x91, 0xD9, 0x10, 0x0B, 0xE0, 0xAF, 0xA0, 0x0C, 0xD9, 0xCD, 0x10,
+0x0D, 0xC0, 0x91, 0xA0, 0x0E, 0xB9, 0xAF, 0x10, 0x0F, 0xA9, 0xAE, 0x20, 0x10, 0x99, 0x91, 0x10,
+0x11, 0x89, 0x90, 0x20, 0x12, 0x79, 0x73, 0x10, 0x13, 0x69, 0x72, 0x20, 0x14, 0x59, 0x55, 0x10,
+0x15, 0x49, 0x54, 0x20, 0x16, 0x39, 0x37, 0x10, 0x17, 0x29, 0x36, 0x20, 0x18, 0x22, 0x53, 0x90,
+0x19, 0x09, 0x18, 0x20, 0x1A, 0x02, 0x35, 0x90, 0x1A, 0xF2, 0x34, 0xA0, 0x1B, 0xE2, 0x17, 0x90,
+0x1C, 0xD2, 0x16, 0xA0, 0x1D, 0xC1, 0xF9, 0x90, 0x1E, 0xB1, 0xF8, 0xA0, 0x1F, 0xA1, 0xDB, 0x90,
+0x20, 0x76, 0x2B, 0x20, 0x21, 0x81, 0xBD, 0x90, 0x22, 0x56, 0x0D, 0x20, 0x23, 0x6A, 0xDA, 0x10,
+0x24, 0x35, 0xEF, 0x20, 0x25, 0x4A, 0xBC, 0x10, 0x26, 0x15, 0xD1, 0x20, 0x27, 0x2A, 0x9E, 0x10,
+0x27, 0xFE, 0xED, 0xA0, 0x29, 0x0A, 0x80, 0x10, 0x29, 0xDE, 0xCF, 0xA0, 0x2A, 0xEA, 0x62, 0x10,
+0x2B, 0xBE, 0xB1, 0xA0, 0x2C, 0xD3, 0x7E, 0x90, 0x2D, 0x9E, 0x93, 0xA0, 0x2E, 0xB3, 0x60, 0x90,
+0x2F, 0x7E, 0x75, 0xA0, 0x30, 0x93, 0x42, 0x90, 0x31, 0x67, 0x92, 0x20, 0x32, 0x73, 0x24, 0x90,
+0x33, 0x47, 0x74, 0x20, 0x34, 0x53, 0x06, 0x90, 0x35, 0x27, 0x56, 0x20, 0x36, 0x32, 0xE8, 0x90,
+0x37, 0x07, 0x38, 0x20, 0x38, 0x1C, 0x05, 0x10, 0x38, 0xE7, 0x1A, 0x20, 0x39, 0xFB, 0xE7, 0x10,
+0x3A, 0xC6, 0xFC, 0x20, 0x3B, 0xDB, 0xC9, 0x10, 0x3C, 0xB0, 0x18, 0xA0, 0x3D, 0xBB, 0xAB, 0x10,
+0x3E, 0x8F, 0xFA, 0xA0, 0x3F, 0x9B, 0x8D, 0x10, 0x40, 0x6F, 0xDC, 0xA0, 0x41, 0x84, 0xA9, 0x90,
+0x42, 0x4F, 0xBE, 0xA0, 0x43, 0x64, 0x8B, 0x90, 0x44, 0x2F, 0xA0, 0xA0, 0x45, 0x44, 0x6D, 0x90,
+0x46, 0x0F, 0x82, 0xA0, 0x47, 0x24, 0x4F, 0x90, 0x47, 0xF8, 0x9F, 0x20, 0x49, 0x04, 0x31, 0x90,
+0x49, 0xD8, 0x81, 0x20, 0x4A, 0xE4, 0x13, 0x90, 0x4B, 0x9C, 0xB3, 0xA0, 0x4C, 0xD6, 0x6A, 0x90,
+0x4D, 0x7C, 0x95, 0xA0, 0x4E, 0xB6, 0x4C, 0x90, 0x4F, 0x5C, 0x77, 0xA0, 0x50, 0x96, 0x2E, 0x90,
+0x51, 0x3C, 0x59, 0xA0, 0x52, 0x76, 0x10, 0x90, 0x53, 0x1C, 0x3B, 0xA0, 0x54, 0x55, 0xF2, 0x90,
+0x54, 0xFC, 0x1D, 0xA0, 0x56, 0x35, 0xD4, 0x90, 0x56, 0xE5, 0x3A, 0x20, 0x58, 0x1E, 0xF1, 0x10,
+0x58, 0xC5, 0x1C, 0x20, 0x59, 0xFE, 0xD3, 0x10, 0x5A, 0xA4, 0xFE, 0x20, 0x5B, 0xDE, 0xB5, 0x10,
+0x5C, 0x84, 0xE0, 0x20, 0x5D, 0xBE, 0x97, 0x10, 0x5E, 0x64, 0xC2, 0x20, 0x5F, 0x9E, 0x79, 0x10,
+0x60, 0x4D, 0xDE, 0xA0, 0x61, 0x87, 0x95, 0x90, 0x62, 0x2D, 0xC0, 0xA0, 0x63, 0x67, 0x77, 0x90,
+0x64, 0x0D, 0xA2, 0xA0, 0x65, 0x47, 0x59, 0x90, 0x65, 0xED, 0x84, 0xA0, 0x67, 0x27, 0x3B, 0x90,
+0x67, 0xCD, 0x66, 0xA0, 0x69, 0x07, 0x1D, 0x90, 0x69, 0xAD, 0x48, 0xA0, 0x6A, 0xE6, 0xFF, 0x90,
+0x6B, 0x96, 0x65, 0x20, 0x6C, 0xD0, 0x1C, 0x10, 0x6D, 0x76, 0x47, 0x20, 0x6E, 0xAF, 0xFE, 0x10,
+0x6F, 0x56, 0x29, 0x20, 0x70, 0x8F, 0xE0, 0x10, 0x71, 0x36, 0x0B, 0x20, 0x72, 0x6F, 0xC2, 0x10,
+0x73, 0x15, 0xED, 0x20, 0x74, 0x4F, 0xA4, 0x10, 0x74, 0xFF, 0x09, 0xA0, 0x76, 0x38, 0xC0, 0x90,
+0x76, 0xDE, 0xEB, 0xA0, 0x78, 0x18, 0xA2, 0x90, 0x78, 0xBE, 0xCD, 0xA0, 0x79, 0xF8, 0x84, 0x90,
+0x7A, 0x9E, 0xAF, 0xA0, 0x7B, 0xD8, 0x66, 0x90, 0x7C, 0x7E, 0x91, 0xA0, 0x7D, 0xB8, 0x48, 0x90,
+0x7E, 0x5E, 0x73, 0xA0, 0x7F, 0x98, 0x2A, 0x90, 0x01, 0x02, 0x03, 0x02, 0x04, 0x02, 0x05, 0x06,
 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
@@ -30287,90 +30784,94 @@
 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
-0x02, 0x04, 0x02, 0x04, 0x02, 0xFF, 0xFF, 0x92, 0x4C, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x00,
-0x04, 0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x08, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0x9D,
-0x90, 0x01, 0x0C, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x10, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x14, 0xFF,
-0xFF, 0x8F, 0x80, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x50, 0x53, 0x54,
-0x00, 0x50, 0x44, 0x54, 0x00, 0x50, 0x57, 0x54, 0x00, 0x50, 0x50, 0x54, 0x00, 0x00, 0x01, 0x00,
-0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x54, 0x5A, 0x69,
-0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x95, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x18, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8,
-0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xA9, 0x79, 0x4F, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF2, 0x7C,
-0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x64, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x1B, 0x10,
-0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0x0A, 0xF2, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0xEA, 0x8D,
-0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x23, 0xF4, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x99, 0xBA,
-0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD7, 0x1B, 0x59, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xD8, 0x91, 0xB4,
-0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE2, 0x7E, 0x4B, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE3, 0x49, 0x52,
-0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE4, 0x5E, 0x2D, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE5, 0x29, 0x34,
-0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE6, 0x47, 0x4A, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xE7, 0x12, 0x51,
-0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xE8, 0x27, 0x2C, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xE8, 0xF2, 0x33,
-0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xEA, 0x07, 0x0E, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xEA, 0xD2, 0x15,
-0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xEB, 0xE6, 0xF0, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xEC, 0xB1, 0xF7,
-0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xED, 0xC6, 0xD2, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xEE, 0x91, 0xD9,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x0B, 0xE0, 0xAF, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x0C, 0xD9, 0xCD,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x0D, 0xC0, 0x91, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x0E, 0xB9, 0xAF,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xA9, 0xAE, 0x20, 0x00, 0x00, 0x00, 0x00, 0x10, 0x99, 0x91,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x11, 0x89, 0x90, 0x20, 0x00, 0x00, 0x00, 0x00, 0x12, 0x79, 0x73,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x13, 0x69, 0x72, 0x20, 0x00, 0x00, 0x00, 0x00, 0x14, 0x59, 0x55,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x15, 0x49, 0x54, 0x20, 0x00, 0x00, 0x00, 0x00, 0x16, 0x39, 0x37,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x17, 0x29, 0x36, 0x20, 0x00, 0x00, 0x00, 0x00, 0x18, 0x22, 0x53,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x19, 0x09, 0x18, 0x20, 0x00, 0x00, 0x00, 0x00, 0x1A, 0x02, 0x35,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xF2, 0x34, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xE2, 0x17,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xD2, 0x16, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC1, 0xF9,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x1E, 0xB1, 0xF8, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA1, 0xDB,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x20, 0x76, 0x2B, 0x20, 0x00, 0x00, 0x00, 0x00, 0x21, 0x81, 0xBD,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x22, 0x56, 0x0D, 0x20, 0x00, 0x00, 0x00, 0x00, 0x23, 0x6A, 0xDA,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x24, 0x35, 0xEF, 0x20, 0x00, 0x00, 0x00, 0x00, 0x25, 0x4A, 0xBC,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x26, 0x15, 0xD1, 0x20, 0x00, 0x00, 0x00, 0x00, 0x27, 0x2A, 0x9E,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x27, 0xFE, 0xED, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x29, 0x0A, 0x80,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x29, 0xDE, 0xCF, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xEA, 0x62,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xBE, 0xB1, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xD3, 0x7E,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x9E, 0x93, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x2E, 0xB3, 0x60,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x7E, 0x75, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x30, 0x93, 0x42,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x92, 0x20, 0x00, 0x00, 0x00, 0x00, 0x32, 0x73, 0x24,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x74, 0x20, 0x00, 0x00, 0x00, 0x00, 0x34, 0x53, 0x06,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x56, 0x20, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0xE8,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x37, 0x07, 0x38, 0x20, 0x00, 0x00, 0x00, 0x00, 0x38, 0x1C, 0x05,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x38, 0xE7, 0x1A, 0x20, 0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0xE7,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xC6, 0xFC, 0x20, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xDB, 0xC9,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xB0, 0x18, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0xAB,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x8F, 0xFA, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x8D,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x40, 0x6F, 0xDC, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0xA9,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x42, 0x4F, 0xBE, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x8B,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x44, 0x2F, 0xA0, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x45, 0x44, 0x6D,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x46, 0x0F, 0x82, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x47, 0x24, 0x4F,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x47, 0xF8, 0x9F, 0x20, 0x00, 0x00, 0x00, 0x00, 0x49, 0x04, 0x31,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x49, 0xD8, 0x81, 0x20, 0x00, 0x00, 0x00, 0x00, 0x4A, 0xE4, 0x13,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x4B, 0x9C, 0xB3, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x4C, 0xD6, 0x6A,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x7C, 0x95, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x4E, 0xB6, 0x4C,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x5C, 0x77, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x50, 0x96, 0x2E,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x51, 0x3C, 0x59, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x52, 0x76, 0x10,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x53, 0x1C, 0x3B, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x54, 0x55, 0xF2,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x54, 0xFC, 0x1D, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x56, 0x35, 0xD4,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x56, 0xE5, 0x3A, 0x20, 0x00, 0x00, 0x00, 0x00, 0x58, 0x1E, 0xF1,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x58, 0xC5, 0x1C, 0x20, 0x00, 0x00, 0x00, 0x00, 0x59, 0xFE, 0xD3,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xA4, 0xFE, 0x20, 0x00, 0x00, 0x00, 0x00, 0x5B, 0xDE, 0xB5,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x5C, 0x84, 0xE0, 0x20, 0x00, 0x00, 0x00, 0x00, 0x5D, 0xBE, 0x97,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x64, 0xC2, 0x20, 0x00, 0x00, 0x00, 0x00, 0x5F, 0x9E, 0x79,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x60, 0x4D, 0xDE, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x61, 0x87, 0x95,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x62, 0x2D, 0xC0, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x63, 0x67, 0x77,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x64, 0x0D, 0xA2, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x65, 0x47, 0x59,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x65, 0xED, 0x84, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x67, 0x27, 0x3B,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x67, 0xCD, 0x66, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x69, 0x07, 0x1D,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x69, 0xAD, 0x48, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x6A, 0xE6, 0xFF,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x6B, 0x96, 0x65, 0x20, 0x00, 0x00, 0x00, 0x00, 0x6C, 0xD0, 0x1C,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x6D, 0x76, 0x47, 0x20, 0x00, 0x00, 0x00, 0x00, 0x6E, 0xAF, 0xFE,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x6F, 0x56, 0x29, 0x20, 0x00, 0x00, 0x00, 0x00, 0x70, 0x8F, 0xE0,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x71, 0x36, 0x0B, 0x20, 0x00, 0x00, 0x00, 0x00, 0x72, 0x6F, 0xC2,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x73, 0x15, 0xED, 0x20, 0x00, 0x00, 0x00, 0x00, 0x74, 0x4F, 0xA4,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x74, 0xFF, 0x09, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x76, 0x38, 0xC0,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x76, 0xDE, 0xEB, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x78, 0x18, 0xA2,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x78, 0xBE, 0xCD, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x79, 0xF8, 0x84,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x7A, 0x9E, 0xAF, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x7B, 0xD8, 0x66,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x7E, 0x91, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x7D, 0xB8, 0x48,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x5E, 0x73, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x98, 0x2A,
-0x90, 0x01, 0x02, 0x03, 0x02, 0x04, 0x02, 0x05, 0x06, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
+0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
+0x02, 0x04, 0x02, 0xFF, 0xFF, 0x92, 0x4C, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF,
+0xFF, 0x8F, 0x80, 0x00, 0x08, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0x9D, 0x90, 0x01,
+0x0C, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x10, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x14, 0xFF, 0xFF, 0x8F,
+0x80, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x50, 0x53, 0x54, 0x00, 0x50,
+0x44, 0x54, 0x00, 0x50, 0x57, 0x54, 0x00, 0x50, 0x50, 0x54, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9B, 0x00,
+0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x18, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA9, 0x79, 0x4F, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF1, 0x39, 0x80, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x64, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x1B, 0x10, 0x00, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB8, 0x0A, 0xF2, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0xEA, 0x8D, 0x80, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD2, 0x23, 0xF4, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x9D, 0xAE, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD7, 0x1B, 0x59, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xD8, 0x91, 0xB4, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xDB, 0x00, 0x07, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xDB, 0xC0, 0x73, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xDC, 0xDE, 0xB3, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xDD, 0xA9, 0xAC, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xDE, 0xBE, 0x95, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0x89, 0x8E, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xE2, 0x7E, 0x4B, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE3, 0x49, 0x52, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xE4, 0x5E, 0x2D, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE5, 0x29, 0x34, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xE6, 0x47, 0x4A, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xE7, 0x12, 0x51, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xE8, 0x27, 0x2C, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xE8, 0xF2, 0x33, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xEA, 0x07, 0x0E, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xEA, 0xD2, 0x15, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xEB, 0xE6, 0xF0, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xEC, 0xB1, 0xF7, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xED, 0xC6, 0xD2, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xEE, 0x91, 0xD9, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x0B, 0xE0, 0xAF, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x0C, 0xD9, 0xCD, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x0D, 0xC0, 0x91, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x0E, 0xB9, 0xAF, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x0F, 0xA9, 0xAE, 0x20, 0x00, 0x00, 0x00, 0x00, 0x10, 0x99, 0x91, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x11, 0x89, 0x90, 0x20, 0x00, 0x00, 0x00, 0x00, 0x12, 0x79, 0x73, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x13, 0x69, 0x72, 0x20, 0x00, 0x00, 0x00, 0x00, 0x14, 0x59, 0x55, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x15, 0x49, 0x54, 0x20, 0x00, 0x00, 0x00, 0x00, 0x16, 0x39, 0x37, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x17, 0x29, 0x36, 0x20, 0x00, 0x00, 0x00, 0x00, 0x18, 0x22, 0x53, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x19, 0x09, 0x18, 0x20, 0x00, 0x00, 0x00, 0x00, 0x1A, 0x02, 0x35, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x1A, 0xF2, 0x34, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xE2, 0x17, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x1C, 0xD2, 0x16, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC1, 0xF9, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x1E, 0xB1, 0xF8, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA1, 0xDB, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x20, 0x76, 0x2B, 0x20, 0x00, 0x00, 0x00, 0x00, 0x21, 0x81, 0xBD, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x22, 0x56, 0x0D, 0x20, 0x00, 0x00, 0x00, 0x00, 0x23, 0x6A, 0xDA, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x24, 0x35, 0xEF, 0x20, 0x00, 0x00, 0x00, 0x00, 0x25, 0x4A, 0xBC, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x26, 0x15, 0xD1, 0x20, 0x00, 0x00, 0x00, 0x00, 0x27, 0x2A, 0x9E, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x27, 0xFE, 0xED, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x29, 0x0A, 0x80, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x29, 0xDE, 0xCF, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xEA, 0x62, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x2B, 0xBE, 0xB1, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xD3, 0x7E, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x2D, 0x9E, 0x93, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x2E, 0xB3, 0x60, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x2F, 0x7E, 0x75, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x30, 0x93, 0x42, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x31, 0x67, 0x92, 0x20, 0x00, 0x00, 0x00, 0x00, 0x32, 0x73, 0x24, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x33, 0x47, 0x74, 0x20, 0x00, 0x00, 0x00, 0x00, 0x34, 0x53, 0x06, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x35, 0x27, 0x56, 0x20, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0xE8, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x37, 0x07, 0x38, 0x20, 0x00, 0x00, 0x00, 0x00, 0x38, 0x1C, 0x05, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x38, 0xE7, 0x1A, 0x20, 0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0xE7, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x3A, 0xC6, 0xFC, 0x20, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xDB, 0xC9, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x3C, 0xB0, 0x18, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0xAB, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x3E, 0x8F, 0xFA, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x8D, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x40, 0x6F, 0xDC, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0xA9, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x42, 0x4F, 0xBE, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x8B, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x44, 0x2F, 0xA0, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x45, 0x44, 0x6D, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x46, 0x0F, 0x82, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x47, 0x24, 0x4F, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x47, 0xF8, 0x9F, 0x20, 0x00, 0x00, 0x00, 0x00, 0x49, 0x04, 0x31, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x49, 0xD8, 0x81, 0x20, 0x00, 0x00, 0x00, 0x00, 0x4A, 0xE4, 0x13, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x4B, 0x9C, 0xB3, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x4C, 0xD6, 0x6A, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x4D, 0x7C, 0x95, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x4E, 0xB6, 0x4C, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x4F, 0x5C, 0x77, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x50, 0x96, 0x2E, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x51, 0x3C, 0x59, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x52, 0x76, 0x10, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x53, 0x1C, 0x3B, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x54, 0x55, 0xF2, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x54, 0xFC, 0x1D, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x56, 0x35, 0xD4, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x56, 0xE5, 0x3A, 0x20, 0x00, 0x00, 0x00, 0x00, 0x58, 0x1E, 0xF1, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x58, 0xC5, 0x1C, 0x20, 0x00, 0x00, 0x00, 0x00, 0x59, 0xFE, 0xD3, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x5A, 0xA4, 0xFE, 0x20, 0x00, 0x00, 0x00, 0x00, 0x5B, 0xDE, 0xB5, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x5C, 0x84, 0xE0, 0x20, 0x00, 0x00, 0x00, 0x00, 0x5D, 0xBE, 0x97, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x5E, 0x64, 0xC2, 0x20, 0x00, 0x00, 0x00, 0x00, 0x5F, 0x9E, 0x79, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x60, 0x4D, 0xDE, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x61, 0x87, 0x95, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x62, 0x2D, 0xC0, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x63, 0x67, 0x77, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x64, 0x0D, 0xA2, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x65, 0x47, 0x59, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x65, 0xED, 0x84, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x67, 0x27, 0x3B, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x67, 0xCD, 0x66, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x69, 0x07, 0x1D, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x69, 0xAD, 0x48, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x6A, 0xE6, 0xFF, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x6B, 0x96, 0x65, 0x20, 0x00, 0x00, 0x00, 0x00, 0x6C, 0xD0, 0x1C, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x6D, 0x76, 0x47, 0x20, 0x00, 0x00, 0x00, 0x00, 0x6E, 0xAF, 0xFE, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x6F, 0x56, 0x29, 0x20, 0x00, 0x00, 0x00, 0x00, 0x70, 0x8F, 0xE0, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x71, 0x36, 0x0B, 0x20, 0x00, 0x00, 0x00, 0x00, 0x72, 0x6F, 0xC2, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x73, 0x15, 0xED, 0x20, 0x00, 0x00, 0x00, 0x00, 0x74, 0x4F, 0xA4, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x74, 0xFF, 0x09, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x76, 0x38, 0xC0, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x76, 0xDE, 0xEB, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x78, 0x18, 0xA2, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x78, 0xBE, 0xCD, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x79, 0xF8, 0x84, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x7A, 0x9E, 0xAF, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x7B, 0xD8, 0x66, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x7C, 0x7E, 0x91, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x7D, 0xB8, 0x48, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x7E, 0x5E, 0x73, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x98, 0x2A, 0x90, 0x01,
+0x02, 0x03, 0x02, 0x04, 0x02, 0x05, 0x06, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
@@ -30379,15 +30880,15 @@
 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
-0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0xFF, 0xFF, 0x92, 0x4C, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90,
-0x00, 0x04, 0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x08, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF,
-0x9D, 0x90, 0x01, 0x0C, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x10, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x14,
-0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x50, 0x53,
-0x54, 0x00, 0x50, 0x44, 0x54, 0x00, 0x50, 0x57, 0x54, 0x00, 0x50, 0x50, 0x54, 0x00, 0x00, 0x01,
-0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0A, 0x50,
-0x53, 0x54, 0x38, 0x50, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D, 0x31,
-0x31, 0x2E, 0x31, 0x2E, 0x30, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 
+0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0xFF, 0xFF, 0x92, 0x4C, 0x00, 0x00,
+0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x08, 0xFF, 0xFF, 0x9D, 0x90,
+0x00, 0x04, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x0C, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x10, 0xFF, 0xFF,
+0x9D, 0x90, 0x01, 0x14, 0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53,
+0x54, 0x00, 0x50, 0x53, 0x54, 0x00, 0x50, 0x44, 0x54, 0x00, 0x50, 0x57, 0x54, 0x00, 0x50, 0x50,
+0x54, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
+0x01, 0x00, 0x0A, 0x50, 0x53, 0x54, 0x38, 0x50, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E,
+0x30, 0x2C, 0x4D, 0x31, 0x31, 0x2E, 0x31, 0x2E, 0x30, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 
 /* America/Fort_Nelson */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x43, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -31739,35 +32240,31 @@
 
 /* America/Hermosillo */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x4D, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x14, 0xA5, 0xB6, 0xE8, 0x70,
-0xAF, 0xF2, 0x6E, 0xE0, 0xB6, 0x66, 0x56, 0x60, 0xB7, 0x43, 0xD2, 0x60, 0xB8, 0x0C, 0x36, 0x60,
-0xB8, 0xFD, 0x86, 0xF0, 0xCB, 0xEA, 0x71, 0x60, 0xD8, 0x91, 0xB4, 0xF0, 0x00, 0x00, 0x70, 0x80,
-0x31, 0x67, 0x84, 0x10, 0x32, 0x73, 0x16, 0x80, 0x33, 0x47, 0x66, 0x10, 0x34, 0x52, 0xF8, 0x80,
-0x35, 0x27, 0x48, 0x10, 0x36, 0x32, 0xDA, 0x80, 0x01, 0x02, 0x04, 0x03, 0x04, 0x02, 0x04, 0x05,
-0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0xFF, 0xFF, 0x97, 0xF8, 0x00, 0x00, 0xFF, 0xFF, 0x9D,
-0x90, 0x00, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x0C, 0xFF,
-0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x10, 0xFF, 0xFF, 0x9D, 0x90, 0x00,
-0x04, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x4D, 0x44, 0x54,
-0x00, 0x50, 0x53, 0x54, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x07, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x14, 0xFF,
-0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF2, 0x6E, 0xE0, 0xFF,
-0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x56, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x43, 0xD2, 0x60, 0xFF,
-0xFF, 0xFF, 0xFF, 0xB8, 0x0C, 0x36, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0xFD, 0x86, 0xF0, 0xFF,
-0xFF, 0xFF, 0xFF, 0xCB, 0xEA, 0x71, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xD8, 0x91, 0xB4, 0xF0, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x80, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x84, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x32, 0x73, 0x16, 0x80, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x66, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x34, 0x52, 0xF8, 0x80, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x48, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x36, 0x32, 0xDA, 0x80, 0x01, 0x02, 0x04, 0x03, 0x04, 0x02, 0x04, 0x05, 0x04,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x10, 0xA5, 0xB6, 0xE8, 0x70,
+0xAF, 0xF1, 0x2B, 0x70, 0xB6, 0x66, 0x56, 0x60, 0xB7, 0x41, 0x3D, 0x70, 0xB8, 0x0C, 0x36, 0x60,
+0xB8, 0xFD, 0x86, 0xF0, 0xCB, 0xEA, 0x71, 0x60, 0x31, 0x67, 0x84, 0x10, 0x32, 0x73, 0x16, 0x80,
+0x33, 0x47, 0x66, 0x10, 0x34, 0x52, 0xF8, 0x80, 0x35, 0x27, 0x48, 0x10, 0x36, 0x32, 0xDA, 0x80,
+0x01, 0x02, 0x04, 0x03, 0x04, 0x02, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0xFF, 0xFF, 0x97,
+0xF8, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0xFF,
+0xFF, 0xAB, 0xA0, 0x01, 0x0C, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0x4C, 0x4D, 0x54, 0x00, 0x4D,
+0x53, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x4D, 0x44, 0x54, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+0x00, 0x01, 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00,
+0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00,
+0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF1, 0x2B,
+0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x56, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x41, 0x3D,
+0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0x0C, 0x36, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0xFD, 0x86,
+0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0xEA, 0x71, 0x60, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x84,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x32, 0x73, 0x16, 0x80, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x66,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x34, 0x52, 0xF8, 0x80, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x48,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0xDA, 0x80, 0x01, 0x02, 0x04, 0x03, 0x04, 0x02, 0x04,
 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0xFF, 0xFF, 0x97, 0xF8, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90,
 0x00, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x0C, 0xFF, 0xFF,
-0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x10, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04,
-0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x4D, 0x44, 0x54, 0x00,
-0x50, 0x53, 0x54, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x0A, 0x4D, 0x53, 0x54, 0x37, 0x0A, 0x00, 0xB5, 0xAE, 0x6A, 0x00, 0x69, 0x56, 0x25,
-0x00, 0x00, 0x00, 0x06, 0x53, 0x6F, 0x6E, 0x6F, 0x72, 0x61, 
+0x9D, 0x90, 0x00, 0x04, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00,
+0x4D, 0x44, 0x54, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0A, 0x4D,
+0x53, 0x54, 0x37, 0x0A, 0x00, 0xB5, 0xAE, 0x6A, 0x00, 0x69, 0x56, 0x25, 0x00, 0x00, 0x00, 0x06,
+0x53, 0x6F, 0x6E, 0x6F, 0x72, 0x61, 
 
 /* America/Indiana/Indianapolis */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x55, 0x53, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -34530,80 +35027,76 @@
 
 /* America/Mazatlan */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x4D, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x14, 0xA5, 0xB6, 0xE8, 0x70,
-0xAF, 0xF2, 0x6E, 0xE0, 0xB6, 0x66, 0x56, 0x60, 0xB7, 0x43, 0xD2, 0x60, 0xB8, 0x0C, 0x36, 0x60,
-0xB8, 0xFD, 0x86, 0xF0, 0xCB, 0xEA, 0x71, 0x60, 0xD8, 0x91, 0xB4, 0xF0, 0x00, 0x00, 0x70, 0x80,
-0x31, 0x67, 0x84, 0x10, 0x32, 0x73, 0x16, 0x80, 0x33, 0x47, 0x66, 0x10, 0x34, 0x52, 0xF8, 0x80,
-0x35, 0x27, 0x48, 0x10, 0x36, 0x32, 0xDA, 0x80, 0x37, 0x07, 0x2A, 0x10, 0x38, 0x1B, 0xF7, 0x00,
-0x38, 0xE7, 0x0C, 0x10, 0x39, 0xFB, 0xD9, 0x00, 0x3A, 0xF5, 0x12, 0x90, 0x3B, 0xB6, 0xD1, 0x00,
-0x3C, 0xB0, 0x0A, 0x90, 0x3D, 0xBB, 0x9D, 0x00, 0x3E, 0x8F, 0xEC, 0x90, 0x3F, 0x9B, 0x7F, 0x00,
-0x40, 0x6F, 0xCE, 0x90, 0x41, 0x84, 0x9B, 0x80, 0x42, 0x4F, 0xB0, 0x90, 0x43, 0x64, 0x7D, 0x80,
-0x44, 0x2F, 0x92, 0x90, 0x45, 0x44, 0x5F, 0x80, 0x46, 0x0F, 0x74, 0x90, 0x47, 0x24, 0x41, 0x80,
-0x47, 0xF8, 0x91, 0x10, 0x49, 0x04, 0x23, 0x80, 0x49, 0xD8, 0x73, 0x10, 0x4A, 0xE4, 0x05, 0x80,
-0x4B, 0xB8, 0x55, 0x10, 0x4C, 0xCD, 0x22, 0x00, 0x4D, 0x98, 0x37, 0x10, 0x4E, 0xAD, 0x04, 0x00,
-0x4F, 0x78, 0x19, 0x10, 0x50, 0x8C, 0xE6, 0x00, 0x51, 0x61, 0x35, 0x90, 0x52, 0x6C, 0xC8, 0x00,
-0x53, 0x41, 0x17, 0x90, 0x54, 0x4C, 0xAA, 0x00, 0x55, 0x20, 0xF9, 0x90, 0x56, 0x2C, 0x8C, 0x00,
-0x57, 0x00, 0xDB, 0x90, 0x58, 0x15, 0xA8, 0x80, 0x58, 0xE0, 0xBD, 0x90, 0x59, 0xF5, 0x8A, 0x80,
-0x5A, 0xC0, 0x9F, 0x90, 0x5B, 0xD5, 0x6C, 0x80, 0x5C, 0xA9, 0xBC, 0x10, 0x5D, 0xB5, 0x4E, 0x80,
-0x5E, 0x89, 0x9E, 0x10, 0x5F, 0x95, 0x30, 0x80, 0x60, 0x69, 0x80, 0x10, 0x61, 0x7E, 0x4D, 0x00,
-0x62, 0x49, 0x62, 0x10, 0x63, 0x5E, 0x2F, 0x00, 0x01, 0x02, 0x04, 0x03, 0x04, 0x02, 0x04, 0x05,
-0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
-0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
-0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
-0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0xFF, 0xFF, 0x9C, 0x3C, 0x00, 0x00, 0xFF, 0xFF, 0x9D,
-0x90, 0x00, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x0C, 0xFF,
-0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x10, 0xFF, 0xFF, 0x9D, 0x90, 0x00,
-0x04, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x4D, 0x44, 0x54,
-0x00, 0x50, 0x53, 0x54, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x07, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x14, 0xFF,
-0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF2, 0x6E, 0xE0, 0xFF,
-0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x56, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x43, 0xD2, 0x60, 0xFF,
-0xFF, 0xFF, 0xFF, 0xB8, 0x0C, 0x36, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0xFD, 0x86, 0xF0, 0xFF,
-0xFF, 0xFF, 0xFF, 0xCB, 0xEA, 0x71, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xD8, 0x91, 0xB4, 0xF0, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x80, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x84, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x32, 0x73, 0x16, 0x80, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x66, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x34, 0x52, 0xF8, 0x80, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x48, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x36, 0x32, 0xDA, 0x80, 0x00, 0x00, 0x00, 0x00, 0x37, 0x07, 0x2A, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x38, 0x1B, 0xF7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0xE7, 0x0C, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x39, 0xFB, 0xD9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xF5, 0x12, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x3B, 0xB6, 0xD1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xB0, 0x0A, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x3D, 0xBB, 0x9D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x8F, 0xEC, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x3F, 0x9B, 0x7F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x6F, 0xCE, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x41, 0x84, 0x9B, 0x80, 0x00, 0x00, 0x00, 0x00, 0x42, 0x4F, 0xB0, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x43, 0x64, 0x7D, 0x80, 0x00, 0x00, 0x00, 0x00, 0x44, 0x2F, 0x92, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x45, 0x44, 0x5F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x46, 0x0F, 0x74, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x47, 0x24, 0x41, 0x80, 0x00, 0x00, 0x00, 0x00, 0x47, 0xF8, 0x91, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x49, 0x04, 0x23, 0x80, 0x00, 0x00, 0x00, 0x00, 0x49, 0xD8, 0x73, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x4A, 0xE4, 0x05, 0x80, 0x00, 0x00, 0x00, 0x00, 0x4B, 0xB8, 0x55, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x4C, 0xCD, 0x22, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x98, 0x37, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x4E, 0xAD, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x78, 0x19, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x50, 0x8C, 0xE6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x51, 0x61, 0x35, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x52, 0x6C, 0xC8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x53, 0x41, 0x17, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x54, 0x4C, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x20, 0xF9, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x56, 0x2C, 0x8C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x57, 0x00, 0xDB, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x58, 0x15, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00, 0x58, 0xE0, 0xBD, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x59, 0xF5, 0x8A, 0x80, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xC0, 0x9F, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x5B, 0xD5, 0x6C, 0x80, 0x00, 0x00, 0x00, 0x00, 0x5C, 0xA9, 0xBC, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x5D, 0xB5, 0x4E, 0x80, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x89, 0x9E, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x5F, 0x95, 0x30, 0x80, 0x00, 0x00, 0x00, 0x00, 0x60, 0x69, 0x80, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x61, 0x7E, 0x4D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x62, 0x49, 0x62, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x63, 0x5E, 0x2F, 0x00, 0x01, 0x02, 0x04, 0x03, 0x04, 0x02, 0x04, 0x05, 0x04,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x3D, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x10, 0xA5, 0xB6, 0xE8, 0x70,
+0xAF, 0xF1, 0x2B, 0x70, 0xB6, 0x66, 0x56, 0x60, 0xB7, 0x41, 0x3D, 0x70, 0xB8, 0x0C, 0x36, 0x60,
+0xB8, 0xFD, 0x86, 0xF0, 0xCB, 0xEA, 0x71, 0x60, 0x31, 0x67, 0x84, 0x10, 0x32, 0x73, 0x16, 0x80,
+0x33, 0x47, 0x66, 0x10, 0x34, 0x52, 0xF8, 0x80, 0x35, 0x27, 0x48, 0x10, 0x36, 0x32, 0xDA, 0x80,
+0x37, 0x07, 0x2A, 0x10, 0x38, 0x1B, 0xF7, 0x00, 0x38, 0xE7, 0x0C, 0x10, 0x39, 0xFB, 0xD9, 0x00,
+0x3A, 0xF5, 0x12, 0x90, 0x3B, 0xB6, 0xD1, 0x00, 0x3C, 0xB0, 0x0A, 0x90, 0x3D, 0xBB, 0x9D, 0x00,
+0x3E, 0x8F, 0xEC, 0x90, 0x3F, 0x9B, 0x7F, 0x00, 0x40, 0x6F, 0xCE, 0x90, 0x41, 0x84, 0x9B, 0x80,
+0x42, 0x4F, 0xB0, 0x90, 0x43, 0x64, 0x7D, 0x80, 0x44, 0x2F, 0x92, 0x90, 0x45, 0x44, 0x5F, 0x80,
+0x46, 0x0F, 0x74, 0x90, 0x47, 0x24, 0x41, 0x80, 0x47, 0xF8, 0x91, 0x10, 0x49, 0x04, 0x23, 0x80,
+0x49, 0xD8, 0x73, 0x10, 0x4A, 0xE4, 0x05, 0x80, 0x4B, 0xB8, 0x55, 0x10, 0x4C, 0xCD, 0x22, 0x00,
+0x4D, 0x98, 0x37, 0x10, 0x4E, 0xAD, 0x04, 0x00, 0x4F, 0x78, 0x19, 0x10, 0x50, 0x8C, 0xE6, 0x00,
+0x51, 0x61, 0x35, 0x90, 0x52, 0x6C, 0xC8, 0x00, 0x53, 0x41, 0x17, 0x90, 0x54, 0x4C, 0xAA, 0x00,
+0x55, 0x20, 0xF9, 0x90, 0x56, 0x2C, 0x8C, 0x00, 0x57, 0x00, 0xDB, 0x90, 0x58, 0x15, 0xA8, 0x80,
+0x58, 0xE0, 0xBD, 0x90, 0x59, 0xF5, 0x8A, 0x80, 0x5A, 0xC0, 0x9F, 0x90, 0x5B, 0xD5, 0x6C, 0x80,
+0x5C, 0xA9, 0xBC, 0x10, 0x5D, 0xB5, 0x4E, 0x80, 0x5E, 0x89, 0x9E, 0x10, 0x5F, 0x95, 0x30, 0x80,
+0x60, 0x69, 0x80, 0x10, 0x61, 0x7E, 0x4D, 0x00, 0x62, 0x49, 0x62, 0x10, 0x63, 0x5E, 0x2F, 0x00,
+0x01, 0x02, 0x04, 0x03, 0x04, 0x02, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
+0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
+0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
+0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0xFF, 0xFF, 0x9C,
+0x3C, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0xFF,
+0xFF, 0xAB, 0xA0, 0x01, 0x0C, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0x4C, 0x4D, 0x54, 0x00, 0x4D,
+0x53, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x4D, 0x44, 0x54, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+0x00, 0x01, 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00,
+0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3D, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00,
+0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF1, 0x2B,
+0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x56, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x41, 0x3D,
+0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0x0C, 0x36, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0xFD, 0x86,
+0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0xEA, 0x71, 0x60, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x84,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x32, 0x73, 0x16, 0x80, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x66,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x34, 0x52, 0xF8, 0x80, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x48,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0xDA, 0x80, 0x00, 0x00, 0x00, 0x00, 0x37, 0x07, 0x2A,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x38, 0x1B, 0xF7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0xE7, 0x0C,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0xD9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xF5, 0x12,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xB6, 0xD1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xB0, 0x0A,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0x9D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x8F, 0xEC,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x7F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x6F, 0xCE,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0x9B, 0x80, 0x00, 0x00, 0x00, 0x00, 0x42, 0x4F, 0xB0,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x7D, 0x80, 0x00, 0x00, 0x00, 0x00, 0x44, 0x2F, 0x92,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x45, 0x44, 0x5F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x46, 0x0F, 0x74,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x47, 0x24, 0x41, 0x80, 0x00, 0x00, 0x00, 0x00, 0x47, 0xF8, 0x91,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x49, 0x04, 0x23, 0x80, 0x00, 0x00, 0x00, 0x00, 0x49, 0xD8, 0x73,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x4A, 0xE4, 0x05, 0x80, 0x00, 0x00, 0x00, 0x00, 0x4B, 0xB8, 0x55,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x4C, 0xCD, 0x22, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x98, 0x37,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x4E, 0xAD, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x78, 0x19,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x50, 0x8C, 0xE6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x51, 0x61, 0x35,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x52, 0x6C, 0xC8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x53, 0x41, 0x17,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x54, 0x4C, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x20, 0xF9,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x56, 0x2C, 0x8C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x57, 0x00, 0xDB,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x58, 0x15, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00, 0x58, 0xE0, 0xBD,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x59, 0xF5, 0x8A, 0x80, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xC0, 0x9F,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x5B, 0xD5, 0x6C, 0x80, 0x00, 0x00, 0x00, 0x00, 0x5C, 0xA9, 0xBC,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x5D, 0xB5, 0x4E, 0x80, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x89, 0x9E,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x5F, 0x95, 0x30, 0x80, 0x00, 0x00, 0x00, 0x00, 0x60, 0x69, 0x80,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x61, 0x7E, 0x4D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x62, 0x49, 0x62,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x63, 0x5E, 0x2F, 0x00, 0x01, 0x02, 0x04, 0x03, 0x04, 0x02, 0x04,
 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0xFF, 0xFF, 0x9C, 0x3C, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90,
 0x00, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x0C, 0xFF, 0xFF,
-0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x10, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04,
-0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x4D, 0x44, 0x54, 0x00,
-0x50, 0x53, 0x54, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x0A, 0x4D, 0x53, 0x54, 0x37, 0x0A, 0x00, 0xAC, 0xC1, 0x42, 0x00, 0x70, 0x47, 0x7D,
-0x00, 0x00, 0x00, 0x32, 0x42, 0x61, 0x6A, 0x61, 0x20, 0x43, 0x61, 0x6C, 0x69, 0x66, 0x6F, 0x72,
-0x6E, 0x69, 0x61, 0x20, 0x53, 0x75, 0x72, 0x2C, 0x20, 0x4E, 0x61, 0x79, 0x61, 0x72, 0x69, 0x74,
-0x20, 0x28, 0x6D, 0x6F, 0x73, 0x74, 0x20, 0x61, 0x72, 0x65, 0x61, 0x73, 0x29, 0x2C, 0x20, 0x53,
-0x69, 0x6E, 0x61, 0x6C, 0x6F, 0x61, 
+0x9D, 0x90, 0x00, 0x04, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00,
+0x4D, 0x44, 0x54, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0A, 0x4D,
+0x53, 0x54, 0x37, 0x0A, 0x00, 0xAC, 0xC1, 0x42, 0x00, 0x70, 0x47, 0x7D, 0x00, 0x00, 0x00, 0x32,
+0x42, 0x61, 0x6A, 0x61, 0x20, 0x43, 0x61, 0x6C, 0x69, 0x66, 0x6F, 0x72, 0x6E, 0x69, 0x61, 0x20,
+0x53, 0x75, 0x72, 0x2C, 0x20, 0x4E, 0x61, 0x79, 0x61, 0x72, 0x69, 0x74, 0x20, 0x28, 0x6D, 0x6F,
+0x73, 0x74, 0x20, 0x61, 0x72, 0x65, 0x61, 0x73, 0x29, 0x2C, 0x20, 0x53, 0x69, 0x6E, 0x61, 0x6C,
+0x6F, 0x61, 
 
 /* America/Mendoza */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -34826,7 +35319,7 @@
 0x50, 0x48, 0x50, 0x32, 0x01, 0x4D, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x39, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x10, 0xA5, 0xB6, 0xDA, 0x60,
-0x16, 0x86, 0xD5, 0x60, 0x18, 0x4C, 0x4B, 0x50, 0x31, 0x67, 0x76, 0x00, 0x32, 0x73, 0x08, 0x70,
+0x16, 0x8A, 0xE6, 0x00, 0x18, 0x24, 0xDA, 0x70, 0x31, 0x67, 0x76, 0x00, 0x32, 0x73, 0x08, 0x70,
 0x33, 0x47, 0x58, 0x00, 0x34, 0x52, 0xEA, 0x70, 0x35, 0x27, 0x3A, 0x00, 0x36, 0x32, 0xCC, 0x70,
 0x37, 0x07, 0x1C, 0x00, 0x38, 0x1B, 0xE8, 0xF0, 0x38, 0xE6, 0xFE, 0x00, 0x39, 0xFB, 0xCA, 0xF0,
 0x3A, 0xF5, 0x04, 0x80, 0x3B, 0xB6, 0xC2, 0xF0, 0x3C, 0xAF, 0xFC, 0x80, 0x3D, 0xBB, 0x8E, 0xF0,
@@ -34850,8 +35343,8 @@
 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x39, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x10, 0xFF, 0xFF, 0xFF,
-0xFF, 0xA5, 0xB6, 0xDA, 0x60, 0x00, 0x00, 0x00, 0x00, 0x16, 0x86, 0xD5, 0x60, 0x00, 0x00, 0x00,
-0x00, 0x18, 0x4C, 0x4B, 0x50, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x76, 0x00, 0x00, 0x00, 0x00,
+0xFF, 0xA5, 0xB6, 0xDA, 0x60, 0x00, 0x00, 0x00, 0x00, 0x16, 0x8A, 0xE6, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x18, 0x24, 0xDA, 0x70, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x76, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x32, 0x73, 0x08, 0x70, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x58, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x34, 0x52, 0xEA, 0x70, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x3A, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x36, 0x32, 0xCC, 0x70, 0x00, 0x00, 0x00, 0x00, 0x37, 0x07, 0x1C, 0x00, 0x00, 0x00, 0x00,
@@ -34987,7 +35480,7 @@
 0x50, 0x48, 0x50, 0x32, 0x01, 0x4D, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x44, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x18, 0xA5, 0xB6, 0xE8, 0x70,
-0xAF, 0xF2, 0x6E, 0xE0, 0xB6, 0x66, 0x56, 0x60, 0xB7, 0x43, 0xD2, 0x60, 0xB8, 0x0C, 0x36, 0x60,
+0xAF, 0xF1, 0x2B, 0x70, 0xB6, 0x66, 0x56, 0x60, 0xB7, 0x41, 0x3D, 0x70, 0xB8, 0x0C, 0x36, 0x60,
 0xB8, 0xFD, 0x86, 0xF0, 0xC5, 0xDE, 0xB0, 0x60, 0xC6, 0x97, 0x34, 0x50, 0xC9, 0x55, 0xF1, 0xE0,
 0xC9, 0xEA, 0xDD, 0x50, 0xCF, 0x02, 0xC6, 0xE0, 0xCF, 0xB7, 0x56, 0x50, 0xDA, 0x99, 0x15, 0xE0,
 0xDB, 0x76, 0x83, 0xD0, 0x31, 0x67, 0x76, 0x00, 0x32, 0x73, 0x08, 0x70, 0x33, 0x47, 0x58, 0x00,
@@ -35017,8 +35510,8 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08,
 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x00, 0x00, 0x00, 0x08,
 0x00, 0x00, 0x00, 0x18, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8, 0x70, 0xFF, 0xFF, 0xFF, 0xFF,
-0xAF, 0xF2, 0x6E, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x56, 0x60, 0xFF, 0xFF, 0xFF, 0xFF,
-0xB7, 0x43, 0xD2, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0x0C, 0x36, 0x60, 0xFF, 0xFF, 0xFF, 0xFF,
+0xAF, 0xF1, 0x2B, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x56, 0x60, 0xFF, 0xFF, 0xFF, 0xFF,
+0xB7, 0x41, 0x3D, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0x0C, 0x36, 0x60, 0xFF, 0xFF, 0xFF, 0xFF,
 0xB8, 0xFD, 0x86, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC5, 0xDE, 0xB0, 0x60, 0xFF, 0xFF, 0xFF, 0xFF,
 0xC6, 0x97, 0x34, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0x55, 0xF1, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF,
 0xC9, 0xEA, 0xDD, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, 0xCF, 0x02, 0xC6, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF,
@@ -35375,71 +35868,79 @@
 
 /* America/Monterrey */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x4D, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x39, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x0C, 0xA5, 0xB6, 0xDA, 0x60,
-0x22, 0x55, 0xF1, 0x00, 0x23, 0x6A, 0xBD, 0xF0, 0x31, 0x67, 0x76, 0x00, 0x32, 0x73, 0x08, 0x70,
-0x33, 0x47, 0x58, 0x00, 0x34, 0x52, 0xEA, 0x70, 0x35, 0x27, 0x3A, 0x00, 0x36, 0x32, 0xCC, 0x70,
-0x37, 0x07, 0x1C, 0x00, 0x38, 0x1B, 0xE8, 0xF0, 0x38, 0xE6, 0xFE, 0x00, 0x39, 0xFB, 0xCA, 0xF0,
-0x3A, 0xF5, 0x04, 0x80, 0x3B, 0xB6, 0xC2, 0xF0, 0x3C, 0xAF, 0xFC, 0x80, 0x3D, 0xBB, 0x8E, 0xF0,
-0x3E, 0x8F, 0xDE, 0x80, 0x3F, 0x9B, 0x70, 0xF0, 0x40, 0x6F, 0xC0, 0x80, 0x41, 0x84, 0x8D, 0x70,
-0x42, 0x4F, 0xA2, 0x80, 0x43, 0x64, 0x6F, 0x70, 0x44, 0x2F, 0x84, 0x80, 0x45, 0x44, 0x51, 0x70,
-0x46, 0x0F, 0x66, 0x80, 0x47, 0x24, 0x33, 0x70, 0x47, 0xF8, 0x83, 0x00, 0x49, 0x04, 0x15, 0x70,
-0x49, 0xD8, 0x65, 0x00, 0x4A, 0xE3, 0xF7, 0x70, 0x4B, 0xB8, 0x47, 0x00, 0x4C, 0xCD, 0x13, 0xF0,
-0x4D, 0x98, 0x29, 0x00, 0x4E, 0xAC, 0xF5, 0xF0, 0x4F, 0x78, 0x0B, 0x00, 0x50, 0x8C, 0xD7, 0xF0,
-0x51, 0x61, 0x27, 0x80, 0x52, 0x6C, 0xB9, 0xF0, 0x53, 0x41, 0x09, 0x80, 0x54, 0x4C, 0x9B, 0xF0,
-0x55, 0x20, 0xEB, 0x80, 0x56, 0x2C, 0x7D, 0xF0, 0x57, 0x00, 0xCD, 0x80, 0x58, 0x15, 0x9A, 0x70,
-0x58, 0xE0, 0xAF, 0x80, 0x59, 0xF5, 0x7C, 0x70, 0x5A, 0xC0, 0x91, 0x80, 0x5B, 0xD5, 0x5E, 0x70,
-0x5C, 0xA9, 0xAE, 0x00, 0x5D, 0xB5, 0x40, 0x70, 0x5E, 0x89, 0x90, 0x00, 0x5F, 0x95, 0x22, 0x70,
-0x60, 0x69, 0x72, 0x00, 0x61, 0x7E, 0x3E, 0xF0, 0x62, 0x49, 0x54, 0x00, 0x63, 0x5E, 0x20, 0xF0,
-0x01, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
-0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
-0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
-0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0xFF, 0xFF, 0xA1, 0xF4, 0x00, 0x00, 0xFF,
-0xFF, 0xAB, 0xA0, 0x00, 0x04, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x08, 0xFF, 0xFF, 0xAB, 0xA0, 0x00,
-0x04, 0x4C, 0x4D, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x00, 0x01, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
-0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x39, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
-0x0C, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xDA, 0x60, 0x00, 0x00, 0x00, 0x00, 0x22, 0x55, 0xF1,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x23, 0x6A, 0xBD, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x76,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x32, 0x73, 0x08, 0x70, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x58,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x34, 0x52, 0xEA, 0x70, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x3A,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0xCC, 0x70, 0x00, 0x00, 0x00, 0x00, 0x37, 0x07, 0x1C,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x1B, 0xE8, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x38, 0xE6, 0xFE,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0xCA, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xF5, 0x04,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xB6, 0xC2, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xAF, 0xFC,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0x8E, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x8F, 0xDE,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x70, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x40, 0x6F, 0xC0,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0x8D, 0x70, 0x00, 0x00, 0x00, 0x00, 0x42, 0x4F, 0xA2,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x6F, 0x70, 0x00, 0x00, 0x00, 0x00, 0x44, 0x2F, 0x84,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x45, 0x44, 0x51, 0x70, 0x00, 0x00, 0x00, 0x00, 0x46, 0x0F, 0x66,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x47, 0x24, 0x33, 0x70, 0x00, 0x00, 0x00, 0x00, 0x47, 0xF8, 0x83,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x49, 0x04, 0x15, 0x70, 0x00, 0x00, 0x00, 0x00, 0x49, 0xD8, 0x65,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x4A, 0xE3, 0xF7, 0x70, 0x00, 0x00, 0x00, 0x00, 0x4B, 0xB8, 0x47,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x4C, 0xCD, 0x13, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x98, 0x29,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x4E, 0xAC, 0xF5, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x78, 0x0B,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x8C, 0xD7, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x51, 0x61, 0x27,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x52, 0x6C, 0xB9, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x53, 0x41, 0x09,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x54, 0x4C, 0x9B, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x55, 0x20, 0xEB,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x56, 0x2C, 0x7D, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x57, 0x00, 0xCD,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x58, 0x15, 0x9A, 0x70, 0x00, 0x00, 0x00, 0x00, 0x58, 0xE0, 0xAF,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x59, 0xF5, 0x7C, 0x70, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xC0, 0x91,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x5B, 0xD5, 0x5E, 0x70, 0x00, 0x00, 0x00, 0x00, 0x5C, 0xA9, 0xAE,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x5D, 0xB5, 0x40, 0x70, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x89, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x5F, 0x95, 0x22, 0x70, 0x00, 0x00, 0x00, 0x00, 0x60, 0x69, 0x72,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x61, 0x7E, 0x3E, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x62, 0x49, 0x54,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x63, 0x5E, 0x20, 0xF0, 0x01, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
-0x02, 0x03, 0xFF, 0xFF, 0xA1, 0xF4, 0x00, 0x00, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x04, 0xFF, 0xFF,
-0xB9, 0xB0, 0x01, 0x08, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x04, 0x4C, 0x4D, 0x54, 0x00, 0x43, 0x53,
-0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x0A, 0x43,
-0x53, 0x54, 0x36, 0x0A, 0x00, 0xB0, 0x7E, 0x4A, 0x00, 0x79, 0x96, 0x4D, 0x00, 0x00, 0x00, 0x36,
-0x44, 0x75, 0x72, 0x61, 0x6E, 0x67, 0x6F, 0x3B, 0x20, 0x43, 0x6F, 0x61, 0x68, 0x75, 0x69, 0x6C,
-0x61, 0x2C, 0x20, 0x4E, 0x75, 0x65, 0x76, 0x6F, 0x20, 0x4C, 0x65, 0x6F, 0x6E, 0x2C, 0x20, 0x54,
-0x61, 0x6D, 0x61, 0x75, 0x6C, 0x69, 0x70, 0x61, 0x73, 0x20, 0x28, 0x6D, 0x6F, 0x73, 0x74, 0x20,
-0x61, 0x72, 0x65, 0x61, 0x73, 0x29, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x3E, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x14, 0xA5, 0xB6, 0xDA, 0x60,
+0xAF, 0xF1, 0x2B, 0x70, 0xB6, 0x66, 0x56, 0x60, 0xB7, 0x41, 0x3D, 0x70, 0xB8, 0x0C, 0x36, 0x60,
+0xB8, 0xFD, 0x86, 0xF0, 0x22, 0x55, 0xF1, 0x00, 0x23, 0x6A, 0xBD, 0xF0, 0x31, 0x67, 0x76, 0x00,
+0x32, 0x73, 0x08, 0x70, 0x33, 0x47, 0x58, 0x00, 0x34, 0x52, 0xEA, 0x70, 0x35, 0x27, 0x3A, 0x00,
+0x36, 0x32, 0xCC, 0x70, 0x37, 0x07, 0x1C, 0x00, 0x38, 0x1B, 0xE8, 0xF0, 0x38, 0xE6, 0xFE, 0x00,
+0x39, 0xFB, 0xCA, 0xF0, 0x3A, 0xF5, 0x04, 0x80, 0x3B, 0xB6, 0xC2, 0xF0, 0x3C, 0xAF, 0xFC, 0x80,
+0x3D, 0xBB, 0x8E, 0xF0, 0x3E, 0x8F, 0xDE, 0x80, 0x3F, 0x9B, 0x70, 0xF0, 0x40, 0x6F, 0xC0, 0x80,
+0x41, 0x84, 0x8D, 0x70, 0x42, 0x4F, 0xA2, 0x80, 0x43, 0x64, 0x6F, 0x70, 0x44, 0x2F, 0x84, 0x80,
+0x45, 0x44, 0x51, 0x70, 0x46, 0x0F, 0x66, 0x80, 0x47, 0x24, 0x33, 0x70, 0x47, 0xF8, 0x83, 0x00,
+0x49, 0x04, 0x15, 0x70, 0x49, 0xD8, 0x65, 0x00, 0x4A, 0xE3, 0xF7, 0x70, 0x4B, 0xB8, 0x47, 0x00,
+0x4C, 0xCD, 0x13, 0xF0, 0x4D, 0x98, 0x29, 0x00, 0x4E, 0xAC, 0xF5, 0xF0, 0x4F, 0x78, 0x0B, 0x00,
+0x50, 0x8C, 0xD7, 0xF0, 0x51, 0x61, 0x27, 0x80, 0x52, 0x6C, 0xB9, 0xF0, 0x53, 0x41, 0x09, 0x80,
+0x54, 0x4C, 0x9B, 0xF0, 0x55, 0x20, 0xEB, 0x80, 0x56, 0x2C, 0x7D, 0xF0, 0x57, 0x00, 0xCD, 0x80,
+0x58, 0x15, 0x9A, 0x70, 0x58, 0xE0, 0xAF, 0x80, 0x59, 0xF5, 0x7C, 0x70, 0x5A, 0xC0, 0x91, 0x80,
+0x5B, 0xD5, 0x5E, 0x70, 0x5C, 0xA9, 0xAE, 0x00, 0x5D, 0xB5, 0x40, 0x70, 0x5E, 0x89, 0x90, 0x00,
+0x5F, 0x95, 0x22, 0x70, 0x60, 0x69, 0x72, 0x00, 0x61, 0x7E, 0x3E, 0xF0, 0x62, 0x49, 0x54, 0x00,
+0x63, 0x5E, 0x20, 0xF0, 0x01, 0x02, 0x04, 0x03, 0x04, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02,
+0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02,
+0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02,
+0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02,
+0x05, 0x02, 0xFF, 0xFF, 0xA1, 0xF4, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF,
+0xAB, 0xA0, 0x00, 0x08, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x0C, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04,
+0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x10, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00,
+0x4D, 0x53, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x4D, 0x44, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00,
+0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x54, 0x5A,
+0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x3E, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x14, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0xB6,
+0xDA, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF1, 0x2B, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB6, 0x66,
+0x56, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x41, 0x3D, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0x0C,
+0x36, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0xFD, 0x86, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x22, 0x55,
+0xF1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x23, 0x6A, 0xBD, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67,
+0x76, 0x00, 0x00, 0x00, 0x00, 0x00, 0x32, 0x73, 0x08, 0x70, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47,
+0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x34, 0x52, 0xEA, 0x70, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27,
+0x3A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0xCC, 0x70, 0x00, 0x00, 0x00, 0x00, 0x37, 0x07,
+0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x1B, 0xE8, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x38, 0xE6,
+0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0xCA, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xF5,
+0x04, 0x80, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xB6, 0xC2, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xAF,
+0xFC, 0x80, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0x8E, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x8F,
+0xDE, 0x80, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x70, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x40, 0x6F,
+0xC0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0x8D, 0x70, 0x00, 0x00, 0x00, 0x00, 0x42, 0x4F,
+0xA2, 0x80, 0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x6F, 0x70, 0x00, 0x00, 0x00, 0x00, 0x44, 0x2F,
+0x84, 0x80, 0x00, 0x00, 0x00, 0x00, 0x45, 0x44, 0x51, 0x70, 0x00, 0x00, 0x00, 0x00, 0x46, 0x0F,
+0x66, 0x80, 0x00, 0x00, 0x00, 0x00, 0x47, 0x24, 0x33, 0x70, 0x00, 0x00, 0x00, 0x00, 0x47, 0xF8,
+0x83, 0x00, 0x00, 0x00, 0x00, 0x00, 0x49, 0x04, 0x15, 0x70, 0x00, 0x00, 0x00, 0x00, 0x49, 0xD8,
+0x65, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4A, 0xE3, 0xF7, 0x70, 0x00, 0x00, 0x00, 0x00, 0x4B, 0xB8,
+0x47, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4C, 0xCD, 0x13, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x98,
+0x29, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4E, 0xAC, 0xF5, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x78,
+0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x8C, 0xD7, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x51, 0x61,
+0x27, 0x80, 0x00, 0x00, 0x00, 0x00, 0x52, 0x6C, 0xB9, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x53, 0x41,
+0x09, 0x80, 0x00, 0x00, 0x00, 0x00, 0x54, 0x4C, 0x9B, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x55, 0x20,
+0xEB, 0x80, 0x00, 0x00, 0x00, 0x00, 0x56, 0x2C, 0x7D, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x57, 0x00,
+0xCD, 0x80, 0x00, 0x00, 0x00, 0x00, 0x58, 0x15, 0x9A, 0x70, 0x00, 0x00, 0x00, 0x00, 0x58, 0xE0,
+0xAF, 0x80, 0x00, 0x00, 0x00, 0x00, 0x59, 0xF5, 0x7C, 0x70, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xC0,
+0x91, 0x80, 0x00, 0x00, 0x00, 0x00, 0x5B, 0xD5, 0x5E, 0x70, 0x00, 0x00, 0x00, 0x00, 0x5C, 0xA9,
+0xAE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5D, 0xB5, 0x40, 0x70, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x89,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5F, 0x95, 0x22, 0x70, 0x00, 0x00, 0x00, 0x00, 0x60, 0x69,
+0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 0x61, 0x7E, 0x3E, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x62, 0x49,
+0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x63, 0x5E, 0x20, 0xF0, 0x01, 0x02, 0x04, 0x03, 0x04, 0x02,
+0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02,
+0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02,
+0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02,
+0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0xFF, 0xFF, 0xA1, 0xF4, 0x00, 0x00, 0xFF, 0xFF,
+0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x0C,
+0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x10, 0xFF, 0xFF, 0xAB, 0xA0,
+0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x4D, 0x44,
+0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x0A, 0x43, 0x53, 0x54, 0x36, 0x0A, 0x00, 0xB0, 0x7E, 0x4A, 0x00, 0x79,
+0x96, 0x4D, 0x00, 0x00, 0x00, 0x36, 0x44, 0x75, 0x72, 0x61, 0x6E, 0x67, 0x6F, 0x3B, 0x20, 0x43,
+0x6F, 0x61, 0x68, 0x75, 0x69, 0x6C, 0x61, 0x2C, 0x20, 0x4E, 0x75, 0x65, 0x76, 0x6F, 0x20, 0x4C,
+0x65, 0x6F, 0x6E, 0x2C, 0x20, 0x54, 0x61, 0x6D, 0x61, 0x75, 0x6C, 0x69, 0x70, 0x61, 0x73, 0x20,
+0x28, 0x6D, 0x6F, 0x73, 0x74, 0x20, 0x61, 0x72, 0x65, 0x61, 0x73, 0x29, 
 
 /* America/Montevideo */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x55, 0x59, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -37164,7 +37665,7 @@
 0x50, 0x48, 0x50, 0x32, 0x01, 0x4D, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x5A, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x14, 0xA5, 0xB6, 0xE8, 0x70,
-0xAF, 0xF2, 0x6E, 0xE0, 0xB6, 0x66, 0x56, 0x60, 0xB7, 0x43, 0xD2, 0x60, 0xB8, 0x0C, 0x36, 0x60,
+0xAF, 0xF1, 0x2B, 0x70, 0xB6, 0x66, 0x56, 0x60, 0xB7, 0x41, 0x3D, 0x70, 0xB8, 0x0C, 0x36, 0x60,
 0xB8, 0xFD, 0x86, 0xF0, 0x31, 0x67, 0x76, 0x00, 0x32, 0x73, 0x08, 0x70, 0x33, 0x47, 0x58, 0x00,
 0x34, 0x52, 0xEA, 0x70, 0x35, 0x27, 0x48, 0x10, 0x36, 0x32, 0xDA, 0x80, 0x37, 0x07, 0x2A, 0x10,
 0x38, 0x1B, 0xF7, 0x00, 0x38, 0xE7, 0x0C, 0x10, 0x39, 0xFB, 0xD9, 0x00, 0x3A, 0xF5, 0x12, 0x90,
@@ -37200,8 +37701,8 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x07, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5A, 0x00, 0x00,
 0x00, 0x07, 0x00, 0x00, 0x00, 0x14, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8, 0x70, 0xFF, 0xFF,
-0xFF, 0xFF, 0xAF, 0xF2, 0x6E, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x56, 0x60, 0xFF, 0xFF,
-0xFF, 0xFF, 0xB7, 0x43, 0xD2, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0x0C, 0x36, 0x60, 0xFF, 0xFF,
+0xFF, 0xFF, 0xAF, 0xF1, 0x2B, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x56, 0x60, 0xFF, 0xFF,
+0xFF, 0xFF, 0xB7, 0x41, 0x3D, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0x0C, 0x36, 0x60, 0xFF, 0xFF,
 0xFF, 0xFF, 0xB8, 0xFD, 0x86, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x76, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x32, 0x73, 0x08, 0x70, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x58, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x34, 0x52, 0xEA, 0x70, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x48, 0x10, 0x00, 0x00,
@@ -37788,8 +38289,8 @@
 0x00, 0x10, 0x4C, 0x4D, 0x54, 0x00, 0x53, 0x4D, 0x54, 0x00, 0x2D, 0x30, 0x35, 0x00, 0x2D, 0x30,
 0x34, 0x00, 0x2D, 0x30, 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x0A, 0x3C, 0x2D, 0x30, 0x33, 0x3E, 0x33, 0x0A, 0x00, 0x38,
-0x3A, 0x88, 0x00, 0xA6, 0x72, 0xAD, 0x00, 0x00, 0x00, 0x14, 0x52, 0x65, 0x67, 0x69, 0x6F, 0x6E,
-0x20, 0x6F, 0x66, 0x20, 0x4D, 0x61, 0x67, 0x61, 0x6C, 0x6C, 0x61, 0x6E, 0x65, 0x73, 
+0x3A, 0x88, 0x00, 0xA6, 0x72, 0xAD, 0x00, 0x00, 0x00, 0x11, 0x4D, 0x61, 0x67, 0x61, 0x6C, 0x6C,
+0x61, 0x6E, 0x65, 0x73, 0x20, 0x52, 0x65, 0x67, 0x69, 0x6F, 0x6E, 
 
 /* America/Rainy_River */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -38471,45 +38972,46 @@
 /* America/Santa_Isabel */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x95, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x18, 0xA5, 0xB6, 0xE8, 0x70,
-0xA9, 0x79, 0x4F, 0x70, 0xAF, 0xF2, 0x7C, 0xF0, 0xB6, 0x66, 0x64, 0x70, 0xB7, 0x1B, 0x10, 0x00,
-0xB8, 0x0A, 0xF2, 0xF0, 0xCB, 0xEA, 0x8D, 0x80, 0xD2, 0x23, 0xF4, 0x70, 0xD2, 0x99, 0xBA, 0x70,
-0xD7, 0x1B, 0x59, 0x00, 0xD8, 0x91, 0xB4, 0xF0, 0xE2, 0x7E, 0x4B, 0x90, 0xE3, 0x49, 0x52, 0x90,
-0xE4, 0x5E, 0x2D, 0x90, 0xE5, 0x29, 0x34, 0x90, 0xE6, 0x47, 0x4A, 0x10, 0xE7, 0x12, 0x51, 0x10,
-0xE8, 0x27, 0x2C, 0x10, 0xE8, 0xF2, 0x33, 0x10, 0xEA, 0x07, 0x0E, 0x10, 0xEA, 0xD2, 0x15, 0x10,
-0xEB, 0xE6, 0xF0, 0x10, 0xEC, 0xB1, 0xF7, 0x10, 0xED, 0xC6, 0xD2, 0x10, 0xEE, 0x91, 0xD9, 0x10,
-0x0B, 0xE0, 0xAF, 0xA0, 0x0C, 0xD9, 0xCD, 0x10, 0x0D, 0xC0, 0x91, 0xA0, 0x0E, 0xB9, 0xAF, 0x10,
-0x0F, 0xA9, 0xAE, 0x20, 0x10, 0x99, 0x91, 0x10, 0x11, 0x89, 0x90, 0x20, 0x12, 0x79, 0x73, 0x10,
-0x13, 0x69, 0x72, 0x20, 0x14, 0x59, 0x55, 0x10, 0x15, 0x49, 0x54, 0x20, 0x16, 0x39, 0x37, 0x10,
-0x17, 0x29, 0x36, 0x20, 0x18, 0x22, 0x53, 0x90, 0x19, 0x09, 0x18, 0x20, 0x1A, 0x02, 0x35, 0x90,
-0x1A, 0xF2, 0x34, 0xA0, 0x1B, 0xE2, 0x17, 0x90, 0x1C, 0xD2, 0x16, 0xA0, 0x1D, 0xC1, 0xF9, 0x90,
-0x1E, 0xB1, 0xF8, 0xA0, 0x1F, 0xA1, 0xDB, 0x90, 0x20, 0x76, 0x2B, 0x20, 0x21, 0x81, 0xBD, 0x90,
-0x22, 0x56, 0x0D, 0x20, 0x23, 0x6A, 0xDA, 0x10, 0x24, 0x35, 0xEF, 0x20, 0x25, 0x4A, 0xBC, 0x10,
-0x26, 0x15, 0xD1, 0x20, 0x27, 0x2A, 0x9E, 0x10, 0x27, 0xFE, 0xED, 0xA0, 0x29, 0x0A, 0x80, 0x10,
-0x29, 0xDE, 0xCF, 0xA0, 0x2A, 0xEA, 0x62, 0x10, 0x2B, 0xBE, 0xB1, 0xA0, 0x2C, 0xD3, 0x7E, 0x90,
-0x2D, 0x9E, 0x93, 0xA0, 0x2E, 0xB3, 0x60, 0x90, 0x2F, 0x7E, 0x75, 0xA0, 0x30, 0x93, 0x42, 0x90,
-0x31, 0x67, 0x92, 0x20, 0x32, 0x73, 0x24, 0x90, 0x33, 0x47, 0x74, 0x20, 0x34, 0x53, 0x06, 0x90,
-0x35, 0x27, 0x56, 0x20, 0x36, 0x32, 0xE8, 0x90, 0x37, 0x07, 0x38, 0x20, 0x38, 0x1C, 0x05, 0x10,
-0x38, 0xE7, 0x1A, 0x20, 0x39, 0xFB, 0xE7, 0x10, 0x3A, 0xC6, 0xFC, 0x20, 0x3B, 0xDB, 0xC9, 0x10,
-0x3C, 0xB0, 0x18, 0xA0, 0x3D, 0xBB, 0xAB, 0x10, 0x3E, 0x8F, 0xFA, 0xA0, 0x3F, 0x9B, 0x8D, 0x10,
-0x40, 0x6F, 0xDC, 0xA0, 0x41, 0x84, 0xA9, 0x90, 0x42, 0x4F, 0xBE, 0xA0, 0x43, 0x64, 0x8B, 0x90,
-0x44, 0x2F, 0xA0, 0xA0, 0x45, 0x44, 0x6D, 0x90, 0x46, 0x0F, 0x82, 0xA0, 0x47, 0x24, 0x4F, 0x90,
-0x47, 0xF8, 0x9F, 0x20, 0x49, 0x04, 0x31, 0x90, 0x49, 0xD8, 0x81, 0x20, 0x4A, 0xE4, 0x13, 0x90,
-0x4B, 0x9C, 0xB3, 0xA0, 0x4C, 0xD6, 0x6A, 0x90, 0x4D, 0x7C, 0x95, 0xA0, 0x4E, 0xB6, 0x4C, 0x90,
-0x4F, 0x5C, 0x77, 0xA0, 0x50, 0x96, 0x2E, 0x90, 0x51, 0x3C, 0x59, 0xA0, 0x52, 0x76, 0x10, 0x90,
-0x53, 0x1C, 0x3B, 0xA0, 0x54, 0x55, 0xF2, 0x90, 0x54, 0xFC, 0x1D, 0xA0, 0x56, 0x35, 0xD4, 0x90,
-0x56, 0xE5, 0x3A, 0x20, 0x58, 0x1E, 0xF1, 0x10, 0x58, 0xC5, 0x1C, 0x20, 0x59, 0xFE, 0xD3, 0x10,
-0x5A, 0xA4, 0xFE, 0x20, 0x5B, 0xDE, 0xB5, 0x10, 0x5C, 0x84, 0xE0, 0x20, 0x5D, 0xBE, 0x97, 0x10,
-0x5E, 0x64, 0xC2, 0x20, 0x5F, 0x9E, 0x79, 0x10, 0x60, 0x4D, 0xDE, 0xA0, 0x61, 0x87, 0x95, 0x90,
-0x62, 0x2D, 0xC0, 0xA0, 0x63, 0x67, 0x77, 0x90, 0x64, 0x0D, 0xA2, 0xA0, 0x65, 0x47, 0x59, 0x90,
-0x65, 0xED, 0x84, 0xA0, 0x67, 0x27, 0x3B, 0x90, 0x67, 0xCD, 0x66, 0xA0, 0x69, 0x07, 0x1D, 0x90,
-0x69, 0xAD, 0x48, 0xA0, 0x6A, 0xE6, 0xFF, 0x90, 0x6B, 0x96, 0x65, 0x20, 0x6C, 0xD0, 0x1C, 0x10,
-0x6D, 0x76, 0x47, 0x20, 0x6E, 0xAF, 0xFE, 0x10, 0x6F, 0x56, 0x29, 0x20, 0x70, 0x8F, 0xE0, 0x10,
-0x71, 0x36, 0x0B, 0x20, 0x72, 0x6F, 0xC2, 0x10, 0x73, 0x15, 0xED, 0x20, 0x74, 0x4F, 0xA4, 0x10,
-0x74, 0xFF, 0x09, 0xA0, 0x76, 0x38, 0xC0, 0x90, 0x76, 0xDE, 0xEB, 0xA0, 0x78, 0x18, 0xA2, 0x90,
-0x78, 0xBE, 0xCD, 0xA0, 0x79, 0xF8, 0x84, 0x90, 0x7A, 0x9E, 0xAF, 0xA0, 0x7B, 0xD8, 0x66, 0x90,
-0x7C, 0x7E, 0x91, 0xA0, 0x7D, 0xB8, 0x48, 0x90, 0x7E, 0x5E, 0x73, 0xA0, 0x7F, 0x98, 0x2A, 0x90,
-0x01, 0x02, 0x03, 0x02, 0x04, 0x02, 0x05, 0x06, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
+0x00, 0x00, 0x00, 0x9B, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x18, 0xA5, 0xB6, 0xE8, 0x70,
+0xA9, 0x79, 0x4F, 0x70, 0xAF, 0xF1, 0x39, 0x80, 0xB6, 0x66, 0x64, 0x70, 0xB7, 0x1B, 0x10, 0x00,
+0xB8, 0x0A, 0xF2, 0xF0, 0xCB, 0xEA, 0x8D, 0x80, 0xD2, 0x23, 0xF4, 0x70, 0xD2, 0x9D, 0xAE, 0xF0,
+0xD7, 0x1B, 0x59, 0x00, 0xD8, 0x91, 0xB4, 0xF0, 0xDB, 0x00, 0x07, 0x00, 0xDB, 0xC0, 0x73, 0xF0,
+0xDC, 0xDE, 0xB3, 0xA0, 0xDD, 0xA9, 0xAC, 0x90, 0xDE, 0xBE, 0x95, 0xA0, 0xDF, 0x89, 0x8E, 0x90,
+0xE2, 0x7E, 0x4B, 0x90, 0xE3, 0x49, 0x52, 0x90, 0xE4, 0x5E, 0x2D, 0x90, 0xE5, 0x29, 0x34, 0x90,
+0xE6, 0x47, 0x4A, 0x10, 0xE7, 0x12, 0x51, 0x10, 0xE8, 0x27, 0x2C, 0x10, 0xE8, 0xF2, 0x33, 0x10,
+0xEA, 0x07, 0x0E, 0x10, 0xEA, 0xD2, 0x15, 0x10, 0xEB, 0xE6, 0xF0, 0x10, 0xEC, 0xB1, 0xF7, 0x10,
+0xED, 0xC6, 0xD2, 0x10, 0xEE, 0x91, 0xD9, 0x10, 0x0B, 0xE0, 0xAF, 0xA0, 0x0C, 0xD9, 0xCD, 0x10,
+0x0D, 0xC0, 0x91, 0xA0, 0x0E, 0xB9, 0xAF, 0x10, 0x0F, 0xA9, 0xAE, 0x20, 0x10, 0x99, 0x91, 0x10,
+0x11, 0x89, 0x90, 0x20, 0x12, 0x79, 0x73, 0x10, 0x13, 0x69, 0x72, 0x20, 0x14, 0x59, 0x55, 0x10,
+0x15, 0x49, 0x54, 0x20, 0x16, 0x39, 0x37, 0x10, 0x17, 0x29, 0x36, 0x20, 0x18, 0x22, 0x53, 0x90,
+0x19, 0x09, 0x18, 0x20, 0x1A, 0x02, 0x35, 0x90, 0x1A, 0xF2, 0x34, 0xA0, 0x1B, 0xE2, 0x17, 0x90,
+0x1C, 0xD2, 0x16, 0xA0, 0x1D, 0xC1, 0xF9, 0x90, 0x1E, 0xB1, 0xF8, 0xA0, 0x1F, 0xA1, 0xDB, 0x90,
+0x20, 0x76, 0x2B, 0x20, 0x21, 0x81, 0xBD, 0x90, 0x22, 0x56, 0x0D, 0x20, 0x23, 0x6A, 0xDA, 0x10,
+0x24, 0x35, 0xEF, 0x20, 0x25, 0x4A, 0xBC, 0x10, 0x26, 0x15, 0xD1, 0x20, 0x27, 0x2A, 0x9E, 0x10,
+0x27, 0xFE, 0xED, 0xA0, 0x29, 0x0A, 0x80, 0x10, 0x29, 0xDE, 0xCF, 0xA0, 0x2A, 0xEA, 0x62, 0x10,
+0x2B, 0xBE, 0xB1, 0xA0, 0x2C, 0xD3, 0x7E, 0x90, 0x2D, 0x9E, 0x93, 0xA0, 0x2E, 0xB3, 0x60, 0x90,
+0x2F, 0x7E, 0x75, 0xA0, 0x30, 0x93, 0x42, 0x90, 0x31, 0x67, 0x92, 0x20, 0x32, 0x73, 0x24, 0x90,
+0x33, 0x47, 0x74, 0x20, 0x34, 0x53, 0x06, 0x90, 0x35, 0x27, 0x56, 0x20, 0x36, 0x32, 0xE8, 0x90,
+0x37, 0x07, 0x38, 0x20, 0x38, 0x1C, 0x05, 0x10, 0x38, 0xE7, 0x1A, 0x20, 0x39, 0xFB, 0xE7, 0x10,
+0x3A, 0xC6, 0xFC, 0x20, 0x3B, 0xDB, 0xC9, 0x10, 0x3C, 0xB0, 0x18, 0xA0, 0x3D, 0xBB, 0xAB, 0x10,
+0x3E, 0x8F, 0xFA, 0xA0, 0x3F, 0x9B, 0x8D, 0x10, 0x40, 0x6F, 0xDC, 0xA0, 0x41, 0x84, 0xA9, 0x90,
+0x42, 0x4F, 0xBE, 0xA0, 0x43, 0x64, 0x8B, 0x90, 0x44, 0x2F, 0xA0, 0xA0, 0x45, 0x44, 0x6D, 0x90,
+0x46, 0x0F, 0x82, 0xA0, 0x47, 0x24, 0x4F, 0x90, 0x47, 0xF8, 0x9F, 0x20, 0x49, 0x04, 0x31, 0x90,
+0x49, 0xD8, 0x81, 0x20, 0x4A, 0xE4, 0x13, 0x90, 0x4B, 0x9C, 0xB3, 0xA0, 0x4C, 0xD6, 0x6A, 0x90,
+0x4D, 0x7C, 0x95, 0xA0, 0x4E, 0xB6, 0x4C, 0x90, 0x4F, 0x5C, 0x77, 0xA0, 0x50, 0x96, 0x2E, 0x90,
+0x51, 0x3C, 0x59, 0xA0, 0x52, 0x76, 0x10, 0x90, 0x53, 0x1C, 0x3B, 0xA0, 0x54, 0x55, 0xF2, 0x90,
+0x54, 0xFC, 0x1D, 0xA0, 0x56, 0x35, 0xD4, 0x90, 0x56, 0xE5, 0x3A, 0x20, 0x58, 0x1E, 0xF1, 0x10,
+0x58, 0xC5, 0x1C, 0x20, 0x59, 0xFE, 0xD3, 0x10, 0x5A, 0xA4, 0xFE, 0x20, 0x5B, 0xDE, 0xB5, 0x10,
+0x5C, 0x84, 0xE0, 0x20, 0x5D, 0xBE, 0x97, 0x10, 0x5E, 0x64, 0xC2, 0x20, 0x5F, 0x9E, 0x79, 0x10,
+0x60, 0x4D, 0xDE, 0xA0, 0x61, 0x87, 0x95, 0x90, 0x62, 0x2D, 0xC0, 0xA0, 0x63, 0x67, 0x77, 0x90,
+0x64, 0x0D, 0xA2, 0xA0, 0x65, 0x47, 0x59, 0x90, 0x65, 0xED, 0x84, 0xA0, 0x67, 0x27, 0x3B, 0x90,
+0x67, 0xCD, 0x66, 0xA0, 0x69, 0x07, 0x1D, 0x90, 0x69, 0xAD, 0x48, 0xA0, 0x6A, 0xE6, 0xFF, 0x90,
+0x6B, 0x96, 0x65, 0x20, 0x6C, 0xD0, 0x1C, 0x10, 0x6D, 0x76, 0x47, 0x20, 0x6E, 0xAF, 0xFE, 0x10,
+0x6F, 0x56, 0x29, 0x20, 0x70, 0x8F, 0xE0, 0x10, 0x71, 0x36, 0x0B, 0x20, 0x72, 0x6F, 0xC2, 0x10,
+0x73, 0x15, 0xED, 0x20, 0x74, 0x4F, 0xA4, 0x10, 0x74, 0xFF, 0x09, 0xA0, 0x76, 0x38, 0xC0, 0x90,
+0x76, 0xDE, 0xEB, 0xA0, 0x78, 0x18, 0xA2, 0x90, 0x78, 0xBE, 0xCD, 0xA0, 0x79, 0xF8, 0x84, 0x90,
+0x7A, 0x9E, 0xAF, 0xA0, 0x7B, 0xD8, 0x66, 0x90, 0x7C, 0x7E, 0x91, 0xA0, 0x7D, 0xB8, 0x48, 0x90,
+0x7E, 0x5E, 0x73, 0xA0, 0x7F, 0x98, 0x2A, 0x90, 0x01, 0x02, 0x03, 0x02, 0x04, 0x02, 0x05, 0x06,
 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
@@ -38518,90 +39020,94 @@
 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
-0x02, 0x04, 0x02, 0x04, 0x02, 0xFF, 0xFF, 0x92, 0x4C, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x00,
-0x04, 0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x08, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0x9D,
-0x90, 0x01, 0x0C, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x10, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x14, 0xFF,
-0xFF, 0x8F, 0x80, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x50, 0x53, 0x54,
-0x00, 0x50, 0x44, 0x54, 0x00, 0x50, 0x57, 0x54, 0x00, 0x50, 0x50, 0x54, 0x00, 0x00, 0x01, 0x00,
-0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x54, 0x5A, 0x69,
-0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x95, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x18, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8,
-0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xA9, 0x79, 0x4F, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF2, 0x7C,
-0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x64, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x1B, 0x10,
-0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0x0A, 0xF2, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0xEA, 0x8D,
-0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x23, 0xF4, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x99, 0xBA,
-0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD7, 0x1B, 0x59, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xD8, 0x91, 0xB4,
-0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE2, 0x7E, 0x4B, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE3, 0x49, 0x52,
-0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE4, 0x5E, 0x2D, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE5, 0x29, 0x34,
-0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE6, 0x47, 0x4A, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xE7, 0x12, 0x51,
-0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xE8, 0x27, 0x2C, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xE8, 0xF2, 0x33,
-0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xEA, 0x07, 0x0E, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xEA, 0xD2, 0x15,
-0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xEB, 0xE6, 0xF0, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xEC, 0xB1, 0xF7,
-0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xED, 0xC6, 0xD2, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xEE, 0x91, 0xD9,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x0B, 0xE0, 0xAF, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x0C, 0xD9, 0xCD,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x0D, 0xC0, 0x91, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x0E, 0xB9, 0xAF,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xA9, 0xAE, 0x20, 0x00, 0x00, 0x00, 0x00, 0x10, 0x99, 0x91,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x11, 0x89, 0x90, 0x20, 0x00, 0x00, 0x00, 0x00, 0x12, 0x79, 0x73,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x13, 0x69, 0x72, 0x20, 0x00, 0x00, 0x00, 0x00, 0x14, 0x59, 0x55,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x15, 0x49, 0x54, 0x20, 0x00, 0x00, 0x00, 0x00, 0x16, 0x39, 0x37,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x17, 0x29, 0x36, 0x20, 0x00, 0x00, 0x00, 0x00, 0x18, 0x22, 0x53,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x19, 0x09, 0x18, 0x20, 0x00, 0x00, 0x00, 0x00, 0x1A, 0x02, 0x35,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xF2, 0x34, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xE2, 0x17,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xD2, 0x16, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC1, 0xF9,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x1E, 0xB1, 0xF8, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA1, 0xDB,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x20, 0x76, 0x2B, 0x20, 0x00, 0x00, 0x00, 0x00, 0x21, 0x81, 0xBD,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x22, 0x56, 0x0D, 0x20, 0x00, 0x00, 0x00, 0x00, 0x23, 0x6A, 0xDA,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x24, 0x35, 0xEF, 0x20, 0x00, 0x00, 0x00, 0x00, 0x25, 0x4A, 0xBC,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x26, 0x15, 0xD1, 0x20, 0x00, 0x00, 0x00, 0x00, 0x27, 0x2A, 0x9E,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x27, 0xFE, 0xED, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x29, 0x0A, 0x80,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x29, 0xDE, 0xCF, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xEA, 0x62,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xBE, 0xB1, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xD3, 0x7E,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x9E, 0x93, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x2E, 0xB3, 0x60,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x7E, 0x75, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x30, 0x93, 0x42,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x92, 0x20, 0x00, 0x00, 0x00, 0x00, 0x32, 0x73, 0x24,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x74, 0x20, 0x00, 0x00, 0x00, 0x00, 0x34, 0x53, 0x06,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x56, 0x20, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0xE8,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x37, 0x07, 0x38, 0x20, 0x00, 0x00, 0x00, 0x00, 0x38, 0x1C, 0x05,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x38, 0xE7, 0x1A, 0x20, 0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0xE7,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xC6, 0xFC, 0x20, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xDB, 0xC9,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xB0, 0x18, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0xAB,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x8F, 0xFA, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x8D,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x40, 0x6F, 0xDC, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0xA9,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x42, 0x4F, 0xBE, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x8B,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x44, 0x2F, 0xA0, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x45, 0x44, 0x6D,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x46, 0x0F, 0x82, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x47, 0x24, 0x4F,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x47, 0xF8, 0x9F, 0x20, 0x00, 0x00, 0x00, 0x00, 0x49, 0x04, 0x31,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x49, 0xD8, 0x81, 0x20, 0x00, 0x00, 0x00, 0x00, 0x4A, 0xE4, 0x13,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x4B, 0x9C, 0xB3, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x4C, 0xD6, 0x6A,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x7C, 0x95, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x4E, 0xB6, 0x4C,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x5C, 0x77, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x50, 0x96, 0x2E,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x51, 0x3C, 0x59, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x52, 0x76, 0x10,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x53, 0x1C, 0x3B, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x54, 0x55, 0xF2,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x54, 0xFC, 0x1D, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x56, 0x35, 0xD4,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x56, 0xE5, 0x3A, 0x20, 0x00, 0x00, 0x00, 0x00, 0x58, 0x1E, 0xF1,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x58, 0xC5, 0x1C, 0x20, 0x00, 0x00, 0x00, 0x00, 0x59, 0xFE, 0xD3,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xA4, 0xFE, 0x20, 0x00, 0x00, 0x00, 0x00, 0x5B, 0xDE, 0xB5,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x5C, 0x84, 0xE0, 0x20, 0x00, 0x00, 0x00, 0x00, 0x5D, 0xBE, 0x97,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x64, 0xC2, 0x20, 0x00, 0x00, 0x00, 0x00, 0x5F, 0x9E, 0x79,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x60, 0x4D, 0xDE, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x61, 0x87, 0x95,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x62, 0x2D, 0xC0, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x63, 0x67, 0x77,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x64, 0x0D, 0xA2, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x65, 0x47, 0x59,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x65, 0xED, 0x84, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x67, 0x27, 0x3B,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x67, 0xCD, 0x66, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x69, 0x07, 0x1D,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x69, 0xAD, 0x48, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x6A, 0xE6, 0xFF,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x6B, 0x96, 0x65, 0x20, 0x00, 0x00, 0x00, 0x00, 0x6C, 0xD0, 0x1C,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x6D, 0x76, 0x47, 0x20, 0x00, 0x00, 0x00, 0x00, 0x6E, 0xAF, 0xFE,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x6F, 0x56, 0x29, 0x20, 0x00, 0x00, 0x00, 0x00, 0x70, 0x8F, 0xE0,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x71, 0x36, 0x0B, 0x20, 0x00, 0x00, 0x00, 0x00, 0x72, 0x6F, 0xC2,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x73, 0x15, 0xED, 0x20, 0x00, 0x00, 0x00, 0x00, 0x74, 0x4F, 0xA4,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x74, 0xFF, 0x09, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x76, 0x38, 0xC0,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x76, 0xDE, 0xEB, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x78, 0x18, 0xA2,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x78, 0xBE, 0xCD, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x79, 0xF8, 0x84,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x7A, 0x9E, 0xAF, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x7B, 0xD8, 0x66,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x7E, 0x91, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x7D, 0xB8, 0x48,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x5E, 0x73, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x98, 0x2A,
-0x90, 0x01, 0x02, 0x03, 0x02, 0x04, 0x02, 0x05, 0x06, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
+0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
+0x02, 0x04, 0x02, 0xFF, 0xFF, 0x92, 0x4C, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF,
+0xFF, 0x8F, 0x80, 0x00, 0x08, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0x9D, 0x90, 0x01,
+0x0C, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x10, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x14, 0xFF, 0xFF, 0x8F,
+0x80, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x50, 0x53, 0x54, 0x00, 0x50,
+0x44, 0x54, 0x00, 0x50, 0x57, 0x54, 0x00, 0x50, 0x50, 0x54, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9B, 0x00,
+0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x18, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA9, 0x79, 0x4F, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF1, 0x39, 0x80, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x64, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x1B, 0x10, 0x00, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB8, 0x0A, 0xF2, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0xEA, 0x8D, 0x80, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD2, 0x23, 0xF4, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x9D, 0xAE, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD7, 0x1B, 0x59, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xD8, 0x91, 0xB4, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xDB, 0x00, 0x07, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xDB, 0xC0, 0x73, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xDC, 0xDE, 0xB3, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xDD, 0xA9, 0xAC, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xDE, 0xBE, 0x95, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0x89, 0x8E, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xE2, 0x7E, 0x4B, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE3, 0x49, 0x52, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xE4, 0x5E, 0x2D, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE5, 0x29, 0x34, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xE6, 0x47, 0x4A, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xE7, 0x12, 0x51, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xE8, 0x27, 0x2C, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xE8, 0xF2, 0x33, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xEA, 0x07, 0x0E, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xEA, 0xD2, 0x15, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xEB, 0xE6, 0xF0, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xEC, 0xB1, 0xF7, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xED, 0xC6, 0xD2, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xEE, 0x91, 0xD9, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x0B, 0xE0, 0xAF, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x0C, 0xD9, 0xCD, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x0D, 0xC0, 0x91, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x0E, 0xB9, 0xAF, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x0F, 0xA9, 0xAE, 0x20, 0x00, 0x00, 0x00, 0x00, 0x10, 0x99, 0x91, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x11, 0x89, 0x90, 0x20, 0x00, 0x00, 0x00, 0x00, 0x12, 0x79, 0x73, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x13, 0x69, 0x72, 0x20, 0x00, 0x00, 0x00, 0x00, 0x14, 0x59, 0x55, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x15, 0x49, 0x54, 0x20, 0x00, 0x00, 0x00, 0x00, 0x16, 0x39, 0x37, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x17, 0x29, 0x36, 0x20, 0x00, 0x00, 0x00, 0x00, 0x18, 0x22, 0x53, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x19, 0x09, 0x18, 0x20, 0x00, 0x00, 0x00, 0x00, 0x1A, 0x02, 0x35, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x1A, 0xF2, 0x34, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xE2, 0x17, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x1C, 0xD2, 0x16, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC1, 0xF9, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x1E, 0xB1, 0xF8, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA1, 0xDB, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x20, 0x76, 0x2B, 0x20, 0x00, 0x00, 0x00, 0x00, 0x21, 0x81, 0xBD, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x22, 0x56, 0x0D, 0x20, 0x00, 0x00, 0x00, 0x00, 0x23, 0x6A, 0xDA, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x24, 0x35, 0xEF, 0x20, 0x00, 0x00, 0x00, 0x00, 0x25, 0x4A, 0xBC, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x26, 0x15, 0xD1, 0x20, 0x00, 0x00, 0x00, 0x00, 0x27, 0x2A, 0x9E, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x27, 0xFE, 0xED, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x29, 0x0A, 0x80, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x29, 0xDE, 0xCF, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xEA, 0x62, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x2B, 0xBE, 0xB1, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xD3, 0x7E, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x2D, 0x9E, 0x93, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x2E, 0xB3, 0x60, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x2F, 0x7E, 0x75, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x30, 0x93, 0x42, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x31, 0x67, 0x92, 0x20, 0x00, 0x00, 0x00, 0x00, 0x32, 0x73, 0x24, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x33, 0x47, 0x74, 0x20, 0x00, 0x00, 0x00, 0x00, 0x34, 0x53, 0x06, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x35, 0x27, 0x56, 0x20, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0xE8, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x37, 0x07, 0x38, 0x20, 0x00, 0x00, 0x00, 0x00, 0x38, 0x1C, 0x05, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x38, 0xE7, 0x1A, 0x20, 0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0xE7, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x3A, 0xC6, 0xFC, 0x20, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xDB, 0xC9, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x3C, 0xB0, 0x18, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0xAB, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x3E, 0x8F, 0xFA, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x8D, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x40, 0x6F, 0xDC, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0xA9, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x42, 0x4F, 0xBE, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x8B, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x44, 0x2F, 0xA0, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x45, 0x44, 0x6D, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x46, 0x0F, 0x82, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x47, 0x24, 0x4F, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x47, 0xF8, 0x9F, 0x20, 0x00, 0x00, 0x00, 0x00, 0x49, 0x04, 0x31, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x49, 0xD8, 0x81, 0x20, 0x00, 0x00, 0x00, 0x00, 0x4A, 0xE4, 0x13, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x4B, 0x9C, 0xB3, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x4C, 0xD6, 0x6A, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x4D, 0x7C, 0x95, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x4E, 0xB6, 0x4C, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x4F, 0x5C, 0x77, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x50, 0x96, 0x2E, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x51, 0x3C, 0x59, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x52, 0x76, 0x10, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x53, 0x1C, 0x3B, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x54, 0x55, 0xF2, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x54, 0xFC, 0x1D, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x56, 0x35, 0xD4, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x56, 0xE5, 0x3A, 0x20, 0x00, 0x00, 0x00, 0x00, 0x58, 0x1E, 0xF1, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x58, 0xC5, 0x1C, 0x20, 0x00, 0x00, 0x00, 0x00, 0x59, 0xFE, 0xD3, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x5A, 0xA4, 0xFE, 0x20, 0x00, 0x00, 0x00, 0x00, 0x5B, 0xDE, 0xB5, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x5C, 0x84, 0xE0, 0x20, 0x00, 0x00, 0x00, 0x00, 0x5D, 0xBE, 0x97, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x5E, 0x64, 0xC2, 0x20, 0x00, 0x00, 0x00, 0x00, 0x5F, 0x9E, 0x79, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x60, 0x4D, 0xDE, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x61, 0x87, 0x95, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x62, 0x2D, 0xC0, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x63, 0x67, 0x77, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x64, 0x0D, 0xA2, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x65, 0x47, 0x59, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x65, 0xED, 0x84, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x67, 0x27, 0x3B, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x67, 0xCD, 0x66, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x69, 0x07, 0x1D, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x69, 0xAD, 0x48, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x6A, 0xE6, 0xFF, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x6B, 0x96, 0x65, 0x20, 0x00, 0x00, 0x00, 0x00, 0x6C, 0xD0, 0x1C, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x6D, 0x76, 0x47, 0x20, 0x00, 0x00, 0x00, 0x00, 0x6E, 0xAF, 0xFE, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x6F, 0x56, 0x29, 0x20, 0x00, 0x00, 0x00, 0x00, 0x70, 0x8F, 0xE0, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x71, 0x36, 0x0B, 0x20, 0x00, 0x00, 0x00, 0x00, 0x72, 0x6F, 0xC2, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x73, 0x15, 0xED, 0x20, 0x00, 0x00, 0x00, 0x00, 0x74, 0x4F, 0xA4, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x74, 0xFF, 0x09, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x76, 0x38, 0xC0, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x76, 0xDE, 0xEB, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x78, 0x18, 0xA2, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x78, 0xBE, 0xCD, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x79, 0xF8, 0x84, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x7A, 0x9E, 0xAF, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x7B, 0xD8, 0x66, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x7C, 0x7E, 0x91, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x7D, 0xB8, 0x48, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x7E, 0x5E, 0x73, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x98, 0x2A, 0x90, 0x01,
+0x02, 0x03, 0x02, 0x04, 0x02, 0x05, 0x06, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
@@ -38610,15 +39116,15 @@
 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
-0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0xFF, 0xFF, 0x92, 0x4C, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90,
-0x00, 0x04, 0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x08, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF,
-0x9D, 0x90, 0x01, 0x0C, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x10, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x14,
-0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x50, 0x53,
-0x54, 0x00, 0x50, 0x44, 0x54, 0x00, 0x50, 0x57, 0x54, 0x00, 0x50, 0x50, 0x54, 0x00, 0x00, 0x01,
-0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0A, 0x50,
-0x53, 0x54, 0x38, 0x50, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D, 0x31,
-0x31, 0x2E, 0x31, 0x2E, 0x30, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 
+0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0xFF, 0xFF, 0x92, 0x4C, 0x00, 0x00,
+0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x08, 0xFF, 0xFF, 0x9D, 0x90,
+0x00, 0x04, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x0C, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x10, 0xFF, 0xFF,
+0x9D, 0x90, 0x01, 0x14, 0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53,
+0x54, 0x00, 0x50, 0x53, 0x54, 0x00, 0x50, 0x44, 0x54, 0x00, 0x50, 0x57, 0x54, 0x00, 0x50, 0x50,
+0x54, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
+0x01, 0x00, 0x0A, 0x50, 0x53, 0x54, 0x38, 0x50, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E,
+0x30, 0x2C, 0x4D, 0x31, 0x31, 0x2E, 0x31, 0x2E, 0x30, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 
 /* America/Santarem */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x42, 0x52, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -40072,45 +40578,46 @@
 /* America/Tijuana */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x4D, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x95, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x18, 0xA5, 0xB6, 0xE8, 0x70,
-0xA9, 0x79, 0x4F, 0x70, 0xAF, 0xF2, 0x7C, 0xF0, 0xB6, 0x66, 0x64, 0x70, 0xB7, 0x1B, 0x10, 0x00,
-0xB8, 0x0A, 0xF2, 0xF0, 0xCB, 0xEA, 0x8D, 0x80, 0xD2, 0x23, 0xF4, 0x70, 0xD2, 0x99, 0xBA, 0x70,
-0xD7, 0x1B, 0x59, 0x00, 0xD8, 0x91, 0xB4, 0xF0, 0xE2, 0x7E, 0x4B, 0x90, 0xE3, 0x49, 0x52, 0x90,
-0xE4, 0x5E, 0x2D, 0x90, 0xE5, 0x29, 0x34, 0x90, 0xE6, 0x47, 0x4A, 0x10, 0xE7, 0x12, 0x51, 0x10,
-0xE8, 0x27, 0x2C, 0x10, 0xE8, 0xF2, 0x33, 0x10, 0xEA, 0x07, 0x0E, 0x10, 0xEA, 0xD2, 0x15, 0x10,
-0xEB, 0xE6, 0xF0, 0x10, 0xEC, 0xB1, 0xF7, 0x10, 0xED, 0xC6, 0xD2, 0x10, 0xEE, 0x91, 0xD9, 0x10,
-0x0B, 0xE0, 0xAF, 0xA0, 0x0C, 0xD9, 0xCD, 0x10, 0x0D, 0xC0, 0x91, 0xA0, 0x0E, 0xB9, 0xAF, 0x10,
-0x0F, 0xA9, 0xAE, 0x20, 0x10, 0x99, 0x91, 0x10, 0x11, 0x89, 0x90, 0x20, 0x12, 0x79, 0x73, 0x10,
-0x13, 0x69, 0x72, 0x20, 0x14, 0x59, 0x55, 0x10, 0x15, 0x49, 0x54, 0x20, 0x16, 0x39, 0x37, 0x10,
-0x17, 0x29, 0x36, 0x20, 0x18, 0x22, 0x53, 0x90, 0x19, 0x09, 0x18, 0x20, 0x1A, 0x02, 0x35, 0x90,
-0x1A, 0xF2, 0x34, 0xA0, 0x1B, 0xE2, 0x17, 0x90, 0x1C, 0xD2, 0x16, 0xA0, 0x1D, 0xC1, 0xF9, 0x90,
-0x1E, 0xB1, 0xF8, 0xA0, 0x1F, 0xA1, 0xDB, 0x90, 0x20, 0x76, 0x2B, 0x20, 0x21, 0x81, 0xBD, 0x90,
-0x22, 0x56, 0x0D, 0x20, 0x23, 0x6A, 0xDA, 0x10, 0x24, 0x35, 0xEF, 0x20, 0x25, 0x4A, 0xBC, 0x10,
-0x26, 0x15, 0xD1, 0x20, 0x27, 0x2A, 0x9E, 0x10, 0x27, 0xFE, 0xED, 0xA0, 0x29, 0x0A, 0x80, 0x10,
-0x29, 0xDE, 0xCF, 0xA0, 0x2A, 0xEA, 0x62, 0x10, 0x2B, 0xBE, 0xB1, 0xA0, 0x2C, 0xD3, 0x7E, 0x90,
-0x2D, 0x9E, 0x93, 0xA0, 0x2E, 0xB3, 0x60, 0x90, 0x2F, 0x7E, 0x75, 0xA0, 0x30, 0x93, 0x42, 0x90,
-0x31, 0x67, 0x92, 0x20, 0x32, 0x73, 0x24, 0x90, 0x33, 0x47, 0x74, 0x20, 0x34, 0x53, 0x06, 0x90,
-0x35, 0x27, 0x56, 0x20, 0x36, 0x32, 0xE8, 0x90, 0x37, 0x07, 0x38, 0x20, 0x38, 0x1C, 0x05, 0x10,
-0x38, 0xE7, 0x1A, 0x20, 0x39, 0xFB, 0xE7, 0x10, 0x3A, 0xC6, 0xFC, 0x20, 0x3B, 0xDB, 0xC9, 0x10,
-0x3C, 0xB0, 0x18, 0xA0, 0x3D, 0xBB, 0xAB, 0x10, 0x3E, 0x8F, 0xFA, 0xA0, 0x3F, 0x9B, 0x8D, 0x10,
-0x40, 0x6F, 0xDC, 0xA0, 0x41, 0x84, 0xA9, 0x90, 0x42, 0x4F, 0xBE, 0xA0, 0x43, 0x64, 0x8B, 0x90,
-0x44, 0x2F, 0xA0, 0xA0, 0x45, 0x44, 0x6D, 0x90, 0x46, 0x0F, 0x82, 0xA0, 0x47, 0x24, 0x4F, 0x90,
-0x47, 0xF8, 0x9F, 0x20, 0x49, 0x04, 0x31, 0x90, 0x49, 0xD8, 0x81, 0x20, 0x4A, 0xE4, 0x13, 0x90,
-0x4B, 0x9C, 0xB3, 0xA0, 0x4C, 0xD6, 0x6A, 0x90, 0x4D, 0x7C, 0x95, 0xA0, 0x4E, 0xB6, 0x4C, 0x90,
-0x4F, 0x5C, 0x77, 0xA0, 0x50, 0x96, 0x2E, 0x90, 0x51, 0x3C, 0x59, 0xA0, 0x52, 0x76, 0x10, 0x90,
-0x53, 0x1C, 0x3B, 0xA0, 0x54, 0x55, 0xF2, 0x90, 0x54, 0xFC, 0x1D, 0xA0, 0x56, 0x35, 0xD4, 0x90,
-0x56, 0xE5, 0x3A, 0x20, 0x58, 0x1E, 0xF1, 0x10, 0x58, 0xC5, 0x1C, 0x20, 0x59, 0xFE, 0xD3, 0x10,
-0x5A, 0xA4, 0xFE, 0x20, 0x5B, 0xDE, 0xB5, 0x10, 0x5C, 0x84, 0xE0, 0x20, 0x5D, 0xBE, 0x97, 0x10,
-0x5E, 0x64, 0xC2, 0x20, 0x5F, 0x9E, 0x79, 0x10, 0x60, 0x4D, 0xDE, 0xA0, 0x61, 0x87, 0x95, 0x90,
-0x62, 0x2D, 0xC0, 0xA0, 0x63, 0x67, 0x77, 0x90, 0x64, 0x0D, 0xA2, 0xA0, 0x65, 0x47, 0x59, 0x90,
-0x65, 0xED, 0x84, 0xA0, 0x67, 0x27, 0x3B, 0x90, 0x67, 0xCD, 0x66, 0xA0, 0x69, 0x07, 0x1D, 0x90,
-0x69, 0xAD, 0x48, 0xA0, 0x6A, 0xE6, 0xFF, 0x90, 0x6B, 0x96, 0x65, 0x20, 0x6C, 0xD0, 0x1C, 0x10,
-0x6D, 0x76, 0x47, 0x20, 0x6E, 0xAF, 0xFE, 0x10, 0x6F, 0x56, 0x29, 0x20, 0x70, 0x8F, 0xE0, 0x10,
-0x71, 0x36, 0x0B, 0x20, 0x72, 0x6F, 0xC2, 0x10, 0x73, 0x15, 0xED, 0x20, 0x74, 0x4F, 0xA4, 0x10,
-0x74, 0xFF, 0x09, 0xA0, 0x76, 0x38, 0xC0, 0x90, 0x76, 0xDE, 0xEB, 0xA0, 0x78, 0x18, 0xA2, 0x90,
-0x78, 0xBE, 0xCD, 0xA0, 0x79, 0xF8, 0x84, 0x90, 0x7A, 0x9E, 0xAF, 0xA0, 0x7B, 0xD8, 0x66, 0x90,
-0x7C, 0x7E, 0x91, 0xA0, 0x7D, 0xB8, 0x48, 0x90, 0x7E, 0x5E, 0x73, 0xA0, 0x7F, 0x98, 0x2A, 0x90,
-0x01, 0x02, 0x03, 0x02, 0x04, 0x02, 0x05, 0x06, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
+0x00, 0x00, 0x00, 0x9B, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x18, 0xA5, 0xB6, 0xE8, 0x70,
+0xA9, 0x79, 0x4F, 0x70, 0xAF, 0xF1, 0x39, 0x80, 0xB6, 0x66, 0x64, 0x70, 0xB7, 0x1B, 0x10, 0x00,
+0xB8, 0x0A, 0xF2, 0xF0, 0xCB, 0xEA, 0x8D, 0x80, 0xD2, 0x23, 0xF4, 0x70, 0xD2, 0x9D, 0xAE, 0xF0,
+0xD7, 0x1B, 0x59, 0x00, 0xD8, 0x91, 0xB4, 0xF0, 0xDB, 0x00, 0x07, 0x00, 0xDB, 0xC0, 0x73, 0xF0,
+0xDC, 0xDE, 0xB3, 0xA0, 0xDD, 0xA9, 0xAC, 0x90, 0xDE, 0xBE, 0x95, 0xA0, 0xDF, 0x89, 0x8E, 0x90,
+0xE2, 0x7E, 0x4B, 0x90, 0xE3, 0x49, 0x52, 0x90, 0xE4, 0x5E, 0x2D, 0x90, 0xE5, 0x29, 0x34, 0x90,
+0xE6, 0x47, 0x4A, 0x10, 0xE7, 0x12, 0x51, 0x10, 0xE8, 0x27, 0x2C, 0x10, 0xE8, 0xF2, 0x33, 0x10,
+0xEA, 0x07, 0x0E, 0x10, 0xEA, 0xD2, 0x15, 0x10, 0xEB, 0xE6, 0xF0, 0x10, 0xEC, 0xB1, 0xF7, 0x10,
+0xED, 0xC6, 0xD2, 0x10, 0xEE, 0x91, 0xD9, 0x10, 0x0B, 0xE0, 0xAF, 0xA0, 0x0C, 0xD9, 0xCD, 0x10,
+0x0D, 0xC0, 0x91, 0xA0, 0x0E, 0xB9, 0xAF, 0x10, 0x0F, 0xA9, 0xAE, 0x20, 0x10, 0x99, 0x91, 0x10,
+0x11, 0x89, 0x90, 0x20, 0x12, 0x79, 0x73, 0x10, 0x13, 0x69, 0x72, 0x20, 0x14, 0x59, 0x55, 0x10,
+0x15, 0x49, 0x54, 0x20, 0x16, 0x39, 0x37, 0x10, 0x17, 0x29, 0x36, 0x20, 0x18, 0x22, 0x53, 0x90,
+0x19, 0x09, 0x18, 0x20, 0x1A, 0x02, 0x35, 0x90, 0x1A, 0xF2, 0x34, 0xA0, 0x1B, 0xE2, 0x17, 0x90,
+0x1C, 0xD2, 0x16, 0xA0, 0x1D, 0xC1, 0xF9, 0x90, 0x1E, 0xB1, 0xF8, 0xA0, 0x1F, 0xA1, 0xDB, 0x90,
+0x20, 0x76, 0x2B, 0x20, 0x21, 0x81, 0xBD, 0x90, 0x22, 0x56, 0x0D, 0x20, 0x23, 0x6A, 0xDA, 0x10,
+0x24, 0x35, 0xEF, 0x20, 0x25, 0x4A, 0xBC, 0x10, 0x26, 0x15, 0xD1, 0x20, 0x27, 0x2A, 0x9E, 0x10,
+0x27, 0xFE, 0xED, 0xA0, 0x29, 0x0A, 0x80, 0x10, 0x29, 0xDE, 0xCF, 0xA0, 0x2A, 0xEA, 0x62, 0x10,
+0x2B, 0xBE, 0xB1, 0xA0, 0x2C, 0xD3, 0x7E, 0x90, 0x2D, 0x9E, 0x93, 0xA0, 0x2E, 0xB3, 0x60, 0x90,
+0x2F, 0x7E, 0x75, 0xA0, 0x30, 0x93, 0x42, 0x90, 0x31, 0x67, 0x92, 0x20, 0x32, 0x73, 0x24, 0x90,
+0x33, 0x47, 0x74, 0x20, 0x34, 0x53, 0x06, 0x90, 0x35, 0x27, 0x56, 0x20, 0x36, 0x32, 0xE8, 0x90,
+0x37, 0x07, 0x38, 0x20, 0x38, 0x1C, 0x05, 0x10, 0x38, 0xE7, 0x1A, 0x20, 0x39, 0xFB, 0xE7, 0x10,
+0x3A, 0xC6, 0xFC, 0x20, 0x3B, 0xDB, 0xC9, 0x10, 0x3C, 0xB0, 0x18, 0xA0, 0x3D, 0xBB, 0xAB, 0x10,
+0x3E, 0x8F, 0xFA, 0xA0, 0x3F, 0x9B, 0x8D, 0x10, 0x40, 0x6F, 0xDC, 0xA0, 0x41, 0x84, 0xA9, 0x90,
+0x42, 0x4F, 0xBE, 0xA0, 0x43, 0x64, 0x8B, 0x90, 0x44, 0x2F, 0xA0, 0xA0, 0x45, 0x44, 0x6D, 0x90,
+0x46, 0x0F, 0x82, 0xA0, 0x47, 0x24, 0x4F, 0x90, 0x47, 0xF8, 0x9F, 0x20, 0x49, 0x04, 0x31, 0x90,
+0x49, 0xD8, 0x81, 0x20, 0x4A, 0xE4, 0x13, 0x90, 0x4B, 0x9C, 0xB3, 0xA0, 0x4C, 0xD6, 0x6A, 0x90,
+0x4D, 0x7C, 0x95, 0xA0, 0x4E, 0xB6, 0x4C, 0x90, 0x4F, 0x5C, 0x77, 0xA0, 0x50, 0x96, 0x2E, 0x90,
+0x51, 0x3C, 0x59, 0xA0, 0x52, 0x76, 0x10, 0x90, 0x53, 0x1C, 0x3B, 0xA0, 0x54, 0x55, 0xF2, 0x90,
+0x54, 0xFC, 0x1D, 0xA0, 0x56, 0x35, 0xD4, 0x90, 0x56, 0xE5, 0x3A, 0x20, 0x58, 0x1E, 0xF1, 0x10,
+0x58, 0xC5, 0x1C, 0x20, 0x59, 0xFE, 0xD3, 0x10, 0x5A, 0xA4, 0xFE, 0x20, 0x5B, 0xDE, 0xB5, 0x10,
+0x5C, 0x84, 0xE0, 0x20, 0x5D, 0xBE, 0x97, 0x10, 0x5E, 0x64, 0xC2, 0x20, 0x5F, 0x9E, 0x79, 0x10,
+0x60, 0x4D, 0xDE, 0xA0, 0x61, 0x87, 0x95, 0x90, 0x62, 0x2D, 0xC0, 0xA0, 0x63, 0x67, 0x77, 0x90,
+0x64, 0x0D, 0xA2, 0xA0, 0x65, 0x47, 0x59, 0x90, 0x65, 0xED, 0x84, 0xA0, 0x67, 0x27, 0x3B, 0x90,
+0x67, 0xCD, 0x66, 0xA0, 0x69, 0x07, 0x1D, 0x90, 0x69, 0xAD, 0x48, 0xA0, 0x6A, 0xE6, 0xFF, 0x90,
+0x6B, 0x96, 0x65, 0x20, 0x6C, 0xD0, 0x1C, 0x10, 0x6D, 0x76, 0x47, 0x20, 0x6E, 0xAF, 0xFE, 0x10,
+0x6F, 0x56, 0x29, 0x20, 0x70, 0x8F, 0xE0, 0x10, 0x71, 0x36, 0x0B, 0x20, 0x72, 0x6F, 0xC2, 0x10,
+0x73, 0x15, 0xED, 0x20, 0x74, 0x4F, 0xA4, 0x10, 0x74, 0xFF, 0x09, 0xA0, 0x76, 0x38, 0xC0, 0x90,
+0x76, 0xDE, 0xEB, 0xA0, 0x78, 0x18, 0xA2, 0x90, 0x78, 0xBE, 0xCD, 0xA0, 0x79, 0xF8, 0x84, 0x90,
+0x7A, 0x9E, 0xAF, 0xA0, 0x7B, 0xD8, 0x66, 0x90, 0x7C, 0x7E, 0x91, 0xA0, 0x7D, 0xB8, 0x48, 0x90,
+0x7E, 0x5E, 0x73, 0xA0, 0x7F, 0x98, 0x2A, 0x90, 0x01, 0x02, 0x03, 0x02, 0x04, 0x02, 0x05, 0x06,
 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
@@ -40119,90 +40626,94 @@
 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
-0x02, 0x04, 0x02, 0x04, 0x02, 0xFF, 0xFF, 0x92, 0x4C, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x00,
-0x04, 0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x08, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0x9D,
-0x90, 0x01, 0x0C, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x10, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x14, 0xFF,
-0xFF, 0x8F, 0x80, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x50, 0x53, 0x54,
-0x00, 0x50, 0x44, 0x54, 0x00, 0x50, 0x57, 0x54, 0x00, 0x50, 0x50, 0x54, 0x00, 0x00, 0x01, 0x00,
-0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x54, 0x5A, 0x69,
-0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x95, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x18, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8,
-0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xA9, 0x79, 0x4F, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF2, 0x7C,
-0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x64, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x1B, 0x10,
-0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0x0A, 0xF2, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0xEA, 0x8D,
-0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x23, 0xF4, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x99, 0xBA,
-0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD7, 0x1B, 0x59, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xD8, 0x91, 0xB4,
-0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE2, 0x7E, 0x4B, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE3, 0x49, 0x52,
-0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE4, 0x5E, 0x2D, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE5, 0x29, 0x34,
-0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE6, 0x47, 0x4A, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xE7, 0x12, 0x51,
-0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xE8, 0x27, 0x2C, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xE8, 0xF2, 0x33,
-0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xEA, 0x07, 0x0E, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xEA, 0xD2, 0x15,
-0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xEB, 0xE6, 0xF0, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xEC, 0xB1, 0xF7,
-0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xED, 0xC6, 0xD2, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xEE, 0x91, 0xD9,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x0B, 0xE0, 0xAF, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x0C, 0xD9, 0xCD,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x0D, 0xC0, 0x91, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x0E, 0xB9, 0xAF,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xA9, 0xAE, 0x20, 0x00, 0x00, 0x00, 0x00, 0x10, 0x99, 0x91,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x11, 0x89, 0x90, 0x20, 0x00, 0x00, 0x00, 0x00, 0x12, 0x79, 0x73,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x13, 0x69, 0x72, 0x20, 0x00, 0x00, 0x00, 0x00, 0x14, 0x59, 0x55,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x15, 0x49, 0x54, 0x20, 0x00, 0x00, 0x00, 0x00, 0x16, 0x39, 0x37,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x17, 0x29, 0x36, 0x20, 0x00, 0x00, 0x00, 0x00, 0x18, 0x22, 0x53,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x19, 0x09, 0x18, 0x20, 0x00, 0x00, 0x00, 0x00, 0x1A, 0x02, 0x35,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xF2, 0x34, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xE2, 0x17,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xD2, 0x16, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC1, 0xF9,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x1E, 0xB1, 0xF8, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA1, 0xDB,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x20, 0x76, 0x2B, 0x20, 0x00, 0x00, 0x00, 0x00, 0x21, 0x81, 0xBD,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x22, 0x56, 0x0D, 0x20, 0x00, 0x00, 0x00, 0x00, 0x23, 0x6A, 0xDA,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x24, 0x35, 0xEF, 0x20, 0x00, 0x00, 0x00, 0x00, 0x25, 0x4A, 0xBC,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x26, 0x15, 0xD1, 0x20, 0x00, 0x00, 0x00, 0x00, 0x27, 0x2A, 0x9E,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x27, 0xFE, 0xED, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x29, 0x0A, 0x80,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x29, 0xDE, 0xCF, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xEA, 0x62,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xBE, 0xB1, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xD3, 0x7E,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x9E, 0x93, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x2E, 0xB3, 0x60,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x7E, 0x75, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x30, 0x93, 0x42,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x92, 0x20, 0x00, 0x00, 0x00, 0x00, 0x32, 0x73, 0x24,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x74, 0x20, 0x00, 0x00, 0x00, 0x00, 0x34, 0x53, 0x06,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x56, 0x20, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0xE8,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x37, 0x07, 0x38, 0x20, 0x00, 0x00, 0x00, 0x00, 0x38, 0x1C, 0x05,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x38, 0xE7, 0x1A, 0x20, 0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0xE7,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xC6, 0xFC, 0x20, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xDB, 0xC9,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xB0, 0x18, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0xAB,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x8F, 0xFA, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x8D,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x40, 0x6F, 0xDC, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0xA9,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x42, 0x4F, 0xBE, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x8B,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x44, 0x2F, 0xA0, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x45, 0x44, 0x6D,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x46, 0x0F, 0x82, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x47, 0x24, 0x4F,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x47, 0xF8, 0x9F, 0x20, 0x00, 0x00, 0x00, 0x00, 0x49, 0x04, 0x31,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x49, 0xD8, 0x81, 0x20, 0x00, 0x00, 0x00, 0x00, 0x4A, 0xE4, 0x13,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x4B, 0x9C, 0xB3, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x4C, 0xD6, 0x6A,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x7C, 0x95, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x4E, 0xB6, 0x4C,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x5C, 0x77, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x50, 0x96, 0x2E,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x51, 0x3C, 0x59, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x52, 0x76, 0x10,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x53, 0x1C, 0x3B, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x54, 0x55, 0xF2,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x54, 0xFC, 0x1D, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x56, 0x35, 0xD4,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x56, 0xE5, 0x3A, 0x20, 0x00, 0x00, 0x00, 0x00, 0x58, 0x1E, 0xF1,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x58, 0xC5, 0x1C, 0x20, 0x00, 0x00, 0x00, 0x00, 0x59, 0xFE, 0xD3,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xA4, 0xFE, 0x20, 0x00, 0x00, 0x00, 0x00, 0x5B, 0xDE, 0xB5,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x5C, 0x84, 0xE0, 0x20, 0x00, 0x00, 0x00, 0x00, 0x5D, 0xBE, 0x97,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x64, 0xC2, 0x20, 0x00, 0x00, 0x00, 0x00, 0x5F, 0x9E, 0x79,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x60, 0x4D, 0xDE, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x61, 0x87, 0x95,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x62, 0x2D, 0xC0, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x63, 0x67, 0x77,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x64, 0x0D, 0xA2, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x65, 0x47, 0x59,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x65, 0xED, 0x84, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x67, 0x27, 0x3B,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x67, 0xCD, 0x66, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x69, 0x07, 0x1D,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x69, 0xAD, 0x48, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x6A, 0xE6, 0xFF,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x6B, 0x96, 0x65, 0x20, 0x00, 0x00, 0x00, 0x00, 0x6C, 0xD0, 0x1C,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x6D, 0x76, 0x47, 0x20, 0x00, 0x00, 0x00, 0x00, 0x6E, 0xAF, 0xFE,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x6F, 0x56, 0x29, 0x20, 0x00, 0x00, 0x00, 0x00, 0x70, 0x8F, 0xE0,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x71, 0x36, 0x0B, 0x20, 0x00, 0x00, 0x00, 0x00, 0x72, 0x6F, 0xC2,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x73, 0x15, 0xED, 0x20, 0x00, 0x00, 0x00, 0x00, 0x74, 0x4F, 0xA4,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x74, 0xFF, 0x09, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x76, 0x38, 0xC0,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x76, 0xDE, 0xEB, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x78, 0x18, 0xA2,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x78, 0xBE, 0xCD, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x79, 0xF8, 0x84,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x7A, 0x9E, 0xAF, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x7B, 0xD8, 0x66,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x7E, 0x91, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x7D, 0xB8, 0x48,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x5E, 0x73, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x98, 0x2A,
-0x90, 0x01, 0x02, 0x03, 0x02, 0x04, 0x02, 0x05, 0x06, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
+0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
+0x02, 0x04, 0x02, 0xFF, 0xFF, 0x92, 0x4C, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF,
+0xFF, 0x8F, 0x80, 0x00, 0x08, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0x9D, 0x90, 0x01,
+0x0C, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x10, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x14, 0xFF, 0xFF, 0x8F,
+0x80, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x50, 0x53, 0x54, 0x00, 0x50,
+0x44, 0x54, 0x00, 0x50, 0x57, 0x54, 0x00, 0x50, 0x50, 0x54, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9B, 0x00,
+0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x18, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA9, 0x79, 0x4F, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF1, 0x39, 0x80, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x64, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x1B, 0x10, 0x00, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB8, 0x0A, 0xF2, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0xEA, 0x8D, 0x80, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD2, 0x23, 0xF4, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x9D, 0xAE, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD7, 0x1B, 0x59, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xD8, 0x91, 0xB4, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xDB, 0x00, 0x07, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xDB, 0xC0, 0x73, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xDC, 0xDE, 0xB3, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xDD, 0xA9, 0xAC, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xDE, 0xBE, 0x95, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0x89, 0x8E, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xE2, 0x7E, 0x4B, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE3, 0x49, 0x52, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xE4, 0x5E, 0x2D, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE5, 0x29, 0x34, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xE6, 0x47, 0x4A, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xE7, 0x12, 0x51, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xE8, 0x27, 0x2C, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xE8, 0xF2, 0x33, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xEA, 0x07, 0x0E, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xEA, 0xD2, 0x15, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xEB, 0xE6, 0xF0, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xEC, 0xB1, 0xF7, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xED, 0xC6, 0xD2, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xEE, 0x91, 0xD9, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x0B, 0xE0, 0xAF, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x0C, 0xD9, 0xCD, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x0D, 0xC0, 0x91, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x0E, 0xB9, 0xAF, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x0F, 0xA9, 0xAE, 0x20, 0x00, 0x00, 0x00, 0x00, 0x10, 0x99, 0x91, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x11, 0x89, 0x90, 0x20, 0x00, 0x00, 0x00, 0x00, 0x12, 0x79, 0x73, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x13, 0x69, 0x72, 0x20, 0x00, 0x00, 0x00, 0x00, 0x14, 0x59, 0x55, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x15, 0x49, 0x54, 0x20, 0x00, 0x00, 0x00, 0x00, 0x16, 0x39, 0x37, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x17, 0x29, 0x36, 0x20, 0x00, 0x00, 0x00, 0x00, 0x18, 0x22, 0x53, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x19, 0x09, 0x18, 0x20, 0x00, 0x00, 0x00, 0x00, 0x1A, 0x02, 0x35, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x1A, 0xF2, 0x34, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xE2, 0x17, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x1C, 0xD2, 0x16, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC1, 0xF9, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x1E, 0xB1, 0xF8, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA1, 0xDB, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x20, 0x76, 0x2B, 0x20, 0x00, 0x00, 0x00, 0x00, 0x21, 0x81, 0xBD, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x22, 0x56, 0x0D, 0x20, 0x00, 0x00, 0x00, 0x00, 0x23, 0x6A, 0xDA, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x24, 0x35, 0xEF, 0x20, 0x00, 0x00, 0x00, 0x00, 0x25, 0x4A, 0xBC, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x26, 0x15, 0xD1, 0x20, 0x00, 0x00, 0x00, 0x00, 0x27, 0x2A, 0x9E, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x27, 0xFE, 0xED, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x29, 0x0A, 0x80, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x29, 0xDE, 0xCF, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xEA, 0x62, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x2B, 0xBE, 0xB1, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xD3, 0x7E, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x2D, 0x9E, 0x93, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x2E, 0xB3, 0x60, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x2F, 0x7E, 0x75, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x30, 0x93, 0x42, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x31, 0x67, 0x92, 0x20, 0x00, 0x00, 0x00, 0x00, 0x32, 0x73, 0x24, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x33, 0x47, 0x74, 0x20, 0x00, 0x00, 0x00, 0x00, 0x34, 0x53, 0x06, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x35, 0x27, 0x56, 0x20, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0xE8, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x37, 0x07, 0x38, 0x20, 0x00, 0x00, 0x00, 0x00, 0x38, 0x1C, 0x05, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x38, 0xE7, 0x1A, 0x20, 0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0xE7, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x3A, 0xC6, 0xFC, 0x20, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xDB, 0xC9, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x3C, 0xB0, 0x18, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0xAB, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x3E, 0x8F, 0xFA, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x8D, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x40, 0x6F, 0xDC, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0xA9, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x42, 0x4F, 0xBE, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x8B, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x44, 0x2F, 0xA0, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x45, 0x44, 0x6D, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x46, 0x0F, 0x82, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x47, 0x24, 0x4F, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x47, 0xF8, 0x9F, 0x20, 0x00, 0x00, 0x00, 0x00, 0x49, 0x04, 0x31, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x49, 0xD8, 0x81, 0x20, 0x00, 0x00, 0x00, 0x00, 0x4A, 0xE4, 0x13, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x4B, 0x9C, 0xB3, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x4C, 0xD6, 0x6A, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x4D, 0x7C, 0x95, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x4E, 0xB6, 0x4C, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x4F, 0x5C, 0x77, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x50, 0x96, 0x2E, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x51, 0x3C, 0x59, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x52, 0x76, 0x10, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x53, 0x1C, 0x3B, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x54, 0x55, 0xF2, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x54, 0xFC, 0x1D, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x56, 0x35, 0xD4, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x56, 0xE5, 0x3A, 0x20, 0x00, 0x00, 0x00, 0x00, 0x58, 0x1E, 0xF1, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x58, 0xC5, 0x1C, 0x20, 0x00, 0x00, 0x00, 0x00, 0x59, 0xFE, 0xD3, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x5A, 0xA4, 0xFE, 0x20, 0x00, 0x00, 0x00, 0x00, 0x5B, 0xDE, 0xB5, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x5C, 0x84, 0xE0, 0x20, 0x00, 0x00, 0x00, 0x00, 0x5D, 0xBE, 0x97, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x5E, 0x64, 0xC2, 0x20, 0x00, 0x00, 0x00, 0x00, 0x5F, 0x9E, 0x79, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x60, 0x4D, 0xDE, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x61, 0x87, 0x95, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x62, 0x2D, 0xC0, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x63, 0x67, 0x77, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x64, 0x0D, 0xA2, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x65, 0x47, 0x59, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x65, 0xED, 0x84, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x67, 0x27, 0x3B, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x67, 0xCD, 0x66, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x69, 0x07, 0x1D, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x69, 0xAD, 0x48, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x6A, 0xE6, 0xFF, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x6B, 0x96, 0x65, 0x20, 0x00, 0x00, 0x00, 0x00, 0x6C, 0xD0, 0x1C, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x6D, 0x76, 0x47, 0x20, 0x00, 0x00, 0x00, 0x00, 0x6E, 0xAF, 0xFE, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x6F, 0x56, 0x29, 0x20, 0x00, 0x00, 0x00, 0x00, 0x70, 0x8F, 0xE0, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x71, 0x36, 0x0B, 0x20, 0x00, 0x00, 0x00, 0x00, 0x72, 0x6F, 0xC2, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x73, 0x15, 0xED, 0x20, 0x00, 0x00, 0x00, 0x00, 0x74, 0x4F, 0xA4, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x74, 0xFF, 0x09, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x76, 0x38, 0xC0, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x76, 0xDE, 0xEB, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x78, 0x18, 0xA2, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x78, 0xBE, 0xCD, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x79, 0xF8, 0x84, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x7A, 0x9E, 0xAF, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x7B, 0xD8, 0x66, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x7C, 0x7E, 0x91, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x7D, 0xB8, 0x48, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x7E, 0x5E, 0x73, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x98, 0x2A, 0x90, 0x01,
+0x02, 0x03, 0x02, 0x04, 0x02, 0x05, 0x06, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
@@ -40211,16 +40722,16 @@
 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
-0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0xFF, 0xFF, 0x92, 0x4C, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90,
-0x00, 0x04, 0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x08, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF,
-0x9D, 0x90, 0x01, 0x0C, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x10, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x14,
-0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x50, 0x53,
-0x54, 0x00, 0x50, 0x44, 0x54, 0x00, 0x50, 0x57, 0x54, 0x00, 0x50, 0x50, 0x54, 0x00, 0x00, 0x01,
-0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0A, 0x50,
-0x53, 0x54, 0x38, 0x50, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D, 0x31,
-0x31, 0x2E, 0x31, 0x2E, 0x30, 0x0A, 0x00, 0xBA, 0xF8, 0x95, 0x00, 0x60, 0x1A, 0xDD, 0x00, 0x00,
-0x00, 0x0F, 0x42, 0x61, 0x6A, 0x61, 0x20, 0x43, 0x61, 0x6C, 0x69, 0x66, 0x6F, 0x72, 0x6E, 0x69,
-0x61, 
+0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0xFF, 0xFF, 0x92, 0x4C, 0x00, 0x00,
+0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x08, 0xFF, 0xFF, 0x9D, 0x90,
+0x00, 0x04, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x0C, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x10, 0xFF, 0xFF,
+0x9D, 0x90, 0x01, 0x14, 0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53,
+0x54, 0x00, 0x50, 0x53, 0x54, 0x00, 0x50, 0x44, 0x54, 0x00, 0x50, 0x57, 0x54, 0x00, 0x50, 0x50,
+0x54, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
+0x01, 0x00, 0x0A, 0x50, 0x53, 0x54, 0x38, 0x50, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E,
+0x30, 0x2C, 0x4D, 0x31, 0x31, 0x2E, 0x31, 0x2E, 0x30, 0x0A, 0x00, 0xBA, 0xF8, 0x95, 0x00, 0x60,
+0x1A, 0xDD, 0x00, 0x00, 0x00, 0x0F, 0x42, 0x61, 0x6A, 0x61, 0x20, 0x43, 0x61, 0x6C, 0x69, 0x66,
+0x6F, 0x72, 0x6E, 0x69, 0x61, 
 
 /* America/Toronto */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x43, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -43223,67 +43734,62 @@
 0x79, 0x6B, 0x61, 0x6C, 0x73, 0x6B, 0x79, 
 
 /* Asia/Choibalsan */
-0x50, 0x48, 0x50, 0x32, 0x01, 0x4D, 0x4E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x33, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x14, 0x86, 0xD3, 0xE7, 0x28,
-0x0F, 0x0B, 0xDC, 0x90, 0x18, 0xE9, 0xC8, 0x80, 0x19, 0xDA, 0xEE, 0xE0, 0x1A, 0xCC, 0x3F, 0x70,
-0x1B, 0xBC, 0x22, 0x60, 0x1C, 0xAC, 0x21, 0x70, 0x1D, 0x9C, 0x04, 0x60, 0x1E, 0x8C, 0x03, 0x70,
-0x1F, 0x7B, 0xE6, 0x60, 0x20, 0x6B, 0xE5, 0x70, 0x21, 0x5B, 0xC8, 0x60, 0x22, 0x4B, 0xC7, 0x70,
-0x23, 0x3B, 0xAA, 0x60, 0x24, 0x2B, 0xA9, 0x70, 0x25, 0x1B, 0x8C, 0x60, 0x26, 0x0B, 0x8B, 0x70,
-0x27, 0x04, 0xA8, 0xE0, 0x27, 0xF4, 0xA7, 0xF0, 0x28, 0xE4, 0x8A, 0xE0, 0x29, 0xD4, 0x89, 0xF0,
-0x2A, 0xC4, 0x6C, 0xE0, 0x2B, 0xB4, 0x6B, 0xF0, 0x2C, 0xA4, 0x4E, 0xE0, 0x2D, 0x94, 0x4D, 0xF0,
-0x2E, 0x84, 0x30, 0xE0, 0x2F, 0x74, 0x2F, 0xF0, 0x30, 0x64, 0x12, 0xE0, 0x31, 0x5D, 0x4C, 0x70,
-0x32, 0x4D, 0x2F, 0x60, 0x33, 0x3D, 0x2E, 0x70, 0x34, 0x2D, 0x11, 0x60, 0x35, 0x1D, 0x10, 0x70,
-0x36, 0x0C, 0xF3, 0x60, 0x3A, 0xE9, 0xA5, 0x90, 0x3B, 0xB4, 0x9E, 0x80, 0x3C, 0xA4, 0x9D, 0x90,
-0x3D, 0x94, 0x80, 0x80, 0x3E, 0x84, 0x7F, 0x90, 0x3F, 0x74, 0x62, 0x80, 0x40, 0x64, 0x61, 0x90,
-0x41, 0x54, 0x44, 0x80, 0x42, 0x44, 0x43, 0x90, 0x43, 0x34, 0x26, 0x80, 0x44, 0x24, 0x25, 0x90,
-0x45, 0x1D, 0x43, 0x00, 0x47, 0xEF, 0xAA, 0xF0, 0x55, 0x15, 0x9A, 0xA0, 0x56, 0x05, 0x61, 0x70,
-0x56, 0xF5, 0x7C, 0xA0, 0x57, 0xE5, 0x43, 0x70, 0x01, 0x02, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
-0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
-0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
-0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x02, 0x05, 0x02, 0x05, 0x02, 0x00, 0x00, 0x6B, 0x58, 0x00,
-0x00, 0x00, 0x00, 0x62, 0x70, 0x00, 0x04, 0x00, 0x00, 0x70, 0x80, 0x00, 0x08, 0x00, 0x00, 0x7E,
-0x90, 0x00, 0x0C, 0x00, 0x00, 0x8C, 0xA0, 0x01, 0x10, 0x00, 0x00, 0x7E, 0x90, 0x01, 0x0C, 0x00,
-0x00, 0x70, 0x80, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x2B, 0x30, 0x37, 0x00, 0x2B, 0x30, 0x38,
-0x00, 0x2B, 0x30, 0x39, 0x00, 0x2B, 0x31, 0x30, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x10, 0x86, 0xD3, 0xEE, 0x4C,
+0x0F, 0x0B, 0xDC, 0x90, 0x18, 0xE9, 0xC8, 0x80, 0x19, 0xDA, 0xFC, 0xF0, 0x1A, 0xCC, 0x4D, 0x80,
+0x1B, 0xBC, 0x30, 0x70, 0x1C, 0xAC, 0x2F, 0x80, 0x1D, 0x9C, 0x12, 0x70, 0x1E, 0x8C, 0x11, 0x80,
+0x1F, 0x7B, 0xF4, 0x70, 0x20, 0x6B, 0xF3, 0x80, 0x21, 0x5B, 0xD6, 0x70, 0x22, 0x4B, 0xD5, 0x80,
+0x23, 0x3B, 0xB8, 0x70, 0x24, 0x2B, 0xB7, 0x80, 0x25, 0x1B, 0x9A, 0x70, 0x26, 0x0B, 0x99, 0x80,
+0x27, 0x04, 0xB6, 0xF0, 0x27, 0xF4, 0xB6, 0x00, 0x28, 0xE4, 0x98, 0xF0, 0x29, 0xD4, 0x98, 0x00,
+0x2A, 0xC4, 0x7A, 0xF0, 0x2B, 0xB4, 0x7A, 0x00, 0x2C, 0xA4, 0x5C, 0xF0, 0x2D, 0x94, 0x5C, 0x00,
+0x2E, 0x84, 0x3E, 0xF0, 0x2F, 0x74, 0x3E, 0x00, 0x30, 0x64, 0x20, 0xF0, 0x31, 0x5D, 0x5A, 0x80,
+0x32, 0x4D, 0x3D, 0x70, 0x33, 0x3D, 0x3C, 0x80, 0x34, 0x2D, 0x1F, 0x70, 0x35, 0x1D, 0x1E, 0x80,
+0x36, 0x0D, 0x01, 0x70, 0x3A, 0xE9, 0xB3, 0xA0, 0x3B, 0xB4, 0xAC, 0x90, 0x3C, 0xA4, 0xAB, 0xA0,
+0x3D, 0x94, 0x8E, 0x90, 0x3E, 0x84, 0x8D, 0xA0, 0x3F, 0x74, 0x70, 0x90, 0x40, 0x64, 0x6F, 0xA0,
+0x41, 0x54, 0x52, 0x90, 0x42, 0x44, 0x51, 0xA0, 0x43, 0x34, 0x34, 0x90, 0x44, 0x24, 0x33, 0xA0,
+0x45, 0x1D, 0x51, 0x10, 0x55, 0x15, 0x9A, 0xA0, 0x56, 0x05, 0x61, 0x70, 0x56, 0xF5, 0x7C, 0xA0,
+0x57, 0xE5, 0x43, 0x70, 0x01, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
+0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
+0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
+0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x00, 0x00, 0x64, 0x34, 0x00, 0x00, 0x00, 0x00, 0x62, 0x70,
+0x00, 0x04, 0x00, 0x00, 0x7E, 0x90, 0x01, 0x08, 0x00, 0x00, 0x70, 0x80, 0x00, 0x0C, 0x4C, 0x4D,
+0x54, 0x00, 0x2B, 0x30, 0x37, 0x00, 0x2B, 0x30, 0x39, 0x00, 0x2B, 0x30, 0x38, 0x00, 0x54, 0x5A,
+0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x33, 0x00, 0x00, 0x00,
-0x07, 0x00, 0x00, 0x00, 0x14, 0xFF, 0xFF, 0xFF, 0xFF, 0x86, 0xD3, 0xE7, 0x28, 0x00, 0x00, 0x00,
-0x00, 0x0F, 0x0B, 0xDC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x18, 0xE9, 0xC8, 0x80, 0x00, 0x00, 0x00,
-0x00, 0x19, 0xDA, 0xEE, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xCC, 0x3F, 0x70, 0x00, 0x00, 0x00,
-0x00, 0x1B, 0xBC, 0x22, 0x60, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xAC, 0x21, 0x70, 0x00, 0x00, 0x00,
-0x00, 0x1D, 0x9C, 0x04, 0x60, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x8C, 0x03, 0x70, 0x00, 0x00, 0x00,
-0x00, 0x1F, 0x7B, 0xE6, 0x60, 0x00, 0x00, 0x00, 0x00, 0x20, 0x6B, 0xE5, 0x70, 0x00, 0x00, 0x00,
-0x00, 0x21, 0x5B, 0xC8, 0x60, 0x00, 0x00, 0x00, 0x00, 0x22, 0x4B, 0xC7, 0x70, 0x00, 0x00, 0x00,
-0x00, 0x23, 0x3B, 0xAA, 0x60, 0x00, 0x00, 0x00, 0x00, 0x24, 0x2B, 0xA9, 0x70, 0x00, 0x00, 0x00,
-0x00, 0x25, 0x1B, 0x8C, 0x60, 0x00, 0x00, 0x00, 0x00, 0x26, 0x0B, 0x8B, 0x70, 0x00, 0x00, 0x00,
-0x00, 0x27, 0x04, 0xA8, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x27, 0xF4, 0xA7, 0xF0, 0x00, 0x00, 0x00,
-0x00, 0x28, 0xE4, 0x8A, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x29, 0xD4, 0x89, 0xF0, 0x00, 0x00, 0x00,
-0x00, 0x2A, 0xC4, 0x6C, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xB4, 0x6B, 0xF0, 0x00, 0x00, 0x00,
-0x00, 0x2C, 0xA4, 0x4E, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x94, 0x4D, 0xF0, 0x00, 0x00, 0x00,
-0x00, 0x2E, 0x84, 0x30, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x74, 0x2F, 0xF0, 0x00, 0x00, 0x00,
-0x00, 0x30, 0x64, 0x12, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x31, 0x5D, 0x4C, 0x70, 0x00, 0x00, 0x00,
-0x00, 0x32, 0x4D, 0x2F, 0x60, 0x00, 0x00, 0x00, 0x00, 0x33, 0x3D, 0x2E, 0x70, 0x00, 0x00, 0x00,
-0x00, 0x34, 0x2D, 0x11, 0x60, 0x00, 0x00, 0x00, 0x00, 0x35, 0x1D, 0x10, 0x70, 0x00, 0x00, 0x00,
-0x00, 0x36, 0x0C, 0xF3, 0x60, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xE9, 0xA5, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x3B, 0xB4, 0x9E, 0x80, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xA4, 0x9D, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x3D, 0x94, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x84, 0x7F, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x3F, 0x74, 0x62, 0x80, 0x00, 0x00, 0x00, 0x00, 0x40, 0x64, 0x61, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x41, 0x54, 0x44, 0x80, 0x00, 0x00, 0x00, 0x00, 0x42, 0x44, 0x43, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x43, 0x34, 0x26, 0x80, 0x00, 0x00, 0x00, 0x00, 0x44, 0x24, 0x25, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x45, 0x1D, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x47, 0xEF, 0xAA, 0xF0, 0x00, 0x00, 0x00,
-0x00, 0x55, 0x15, 0x9A, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x56, 0x05, 0x61, 0x70, 0x00, 0x00, 0x00,
-0x00, 0x56, 0xF5, 0x7C, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x57, 0xE5, 0x43, 0x70, 0x01, 0x02, 0x04,
-0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
-0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
-0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x02, 0x05, 0x02, 0x05, 0x02,
-0x00, 0x00, 0x6B, 0x58, 0x00, 0x00, 0x00, 0x00, 0x62, 0x70, 0x00, 0x04, 0x00, 0x00, 0x70, 0x80,
-0x00, 0x08, 0x00, 0x00, 0x7E, 0x90, 0x00, 0x0C, 0x00, 0x00, 0x8C, 0xA0, 0x01, 0x10, 0x00, 0x00,
-0x7E, 0x90, 0x01, 0x0C, 0x00, 0x00, 0x70, 0x80, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x2B, 0x30,
-0x37, 0x00, 0x2B, 0x30, 0x38, 0x00, 0x2B, 0x30, 0x39, 0x00, 0x2B, 0x31, 0x30, 0x00, 0x0A, 0x3C,
-0x2B, 0x30, 0x38, 0x3E, 0x2D, 0x38, 0x0A, 0x00, 0xD2, 0xAC, 0x4A, 0x01, 0xC1, 0x5F, 0x10, 0x00,
-0x00, 0x00, 0x12, 0x44, 0x6F, 0x72, 0x6E, 0x6F, 0x64, 0x2C, 0x20, 0x53, 0x75, 0x6B, 0x68, 0x62,
-0x61, 0x61, 0x74, 0x61, 0x72, 
+0x00, 0x32, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0x86, 0xD3,
+0xEE, 0x4C, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x0B, 0xDC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x18, 0xE9,
+0xC8, 0x80, 0x00, 0x00, 0x00, 0x00, 0x19, 0xDA, 0xFC, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xCC,
+0x4D, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xBC, 0x30, 0x70, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xAC,
+0x2F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1D, 0x9C, 0x12, 0x70, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x8C,
+0x11, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1F, 0x7B, 0xF4, 0x70, 0x00, 0x00, 0x00, 0x00, 0x20, 0x6B,
+0xF3, 0x80, 0x00, 0x00, 0x00, 0x00, 0x21, 0x5B, 0xD6, 0x70, 0x00, 0x00, 0x00, 0x00, 0x22, 0x4B,
+0xD5, 0x80, 0x00, 0x00, 0x00, 0x00, 0x23, 0x3B, 0xB8, 0x70, 0x00, 0x00, 0x00, 0x00, 0x24, 0x2B,
+0xB7, 0x80, 0x00, 0x00, 0x00, 0x00, 0x25, 0x1B, 0x9A, 0x70, 0x00, 0x00, 0x00, 0x00, 0x26, 0x0B,
+0x99, 0x80, 0x00, 0x00, 0x00, 0x00, 0x27, 0x04, 0xB6, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x27, 0xF4,
+0xB6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0xE4, 0x98, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x29, 0xD4,
+0x98, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xC4, 0x7A, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xB4,
+0x7A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xA4, 0x5C, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x94,
+0x5C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2E, 0x84, 0x3E, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x74,
+0x3E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x64, 0x20, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x31, 0x5D,
+0x5A, 0x80, 0x00, 0x00, 0x00, 0x00, 0x32, 0x4D, 0x3D, 0x70, 0x00, 0x00, 0x00, 0x00, 0x33, 0x3D,
+0x3C, 0x80, 0x00, 0x00, 0x00, 0x00, 0x34, 0x2D, 0x1F, 0x70, 0x00, 0x00, 0x00, 0x00, 0x35, 0x1D,
+0x1E, 0x80, 0x00, 0x00, 0x00, 0x00, 0x36, 0x0D, 0x01, 0x70, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xE9,
+0xB3, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xB4, 0xAC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xA4,
+0xAB, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x3D, 0x94, 0x8E, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x84,
+0x8D, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x74, 0x70, 0x90, 0x00, 0x00, 0x00, 0x00, 0x40, 0x64,
+0x6F, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x41, 0x54, 0x52, 0x90, 0x00, 0x00, 0x00, 0x00, 0x42, 0x44,
+0x51, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x43, 0x34, 0x34, 0x90, 0x00, 0x00, 0x00, 0x00, 0x44, 0x24,
+0x33, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x45, 0x1D, 0x51, 0x10, 0x00, 0x00, 0x00, 0x00, 0x55, 0x15,
+0x9A, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x56, 0x05, 0x61, 0x70, 0x00, 0x00, 0x00, 0x00, 0x56, 0xF5,
+0x7C, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x57, 0xE5, 0x43, 0x70, 0x01, 0x03, 0x02, 0x03, 0x02, 0x03,
+0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
+0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
+0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x00, 0x00, 0x64, 0x34,
+0x00, 0x00, 0x00, 0x00, 0x62, 0x70, 0x00, 0x04, 0x00, 0x00, 0x7E, 0x90, 0x01, 0x08, 0x00, 0x00,
+0x70, 0x80, 0x00, 0x0C, 0x4C, 0x4D, 0x54, 0x00, 0x2B, 0x30, 0x37, 0x00, 0x2B, 0x30, 0x39, 0x00,
+0x2B, 0x30, 0x38, 0x00, 0x0A, 0x3C, 0x2B, 0x30, 0x38, 0x3E, 0x2D, 0x38, 0x0A, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 
 /* Asia/Chongqing */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -43555,20 +44061,22 @@
 
 /* Asia/Dili */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x54, 0x4C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0C, 0x92, 0xE6, 0x18, 0xC4,
-0xCB, 0x99, 0x32, 0xF0, 0x0B, 0xEA, 0x30, 0x70, 0x39, 0xC3, 0x99, 0x00, 0x01, 0x02, 0x01, 0x02,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x0C, 0x92, 0xE6, 0x1E, 0x00,
+0xCB, 0x99, 0x32, 0xF0, 0x0B, 0xEA, 0x30, 0x70, 0x39, 0xC3, 0x99, 0x00, 0x01, 0x02, 0x03, 0x02,
 0x00, 0x00, 0x75, 0xBC, 0x00, 0x00, 0x00, 0x00, 0x70, 0x80, 0x00, 0x04, 0x00, 0x00, 0x7E, 0x90,
-0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x2B, 0x30, 0x38, 0x00, 0x2B, 0x30, 0x39, 0x00, 0x54, 0x5A,
-0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x04, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0C, 0xFF, 0xFF, 0xFF, 0xFF, 0x92, 0xE6,
-0x18, 0xC4, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0x99, 0x32, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x0B, 0xEA,
-0x30, 0x70, 0x00, 0x00, 0x00, 0x00, 0x39, 0xC3, 0x99, 0x00, 0x01, 0x02, 0x01, 0x02, 0x00, 0x00,
-0x75, 0xBC, 0x00, 0x00, 0x00, 0x00, 0x70, 0x80, 0x00, 0x04, 0x00, 0x00, 0x7E, 0x90, 0x00, 0x08,
-0x4C, 0x4D, 0x54, 0x00, 0x2B, 0x30, 0x38, 0x00, 0x2B, 0x30, 0x39, 0x00, 0x0A, 0x3C, 0x2B, 0x30,
-0x39, 0x3E, 0x2D, 0x39, 0x0A, 0x00, 0x7C, 0x48, 0x68, 0x01, 0xD2, 0x48, 0x7D, 0x00, 0x00, 0x00,
-0x00, 
+0x00, 0x08, 0x00, 0x00, 0x70, 0x80, 0x00, 0x04, 0x00, 0x00, 0x7E, 0x90, 0x00, 0x08, 0x4C, 0x4D,
+0x54, 0x00, 0x2B, 0x30, 0x38, 0x00, 0x2B, 0x30, 0x39, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
+0x01, 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x0C,
+0xFF, 0xFF, 0xFF, 0xFF, 0x92, 0xE6, 0x1E, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0x99, 0x32, 0xF0,
+0x00, 0x00, 0x00, 0x00, 0x0B, 0xEA, 0x30, 0x70, 0x00, 0x00, 0x00, 0x00, 0x39, 0xC3, 0x99, 0x00,
+0x01, 0x02, 0x03, 0x02, 0x00, 0x00, 0x75, 0xBC, 0x00, 0x00, 0x00, 0x00, 0x70, 0x80, 0x00, 0x04,
+0x00, 0x00, 0x7E, 0x90, 0x00, 0x08, 0x00, 0x00, 0x70, 0x80, 0x00, 0x04, 0x00, 0x00, 0x7E, 0x90,
+0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x2B, 0x30, 0x38, 0x00, 0x2B, 0x30, 0x39, 0x00, 0x00, 0x01,
+0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0A, 0x3C, 0x2B, 0x30, 0x39, 0x3E, 0x2D, 0x39,
+0x0A, 0x00, 0x7C, 0x48, 0x68, 0x01, 0xD2, 0x48, 0x7D, 0x00, 0x00, 0x00, 0x00, 
 
 /* Asia/Dubai */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x41, 0x45, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -44441,10 +44949,8 @@
 0x00, 0x00, 0x00, 0x00, 0x54, 0x60, 0x00, 0x04, 0x00, 0x00, 0x70, 0x80, 0x01, 0x08, 0x00, 0x00,
 0x62, 0x70, 0x00, 0x0C, 0x4C, 0x4D, 0x54, 0x00, 0x2B, 0x30, 0x36, 0x00, 0x2B, 0x30, 0x38, 0x00,
 0x2B, 0x30, 0x37, 0x00, 0x0A, 0x3C, 0x2B, 0x30, 0x37, 0x3E, 0x2D, 0x37, 0x0A, 0x00, 0xD2, 0x98,
-0xC2, 0x01, 0x9E, 0x81, 0x47, 0x00, 0x00, 0x00, 0x2B, 0x42, 0x61, 0x79, 0x61, 0x6E, 0x2D, 0x4F,
-0x6C, 0x67, 0x69, 0x79, 0x2C, 0x20, 0x47, 0x6F, 0x76, 0x69, 0x2D, 0x41, 0x6C, 0x74, 0x61, 0x69,
-0x2C, 0x20, 0x48, 0x6F, 0x76, 0x64, 0x2C, 0x20, 0x55, 0x76, 0x73, 0x2C, 0x20, 0x5A, 0x61, 0x76,
-0x6B, 0x68, 0x61, 0x6E, 
+0xC2, 0x01, 0x9E, 0x81, 0x47, 0x00, 0x00, 0x00, 0x16, 0x42, 0x61, 0x79, 0x61, 0x6E, 0x2D, 0x4F,
+0x6C, 0x67, 0x69, 0x69, 0x2C, 0x20, 0x48, 0x6F, 0x76, 0x64, 0x2C, 0x20, 0x55, 0x76, 0x73, 
 
 /* Asia/Irkutsk */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x52, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -45542,27 +46048,33 @@
 
 /* Asia/Manila */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x50, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x10, 0x80, 0x00, 0x00, 0x00,
-0xC1, 0x9C, 0xF4, 0x80, 0xC2, 0x16, 0x30, 0x70, 0xCB, 0xF2, 0xE7, 0x00, 0xD0, 0xA9, 0x25, 0x70,
-0xE2, 0x6C, 0x39, 0x00, 0xE2, 0xD5, 0xA2, 0xF0, 0x0F, 0x75, 0x46, 0x80, 0x10, 0x66, 0x7A, 0xF0,
-0x02, 0x01, 0x02, 0x03, 0x02, 0x01, 0x02, 0x01, 0x02, 0xFF, 0xFF, 0x1F, 0xF0, 0x00, 0x00, 0x00,
-0x00, 0x7E, 0x90, 0x01, 0x04, 0x00, 0x00, 0x70, 0x80, 0x00, 0x08, 0x00, 0x00, 0x7E, 0x90, 0x00,
-0x0C, 0x00, 0x00, 0x70, 0x80, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x50, 0x44, 0x54, 0x00, 0x50,
-0x53, 0x54, 0x00, 0x4A, 0x53, 0x54, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x06, 0x00,
-0x00, 0x00, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0x14, 0xE1, 0xDC, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0x7B,
-0x1F, 0x3F, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xC1, 0x9C, 0xF4, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xC2,
-0x16, 0x30, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0xF2, 0xE7, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xD0,
-0xA9, 0x25, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xE2, 0x6C, 0x39, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xE2,
-0xD5, 0xA2, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x75, 0x46, 0x80, 0x00, 0x00, 0x00, 0x00, 0x10,
-0x66, 0x7A, 0xF0, 0x01, 0x03, 0x02, 0x03, 0x04, 0x03, 0x02, 0x03, 0x02, 0x03, 0xFF, 0xFF, 0x1F,
-0xF0, 0x00, 0x00, 0x00, 0x00, 0x71, 0x70, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x90, 0x01, 0x04, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x10, 0x80, 0x00, 0x00, 0x00,
+0xC1, 0x9C, 0xF4, 0x80, 0xC2, 0x01, 0x18, 0x70, 0xCB, 0x3F, 0x9B, 0x00, 0xCB, 0x8C, 0x03, 0xF0,
+0xD1, 0x4B, 0x4D, 0xF0, 0xD2, 0xB1, 0xE5, 0xF0, 0xE2, 0x6C, 0x39, 0x00, 0xE2, 0xB3, 0x5B, 0xF0,
+0x0D, 0x9B, 0xFC, 0x00, 0x0E, 0x86, 0x98, 0xF0, 0x26, 0x56, 0xBF, 0x00, 0x26, 0xB1, 0xA8, 0x70,
+0x03, 0x01, 0x02, 0x01, 0x04, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0xFF, 0xFF, 0x1F,
+0xE8, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x90, 0x01, 0x04, 0x00, 0x00, 0x70, 0x80, 0x00, 0x08, 0x00,
 0x00, 0x70, 0x80, 0x00, 0x08, 0x00, 0x00, 0x7E, 0x90, 0x00, 0x0C, 0x00, 0x00, 0x70, 0x80, 0x00,
 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x50, 0x44, 0x54, 0x00, 0x50, 0x53, 0x54, 0x00, 0x4A, 0x53, 0x54,
-0x00, 0x0A, 0x50, 0x53, 0x54, 0x2D, 0x38, 0x0A, 0x00, 0x9F, 0x94, 0xDD, 0x01, 0xCB, 0x4A, 0x20,
-0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x54, 0x5A, 0x69,
+0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x0E, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0x14, 0xE1, 0xDC,
+0x18, 0xFF, 0xFF, 0xFF, 0xFF, 0x7B, 0xBB, 0x7A, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xC1, 0x9C, 0xF4,
+0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xC2, 0x01, 0x18, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0x3F, 0x9B,
+0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0x8C, 0x03, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD1, 0x4B, 0x4D,
+0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0xB1, 0xE5, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE2, 0x6C, 0x39,
+0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xE2, 0xB3, 0x5B, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x0D, 0x9B, 0xFC,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x86, 0x98, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x26, 0x56, 0xBF,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x26, 0xB1, 0xA8, 0x70, 0x01, 0x04, 0x02, 0x03, 0x02, 0x05, 0x02,
+0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0xFF, 0xFF, 0x1F, 0xE8, 0x00, 0x00, 0x00, 0x00, 0x71,
+0x68, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x90, 0x01, 0x04, 0x00, 0x00, 0x70, 0x80, 0x00, 0x08, 0x00,
+0x00, 0x70, 0x80, 0x00, 0x08, 0x00, 0x00, 0x7E, 0x90, 0x00, 0x0C, 0x00, 0x00, 0x70, 0x80, 0x00,
+0x08, 0x4C, 0x4D, 0x54, 0x00, 0x50, 0x44, 0x54, 0x00, 0x50, 0x53, 0x54, 0x00, 0x4A, 0x53, 0x54,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x0A,
+0x50, 0x53, 0x54, 0x2D, 0x38, 0x0A, 0x00, 0x9F, 0x96, 0x2A, 0x01, 0xCB, 0x3D, 0x89, 0x00, 0x00,
+0x00, 0x00, 
 
 /* Asia/Muscat */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x4F, 0x4D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -46752,7 +47264,7 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x47, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x1C, 0x9A, 0x6C, 0x7D, 0xC8,
 0xBF, 0x00, 0xCC, 0x48, 0x0D, 0x94, 0x44, 0x38, 0x0E, 0xAD, 0x13, 0xB8, 0x0F, 0x79, 0x73, 0x40,
-0x10, 0x28, 0xCA, 0xC0, 0x10, 0xED, 0x3A, 0x40, 0x11, 0xAD, 0xBC, 0x48, 0x12, 0x45, 0x4A, 0xB8,
+0x10, 0x28, 0xCA, 0xC0, 0x10, 0xA9, 0xFD, 0xC0, 0x11, 0xAD, 0xBC, 0x48, 0x12, 0x45, 0x4A, 0xB8,
 0x13, 0x37, 0xEC, 0xC8, 0x14, 0x2D, 0x15, 0xB8, 0x28, 0x20, 0x76, 0xC8, 0x28, 0xDB, 0x9D, 0xB8,
 0x29, 0xCB, 0x9C, 0xC8, 0x2A, 0xBE, 0x22, 0xB8, 0x2B, 0xAC, 0xD0, 0x48, 0x2C, 0x9F, 0x56, 0x38,
 0x2D, 0x8E, 0x03, 0xC8, 0x2E, 0x80, 0x89, 0xB8, 0x2F, 0x6F, 0x37, 0x48, 0x30, 0x61, 0xBD, 0x38,
@@ -46783,7 +47295,7 @@
 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x1C, 0xFF, 0xFF, 0xFF, 0xFF, 0x9A, 0x6C, 0x7D, 0xC8, 0xFF,
 0xFF, 0xFF, 0xFF, 0xBF, 0x00, 0xCC, 0x48, 0x00, 0x00, 0x00, 0x00, 0x0D, 0x94, 0x44, 0x38, 0x00,
 0x00, 0x00, 0x00, 0x0E, 0xAD, 0x13, 0xB8, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x79, 0x73, 0x40, 0x00,
-0x00, 0x00, 0x00, 0x10, 0x28, 0xCA, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x10, 0xED, 0x3A, 0x40, 0x00,
+0x00, 0x00, 0x00, 0x10, 0x28, 0xCA, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x10, 0xA9, 0xFD, 0xC0, 0x00,
 0x00, 0x00, 0x00, 0x11, 0xAD, 0xBC, 0x48, 0x00, 0x00, 0x00, 0x00, 0x12, 0x45, 0x4A, 0xB8, 0x00,
 0x00, 0x00, 0x00, 0x13, 0x37, 0xEC, 0xC8, 0x00, 0x00, 0x00, 0x00, 0x14, 0x2D, 0x15, 0xB8, 0x00,
 0x00, 0x00, 0x00, 0x28, 0x20, 0x76, 0xC8, 0x00, 0x00, 0x00, 0x00, 0x28, 0xDB, 0x9D, 0xB8, 0x00,
@@ -47703,19 +48215,19 @@
 
 /* Atlantic/Azores */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x50, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x18, 0x80, 0x00, 0x00, 0x00,
-0x92, 0xE6, 0xAA, 0xA0, 0x9B, 0x4B, 0x89, 0x90, 0x9B, 0xFE, 0xE3, 0xA0, 0x9C, 0x9D, 0x09, 0x90,
-0x9D, 0xC9, 0x9F, 0x90, 0x9E, 0x7F, 0x8E, 0x90, 0x9F, 0xAA, 0xD3, 0x10, 0xA0, 0x5F, 0x70, 0x90,
-0xA1, 0x8C, 0x06, 0x90, 0xA2, 0x41, 0xF5, 0x90, 0xA3, 0x6E, 0x8B, 0x90, 0xA4, 0x23, 0x29, 0x10,
-0xA5, 0x4F, 0xBF, 0x10, 0xAA, 0x06, 0x0B, 0x90, 0xAA, 0xF4, 0xAB, 0x10, 0xAD, 0xC9, 0xC4, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0xD8, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x1D, 0x80, 0x00, 0x00, 0x00,
+0x92, 0xE6, 0xAA, 0xA0, 0x9B, 0x4B, 0x89, 0x90, 0x9B, 0xFE, 0xE3, 0xA0, 0x9C, 0x9D, 0x17, 0xA0,
+0x9D, 0xC9, 0x9F, 0x90, 0x9E, 0x7E, 0x4B, 0x20, 0x9F, 0xAA, 0xD3, 0x10, 0xA0, 0x5F, 0x7E, 0xA0,
+0xA1, 0x8C, 0x06, 0x90, 0xA2, 0x42, 0x03, 0xA0, 0xA3, 0x6E, 0x8B, 0x90, 0xA4, 0x23, 0x37, 0x20,
+0xA5, 0x4F, 0xBF, 0x10, 0xAA, 0x06, 0x0B, 0x90, 0xAA, 0xE7, 0x7C, 0x10, 0xAD, 0xC9, 0xC4, 0x10,
 0xAE, 0xA7, 0x40, 0x10, 0xAF, 0xA0, 0x6B, 0x90, 0xB0, 0x87, 0x22, 0x10, 0xB1, 0x89, 0x88, 0x10,
 0xB2, 0x70, 0x3E, 0x90, 0xB3, 0x72, 0xA4, 0x90, 0xB4, 0x50, 0x20, 0x90, 0xB7, 0x32, 0x68, 0x90,
 0xB8, 0x0F, 0xE4, 0x90, 0xB8, 0xFF, 0xD5, 0x90, 0xB9, 0xEF, 0xC6, 0x90, 0xBC, 0xC8, 0xD4, 0x10,
 0xBD, 0xB8, 0xC5, 0x10, 0xBE, 0x9F, 0x7B, 0x90, 0xBF, 0x98, 0xA7, 0x10, 0xC0, 0x9B, 0x0D, 0x10,
 0xC1, 0x78, 0x89, 0x10, 0xC2, 0x68, 0x7A, 0x10, 0xC3, 0x58, 0x6B, 0x10, 0xC4, 0x3F, 0x21, 0x90,
 0xC5, 0x38, 0x4D, 0x10, 0xC6, 0x3A, 0xB3, 0x10, 0xC7, 0x58, 0xC8, 0x90, 0xC7, 0xD9, 0xFB, 0x90,
-0xC9, 0x01, 0x4B, 0x90, 0xC9, 0xF1, 0x3C, 0x90, 0xCA, 0xE2, 0x7F, 0x10, 0xCB, 0xB5, 0x6F, 0x10,
+0xC9, 0x03, 0xEE, 0x90, 0xC9, 0xF1, 0x3C, 0x90, 0xCA, 0xE2, 0x7F, 0x10, 0xCB, 0xB5, 0x6F, 0x10,
 0xCB, 0xEC, 0xC0, 0x00, 0xCC, 0x80, 0x68, 0x00, 0xCC, 0xDC, 0xBF, 0x10, 0xCD, 0x95, 0x51, 0x10,
 0xCD, 0xC3, 0x67, 0x80, 0xCE, 0x72, 0xBF, 0x00, 0xCE, 0xC5, 0xDB, 0x90, 0xCF, 0x75, 0x33, 0x10,
 0xCF, 0xAC, 0x84, 0x00, 0xD0, 0x52, 0xA1, 0x00, 0xD0, 0xA5, 0xBD, 0x90, 0xD1, 0x55, 0x15, 0x10,
@@ -47730,198 +48242,195 @@
 0xEE, 0x9A, 0xCD, 0x40, 0xEF, 0x8A, 0xBE, 0x40, 0xF0, 0x7A, 0xAF, 0x40, 0xF1, 0x6A, 0xA0, 0x40,
 0xF2, 0x63, 0xCB, 0xC0, 0xF3, 0x53, 0xBC, 0xC0, 0xF4, 0x43, 0xAD, 0xC0, 0xF5, 0x33, 0x9E, 0xC0,
 0xF6, 0x23, 0x8F, 0xC0, 0xF7, 0x13, 0x80, 0xC0, 0xF8, 0x03, 0x71, 0xC0, 0xF8, 0xF3, 0x62, 0xC0,
-0x0D, 0x9B, 0x29, 0x10, 0x0E, 0x8B, 0x1A, 0x10, 0x0F, 0x84, 0x45, 0x90, 0x10, 0x74, 0x36, 0x90,
-0x11, 0x64, 0x27, 0x90, 0x12, 0x54, 0x26, 0xA0, 0x13, 0x44, 0x09, 0x90, 0x14, 0x34, 0x08, 0xA0,
-0x15, 0x23, 0xF9, 0xA0, 0x16, 0x13, 0xEA, 0xA0, 0x17, 0x03, 0xDB, 0xA0, 0x17, 0xF3, 0xCC, 0xA0,
-0x18, 0xE3, 0xCB, 0xB0, 0x19, 0xD3, 0xAE, 0xA0, 0x1A, 0xC3, 0x9F, 0xA0, 0x1B, 0xBC, 0xCB, 0x20,
-0x1C, 0xAC, 0xBC, 0x20, 0x1D, 0x9C, 0xAD, 0x20, 0x1E, 0x8C, 0x9E, 0x20, 0x1F, 0x7C, 0x8F, 0x20,
-0x20, 0x6C, 0x80, 0x20, 0x21, 0x5C, 0x71, 0x20, 0x22, 0x4C, 0x62, 0x20, 0x23, 0x3C, 0x53, 0x20,
-0x24, 0x2C, 0x44, 0x20, 0x25, 0x1C, 0x35, 0x20, 0x26, 0x0C, 0x26, 0x20, 0x27, 0x05, 0x51, 0xA0,
-0x27, 0xF5, 0x42, 0xA0, 0x28, 0xE5, 0x33, 0xA0, 0x29, 0xD5, 0x24, 0xA0, 0x2A, 0xC5, 0x15, 0xA0,
-0x2B, 0xB4, 0xF8, 0x90, 0x2C, 0xA4, 0xE9, 0x90, 0x2D, 0x94, 0xDA, 0x90, 0x2E, 0x84, 0xCB, 0x90,
-0x2F, 0x74, 0xBC, 0x90, 0x30, 0x64, 0xAD, 0x90, 0x31, 0x5D, 0xD9, 0x10, 0x32, 0x72, 0xB4, 0x10,
-0x33, 0x3D, 0xBB, 0x10, 0x34, 0x52, 0x96, 0x10, 0x35, 0x1D, 0x9D, 0x10, 0x36, 0x32, 0x78, 0x10,
-0x36, 0xFD, 0x7F, 0x10, 0x38, 0x1B, 0x94, 0x90, 0x38, 0xDD, 0x61, 0x10, 0x39, 0xFB, 0x76, 0x90,
-0x3A, 0xBD, 0x43, 0x10, 0x3B, 0xDB, 0x58, 0x90, 0x3C, 0xA6, 0x5F, 0x90, 0x3D, 0xBB, 0x3A, 0x90,
-0x3E, 0x86, 0x41, 0x90, 0x3F, 0x9B, 0x1C, 0x90, 0x40, 0x66, 0x23, 0x90, 0x41, 0x84, 0x39, 0x10,
-0x42, 0x46, 0x05, 0x90, 0x43, 0x64, 0x1B, 0x10, 0x44, 0x25, 0xE7, 0x90, 0x45, 0x43, 0xFD, 0x10,
-0x46, 0x05, 0xC9, 0x90, 0x47, 0x23, 0xDF, 0x10, 0x47, 0xEE, 0xE6, 0x10, 0x49, 0x03, 0xC1, 0x10,
-0x49, 0xCE, 0xC8, 0x10, 0x4A, 0xE3, 0xA3, 0x10, 0x4B, 0xAE, 0xAA, 0x10, 0x4C, 0xCC, 0xBF, 0x90,
-0x4D, 0x8E, 0x8C, 0x10, 0x4E, 0xAC, 0xA1, 0x90, 0x4F, 0x6E, 0x6E, 0x10, 0x50, 0x8C, 0x83, 0x90,
-0x51, 0x57, 0x8A, 0x90, 0x52, 0x6C, 0x65, 0x90, 0x53, 0x37, 0x6C, 0x90, 0x54, 0x4C, 0x47, 0x90,
-0x55, 0x17, 0x4E, 0x90, 0x56, 0x2C, 0x29, 0x90, 0x56, 0xF7, 0x30, 0x90, 0x58, 0x15, 0x46, 0x10,
-0x58, 0xD7, 0x12, 0x90, 0x59, 0xF5, 0x28, 0x10, 0x5A, 0xB6, 0xF4, 0x90, 0x5B, 0xD5, 0x0A, 0x10,
-0x5C, 0xA0, 0x11, 0x10, 0x5D, 0xB4, 0xEC, 0x10, 0x5E, 0x7F, 0xF3, 0x10, 0x5F, 0x94, 0xCE, 0x10,
-0x60, 0x5F, 0xD5, 0x10, 0x61, 0x7D, 0xEA, 0x90, 0x62, 0x3F, 0xB7, 0x10, 0x63, 0x5D, 0xCC, 0x90,
-0x64, 0x1F, 0x99, 0x10, 0x65, 0x3D, 0xAE, 0x90, 0x66, 0x08, 0xB5, 0x90, 0x67, 0x1D, 0x90, 0x90,
-0x67, 0xE8, 0x97, 0x90, 0x68, 0xFD, 0x72, 0x90, 0x69, 0xC8, 0x79, 0x90, 0x6A, 0xDD, 0x54, 0x90,
-0x6B, 0xA8, 0x5B, 0x90, 0x6C, 0xC6, 0x71, 0x10, 0x6D, 0x88, 0x3D, 0x90, 0x6E, 0xA6, 0x53, 0x10,
-0x6F, 0x68, 0x1F, 0x90, 0x70, 0x86, 0x35, 0x10, 0x71, 0x51, 0x3C, 0x10, 0x72, 0x66, 0x17, 0x10,
-0x73, 0x31, 0x1E, 0x10, 0x74, 0x45, 0xF9, 0x10, 0x75, 0x11, 0x00, 0x10, 0x76, 0x2F, 0x15, 0x90,
-0x76, 0xF0, 0xE2, 0x10, 0x78, 0x0E, 0xF7, 0x90, 0x78, 0xD0, 0xC4, 0x10, 0x79, 0xEE, 0xD9, 0x90,
-0x7A, 0xB0, 0xA6, 0x10, 0x7B, 0xCE, 0xBB, 0x90, 0x7C, 0x99, 0xC2, 0x90, 0x7D, 0xAE, 0x9D, 0x90,
-0x7E, 0x79, 0xA4, 0x90, 0x7F, 0x8E, 0x7F, 0x90, 0x01, 0x06, 0x02, 0x03, 0x04, 0x05, 0x04, 0x05,
+0xF9, 0xE3, 0x53, 0xC0, 0x17, 0x03, 0xCD, 0x90, 0x17, 0xF3, 0xBE, 0x90, 0x18, 0xE3, 0xAF, 0x90,
+0x19, 0xD3, 0xA0, 0x90, 0x1A, 0xC3, 0x91, 0x90, 0x1B, 0xBC, 0xBD, 0x10, 0x1C, 0xAC, 0xAE, 0x10,
+0x1D, 0x9C, 0x9F, 0x10, 0x1E, 0x8C, 0x90, 0x10, 0x1F, 0x7C, 0x81, 0x10, 0x20, 0x6C, 0x72, 0x10,
+0x21, 0x5C, 0x63, 0x10, 0x22, 0x4C, 0x54, 0x10, 0x23, 0x3C, 0x45, 0x10, 0x24, 0x2C, 0x36, 0x10,
+0x25, 0x1C, 0x27, 0x10, 0x26, 0x0C, 0x18, 0x10, 0x27, 0x05, 0x43, 0x90, 0x27, 0xF5, 0x34, 0x90,
+0x28, 0xE5, 0x25, 0x90, 0x29, 0xD5, 0x16, 0x90, 0x2A, 0xC5, 0x07, 0x90, 0x2B, 0x3D, 0x0E, 0x20,
+0x2B, 0xB4, 0xF8, 0x90, 0x2C, 0x1F, 0xC2, 0x10, 0x2C, 0xA4, 0xE9, 0x90, 0x2D, 0x94, 0xDA, 0x90,
+0x2E, 0x84, 0xCB, 0x90, 0x2F, 0x74, 0xBC, 0x90, 0x30, 0x64, 0xAD, 0x90, 0x31, 0x5D, 0xD9, 0x10,
+0x32, 0x72, 0xB4, 0x10, 0x33, 0x3D, 0xBB, 0x10, 0x34, 0x52, 0x96, 0x10, 0x35, 0x1D, 0x9D, 0x10,
+0x36, 0x32, 0x78, 0x10, 0x36, 0xFD, 0x7F, 0x10, 0x38, 0x1B, 0x94, 0x90, 0x38, 0xDD, 0x61, 0x10,
+0x39, 0xFB, 0x76, 0x90, 0x3A, 0xBD, 0x43, 0x10, 0x3B, 0xDB, 0x58, 0x90, 0x3C, 0xA6, 0x5F, 0x90,
+0x3D, 0xBB, 0x3A, 0x90, 0x3E, 0x86, 0x41, 0x90, 0x3F, 0x9B, 0x1C, 0x90, 0x40, 0x66, 0x23, 0x90,
+0x41, 0x84, 0x39, 0x10, 0x42, 0x46, 0x05, 0x90, 0x43, 0x64, 0x1B, 0x10, 0x44, 0x25, 0xE7, 0x90,
+0x45, 0x43, 0xFD, 0x10, 0x46, 0x05, 0xC9, 0x90, 0x47, 0x23, 0xDF, 0x10, 0x47, 0xEE, 0xE6, 0x10,
+0x49, 0x03, 0xC1, 0x10, 0x49, 0xCE, 0xC8, 0x10, 0x4A, 0xE3, 0xA3, 0x10, 0x4B, 0xAE, 0xAA, 0x10,
+0x4C, 0xCC, 0xBF, 0x90, 0x4D, 0x8E, 0x8C, 0x10, 0x4E, 0xAC, 0xA1, 0x90, 0x4F, 0x6E, 0x6E, 0x10,
+0x50, 0x8C, 0x83, 0x90, 0x51, 0x57, 0x8A, 0x90, 0x52, 0x6C, 0x65, 0x90, 0x53, 0x37, 0x6C, 0x90,
+0x54, 0x4C, 0x47, 0x90, 0x55, 0x17, 0x4E, 0x90, 0x56, 0x2C, 0x29, 0x90, 0x56, 0xF7, 0x30, 0x90,
+0x58, 0x15, 0x46, 0x10, 0x58, 0xD7, 0x12, 0x90, 0x59, 0xF5, 0x28, 0x10, 0x5A, 0xB6, 0xF4, 0x90,
+0x5B, 0xD5, 0x0A, 0x10, 0x5C, 0xA0, 0x11, 0x10, 0x5D, 0xB4, 0xEC, 0x10, 0x5E, 0x7F, 0xF3, 0x10,
+0x5F, 0x94, 0xCE, 0x10, 0x60, 0x5F, 0xD5, 0x10, 0x61, 0x7D, 0xEA, 0x90, 0x62, 0x3F, 0xB7, 0x10,
+0x63, 0x5D, 0xCC, 0x90, 0x64, 0x1F, 0x99, 0x10, 0x65, 0x3D, 0xAE, 0x90, 0x66, 0x08, 0xB5, 0x90,
+0x67, 0x1D, 0x90, 0x90, 0x67, 0xE8, 0x97, 0x90, 0x68, 0xFD, 0x72, 0x90, 0x69, 0xC8, 0x79, 0x90,
+0x6A, 0xDD, 0x54, 0x90, 0x6B, 0xA8, 0x5B, 0x90, 0x6C, 0xC6, 0x71, 0x10, 0x6D, 0x88, 0x3D, 0x90,
+0x6E, 0xA6, 0x53, 0x10, 0x6F, 0x68, 0x1F, 0x90, 0x70, 0x86, 0x35, 0x10, 0x71, 0x51, 0x3C, 0x10,
+0x72, 0x66, 0x17, 0x10, 0x73, 0x31, 0x1E, 0x10, 0x74, 0x45, 0xF9, 0x10, 0x75, 0x11, 0x00, 0x10,
+0x76, 0x2F, 0x15, 0x90, 0x76, 0xF0, 0xE2, 0x10, 0x78, 0x0E, 0xF7, 0x90, 0x78, 0xD0, 0xC4, 0x10,
+0x79, 0xEE, 0xD9, 0x90, 0x7A, 0xB0, 0xA6, 0x10, 0x7B, 0xCE, 0xBB, 0x90, 0x7C, 0x99, 0xC2, 0x90,
+0x7D, 0xAE, 0x9D, 0x90, 0x7E, 0x79, 0xA4, 0x90, 0x7F, 0x8E, 0x7F, 0x90, 0x01, 0x07, 0x02, 0x03,
+0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05,
 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05,
+0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x06, 0x04, 0x05, 0x04, 0x06, 0x04, 0x05,
+0x04, 0x06, 0x04, 0x05, 0x04, 0x06, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05,
 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05,
-0x04, 0x05, 0x04, 0x05, 0x04, 0x07, 0x04, 0x05, 0x04, 0x07, 0x04, 0x05, 0x04, 0x07, 0x04, 0x05,
-0x04, 0x07, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05,
 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05,
-0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x09, 0x07, 0x08, 0x07,
-0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07,
-0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x0A, 0x0B, 0x0C, 0x0B,
-0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B,
-0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B,
-0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B,
-0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B,
-0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B,
-0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0xFF, 0xFF, 0xE7, 0xF0, 0x00, 0x00, 0xFF, 0xFF, 0xE5,
-0x28, 0x00, 0x04, 0xFF, 0xFF, 0xF1, 0xF0, 0x01, 0x08, 0xFF, 0xFF, 0xE3, 0xE0, 0x00, 0x0C, 0xFF,
-0xFF, 0xF1, 0xF0, 0x01, 0x08, 0xFF, 0xFF, 0xE3, 0xE0, 0x00, 0x0C, 0xFF, 0xFF, 0xE3, 0xE0, 0x00,
-0x0C, 0x00, 0x00, 0x00, 0x00, 0x01, 0x10, 0xFF, 0xFF, 0xF1, 0xF0, 0x00, 0x08, 0xFF, 0xFF, 0xF1,
-0xF0, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x01, 0x10, 0xFF,
-0xFF, 0xF1, 0xF0, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x48, 0x4D, 0x54, 0x00, 0x2D, 0x30, 0x31,
-0x00, 0x2D, 0x30, 0x32, 0x00, 0x2B, 0x30, 0x30, 0x00, 0x57, 0x45, 0x54, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0D, 0x00,
-0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, 0x00, 0x0D, 0x00,
-0x00, 0x00, 0x18, 0xFF, 0xFF, 0xFF, 0xFF, 0x5E, 0x3D, 0x1B, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0x92,
-0xE6, 0xAA, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0x9B, 0x4B, 0x89, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0x9B,
-0xFE, 0xE3, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0x9C, 0x9D, 0x09, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0x9D,
-0xC9, 0x9F, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0x9E, 0x7F, 0x8E, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0x9F,
-0xAA, 0xD3, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xA0, 0x5F, 0x70, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xA1,
-0x8C, 0x06, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xA2, 0x41, 0xF5, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xA3,
-0x6E, 0x8B, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xA4, 0x23, 0x29, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5,
-0x4F, 0xBF, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xAA, 0x06, 0x0B, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xAA,
-0xF4, 0xAB, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xAD, 0xC9, 0xC4, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xAE,
-0xA7, 0x40, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xA0, 0x6B, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xB0,
-0x87, 0x22, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xB1, 0x89, 0x88, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xB2,
-0x70, 0x3E, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xB3, 0x72, 0xA4, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xB4,
-0x50, 0x20, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x32, 0x68, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8,
-0x0F, 0xE4, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0xFF, 0xD5, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xB9,
-0xEF, 0xC6, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xBC, 0xC8, 0xD4, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xBD,
-0xB8, 0xC5, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xBE, 0x9F, 0x7B, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xBF,
-0x98, 0xA7, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xC0, 0x9B, 0x0D, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xC1,
-0x78, 0x89, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xC2, 0x68, 0x7A, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xC3,
-0x58, 0x6B, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xC4, 0x3F, 0x21, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xC5,
-0x38, 0x4D, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xC6, 0x3A, 0xB3, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xC7,
-0x58, 0xC8, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xC7, 0xD9, 0xFB, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9,
-0x01, 0x4B, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0xF1, 0x3C, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xCA,
-0xE2, 0x7F, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0xB5, 0x6F, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB,
-0xEC, 0xC0, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xCC, 0x80, 0x68, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xCC,
-0xDC, 0xBF, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xCD, 0x95, 0x51, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xCD,
-0xC3, 0x67, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xCE, 0x72, 0xBF, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xCE,
-0xC5, 0xDB, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xCF, 0x75, 0x33, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xCF,
-0xAC, 0x84, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xD0, 0x52, 0xA1, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xD0,
-0xA5, 0xBD, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xD1, 0x55, 0x15, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xD1,
-0x8C, 0x66, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x32, 0x83, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2,
-0x85, 0x9F, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xD3, 0x59, 0xE1, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xD4,
-0x49, 0xD2, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xD5, 0x39, 0xED, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xD6,
-0x29, 0xDE, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xD7, 0x19, 0xCF, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xD8,
-0x09, 0xC0, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xD8, 0xF9, 0xB1, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xD9,
-0xE9, 0xA2, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xDA, 0xD9, 0x93, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xDB,
-0xC9, 0x84, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xDC, 0xB9, 0x75, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xDD,
-0xB2, 0xA0, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xDE, 0xA2, 0x91, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF,
-0x92, 0x82, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE0, 0x82, 0x73, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE1,
-0x72, 0x64, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE2, 0x62, 0x55, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE3,
-0x52, 0x46, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE4, 0x42, 0x37, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE5,
-0x32, 0x28, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE6, 0x22, 0x19, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE7,
-0x1B, 0x45, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xE8, 0x0B, 0x36, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xE8,
-0xFB, 0x27, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xE9, 0xEB, 0x18, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xEA,
-0xDB, 0x09, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xEB, 0xCA, 0xFA, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xEC,
-0xBA, 0xEB, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xED, 0xAA, 0xDC, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xEE,
-0x9A, 0xCD, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xEF, 0x8A, 0xBE, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xF0,
-0x7A, 0xAF, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xF1, 0x6A, 0xA0, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xF2,
-0x63, 0xCB, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF3, 0x53, 0xBC, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4,
-0x43, 0xAD, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x33, 0x9E, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF6,
-0x23, 0x8F, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x13, 0x80, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8,
-0x03, 0x71, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0xF3, 0x62, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x0D,
-0x9B, 0x29, 0x10, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x8B, 0x1A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x0F,
-0x84, 0x45, 0x90, 0x00, 0x00, 0x00, 0x00, 0x10, 0x74, 0x36, 0x90, 0x00, 0x00, 0x00, 0x00, 0x11,
-0x64, 0x27, 0x90, 0x00, 0x00, 0x00, 0x00, 0x12, 0x54, 0x26, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x13,
-0x44, 0x09, 0x90, 0x00, 0x00, 0x00, 0x00, 0x14, 0x34, 0x08, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x15,
-0x23, 0xF9, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x16, 0x13, 0xEA, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x17,
-0x03, 0xDB, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x17, 0xF3, 0xCC, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x18,
-0xE3, 0xCB, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x19, 0xD3, 0xAE, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1A,
-0xC3, 0x9F, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xBC, 0xCB, 0x20, 0x00, 0x00, 0x00, 0x00, 0x1C,
-0xAC, 0xBC, 0x20, 0x00, 0x00, 0x00, 0x00, 0x1D, 0x9C, 0xAD, 0x20, 0x00, 0x00, 0x00, 0x00, 0x1E,
-0x8C, 0x9E, 0x20, 0x00, 0x00, 0x00, 0x00, 0x1F, 0x7C, 0x8F, 0x20, 0x00, 0x00, 0x00, 0x00, 0x20,
-0x6C, 0x80, 0x20, 0x00, 0x00, 0x00, 0x00, 0x21, 0x5C, 0x71, 0x20, 0x00, 0x00, 0x00, 0x00, 0x22,
-0x4C, 0x62, 0x20, 0x00, 0x00, 0x00, 0x00, 0x23, 0x3C, 0x53, 0x20, 0x00, 0x00, 0x00, 0x00, 0x24,
-0x2C, 0x44, 0x20, 0x00, 0x00, 0x00, 0x00, 0x25, 0x1C, 0x35, 0x20, 0x00, 0x00, 0x00, 0x00, 0x26,
-0x0C, 0x26, 0x20, 0x00, 0x00, 0x00, 0x00, 0x27, 0x05, 0x51, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x27,
-0xF5, 0x42, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x28, 0xE5, 0x33, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x29,
-0xD5, 0x24, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xC5, 0x15, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x2B,
-0xB4, 0xF8, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xA4, 0xE9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2D,
-0x94, 0xDA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2E, 0x84, 0xCB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2F,
-0x74, 0xBC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x30, 0x64, 0xAD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x31,
-0x5D, 0xD9, 0x10, 0x00, 0x00, 0x00, 0x00, 0x32, 0x72, 0xB4, 0x10, 0x00, 0x00, 0x00, 0x00, 0x33,
-0x3D, 0xBB, 0x10, 0x00, 0x00, 0x00, 0x00, 0x34, 0x52, 0x96, 0x10, 0x00, 0x00, 0x00, 0x00, 0x35,
-0x1D, 0x9D, 0x10, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0x78, 0x10, 0x00, 0x00, 0x00, 0x00, 0x36,
-0xFD, 0x7F, 0x10, 0x00, 0x00, 0x00, 0x00, 0x38, 0x1B, 0x94, 0x90, 0x00, 0x00, 0x00, 0x00, 0x38,
-0xDD, 0x61, 0x10, 0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0x76, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3A,
-0xBD, 0x43, 0x10, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xDB, 0x58, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3C,
-0xA6, 0x5F, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0x3A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3E,
-0x86, 0x41, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x1C, 0x90, 0x00, 0x00, 0x00, 0x00, 0x40,
-0x66, 0x23, 0x90, 0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0x39, 0x10, 0x00, 0x00, 0x00, 0x00, 0x42,
-0x46, 0x05, 0x90, 0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x1B, 0x10, 0x00, 0x00, 0x00, 0x00, 0x44,
-0x25, 0xE7, 0x90, 0x00, 0x00, 0x00, 0x00, 0x45, 0x43, 0xFD, 0x10, 0x00, 0x00, 0x00, 0x00, 0x46,
-0x05, 0xC9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x47, 0x23, 0xDF, 0x10, 0x00, 0x00, 0x00, 0x00, 0x47,
-0xEE, 0xE6, 0x10, 0x00, 0x00, 0x00, 0x00, 0x49, 0x03, 0xC1, 0x10, 0x00, 0x00, 0x00, 0x00, 0x49,
-0xCE, 0xC8, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4A, 0xE3, 0xA3, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4B,
-0xAE, 0xAA, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4C, 0xCC, 0xBF, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4D,
-0x8E, 0x8C, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4E, 0xAC, 0xA1, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4F,
-0x6E, 0x6E, 0x10, 0x00, 0x00, 0x00, 0x00, 0x50, 0x8C, 0x83, 0x90, 0x00, 0x00, 0x00, 0x00, 0x51,
-0x57, 0x8A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x52, 0x6C, 0x65, 0x90, 0x00, 0x00, 0x00, 0x00, 0x53,
-0x37, 0x6C, 0x90, 0x00, 0x00, 0x00, 0x00, 0x54, 0x4C, 0x47, 0x90, 0x00, 0x00, 0x00, 0x00, 0x55,
-0x17, 0x4E, 0x90, 0x00, 0x00, 0x00, 0x00, 0x56, 0x2C, 0x29, 0x90, 0x00, 0x00, 0x00, 0x00, 0x56,
-0xF7, 0x30, 0x90, 0x00, 0x00, 0x00, 0x00, 0x58, 0x15, 0x46, 0x10, 0x00, 0x00, 0x00, 0x00, 0x58,
-0xD7, 0x12, 0x90, 0x00, 0x00, 0x00, 0x00, 0x59, 0xF5, 0x28, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5A,
-0xB6, 0xF4, 0x90, 0x00, 0x00, 0x00, 0x00, 0x5B, 0xD5, 0x0A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5C,
-0xA0, 0x11, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5D, 0xB4, 0xEC, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5E,
-0x7F, 0xF3, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5F, 0x94, 0xCE, 0x10, 0x00, 0x00, 0x00, 0x00, 0x60,
-0x5F, 0xD5, 0x10, 0x00, 0x00, 0x00, 0x00, 0x61, 0x7D, 0xEA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x62,
-0x3F, 0xB7, 0x10, 0x00, 0x00, 0x00, 0x00, 0x63, 0x5D, 0xCC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x64,
-0x1F, 0x99, 0x10, 0x00, 0x00, 0x00, 0x00, 0x65, 0x3D, 0xAE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x66,
-0x08, 0xB5, 0x90, 0x00, 0x00, 0x00, 0x00, 0x67, 0x1D, 0x90, 0x90, 0x00, 0x00, 0x00, 0x00, 0x67,
-0xE8, 0x97, 0x90, 0x00, 0x00, 0x00, 0x00, 0x68, 0xFD, 0x72, 0x90, 0x00, 0x00, 0x00, 0x00, 0x69,
-0xC8, 0x79, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6A, 0xDD, 0x54, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6B,
-0xA8, 0x5B, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6C, 0xC6, 0x71, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6D,
-0x88, 0x3D, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6E, 0xA6, 0x53, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6F,
-0x68, 0x1F, 0x90, 0x00, 0x00, 0x00, 0x00, 0x70, 0x86, 0x35, 0x10, 0x00, 0x00, 0x00, 0x00, 0x71,
-0x51, 0x3C, 0x10, 0x00, 0x00, 0x00, 0x00, 0x72, 0x66, 0x17, 0x10, 0x00, 0x00, 0x00, 0x00, 0x73,
-0x31, 0x1E, 0x10, 0x00, 0x00, 0x00, 0x00, 0x74, 0x45, 0xF9, 0x10, 0x00, 0x00, 0x00, 0x00, 0x75,
-0x11, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x76, 0x2F, 0x15, 0x90, 0x00, 0x00, 0x00, 0x00, 0x76,
-0xF0, 0xE2, 0x10, 0x00, 0x00, 0x00, 0x00, 0x78, 0x0E, 0xF7, 0x90, 0x00, 0x00, 0x00, 0x00, 0x78,
-0xD0, 0xC4, 0x10, 0x00, 0x00, 0x00, 0x00, 0x79, 0xEE, 0xD9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7A,
-0xB0, 0xA6, 0x10, 0x00, 0x00, 0x00, 0x00, 0x7B, 0xCE, 0xBB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7C,
-0x99, 0xC2, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7D, 0xAE, 0x9D, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7E,
-0x79, 0xA4, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x8E, 0x7F, 0x90, 0x01, 0x06, 0x02, 0x03, 0x04,
+0x04, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A,
+0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x0C, 0x0B, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A,
+0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A,
+0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A,
+0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A,
+0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A,
+0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A,
+0x09, 0x0A, 0x09, 0x0A, 0xFF, 0xFF, 0xE7, 0xF0, 0x00, 0x00, 0xFF, 0xFF, 0xE5, 0x28, 0x00, 0x04,
+0xFF, 0xFF, 0xF1, 0xF0, 0x01, 0x08, 0xFF, 0xFF, 0xE3, 0xE0, 0x00, 0x0C, 0xFF, 0xFF, 0xF1, 0xF0,
+0x01, 0x08, 0xFF, 0xFF, 0xE3, 0xE0, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x01, 0x10, 0xFF, 0xFF,
+0xE3, 0xE0, 0x00, 0x0C, 0xFF, 0xFF, 0xF1, 0xF0, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x01, 0x10,
+0xFF, 0xFF, 0xF1, 0xF0, 0x00, 0x08, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x14, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x19, 0x00, 0x00, 0x00, 0x00, 0x01, 0x10, 0xFF, 0xFF, 0xF1, 0xF0, 0x00, 0x08, 0x4C, 0x4D,
+0x54, 0x00, 0x48, 0x4D, 0x54, 0x00, 0x2D, 0x30, 0x31, 0x00, 0x2D, 0x30, 0x32, 0x00, 0x2B, 0x30,
+0x30, 0x00, 0x57, 0x45, 0x53, 0x54, 0x00, 0x57, 0x45, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
+0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x0F, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xD8, 0x00, 0x00, 0x00,
+0x0F, 0x00, 0x00, 0x00, 0x1D, 0xFF, 0xFF, 0xFF, 0xFF, 0x5E, 0x3D, 0x1B, 0x90, 0xFF, 0xFF, 0xFF,
+0xFF, 0x92, 0xE6, 0xAA, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0x9B, 0x4B, 0x89, 0x90, 0xFF, 0xFF, 0xFF,
+0xFF, 0x9B, 0xFE, 0xE3, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0x9C, 0x9D, 0x17, 0xA0, 0xFF, 0xFF, 0xFF,
+0xFF, 0x9D, 0xC9, 0x9F, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0x9E, 0x7E, 0x4B, 0x20, 0xFF, 0xFF, 0xFF,
+0xFF, 0x9F, 0xAA, 0xD3, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xA0, 0x5F, 0x7E, 0xA0, 0xFF, 0xFF, 0xFF,
+0xFF, 0xA1, 0x8C, 0x06, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xA2, 0x42, 0x03, 0xA0, 0xFF, 0xFF, 0xFF,
+0xFF, 0xA3, 0x6E, 0x8B, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xA4, 0x23, 0x37, 0x20, 0xFF, 0xFF, 0xFF,
+0xFF, 0xA5, 0x4F, 0xBF, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xAA, 0x06, 0x0B, 0x90, 0xFF, 0xFF, 0xFF,
+0xFF, 0xAA, 0xE7, 0x7C, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xAD, 0xC9, 0xC4, 0x10, 0xFF, 0xFF, 0xFF,
+0xFF, 0xAE, 0xA7, 0x40, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xA0, 0x6B, 0x90, 0xFF, 0xFF, 0xFF,
+0xFF, 0xB0, 0x87, 0x22, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xB1, 0x89, 0x88, 0x10, 0xFF, 0xFF, 0xFF,
+0xFF, 0xB2, 0x70, 0x3E, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xB3, 0x72, 0xA4, 0x90, 0xFF, 0xFF, 0xFF,
+0xFF, 0xB4, 0x50, 0x20, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x32, 0x68, 0x90, 0xFF, 0xFF, 0xFF,
+0xFF, 0xB8, 0x0F, 0xE4, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0xFF, 0xD5, 0x90, 0xFF, 0xFF, 0xFF,
+0xFF, 0xB9, 0xEF, 0xC6, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xBC, 0xC8, 0xD4, 0x10, 0xFF, 0xFF, 0xFF,
+0xFF, 0xBD, 0xB8, 0xC5, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xBE, 0x9F, 0x7B, 0x90, 0xFF, 0xFF, 0xFF,
+0xFF, 0xBF, 0x98, 0xA7, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xC0, 0x9B, 0x0D, 0x10, 0xFF, 0xFF, 0xFF,
+0xFF, 0xC1, 0x78, 0x89, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xC2, 0x68, 0x7A, 0x10, 0xFF, 0xFF, 0xFF,
+0xFF, 0xC3, 0x58, 0x6B, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xC4, 0x3F, 0x21, 0x90, 0xFF, 0xFF, 0xFF,
+0xFF, 0xC5, 0x38, 0x4D, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xC6, 0x3A, 0xB3, 0x10, 0xFF, 0xFF, 0xFF,
+0xFF, 0xC7, 0x58, 0xC8, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xC7, 0xD9, 0xFB, 0x90, 0xFF, 0xFF, 0xFF,
+0xFF, 0xC9, 0x03, 0xEE, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0xF1, 0x3C, 0x90, 0xFF, 0xFF, 0xFF,
+0xFF, 0xCA, 0xE2, 0x7F, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0xB5, 0x6F, 0x10, 0xFF, 0xFF, 0xFF,
+0xFF, 0xCB, 0xEC, 0xC0, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xCC, 0x80, 0x68, 0x00, 0xFF, 0xFF, 0xFF,
+0xFF, 0xCC, 0xDC, 0xBF, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xCD, 0x95, 0x51, 0x10, 0xFF, 0xFF, 0xFF,
+0xFF, 0xCD, 0xC3, 0x67, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xCE, 0x72, 0xBF, 0x00, 0xFF, 0xFF, 0xFF,
+0xFF, 0xCE, 0xC5, 0xDB, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xCF, 0x75, 0x33, 0x10, 0xFF, 0xFF, 0xFF,
+0xFF, 0xCF, 0xAC, 0x84, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xD0, 0x52, 0xA1, 0x00, 0xFF, 0xFF, 0xFF,
+0xFF, 0xD0, 0xA5, 0xBD, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xD1, 0x55, 0x15, 0x10, 0xFF, 0xFF, 0xFF,
+0xFF, 0xD1, 0x8C, 0x66, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x32, 0x83, 0x00, 0xFF, 0xFF, 0xFF,
+0xFF, 0xD2, 0x85, 0x9F, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xD3, 0x59, 0xE1, 0x10, 0xFF, 0xFF, 0xFF,
+0xFF, 0xD4, 0x49, 0xD2, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xD5, 0x39, 0xED, 0x40, 0xFF, 0xFF, 0xFF,
+0xFF, 0xD6, 0x29, 0xDE, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xD7, 0x19, 0xCF, 0x40, 0xFF, 0xFF, 0xFF,
+0xFF, 0xD8, 0x09, 0xC0, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xD8, 0xF9, 0xB1, 0x40, 0xFF, 0xFF, 0xFF,
+0xFF, 0xD9, 0xE9, 0xA2, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xDA, 0xD9, 0x93, 0x40, 0xFF, 0xFF, 0xFF,
+0xFF, 0xDB, 0xC9, 0x84, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xDC, 0xB9, 0x75, 0x40, 0xFF, 0xFF, 0xFF,
+0xFF, 0xDD, 0xB2, 0xA0, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xDE, 0xA2, 0x91, 0xC0, 0xFF, 0xFF, 0xFF,
+0xFF, 0xDF, 0x92, 0x82, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE0, 0x82, 0x73, 0xC0, 0xFF, 0xFF, 0xFF,
+0xFF, 0xE1, 0x72, 0x64, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE2, 0x62, 0x55, 0xC0, 0xFF, 0xFF, 0xFF,
+0xFF, 0xE3, 0x52, 0x46, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE4, 0x42, 0x37, 0xC0, 0xFF, 0xFF, 0xFF,
+0xFF, 0xE5, 0x32, 0x28, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE6, 0x22, 0x19, 0xC0, 0xFF, 0xFF, 0xFF,
+0xFF, 0xE7, 0x1B, 0x45, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xE8, 0x0B, 0x36, 0x40, 0xFF, 0xFF, 0xFF,
+0xFF, 0xE8, 0xFB, 0x27, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xE9, 0xEB, 0x18, 0x40, 0xFF, 0xFF, 0xFF,
+0xFF, 0xEA, 0xDB, 0x09, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xEB, 0xCA, 0xFA, 0x40, 0xFF, 0xFF, 0xFF,
+0xFF, 0xEC, 0xBA, 0xEB, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xED, 0xAA, 0xDC, 0x40, 0xFF, 0xFF, 0xFF,
+0xFF, 0xEE, 0x9A, 0xCD, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xEF, 0x8A, 0xBE, 0x40, 0xFF, 0xFF, 0xFF,
+0xFF, 0xF0, 0x7A, 0xAF, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xF1, 0x6A, 0xA0, 0x40, 0xFF, 0xFF, 0xFF,
+0xFF, 0xF2, 0x63, 0xCB, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF3, 0x53, 0xBC, 0xC0, 0xFF, 0xFF, 0xFF,
+0xFF, 0xF4, 0x43, 0xAD, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x33, 0x9E, 0xC0, 0xFF, 0xFF, 0xFF,
+0xFF, 0xF6, 0x23, 0x8F, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x13, 0x80, 0xC0, 0xFF, 0xFF, 0xFF,
+0xFF, 0xF8, 0x03, 0x71, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0xF3, 0x62, 0xC0, 0xFF, 0xFF, 0xFF,
+0xFF, 0xF9, 0xE3, 0x53, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x17, 0x03, 0xCD, 0x90, 0x00, 0x00, 0x00,
+0x00, 0x17, 0xF3, 0xBE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x18, 0xE3, 0xAF, 0x90, 0x00, 0x00, 0x00,
+0x00, 0x19, 0xD3, 0xA0, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xC3, 0x91, 0x90, 0x00, 0x00, 0x00,
+0x00, 0x1B, 0xBC, 0xBD, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xAC, 0xAE, 0x10, 0x00, 0x00, 0x00,
+0x00, 0x1D, 0x9C, 0x9F, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x8C, 0x90, 0x10, 0x00, 0x00, 0x00,
+0x00, 0x1F, 0x7C, 0x81, 0x10, 0x00, 0x00, 0x00, 0x00, 0x20, 0x6C, 0x72, 0x10, 0x00, 0x00, 0x00,
+0x00, 0x21, 0x5C, 0x63, 0x10, 0x00, 0x00, 0x00, 0x00, 0x22, 0x4C, 0x54, 0x10, 0x00, 0x00, 0x00,
+0x00, 0x23, 0x3C, 0x45, 0x10, 0x00, 0x00, 0x00, 0x00, 0x24, 0x2C, 0x36, 0x10, 0x00, 0x00, 0x00,
+0x00, 0x25, 0x1C, 0x27, 0x10, 0x00, 0x00, 0x00, 0x00, 0x26, 0x0C, 0x18, 0x10, 0x00, 0x00, 0x00,
+0x00, 0x27, 0x05, 0x43, 0x90, 0x00, 0x00, 0x00, 0x00, 0x27, 0xF5, 0x34, 0x90, 0x00, 0x00, 0x00,
+0x00, 0x28, 0xE5, 0x25, 0x90, 0x00, 0x00, 0x00, 0x00, 0x29, 0xD5, 0x16, 0x90, 0x00, 0x00, 0x00,
+0x00, 0x2A, 0xC5, 0x07, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2B, 0x3D, 0x0E, 0x20, 0x00, 0x00, 0x00,
+0x00, 0x2B, 0xB4, 0xF8, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2C, 0x1F, 0xC2, 0x10, 0x00, 0x00, 0x00,
+0x00, 0x2C, 0xA4, 0xE9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x94, 0xDA, 0x90, 0x00, 0x00, 0x00,
+0x00, 0x2E, 0x84, 0xCB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x74, 0xBC, 0x90, 0x00, 0x00, 0x00,
+0x00, 0x30, 0x64, 0xAD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x31, 0x5D, 0xD9, 0x10, 0x00, 0x00, 0x00,
+0x00, 0x32, 0x72, 0xB4, 0x10, 0x00, 0x00, 0x00, 0x00, 0x33, 0x3D, 0xBB, 0x10, 0x00, 0x00, 0x00,
+0x00, 0x34, 0x52, 0x96, 0x10, 0x00, 0x00, 0x00, 0x00, 0x35, 0x1D, 0x9D, 0x10, 0x00, 0x00, 0x00,
+0x00, 0x36, 0x32, 0x78, 0x10, 0x00, 0x00, 0x00, 0x00, 0x36, 0xFD, 0x7F, 0x10, 0x00, 0x00, 0x00,
+0x00, 0x38, 0x1B, 0x94, 0x90, 0x00, 0x00, 0x00, 0x00, 0x38, 0xDD, 0x61, 0x10, 0x00, 0x00, 0x00,
+0x00, 0x39, 0xFB, 0x76, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xBD, 0x43, 0x10, 0x00, 0x00, 0x00,
+0x00, 0x3B, 0xDB, 0x58, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xA6, 0x5F, 0x90, 0x00, 0x00, 0x00,
+0x00, 0x3D, 0xBB, 0x3A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x86, 0x41, 0x90, 0x00, 0x00, 0x00,
+0x00, 0x3F, 0x9B, 0x1C, 0x90, 0x00, 0x00, 0x00, 0x00, 0x40, 0x66, 0x23, 0x90, 0x00, 0x00, 0x00,
+0x00, 0x41, 0x84, 0x39, 0x10, 0x00, 0x00, 0x00, 0x00, 0x42, 0x46, 0x05, 0x90, 0x00, 0x00, 0x00,
+0x00, 0x43, 0x64, 0x1B, 0x10, 0x00, 0x00, 0x00, 0x00, 0x44, 0x25, 0xE7, 0x90, 0x00, 0x00, 0x00,
+0x00, 0x45, 0x43, 0xFD, 0x10, 0x00, 0x00, 0x00, 0x00, 0x46, 0x05, 0xC9, 0x90, 0x00, 0x00, 0x00,
+0x00, 0x47, 0x23, 0xDF, 0x10, 0x00, 0x00, 0x00, 0x00, 0x47, 0xEE, 0xE6, 0x10, 0x00, 0x00, 0x00,
+0x00, 0x49, 0x03, 0xC1, 0x10, 0x00, 0x00, 0x00, 0x00, 0x49, 0xCE, 0xC8, 0x10, 0x00, 0x00, 0x00,
+0x00, 0x4A, 0xE3, 0xA3, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4B, 0xAE, 0xAA, 0x10, 0x00, 0x00, 0x00,
+0x00, 0x4C, 0xCC, 0xBF, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x8E, 0x8C, 0x10, 0x00, 0x00, 0x00,
+0x00, 0x4E, 0xAC, 0xA1, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x6E, 0x6E, 0x10, 0x00, 0x00, 0x00,
+0x00, 0x50, 0x8C, 0x83, 0x90, 0x00, 0x00, 0x00, 0x00, 0x51, 0x57, 0x8A, 0x90, 0x00, 0x00, 0x00,
+0x00, 0x52, 0x6C, 0x65, 0x90, 0x00, 0x00, 0x00, 0x00, 0x53, 0x37, 0x6C, 0x90, 0x00, 0x00, 0x00,
+0x00, 0x54, 0x4C, 0x47, 0x90, 0x00, 0x00, 0x00, 0x00, 0x55, 0x17, 0x4E, 0x90, 0x00, 0x00, 0x00,
+0x00, 0x56, 0x2C, 0x29, 0x90, 0x00, 0x00, 0x00, 0x00, 0x56, 0xF7, 0x30, 0x90, 0x00, 0x00, 0x00,
+0x00, 0x58, 0x15, 0x46, 0x10, 0x00, 0x00, 0x00, 0x00, 0x58, 0xD7, 0x12, 0x90, 0x00, 0x00, 0x00,
+0x00, 0x59, 0xF5, 0x28, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xB6, 0xF4, 0x90, 0x00, 0x00, 0x00,
+0x00, 0x5B, 0xD5, 0x0A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5C, 0xA0, 0x11, 0x10, 0x00, 0x00, 0x00,
+0x00, 0x5D, 0xB4, 0xEC, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x7F, 0xF3, 0x10, 0x00, 0x00, 0x00,
+0x00, 0x5F, 0x94, 0xCE, 0x10, 0x00, 0x00, 0x00, 0x00, 0x60, 0x5F, 0xD5, 0x10, 0x00, 0x00, 0x00,
+0x00, 0x61, 0x7D, 0xEA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x62, 0x3F, 0xB7, 0x10, 0x00, 0x00, 0x00,
+0x00, 0x63, 0x5D, 0xCC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x64, 0x1F, 0x99, 0x10, 0x00, 0x00, 0x00,
+0x00, 0x65, 0x3D, 0xAE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x66, 0x08, 0xB5, 0x90, 0x00, 0x00, 0x00,
+0x00, 0x67, 0x1D, 0x90, 0x90, 0x00, 0x00, 0x00, 0x00, 0x67, 0xE8, 0x97, 0x90, 0x00, 0x00, 0x00,
+0x00, 0x68, 0xFD, 0x72, 0x90, 0x00, 0x00, 0x00, 0x00, 0x69, 0xC8, 0x79, 0x90, 0x00, 0x00, 0x00,
+0x00, 0x6A, 0xDD, 0x54, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6B, 0xA8, 0x5B, 0x90, 0x00, 0x00, 0x00,
+0x00, 0x6C, 0xC6, 0x71, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6D, 0x88, 0x3D, 0x90, 0x00, 0x00, 0x00,
+0x00, 0x6E, 0xA6, 0x53, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6F, 0x68, 0x1F, 0x90, 0x00, 0x00, 0x00,
+0x00, 0x70, 0x86, 0x35, 0x10, 0x00, 0x00, 0x00, 0x00, 0x71, 0x51, 0x3C, 0x10, 0x00, 0x00, 0x00,
+0x00, 0x72, 0x66, 0x17, 0x10, 0x00, 0x00, 0x00, 0x00, 0x73, 0x31, 0x1E, 0x10, 0x00, 0x00, 0x00,
+0x00, 0x74, 0x45, 0xF9, 0x10, 0x00, 0x00, 0x00, 0x00, 0x75, 0x11, 0x00, 0x10, 0x00, 0x00, 0x00,
+0x00, 0x76, 0x2F, 0x15, 0x90, 0x00, 0x00, 0x00, 0x00, 0x76, 0xF0, 0xE2, 0x10, 0x00, 0x00, 0x00,
+0x00, 0x78, 0x0E, 0xF7, 0x90, 0x00, 0x00, 0x00, 0x00, 0x78, 0xD0, 0xC4, 0x10, 0x00, 0x00, 0x00,
+0x00, 0x79, 0xEE, 0xD9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7A, 0xB0, 0xA6, 0x10, 0x00, 0x00, 0x00,
+0x00, 0x7B, 0xCE, 0xBB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x99, 0xC2, 0x90, 0x00, 0x00, 0x00,
+0x00, 0x7D, 0xAE, 0x9D, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x79, 0xA4, 0x90, 0x00, 0x00, 0x00,
+0x00, 0x7F, 0x8E, 0x7F, 0x90, 0x01, 0x07, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
+0x03, 0x02, 0x03, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04,
 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04,
+0x05, 0x04, 0x06, 0x04, 0x05, 0x04, 0x06, 0x04, 0x05, 0x04, 0x06, 0x04, 0x05, 0x04, 0x06, 0x04,
 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04,
-0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x07, 0x04, 0x05, 0x04, 0x07, 0x04, 0x05, 0x04,
-0x07, 0x04, 0x05, 0x04, 0x07, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04,
 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04,
-0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x09,
-0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08,
-0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x0A,
-0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C,
-0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C,
-0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C,
-0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C,
-0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C,
-0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0xFF, 0xFF, 0xE7, 0xF0, 0x00, 0x00,
-0xFF, 0xFF, 0xE5, 0x28, 0x00, 0x04, 0xFF, 0xFF, 0xF1, 0xF0, 0x01, 0x08, 0xFF, 0xFF, 0xE3, 0xE0,
-0x00, 0x0C, 0xFF, 0xFF, 0xF1, 0xF0, 0x01, 0x08, 0xFF, 0xFF, 0xE3, 0xE0, 0x00, 0x0C, 0xFF, 0xFF,
-0xE3, 0xE0, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x01, 0x10, 0xFF, 0xFF, 0xF1, 0xF0, 0x00, 0x08,
-0xFF, 0xFF, 0xF1, 0xF0, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00,
-0x01, 0x10, 0xFF, 0xFF, 0xF1, 0xF0, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x48, 0x4D, 0x54, 0x00,
-0x2D, 0x30, 0x31, 0x00, 0x2D, 0x30, 0x32, 0x00, 0x2B, 0x30, 0x30, 0x00, 0x57, 0x45, 0x54, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x0A, 0x3C, 0x2D, 0x30, 0x31, 0x3E,
-0x31, 0x3C, 0x2B, 0x30, 0x30, 0x3E, 0x2C, 0x4D, 0x33, 0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x30, 0x2C,
-0x4D, 0x31, 0x30, 0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x31, 0x0A, 0x00, 0xC2, 0xE7, 0xD5, 0x00, 0xEB,
-0x7E, 0x75, 0x00, 0x00, 0x00, 0x06, 0x41, 0x7A, 0x6F, 0x72, 0x65, 0x73, 
+0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06,
+0x08, 0x06, 0x08, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09,
+0x0A, 0x0C, 0x0B, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09,
+0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09,
+0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09,
+0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09,
+0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09,
+0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0xFF, 0xFF, 0xE7,
+0xF0, 0x00, 0x00, 0xFF, 0xFF, 0xE5, 0x28, 0x00, 0x04, 0xFF, 0xFF, 0xF1, 0xF0, 0x01, 0x08, 0xFF,
+0xFF, 0xE3, 0xE0, 0x00, 0x0C, 0xFF, 0xFF, 0xF1, 0xF0, 0x01, 0x08, 0xFF, 0xFF, 0xE3, 0xE0, 0x00,
+0x0C, 0x00, 0x00, 0x00, 0x00, 0x01, 0x10, 0xFF, 0xFF, 0xE3, 0xE0, 0x00, 0x0C, 0xFF, 0xFF, 0xF1,
+0xF0, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x01, 0x10, 0xFF, 0xFF, 0xF1, 0xF0, 0x00, 0x08, 0x00,
+0x00, 0x0E, 0x10, 0x01, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x19, 0x00, 0x00, 0x00, 0x00, 0x01,
+0x10, 0xFF, 0xFF, 0xF1, 0xF0, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x48, 0x4D, 0x54, 0x00, 0x2D,
+0x30, 0x31, 0x00, 0x2D, 0x30, 0x32, 0x00, 0x2B, 0x30, 0x30, 0x00, 0x57, 0x45, 0x53, 0x54, 0x00,
+0x57, 0x45, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00,
+0x01, 0x01, 0x0A, 0x3C, 0x2D, 0x30, 0x31, 0x3E, 0x31, 0x3C, 0x2B, 0x30, 0x30, 0x3E, 0x2C, 0x4D,
+0x33, 0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x30, 0x2C, 0x4D, 0x31, 0x30, 0x2E, 0x35, 0x2E, 0x30, 0x2F,
+0x31, 0x0A, 0x00, 0xC2, 0xE7, 0xD5, 0x00, 0xEB, 0x7E, 0x75, 0x00, 0x00, 0x00, 0x06, 0x41, 0x7A,
+0x6F, 0x72, 0x65, 0x73, 
 
 /* Atlantic/Bermuda */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x42, 0x4D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -48602,18 +49111,18 @@
 /* Atlantic/Madeira */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x50, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x1D, 0x80, 0x00, 0x00, 0x00,
-0x92, 0xE6, 0x9C, 0x90, 0x9B, 0x4B, 0x7B, 0x80, 0x9B, 0xFE, 0xD5, 0x90, 0x9C, 0x9C, 0xFB, 0x80,
-0x9D, 0xC9, 0x91, 0x80, 0x9E, 0x7F, 0x80, 0x80, 0x9F, 0xAA, 0xC5, 0x00, 0xA0, 0x5F, 0x62, 0x80,
-0xA1, 0x8B, 0xF8, 0x80, 0xA2, 0x41, 0xE7, 0x80, 0xA3, 0x6E, 0x7D, 0x80, 0xA4, 0x23, 0x1B, 0x00,
-0xA5, 0x4F, 0xB1, 0x00, 0xAA, 0x05, 0xFD, 0x80, 0xAA, 0xF4, 0x9D, 0x00, 0xAD, 0xC9, 0xB6, 0x00,
+0x00, 0x00, 0x00, 0xD6, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x1D, 0x80, 0x00, 0x00, 0x00,
+0x92, 0xE6, 0x9C, 0x90, 0x9B, 0x4B, 0x7B, 0x80, 0x9B, 0xFE, 0xD5, 0x90, 0x9C, 0x9D, 0x09, 0x90,
+0x9D, 0xC9, 0x91, 0x80, 0x9E, 0x7E, 0x3D, 0x10, 0x9F, 0xAA, 0xC5, 0x00, 0xA0, 0x5F, 0x70, 0x90,
+0xA1, 0x8B, 0xF8, 0x80, 0xA2, 0x41, 0xF5, 0x90, 0xA3, 0x6E, 0x7D, 0x80, 0xA4, 0x23, 0x29, 0x10,
+0xA5, 0x4F, 0xB1, 0x00, 0xAA, 0x05, 0xFD, 0x80, 0xAA, 0xE7, 0x6E, 0x00, 0xAD, 0xC9, 0xB6, 0x00,
 0xAE, 0xA7, 0x32, 0x00, 0xAF, 0xA0, 0x5D, 0x80, 0xB0, 0x87, 0x14, 0x00, 0xB1, 0x89, 0x7A, 0x00,
 0xB2, 0x70, 0x30, 0x80, 0xB3, 0x72, 0x96, 0x80, 0xB4, 0x50, 0x12, 0x80, 0xB7, 0x32, 0x5A, 0x80,
 0xB8, 0x0F, 0xD6, 0x80, 0xB8, 0xFF, 0xC7, 0x80, 0xB9, 0xEF, 0xB8, 0x80, 0xBC, 0xC8, 0xC6, 0x00,
 0xBD, 0xB8, 0xB7, 0x00, 0xBE, 0x9F, 0x6D, 0x80, 0xBF, 0x98, 0x99, 0x00, 0xC0, 0x9A, 0xFF, 0x00,
 0xC1, 0x78, 0x7B, 0x00, 0xC2, 0x68, 0x6C, 0x00, 0xC3, 0x58, 0x5D, 0x00, 0xC4, 0x3F, 0x13, 0x80,
 0xC5, 0x38, 0x3F, 0x00, 0xC6, 0x3A, 0xA5, 0x00, 0xC7, 0x58, 0xBA, 0x80, 0xC7, 0xD9, 0xED, 0x80,
-0xC9, 0x01, 0x3D, 0x80, 0xC9, 0xF1, 0x2E, 0x80, 0xCA, 0xE2, 0x71, 0x00, 0xCB, 0xB5, 0x61, 0x00,
+0xC9, 0x03, 0xE0, 0x80, 0xC9, 0xF1, 0x2E, 0x80, 0xCA, 0xE2, 0x71, 0x00, 0xCB, 0xB5, 0x61, 0x00,
 0xCB, 0xEC, 0xB1, 0xF0, 0xCC, 0x80, 0x59, 0xF0, 0xCC, 0xDC, 0xB1, 0x00, 0xCD, 0x95, 0x43, 0x00,
 0xCD, 0xC3, 0x59, 0x70, 0xCE, 0x72, 0xB0, 0xF0, 0xCE, 0xC5, 0xCD, 0x80, 0xCF, 0x75, 0x25, 0x00,
 0xCF, 0xAC, 0x75, 0xF0, 0xD0, 0x52, 0x92, 0xF0, 0xD0, 0xA5, 0xAF, 0x80, 0xD1, 0x55, 0x07, 0x00,
@@ -48628,199 +49137,191 @@
 0xEE, 0x9A, 0xBF, 0x30, 0xEF, 0x8A, 0xB0, 0x30, 0xF0, 0x7A, 0xA1, 0x30, 0xF1, 0x6A, 0x92, 0x30,
 0xF2, 0x63, 0xBD, 0xB0, 0xF3, 0x53, 0xAE, 0xB0, 0xF4, 0x43, 0x9F, 0xB0, 0xF5, 0x33, 0x90, 0xB0,
 0xF6, 0x23, 0x81, 0xB0, 0xF7, 0x13, 0x72, 0xB0, 0xF8, 0x03, 0x63, 0xB0, 0xF8, 0xF3, 0x54, 0xB0,
-0x0D, 0x9B, 0x1B, 0x00, 0x0E, 0x8B, 0x0C, 0x00, 0x0F, 0x84, 0x37, 0x80, 0x10, 0x74, 0x28, 0x80,
-0x11, 0x64, 0x19, 0x80, 0x12, 0x54, 0x18, 0x90, 0x13, 0x43, 0xFB, 0x80, 0x14, 0x33, 0xFA, 0x90,
-0x15, 0x23, 0xEB, 0x90, 0x16, 0x13, 0xDC, 0x90, 0x17, 0x03, 0xCD, 0x90, 0x17, 0xF3, 0xBE, 0x90,
-0x18, 0xE3, 0xBD, 0xA0, 0x19, 0xD3, 0xA0, 0x90, 0x1A, 0xC3, 0x91, 0x90, 0x1B, 0xBC, 0xBD, 0x10,
-0x1C, 0xAC, 0xAE, 0x10, 0x1D, 0x9C, 0x9F, 0x10, 0x1E, 0x8C, 0x90, 0x10, 0x1F, 0x7C, 0x81, 0x10,
-0x20, 0x6C, 0x72, 0x10, 0x21, 0x5C, 0x63, 0x10, 0x22, 0x4C, 0x54, 0x10, 0x23, 0x3C, 0x45, 0x10,
-0x24, 0x2C, 0x36, 0x10, 0x25, 0x1C, 0x27, 0x10, 0x26, 0x0C, 0x18, 0x10, 0x27, 0x05, 0x43, 0x90,
-0x27, 0xF5, 0x34, 0x90, 0x28, 0xE5, 0x25, 0x90, 0x29, 0xD5, 0x16, 0x90, 0x2A, 0xC5, 0x07, 0x90,
-0x2B, 0xB4, 0xF8, 0x90, 0x2C, 0xA4, 0xE9, 0x90, 0x2D, 0x94, 0xDA, 0x90, 0x2E, 0x84, 0xCB, 0x90,
-0x2F, 0x74, 0xBC, 0x90, 0x30, 0x64, 0xAD, 0x90, 0x31, 0x5D, 0xD9, 0x10, 0x32, 0x72, 0xB4, 0x10,
-0x33, 0x3D, 0xBB, 0x10, 0x34, 0x52, 0x96, 0x10, 0x35, 0x1D, 0x9D, 0x10, 0x36, 0x32, 0x78, 0x10,
-0x36, 0xFD, 0x7F, 0x10, 0x38, 0x1B, 0x94, 0x90, 0x38, 0xDD, 0x61, 0x10, 0x39, 0xFB, 0x76, 0x90,
-0x3A, 0xBD, 0x43, 0x10, 0x3B, 0xDB, 0x58, 0x90, 0x3C, 0xA6, 0x5F, 0x90, 0x3D, 0xBB, 0x3A, 0x90,
-0x3E, 0x86, 0x41, 0x90, 0x3F, 0x9B, 0x1C, 0x90, 0x40, 0x66, 0x23, 0x90, 0x41, 0x84, 0x39, 0x10,
-0x42, 0x46, 0x05, 0x90, 0x43, 0x64, 0x1B, 0x10, 0x44, 0x25, 0xE7, 0x90, 0x45, 0x43, 0xFD, 0x10,
-0x46, 0x05, 0xC9, 0x90, 0x47, 0x23, 0xDF, 0x10, 0x47, 0xEE, 0xE6, 0x10, 0x49, 0x03, 0xC1, 0x10,
-0x49, 0xCE, 0xC8, 0x10, 0x4A, 0xE3, 0xA3, 0x10, 0x4B, 0xAE, 0xAA, 0x10, 0x4C, 0xCC, 0xBF, 0x90,
-0x4D, 0x8E, 0x8C, 0x10, 0x4E, 0xAC, 0xA1, 0x90, 0x4F, 0x6E, 0x6E, 0x10, 0x50, 0x8C, 0x83, 0x90,
-0x51, 0x57, 0x8A, 0x90, 0x52, 0x6C, 0x65, 0x90, 0x53, 0x37, 0x6C, 0x90, 0x54, 0x4C, 0x47, 0x90,
-0x55, 0x17, 0x4E, 0x90, 0x56, 0x2C, 0x29, 0x90, 0x56, 0xF7, 0x30, 0x90, 0x58, 0x15, 0x46, 0x10,
-0x58, 0xD7, 0x12, 0x90, 0x59, 0xF5, 0x28, 0x10, 0x5A, 0xB6, 0xF4, 0x90, 0x5B, 0xD5, 0x0A, 0x10,
-0x5C, 0xA0, 0x11, 0x10, 0x5D, 0xB4, 0xEC, 0x10, 0x5E, 0x7F, 0xF3, 0x10, 0x5F, 0x94, 0xCE, 0x10,
-0x60, 0x5F, 0xD5, 0x10, 0x61, 0x7D, 0xEA, 0x90, 0x62, 0x3F, 0xB7, 0x10, 0x63, 0x5D, 0xCC, 0x90,
-0x64, 0x1F, 0x99, 0x10, 0x65, 0x3D, 0xAE, 0x90, 0x66, 0x08, 0xB5, 0x90, 0x67, 0x1D, 0x90, 0x90,
-0x67, 0xE8, 0x97, 0x90, 0x68, 0xFD, 0x72, 0x90, 0x69, 0xC8, 0x79, 0x90, 0x6A, 0xDD, 0x54, 0x90,
-0x6B, 0xA8, 0x5B, 0x90, 0x6C, 0xC6, 0x71, 0x10, 0x6D, 0x88, 0x3D, 0x90, 0x6E, 0xA6, 0x53, 0x10,
-0x6F, 0x68, 0x1F, 0x90, 0x70, 0x86, 0x35, 0x10, 0x71, 0x51, 0x3C, 0x10, 0x72, 0x66, 0x17, 0x10,
-0x73, 0x31, 0x1E, 0x10, 0x74, 0x45, 0xF9, 0x10, 0x75, 0x11, 0x00, 0x10, 0x76, 0x2F, 0x15, 0x90,
-0x76, 0xF0, 0xE2, 0x10, 0x78, 0x0E, 0xF7, 0x90, 0x78, 0xD0, 0xC4, 0x10, 0x79, 0xEE, 0xD9, 0x90,
-0x7A, 0xB0, 0xA6, 0x10, 0x7B, 0xCE, 0xBB, 0x90, 0x7C, 0x99, 0xC2, 0x90, 0x7D, 0xAE, 0x9D, 0x90,
-0x7E, 0x79, 0xA4, 0x90, 0x7F, 0x8E, 0x7F, 0x90, 0x01, 0x06, 0x02, 0x03, 0x04, 0x05, 0x04, 0x05,
+0xF9, 0xE3, 0x45, 0xB0, 0x17, 0x0C, 0xFA, 0x00, 0x17, 0xF3, 0xB0, 0x80, 0x18, 0xE3, 0xA1, 0x80,
+0x19, 0xD3, 0x92, 0x80, 0x1A, 0xC3, 0x83, 0x80, 0x1B, 0xBC, 0xAF, 0x00, 0x1C, 0xAC, 0xA0, 0x00,
+0x1D, 0x9C, 0x91, 0x00, 0x1E, 0x8C, 0x82, 0x00, 0x1F, 0x7C, 0x81, 0x10, 0x20, 0x6C, 0x72, 0x10,
+0x21, 0x5C, 0x63, 0x10, 0x22, 0x4C, 0x54, 0x10, 0x23, 0x3C, 0x45, 0x10, 0x24, 0x2C, 0x36, 0x10,
+0x25, 0x1C, 0x27, 0x10, 0x26, 0x0C, 0x18, 0x10, 0x27, 0x05, 0x43, 0x90, 0x27, 0xF5, 0x34, 0x90,
+0x28, 0xE5, 0x25, 0x90, 0x29, 0xD5, 0x16, 0x90, 0x2A, 0xC5, 0x07, 0x90, 0x2B, 0xB4, 0xF8, 0x90,
+0x2C, 0xA4, 0xE9, 0x90, 0x2D, 0x94, 0xDA, 0x90, 0x2E, 0x84, 0xCB, 0x90, 0x2F, 0x74, 0xBC, 0x90,
+0x30, 0x64, 0xAD, 0x90, 0x31, 0x5D, 0xD9, 0x10, 0x32, 0x72, 0xB4, 0x10, 0x33, 0x3D, 0xBB, 0x10,
+0x34, 0x52, 0x96, 0x10, 0x35, 0x1D, 0x9D, 0x10, 0x36, 0x32, 0x78, 0x10, 0x36, 0xFD, 0x7F, 0x10,
+0x38, 0x1B, 0x94, 0x90, 0x38, 0xDD, 0x61, 0x10, 0x39, 0xFB, 0x76, 0x90, 0x3A, 0xBD, 0x43, 0x10,
+0x3B, 0xDB, 0x58, 0x90, 0x3C, 0xA6, 0x5F, 0x90, 0x3D, 0xBB, 0x3A, 0x90, 0x3E, 0x86, 0x41, 0x90,
+0x3F, 0x9B, 0x1C, 0x90, 0x40, 0x66, 0x23, 0x90, 0x41, 0x84, 0x39, 0x10, 0x42, 0x46, 0x05, 0x90,
+0x43, 0x64, 0x1B, 0x10, 0x44, 0x25, 0xE7, 0x90, 0x45, 0x43, 0xFD, 0x10, 0x46, 0x05, 0xC9, 0x90,
+0x47, 0x23, 0xDF, 0x10, 0x47, 0xEE, 0xE6, 0x10, 0x49, 0x03, 0xC1, 0x10, 0x49, 0xCE, 0xC8, 0x10,
+0x4A, 0xE3, 0xA3, 0x10, 0x4B, 0xAE, 0xAA, 0x10, 0x4C, 0xCC, 0xBF, 0x90, 0x4D, 0x8E, 0x8C, 0x10,
+0x4E, 0xAC, 0xA1, 0x90, 0x4F, 0x6E, 0x6E, 0x10, 0x50, 0x8C, 0x83, 0x90, 0x51, 0x57, 0x8A, 0x90,
+0x52, 0x6C, 0x65, 0x90, 0x53, 0x37, 0x6C, 0x90, 0x54, 0x4C, 0x47, 0x90, 0x55, 0x17, 0x4E, 0x90,
+0x56, 0x2C, 0x29, 0x90, 0x56, 0xF7, 0x30, 0x90, 0x58, 0x15, 0x46, 0x10, 0x58, 0xD7, 0x12, 0x90,
+0x59, 0xF5, 0x28, 0x10, 0x5A, 0xB6, 0xF4, 0x90, 0x5B, 0xD5, 0x0A, 0x10, 0x5C, 0xA0, 0x11, 0x10,
+0x5D, 0xB4, 0xEC, 0x10, 0x5E, 0x7F, 0xF3, 0x10, 0x5F, 0x94, 0xCE, 0x10, 0x60, 0x5F, 0xD5, 0x10,
+0x61, 0x7D, 0xEA, 0x90, 0x62, 0x3F, 0xB7, 0x10, 0x63, 0x5D, 0xCC, 0x90, 0x64, 0x1F, 0x99, 0x10,
+0x65, 0x3D, 0xAE, 0x90, 0x66, 0x08, 0xB5, 0x90, 0x67, 0x1D, 0x90, 0x90, 0x67, 0xE8, 0x97, 0x90,
+0x68, 0xFD, 0x72, 0x90, 0x69, 0xC8, 0x79, 0x90, 0x6A, 0xDD, 0x54, 0x90, 0x6B, 0xA8, 0x5B, 0x90,
+0x6C, 0xC6, 0x71, 0x10, 0x6D, 0x88, 0x3D, 0x90, 0x6E, 0xA6, 0x53, 0x10, 0x6F, 0x68, 0x1F, 0x90,
+0x70, 0x86, 0x35, 0x10, 0x71, 0x51, 0x3C, 0x10, 0x72, 0x66, 0x17, 0x10, 0x73, 0x31, 0x1E, 0x10,
+0x74, 0x45, 0xF9, 0x10, 0x75, 0x11, 0x00, 0x10, 0x76, 0x2F, 0x15, 0x90, 0x76, 0xF0, 0xE2, 0x10,
+0x78, 0x0E, 0xF7, 0x90, 0x78, 0xD0, 0xC4, 0x10, 0x79, 0xEE, 0xD9, 0x90, 0x7A, 0xB0, 0xA6, 0x10,
+0x7B, 0xCE, 0xBB, 0x90, 0x7C, 0x99, 0xC2, 0x90, 0x7D, 0xAE, 0x9D, 0x90, 0x7E, 0x79, 0xA4, 0x90,
+0x7F, 0x8E, 0x7F, 0x90, 0x01, 0x07, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
+0x02, 0x03, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05,
 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05,
+0x04, 0x06, 0x04, 0x05, 0x04, 0x06, 0x04, 0x05, 0x04, 0x06, 0x04, 0x05, 0x04, 0x06, 0x04, 0x05,
 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05,
-0x04, 0x05, 0x04, 0x05, 0x04, 0x07, 0x04, 0x05, 0x04, 0x07, 0x04, 0x05, 0x04, 0x07, 0x04, 0x05,
-0x04, 0x07, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05,
 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05,
-0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x0A, 0x08, 0x09, 0x08,
-0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C,
-0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C,
-0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C,
-0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C,
-0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C,
-0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C,
+0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x08, 0x0A, 0x08, 0x09, 0x08, 0x09, 0x08,
+0x09, 0x08, 0x09, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B,
+0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B,
+0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B,
+0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B,
+0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B,
+0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B,
+0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0xFF, 0xFF, 0xF0, 0x28, 0x00, 0x00,
+0xFF, 0xFF, 0xF0, 0x28, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x01, 0x08, 0xFF, 0xFF, 0xF1, 0xF0,
+0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x01, 0x08, 0xFF, 0xFF, 0xF1, 0xF0, 0x00, 0x0C, 0x00, 0x00,
+0x0E, 0x10, 0x01, 0x10, 0xFF, 0xFF, 0xF1, 0xF0, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14,
+0x00, 0x00, 0x0E, 0x10, 0x01, 0x18, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x18, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x14, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x18, 0x4C, 0x4D, 0x54, 0x00, 0x46, 0x4D, 0x54, 0x00,
+0x2B, 0x30, 0x30, 0x00, 0x2D, 0x30, 0x31, 0x00, 0x2B, 0x30, 0x31, 0x00, 0x57, 0x45, 0x54, 0x00,
+0x57, 0x45, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00,
+0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x54,
+0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0xD6, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x1D, 0xFF, 0xFF, 0xFF, 0xFF, 0x5E,
+0x3D, 0x13, 0x58, 0xFF, 0xFF, 0xFF, 0xFF, 0x92, 0xE6, 0x9C, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0x9B,
+0x4B, 0x7B, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0x9B, 0xFE, 0xD5, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0x9C,
+0x9D, 0x09, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0x9D, 0xC9, 0x91, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0x9E,
+0x7E, 0x3D, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0x9F, 0xAA, 0xC5, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xA0,
+0x5F, 0x70, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xA1, 0x8B, 0xF8, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xA2,
+0x41, 0xF5, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xA3, 0x6E, 0x7D, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xA4,
+0x23, 0x29, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0x4F, 0xB1, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xAA,
+0x05, 0xFD, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xAA, 0xE7, 0x6E, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xAD,
+0xC9, 0xB6, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xAE, 0xA7, 0x32, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF,
+0xA0, 0x5D, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xB0, 0x87, 0x14, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xB1,
+0x89, 0x7A, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xB2, 0x70, 0x30, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xB3,
+0x72, 0x96, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xB4, 0x50, 0x12, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7,
+0x32, 0x5A, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0x0F, 0xD6, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8,
+0xFF, 0xC7, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xB9, 0xEF, 0xB8, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xBC,
+0xC8, 0xC6, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xBD, 0xB8, 0xB7, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xBE,
+0x9F, 0x6D, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xBF, 0x98, 0x99, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xC0,
+0x9A, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xC1, 0x78, 0x7B, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xC2,
+0x68, 0x6C, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xC3, 0x58, 0x5D, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xC4,
+0x3F, 0x13, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xC5, 0x38, 0x3F, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xC6,
+0x3A, 0xA5, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xC7, 0x58, 0xBA, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xC7,
+0xD9, 0xED, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0x03, 0xE0, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9,
+0xF1, 0x2E, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xCA, 0xE2, 0x71, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB,
+0xB5, 0x61, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0xEC, 0xB1, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCC,
+0x80, 0x59, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCC, 0xDC, 0xB1, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xCD,
+0x95, 0x43, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xCD, 0xC3, 0x59, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xCE,
+0x72, 0xB0, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCE, 0xC5, 0xCD, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xCF,
+0x75, 0x25, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xCF, 0xAC, 0x75, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD0,
+0x52, 0x92, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD0, 0xA5, 0xAF, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xD1,
+0x55, 0x07, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xD1, 0x8C, 0x57, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2,
+0x32, 0x74, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x85, 0x91, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xD3,
+0x59, 0xD3, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xD4, 0x49, 0xC4, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xD5,
+0x39, 0xDF, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xD6, 0x29, 0xD0, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xD7,
+0x19, 0xC1, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xD8, 0x09, 0xB2, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xD8,
+0xF9, 0xA3, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xD9, 0xE9, 0x94, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xDA,
+0xD9, 0x85, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xDB, 0xC9, 0x76, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xDC,
+0xB9, 0x67, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xDD, 0xB2, 0x92, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xDE,
+0xA2, 0x83, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0x92, 0x74, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE0,
+0x82, 0x65, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE1, 0x72, 0x56, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE2,
+0x62, 0x47, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE3, 0x52, 0x38, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE4,
+0x42, 0x29, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE5, 0x32, 0x1A, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE6,
+0x22, 0x0B, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE7, 0x1B, 0x37, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xE8,
+0x0B, 0x28, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xE8, 0xFB, 0x19, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xE9,
+0xEB, 0x0A, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xEA, 0xDA, 0xFB, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xEB,
+0xCA, 0xEC, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xEC, 0xBA, 0xDD, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xED,
+0xAA, 0xCE, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xEE, 0x9A, 0xBF, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xEF,
+0x8A, 0xB0, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xF0, 0x7A, 0xA1, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xF1,
+0x6A, 0x92, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xF2, 0x63, 0xBD, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF3,
+0x53, 0xAE, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x43, 0x9F, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF5,
+0x33, 0x90, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF6, 0x23, 0x81, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7,
+0x13, 0x72, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x03, 0x63, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8,
+0xF3, 0x54, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF9, 0xE3, 0x45, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x17,
+0x0C, 0xFA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x17, 0xF3, 0xB0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x18,
+0xE3, 0xA1, 0x80, 0x00, 0x00, 0x00, 0x00, 0x19, 0xD3, 0x92, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1A,
+0xC3, 0x83, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xBC, 0xAF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1C,
+0xAC, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1D, 0x9C, 0x91, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E,
+0x8C, 0x82, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1F, 0x7C, 0x81, 0x10, 0x00, 0x00, 0x00, 0x00, 0x20,
+0x6C, 0x72, 0x10, 0x00, 0x00, 0x00, 0x00, 0x21, 0x5C, 0x63, 0x10, 0x00, 0x00, 0x00, 0x00, 0x22,
+0x4C, 0x54, 0x10, 0x00, 0x00, 0x00, 0x00, 0x23, 0x3C, 0x45, 0x10, 0x00, 0x00, 0x00, 0x00, 0x24,
+0x2C, 0x36, 0x10, 0x00, 0x00, 0x00, 0x00, 0x25, 0x1C, 0x27, 0x10, 0x00, 0x00, 0x00, 0x00, 0x26,
+0x0C, 0x18, 0x10, 0x00, 0x00, 0x00, 0x00, 0x27, 0x05, 0x43, 0x90, 0x00, 0x00, 0x00, 0x00, 0x27,
+0xF5, 0x34, 0x90, 0x00, 0x00, 0x00, 0x00, 0x28, 0xE5, 0x25, 0x90, 0x00, 0x00, 0x00, 0x00, 0x29,
+0xD5, 0x16, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xC5, 0x07, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2B,
+0xB4, 0xF8, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xA4, 0xE9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2D,
+0x94, 0xDA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2E, 0x84, 0xCB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2F,
+0x74, 0xBC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x30, 0x64, 0xAD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x31,
+0x5D, 0xD9, 0x10, 0x00, 0x00, 0x00, 0x00, 0x32, 0x72, 0xB4, 0x10, 0x00, 0x00, 0x00, 0x00, 0x33,
+0x3D, 0xBB, 0x10, 0x00, 0x00, 0x00, 0x00, 0x34, 0x52, 0x96, 0x10, 0x00, 0x00, 0x00, 0x00, 0x35,
+0x1D, 0x9D, 0x10, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0x78, 0x10, 0x00, 0x00, 0x00, 0x00, 0x36,
+0xFD, 0x7F, 0x10, 0x00, 0x00, 0x00, 0x00, 0x38, 0x1B, 0x94, 0x90, 0x00, 0x00, 0x00, 0x00, 0x38,
+0xDD, 0x61, 0x10, 0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0x76, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3A,
+0xBD, 0x43, 0x10, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xDB, 0x58, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3C,
+0xA6, 0x5F, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0x3A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3E,
+0x86, 0x41, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x1C, 0x90, 0x00, 0x00, 0x00, 0x00, 0x40,
+0x66, 0x23, 0x90, 0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0x39, 0x10, 0x00, 0x00, 0x00, 0x00, 0x42,
+0x46, 0x05, 0x90, 0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x1B, 0x10, 0x00, 0x00, 0x00, 0x00, 0x44,
+0x25, 0xE7, 0x90, 0x00, 0x00, 0x00, 0x00, 0x45, 0x43, 0xFD, 0x10, 0x00, 0x00, 0x00, 0x00, 0x46,
+0x05, 0xC9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x47, 0x23, 0xDF, 0x10, 0x00, 0x00, 0x00, 0x00, 0x47,
+0xEE, 0xE6, 0x10, 0x00, 0x00, 0x00, 0x00, 0x49, 0x03, 0xC1, 0x10, 0x00, 0x00, 0x00, 0x00, 0x49,
+0xCE, 0xC8, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4A, 0xE3, 0xA3, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4B,
+0xAE, 0xAA, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4C, 0xCC, 0xBF, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4D,
+0x8E, 0x8C, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4E, 0xAC, 0xA1, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4F,
+0x6E, 0x6E, 0x10, 0x00, 0x00, 0x00, 0x00, 0x50, 0x8C, 0x83, 0x90, 0x00, 0x00, 0x00, 0x00, 0x51,
+0x57, 0x8A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x52, 0x6C, 0x65, 0x90, 0x00, 0x00, 0x00, 0x00, 0x53,
+0x37, 0x6C, 0x90, 0x00, 0x00, 0x00, 0x00, 0x54, 0x4C, 0x47, 0x90, 0x00, 0x00, 0x00, 0x00, 0x55,
+0x17, 0x4E, 0x90, 0x00, 0x00, 0x00, 0x00, 0x56, 0x2C, 0x29, 0x90, 0x00, 0x00, 0x00, 0x00, 0x56,
+0xF7, 0x30, 0x90, 0x00, 0x00, 0x00, 0x00, 0x58, 0x15, 0x46, 0x10, 0x00, 0x00, 0x00, 0x00, 0x58,
+0xD7, 0x12, 0x90, 0x00, 0x00, 0x00, 0x00, 0x59, 0xF5, 0x28, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5A,
+0xB6, 0xF4, 0x90, 0x00, 0x00, 0x00, 0x00, 0x5B, 0xD5, 0x0A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5C,
+0xA0, 0x11, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5D, 0xB4, 0xEC, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5E,
+0x7F, 0xF3, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5F, 0x94, 0xCE, 0x10, 0x00, 0x00, 0x00, 0x00, 0x60,
+0x5F, 0xD5, 0x10, 0x00, 0x00, 0x00, 0x00, 0x61, 0x7D, 0xEA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x62,
+0x3F, 0xB7, 0x10, 0x00, 0x00, 0x00, 0x00, 0x63, 0x5D, 0xCC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x64,
+0x1F, 0x99, 0x10, 0x00, 0x00, 0x00, 0x00, 0x65, 0x3D, 0xAE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x66,
+0x08, 0xB5, 0x90, 0x00, 0x00, 0x00, 0x00, 0x67, 0x1D, 0x90, 0x90, 0x00, 0x00, 0x00, 0x00, 0x67,
+0xE8, 0x97, 0x90, 0x00, 0x00, 0x00, 0x00, 0x68, 0xFD, 0x72, 0x90, 0x00, 0x00, 0x00, 0x00, 0x69,
+0xC8, 0x79, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6A, 0xDD, 0x54, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6B,
+0xA8, 0x5B, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6C, 0xC6, 0x71, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6D,
+0x88, 0x3D, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6E, 0xA6, 0x53, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6F,
+0x68, 0x1F, 0x90, 0x00, 0x00, 0x00, 0x00, 0x70, 0x86, 0x35, 0x10, 0x00, 0x00, 0x00, 0x00, 0x71,
+0x51, 0x3C, 0x10, 0x00, 0x00, 0x00, 0x00, 0x72, 0x66, 0x17, 0x10, 0x00, 0x00, 0x00, 0x00, 0x73,
+0x31, 0x1E, 0x10, 0x00, 0x00, 0x00, 0x00, 0x74, 0x45, 0xF9, 0x10, 0x00, 0x00, 0x00, 0x00, 0x75,
+0x11, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x76, 0x2F, 0x15, 0x90, 0x00, 0x00, 0x00, 0x00, 0x76,
+0xF0, 0xE2, 0x10, 0x00, 0x00, 0x00, 0x00, 0x78, 0x0E, 0xF7, 0x90, 0x00, 0x00, 0x00, 0x00, 0x78,
+0xD0, 0xC4, 0x10, 0x00, 0x00, 0x00, 0x00, 0x79, 0xEE, 0xD9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7A,
+0xB0, 0xA6, 0x10, 0x00, 0x00, 0x00, 0x00, 0x7B, 0xCE, 0xBB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7C,
+0x99, 0xC2, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7D, 0xAE, 0x9D, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7E,
+0x79, 0xA4, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x8E, 0x7F, 0x90, 0x01, 0x07, 0x02, 0x03, 0x02,
+0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04,
+0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04,
+0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x06, 0x04, 0x05, 0x04, 0x06, 0x04, 0x05, 0x04,
+0x06, 0x04, 0x05, 0x04, 0x06, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04,
+0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04,
+0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04,
+0x08, 0x0A, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C,
 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C,
-0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0xFF, 0xFF, 0xF0, 0x28, 0x00, 0x00, 0xFF, 0xFF, 0xF0,
-0x28, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x01, 0x08, 0xFF, 0xFF, 0xF1, 0xF0, 0x00, 0x0C, 0x00,
-0x00, 0x00, 0x00, 0x01, 0x08, 0xFF, 0xFF, 0xF1, 0xF0, 0x00, 0x0C, 0xFF, 0xFF, 0xF1, 0xF0, 0x00,
-0x0C, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x10, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x14, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x19, 0x00, 0x00, 0x00, 0x00, 0x00, 0x19, 0x00, 0x00, 0x00, 0x00, 0x00, 0x19, 0x00,
-0x00, 0x0E, 0x10, 0x01, 0x14, 0x4C, 0x4D, 0x54, 0x00, 0x46, 0x4D, 0x54, 0x00, 0x2B, 0x30, 0x30,
-0x00, 0x2D, 0x30, 0x31, 0x00, 0x2B, 0x30, 0x31, 0x00, 0x57, 0x45, 0x53, 0x54, 0x00, 0x57, 0x45,
-0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x54, 0x5A, 0x69, 0x66,
-0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xDF,
-0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x1D, 0xFF, 0xFF, 0xFF, 0xFF, 0x5E, 0x3D, 0x13, 0x58,
-0xFF, 0xFF, 0xFF, 0xFF, 0x92, 0xE6, 0x9C, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0x9B, 0x4B, 0x7B, 0x80,
-0xFF, 0xFF, 0xFF, 0xFF, 0x9B, 0xFE, 0xD5, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0x9C, 0x9C, 0xFB, 0x80,
-0xFF, 0xFF, 0xFF, 0xFF, 0x9D, 0xC9, 0x91, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0x9E, 0x7F, 0x80, 0x80,
-0xFF, 0xFF, 0xFF, 0xFF, 0x9F, 0xAA, 0xC5, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xA0, 0x5F, 0x62, 0x80,
-0xFF, 0xFF, 0xFF, 0xFF, 0xA1, 0x8B, 0xF8, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xA2, 0x41, 0xE7, 0x80,
-0xFF, 0xFF, 0xFF, 0xFF, 0xA3, 0x6E, 0x7D, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xA4, 0x23, 0x1B, 0x00,
-0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0x4F, 0xB1, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xAA, 0x05, 0xFD, 0x80,
-0xFF, 0xFF, 0xFF, 0xFF, 0xAA, 0xF4, 0x9D, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xAD, 0xC9, 0xB6, 0x00,
-0xFF, 0xFF, 0xFF, 0xFF, 0xAE, 0xA7, 0x32, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xA0, 0x5D, 0x80,
-0xFF, 0xFF, 0xFF, 0xFF, 0xB0, 0x87, 0x14, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xB1, 0x89, 0x7A, 0x00,
-0xFF, 0xFF, 0xFF, 0xFF, 0xB2, 0x70, 0x30, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xB3, 0x72, 0x96, 0x80,
-0xFF, 0xFF, 0xFF, 0xFF, 0xB4, 0x50, 0x12, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x32, 0x5A, 0x80,
-0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0x0F, 0xD6, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0xFF, 0xC7, 0x80,
-0xFF, 0xFF, 0xFF, 0xFF, 0xB9, 0xEF, 0xB8, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xBC, 0xC8, 0xC6, 0x00,
-0xFF, 0xFF, 0xFF, 0xFF, 0xBD, 0xB8, 0xB7, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xBE, 0x9F, 0x6D, 0x80,
-0xFF, 0xFF, 0xFF, 0xFF, 0xBF, 0x98, 0x99, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xC0, 0x9A, 0xFF, 0x00,
-0xFF, 0xFF, 0xFF, 0xFF, 0xC1, 0x78, 0x7B, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xC2, 0x68, 0x6C, 0x00,
-0xFF, 0xFF, 0xFF, 0xFF, 0xC3, 0x58, 0x5D, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xC4, 0x3F, 0x13, 0x80,
-0xFF, 0xFF, 0xFF, 0xFF, 0xC5, 0x38, 0x3F, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xC6, 0x3A, 0xA5, 0x00,
-0xFF, 0xFF, 0xFF, 0xFF, 0xC7, 0x58, 0xBA, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xC7, 0xD9, 0xED, 0x80,
-0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0x01, 0x3D, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0xF1, 0x2E, 0x80,
-0xFF, 0xFF, 0xFF, 0xFF, 0xCA, 0xE2, 0x71, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0xB5, 0x61, 0x00,
-0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0xEC, 0xB1, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCC, 0x80, 0x59, 0xF0,
-0xFF, 0xFF, 0xFF, 0xFF, 0xCC, 0xDC, 0xB1, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xCD, 0x95, 0x43, 0x00,
-0xFF, 0xFF, 0xFF, 0xFF, 0xCD, 0xC3, 0x59, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xCE, 0x72, 0xB0, 0xF0,
-0xFF, 0xFF, 0xFF, 0xFF, 0xCE, 0xC5, 0xCD, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xCF, 0x75, 0x25, 0x00,
-0xFF, 0xFF, 0xFF, 0xFF, 0xCF, 0xAC, 0x75, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD0, 0x52, 0x92, 0xF0,
-0xFF, 0xFF, 0xFF, 0xFF, 0xD0, 0xA5, 0xAF, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xD1, 0x55, 0x07, 0x00,
-0xFF, 0xFF, 0xFF, 0xFF, 0xD1, 0x8C, 0x57, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x32, 0x74, 0xF0,
-0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x85, 0x91, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xD3, 0x59, 0xD3, 0x00,
-0xFF, 0xFF, 0xFF, 0xFF, 0xD4, 0x49, 0xC4, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xD5, 0x39, 0xDF, 0x30,
-0xFF, 0xFF, 0xFF, 0xFF, 0xD6, 0x29, 0xD0, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xD7, 0x19, 0xC1, 0x30,
-0xFF, 0xFF, 0xFF, 0xFF, 0xD8, 0x09, 0xB2, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xD8, 0xF9, 0xA3, 0x30,
-0xFF, 0xFF, 0xFF, 0xFF, 0xD9, 0xE9, 0x94, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xDA, 0xD9, 0x85, 0x30,
-0xFF, 0xFF, 0xFF, 0xFF, 0xDB, 0xC9, 0x76, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xDC, 0xB9, 0x67, 0x30,
-0xFF, 0xFF, 0xFF, 0xFF, 0xDD, 0xB2, 0x92, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xDE, 0xA2, 0x83, 0xB0,
-0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0x92, 0x74, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE0, 0x82, 0x65, 0xB0,
-0xFF, 0xFF, 0xFF, 0xFF, 0xE1, 0x72, 0x56, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE2, 0x62, 0x47, 0xB0,
-0xFF, 0xFF, 0xFF, 0xFF, 0xE3, 0x52, 0x38, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE4, 0x42, 0x29, 0xB0,
-0xFF, 0xFF, 0xFF, 0xFF, 0xE5, 0x32, 0x1A, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE6, 0x22, 0x0B, 0xB0,
-0xFF, 0xFF, 0xFF, 0xFF, 0xE7, 0x1B, 0x37, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xE8, 0x0B, 0x28, 0x30,
-0xFF, 0xFF, 0xFF, 0xFF, 0xE8, 0xFB, 0x19, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xE9, 0xEB, 0x0A, 0x30,
-0xFF, 0xFF, 0xFF, 0xFF, 0xEA, 0xDA, 0xFB, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xEB, 0xCA, 0xEC, 0x30,
-0xFF, 0xFF, 0xFF, 0xFF, 0xEC, 0xBA, 0xDD, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xED, 0xAA, 0xCE, 0x30,
-0xFF, 0xFF, 0xFF, 0xFF, 0xEE, 0x9A, 0xBF, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xEF, 0x8A, 0xB0, 0x30,
-0xFF, 0xFF, 0xFF, 0xFF, 0xF0, 0x7A, 0xA1, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xF1, 0x6A, 0x92, 0x30,
-0xFF, 0xFF, 0xFF, 0xFF, 0xF2, 0x63, 0xBD, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF3, 0x53, 0xAE, 0xB0,
-0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x43, 0x9F, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x33, 0x90, 0xB0,
-0xFF, 0xFF, 0xFF, 0xFF, 0xF6, 0x23, 0x81, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x13, 0x72, 0xB0,
-0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x03, 0x63, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0xF3, 0x54, 0xB0,
-0x00, 0x00, 0x00, 0x00, 0x0D, 0x9B, 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x8B, 0x0C, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x0F, 0x84, 0x37, 0x80, 0x00, 0x00, 0x00, 0x00, 0x10, 0x74, 0x28, 0x80,
-0x00, 0x00, 0x00, 0x00, 0x11, 0x64, 0x19, 0x80, 0x00, 0x00, 0x00, 0x00, 0x12, 0x54, 0x18, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x13, 0x43, 0xFB, 0x80, 0x00, 0x00, 0x00, 0x00, 0x14, 0x33, 0xFA, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x15, 0x23, 0xEB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x16, 0x13, 0xDC, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x17, 0x03, 0xCD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x17, 0xF3, 0xBE, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x18, 0xE3, 0xBD, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x19, 0xD3, 0xA0, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x1A, 0xC3, 0x91, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xBC, 0xBD, 0x10,
-0x00, 0x00, 0x00, 0x00, 0x1C, 0xAC, 0xAE, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1D, 0x9C, 0x9F, 0x10,
-0x00, 0x00, 0x00, 0x00, 0x1E, 0x8C, 0x90, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1F, 0x7C, 0x81, 0x10,
-0x00, 0x00, 0x00, 0x00, 0x20, 0x6C, 0x72, 0x10, 0x00, 0x00, 0x00, 0x00, 0x21, 0x5C, 0x63, 0x10,
-0x00, 0x00, 0x00, 0x00, 0x22, 0x4C, 0x54, 0x10, 0x00, 0x00, 0x00, 0x00, 0x23, 0x3C, 0x45, 0x10,
-0x00, 0x00, 0x00, 0x00, 0x24, 0x2C, 0x36, 0x10, 0x00, 0x00, 0x00, 0x00, 0x25, 0x1C, 0x27, 0x10,
-0x00, 0x00, 0x00, 0x00, 0x26, 0x0C, 0x18, 0x10, 0x00, 0x00, 0x00, 0x00, 0x27, 0x05, 0x43, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x27, 0xF5, 0x34, 0x90, 0x00, 0x00, 0x00, 0x00, 0x28, 0xE5, 0x25, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x29, 0xD5, 0x16, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xC5, 0x07, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x2B, 0xB4, 0xF8, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xA4, 0xE9, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x2D, 0x94, 0xDA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2E, 0x84, 0xCB, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x2F, 0x74, 0xBC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x30, 0x64, 0xAD, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x31, 0x5D, 0xD9, 0x10, 0x00, 0x00, 0x00, 0x00, 0x32, 0x72, 0xB4, 0x10,
-0x00, 0x00, 0x00, 0x00, 0x33, 0x3D, 0xBB, 0x10, 0x00, 0x00, 0x00, 0x00, 0x34, 0x52, 0x96, 0x10,
-0x00, 0x00, 0x00, 0x00, 0x35, 0x1D, 0x9D, 0x10, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0x78, 0x10,
-0x00, 0x00, 0x00, 0x00, 0x36, 0xFD, 0x7F, 0x10, 0x00, 0x00, 0x00, 0x00, 0x38, 0x1B, 0x94, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x38, 0xDD, 0x61, 0x10, 0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0x76, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x3A, 0xBD, 0x43, 0x10, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xDB, 0x58, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x3C, 0xA6, 0x5F, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0x3A, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x3E, 0x86, 0x41, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x1C, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x40, 0x66, 0x23, 0x90, 0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0x39, 0x10,
-0x00, 0x00, 0x00, 0x00, 0x42, 0x46, 0x05, 0x90, 0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x1B, 0x10,
-0x00, 0x00, 0x00, 0x00, 0x44, 0x25, 0xE7, 0x90, 0x00, 0x00, 0x00, 0x00, 0x45, 0x43, 0xFD, 0x10,
-0x00, 0x00, 0x00, 0x00, 0x46, 0x05, 0xC9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x47, 0x23, 0xDF, 0x10,
-0x00, 0x00, 0x00, 0x00, 0x47, 0xEE, 0xE6, 0x10, 0x00, 0x00, 0x00, 0x00, 0x49, 0x03, 0xC1, 0x10,
-0x00, 0x00, 0x00, 0x00, 0x49, 0xCE, 0xC8, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4A, 0xE3, 0xA3, 0x10,
-0x00, 0x00, 0x00, 0x00, 0x4B, 0xAE, 0xAA, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4C, 0xCC, 0xBF, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x4D, 0x8E, 0x8C, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4E, 0xAC, 0xA1, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x4F, 0x6E, 0x6E, 0x10, 0x00, 0x00, 0x00, 0x00, 0x50, 0x8C, 0x83, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x51, 0x57, 0x8A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x52, 0x6C, 0x65, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x53, 0x37, 0x6C, 0x90, 0x00, 0x00, 0x00, 0x00, 0x54, 0x4C, 0x47, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x55, 0x17, 0x4E, 0x90, 0x00, 0x00, 0x00, 0x00, 0x56, 0x2C, 0x29, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x56, 0xF7, 0x30, 0x90, 0x00, 0x00, 0x00, 0x00, 0x58, 0x15, 0x46, 0x10,
-0x00, 0x00, 0x00, 0x00, 0x58, 0xD7, 0x12, 0x90, 0x00, 0x00, 0x00, 0x00, 0x59, 0xF5, 0x28, 0x10,
-0x00, 0x00, 0x00, 0x00, 0x5A, 0xB6, 0xF4, 0x90, 0x00, 0x00, 0x00, 0x00, 0x5B, 0xD5, 0x0A, 0x10,
-0x00, 0x00, 0x00, 0x00, 0x5C, 0xA0, 0x11, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5D, 0xB4, 0xEC, 0x10,
-0x00, 0x00, 0x00, 0x00, 0x5E, 0x7F, 0xF3, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5F, 0x94, 0xCE, 0x10,
-0x00, 0x00, 0x00, 0x00, 0x60, 0x5F, 0xD5, 0x10, 0x00, 0x00, 0x00, 0x00, 0x61, 0x7D, 0xEA, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x62, 0x3F, 0xB7, 0x10, 0x00, 0x00, 0x00, 0x00, 0x63, 0x5D, 0xCC, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x64, 0x1F, 0x99, 0x10, 0x00, 0x00, 0x00, 0x00, 0x65, 0x3D, 0xAE, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x66, 0x08, 0xB5, 0x90, 0x00, 0x00, 0x00, 0x00, 0x67, 0x1D, 0x90, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x67, 0xE8, 0x97, 0x90, 0x00, 0x00, 0x00, 0x00, 0x68, 0xFD, 0x72, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x69, 0xC8, 0x79, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6A, 0xDD, 0x54, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x6B, 0xA8, 0x5B, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6C, 0xC6, 0x71, 0x10,
-0x00, 0x00, 0x00, 0x00, 0x6D, 0x88, 0x3D, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6E, 0xA6, 0x53, 0x10,
-0x00, 0x00, 0x00, 0x00, 0x6F, 0x68, 0x1F, 0x90, 0x00, 0x00, 0x00, 0x00, 0x70, 0x86, 0x35, 0x10,
-0x00, 0x00, 0x00, 0x00, 0x71, 0x51, 0x3C, 0x10, 0x00, 0x00, 0x00, 0x00, 0x72, 0x66, 0x17, 0x10,
-0x00, 0x00, 0x00, 0x00, 0x73, 0x31, 0x1E, 0x10, 0x00, 0x00, 0x00, 0x00, 0x74, 0x45, 0xF9, 0x10,
-0x00, 0x00, 0x00, 0x00, 0x75, 0x11, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x76, 0x2F, 0x15, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x76, 0xF0, 0xE2, 0x10, 0x00, 0x00, 0x00, 0x00, 0x78, 0x0E, 0xF7, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x78, 0xD0, 0xC4, 0x10, 0x00, 0x00, 0x00, 0x00, 0x79, 0xEE, 0xD9, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x7A, 0xB0, 0xA6, 0x10, 0x00, 0x00, 0x00, 0x00, 0x7B, 0xCE, 0xBB, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x7C, 0x99, 0xC2, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7D, 0xAE, 0x9D, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x7E, 0x79, 0xA4, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x8E, 0x7F, 0x90,
-0x01, 0x06, 0x02, 0x03, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05,
-0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05,
-0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x07, 0x04, 0x05,
-0x04, 0x07, 0x04, 0x05, 0x04, 0x07, 0x04, 0x05, 0x04, 0x07, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05,
-0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05,
-0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05,
-0x04, 0x05, 0x04, 0x05, 0x0A, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08,
-0x09, 0x08, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C,
 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C,
 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C,
 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C,
 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C,
 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C,
-0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0xFF,
-0xFF, 0xF0, 0x28, 0x00, 0x00, 0xFF, 0xFF, 0xF0, 0x28, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x01,
-0x08, 0xFF, 0xFF, 0xF1, 0xF0, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x01, 0x08, 0xFF, 0xFF, 0xF1,
-0xF0, 0x00, 0x0C, 0xFF, 0xFF, 0xF1, 0xF0, 0x00, 0x0C, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x10, 0x00,
-0x00, 0x0E, 0x10, 0x01, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x19, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x19, 0x00, 0x00, 0x00, 0x00, 0x00, 0x19, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x14, 0x4C, 0x4D, 0x54,
-0x00, 0x46, 0x4D, 0x54, 0x00, 0x2B, 0x30, 0x30, 0x00, 0x2D, 0x30, 0x31, 0x00, 0x2B, 0x30, 0x31,
-0x00, 0x57, 0x45, 0x53, 0x54, 0x00, 0x57, 0x45, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01,
-0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x01, 0x0A, 0x57, 0x45, 0x54, 0x30, 0x57, 0x45, 0x53, 0x54, 0x2C, 0x4D, 0x33,
-0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x31, 0x2C, 0x4D, 0x31, 0x30, 0x2E, 0x35, 0x2E, 0x30, 0x0A, 0x00,
-0xBB, 0x1F, 0xA5, 0x00, 0xF8, 0xDE, 0xF0, 0x00, 0x00, 0x00, 0x0F, 0x4D, 0x61, 0x64, 0x65, 0x69,
-0x72, 0x61, 0x20, 0x49, 0x73, 0x6C, 0x61, 0x6E, 0x64, 0x73, 
+0x0B, 0xFF, 0xFF, 0xF0, 0x28, 0x00, 0x00, 0xFF, 0xFF, 0xF0, 0x28, 0x00, 0x04, 0x00, 0x00, 0x00,
+0x00, 0x01, 0x08, 0xFF, 0xFF, 0xF1, 0xF0, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x01, 0x08, 0xFF,
+0xFF, 0xF1, 0xF0, 0x00, 0x0C, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x10, 0xFF, 0xFF, 0xF1, 0xF0, 0x00,
+0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x18, 0x00, 0x00, 0x0E,
+0x10, 0x01, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x18, 0x4C,
+0x4D, 0x54, 0x00, 0x46, 0x4D, 0x54, 0x00, 0x2B, 0x30, 0x30, 0x00, 0x2D, 0x30, 0x31, 0x00, 0x2B,
+0x30, 0x31, 0x00, 0x57, 0x45, 0x54, 0x00, 0x57, 0x45, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x0A, 0x57, 0x45, 0x54, 0x30, 0x57, 0x45, 0x53, 0x54, 0x2C,
+0x4D, 0x33, 0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x31, 0x2C, 0x4D, 0x31, 0x30, 0x2E, 0x35, 0x2E, 0x30,
+0x0A, 0x00, 0xBB, 0x1F, 0xA5, 0x00, 0xF8, 0xDE, 0xF0, 0x00, 0x00, 0x00, 0x0F, 0x4D, 0x61, 0x64,
+0x65, 0x69, 0x72, 0x61, 0x20, 0x49, 0x73, 0x6C, 0x61, 0x6E, 0x64, 0x73, 
 
 /* Atlantic/Reykjavik */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x49, 0x53, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -52930,12 +53431,24 @@
 
 /* CET */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x88, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x09, 0x9B, 0x0C, 0x17, 0x60,
-0x9B, 0xD5, 0xDA, 0xF0, 0x9C, 0xD9, 0xAE, 0x90, 0x9D, 0xA4, 0xB5, 0x90, 0x9E, 0xB9, 0x90, 0x90,
-0x9F, 0x84, 0x97, 0x90, 0xC8, 0x09, 0x71, 0x90, 0xCC, 0xE7, 0x4B, 0x10, 0xCD, 0xA9, 0x17, 0x90,
-0xCE, 0xA2, 0x43, 0x10, 0xCF, 0x92, 0x34, 0x10, 0xD0, 0x82, 0x25, 0x10, 0xD1, 0x72, 0x16, 0x10,
-0xD2, 0x4E, 0x40, 0x90, 0x0D, 0xA4, 0x63, 0x90, 0x0E, 0x8B, 0x1A, 0x10, 0x0F, 0x84, 0x45, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0xB8, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x16, 0x80, 0x00, 0x00, 0x00,
+0x98, 0x44, 0x49, 0x80, 0x9B, 0x0C, 0x25, 0x70, 0x9B, 0xD5, 0xDA, 0xF0, 0x9C, 0xD9, 0xAE, 0x90,
+0x9D, 0xA4, 0xB5, 0x90, 0x9E, 0xB9, 0x90, 0x90, 0x9F, 0x84, 0x97, 0x90, 0x9F, 0xCE, 0xF8, 0x30,
+0xA0, 0x60, 0xA5, 0xF0, 0xA1, 0x7E, 0xBB, 0x70, 0xA2, 0x2E, 0x12, 0xF0, 0xA3, 0x7A, 0x4C, 0xF0,
+0xA4, 0x35, 0x81, 0xF0, 0xA5, 0x5E, 0x23, 0x70, 0xA6, 0x25, 0x35, 0xF0, 0xA7, 0x27, 0x9B, 0xF0,
+0xA8, 0x2A, 0x01, 0xF0, 0xA9, 0x07, 0x7D, 0xF0, 0xA9, 0xEE, 0x34, 0x70, 0xAA, 0xE7, 0x5F, 0xF0,
+0xAB, 0xD7, 0x50, 0xF0, 0xAC, 0xC7, 0x41, 0xF0, 0xAD, 0xC9, 0xA7, 0xF0, 0xAE, 0xA7, 0x23, 0xF0,
+0xAF, 0xA0, 0x4F, 0x70, 0xB0, 0x87, 0x05, 0xF0, 0xB1, 0x89, 0x6B, 0xF0, 0xB2, 0x70, 0x4C, 0xA0,
+0xB3, 0x72, 0xB2, 0xA0, 0xB4, 0x50, 0x2E, 0xA0, 0xB5, 0x49, 0x5A, 0x20, 0xB6, 0x30, 0x10, 0xA0,
+0xB7, 0x32, 0x76, 0xA0, 0xB8, 0x0F, 0xF2, 0xA0, 0xB8, 0xFF, 0xE3, 0xA0, 0xB9, 0xEF, 0xD4, 0xA0,
+0xBA, 0xD6, 0x8B, 0x20, 0xBB, 0xD8, 0xF1, 0x20, 0xBC, 0xC8, 0xE2, 0x20, 0xBD, 0xB8, 0xD3, 0x20,
+0xBE, 0x9F, 0x89, 0xA0, 0xBF, 0x98, 0xB5, 0x20, 0xC0, 0x9B, 0x1B, 0x20, 0xC1, 0x78, 0x97, 0x20,
+0xC2, 0x68, 0x88, 0x20, 0xC3, 0x58, 0x79, 0x20, 0xC4, 0x3F, 0x2F, 0xA0, 0xC5, 0x38, 0x5B, 0x20,
+0xC6, 0x3A, 0xC1, 0x20, 0xC7, 0x58, 0xD6, 0xA0, 0xC7, 0xDA, 0x09, 0xA0, 0xC8, 0x4A, 0x19, 0x20,
+0xCC, 0xE7, 0x4B, 0x10, 0xCD, 0xA9, 0x17, 0x90, 0xCE, 0xA2, 0x43, 0x10, 0xCF, 0x92, 0x34, 0x10,
+0xD0, 0x6E, 0x5E, 0x90, 0xD1, 0x72, 0x16, 0x10, 0xD2, 0x4E, 0x40, 0x90, 0xD3, 0x91, 0x40, 0x10,
+0xD4, 0x4B, 0x23, 0x90, 0x0D, 0xA4, 0x63, 0x90, 0x0E, 0x8B, 0x1A, 0x10, 0x0F, 0x84, 0x45, 0x90,
 0x10, 0x74, 0x36, 0x90, 0x11, 0x64, 0x27, 0x90, 0x12, 0x54, 0x18, 0x90, 0x13, 0x4D, 0x44, 0x10,
 0x14, 0x33, 0xFA, 0x90, 0x15, 0x23, 0xEB, 0x90, 0x16, 0x13, 0xDC, 0x90, 0x17, 0x03, 0xCD, 0x90,
 0x17, 0xF3, 0xBE, 0x90, 0x18, 0xE3, 0xAF, 0x90, 0x19, 0xD3, 0xA0, 0x90, 0x1A, 0xC3, 0x91, 0x90,
@@ -52965,102 +53478,143 @@
 0x72, 0x66, 0x17, 0x10, 0x73, 0x31, 0x1E, 0x10, 0x74, 0x45, 0xF9, 0x10, 0x75, 0x11, 0x00, 0x10,
 0x76, 0x2F, 0x15, 0x90, 0x76, 0xF0, 0xE2, 0x10, 0x78, 0x0E, 0xF7, 0x90, 0x78, 0xD0, 0xC4, 0x10,
 0x79, 0xEE, 0xD9, 0x90, 0x7A, 0xB0, 0xA6, 0x10, 0x7B, 0xCE, 0xBB, 0x90, 0x7C, 0x99, 0xC2, 0x90,
-0x7D, 0xAE, 0x9D, 0x90, 0x7E, 0x79, 0xA4, 0x90, 0x7F, 0x8E, 0x7F, 0x90, 0x01, 0x00, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x05, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x00,
-0x00, 0x00, 0x1C, 0x20, 0x01, 0x00, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x05, 0x43, 0x45, 0x53, 0x54,
-0x00, 0x43, 0x45, 0x54, 0x00, 0x00, 0x00, 0x01, 0x01, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, 0x00, 0x00, 0x00,
-0x04, 0x00, 0x00, 0x00, 0x09, 0xFF, 0xFF, 0xFF, 0xFF, 0x9B, 0x0C, 0x17, 0x60, 0xFF, 0xFF, 0xFF,
-0xFF, 0x9B, 0xD5, 0xDA, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0x9C, 0xD9, 0xAE, 0x90, 0xFF, 0xFF, 0xFF,
-0xFF, 0x9D, 0xA4, 0xB5, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0x9E, 0xB9, 0x90, 0x90, 0xFF, 0xFF, 0xFF,
-0xFF, 0x9F, 0x84, 0x97, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xC8, 0x09, 0x71, 0x90, 0xFF, 0xFF, 0xFF,
-0xFF, 0xCC, 0xE7, 0x4B, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xCD, 0xA9, 0x17, 0x90, 0xFF, 0xFF, 0xFF,
-0xFF, 0xCE, 0xA2, 0x43, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xCF, 0x92, 0x34, 0x10, 0xFF, 0xFF, 0xFF,
-0xFF, 0xD0, 0x82, 0x25, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xD1, 0x72, 0x16, 0x10, 0xFF, 0xFF, 0xFF,
-0xFF, 0xD2, 0x4E, 0x40, 0x90, 0x00, 0x00, 0x00, 0x00, 0x0D, 0xA4, 0x63, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x0E, 0x8B, 0x1A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x84, 0x45, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x10, 0x74, 0x36, 0x90, 0x00, 0x00, 0x00, 0x00, 0x11, 0x64, 0x27, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x12, 0x54, 0x18, 0x90, 0x00, 0x00, 0x00, 0x00, 0x13, 0x4D, 0x44, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x14, 0x33, 0xFA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x15, 0x23, 0xEB, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x16, 0x13, 0xDC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x17, 0x03, 0xCD, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x17, 0xF3, 0xBE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x18, 0xE3, 0xAF, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x19, 0xD3, 0xA0, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xC3, 0x91, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x1B, 0xBC, 0xBD, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xAC, 0xAE, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x1D, 0x9C, 0x9F, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x8C, 0x90, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x1F, 0x7C, 0x81, 0x10, 0x00, 0x00, 0x00, 0x00, 0x20, 0x6C, 0x72, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x21, 0x5C, 0x63, 0x10, 0x00, 0x00, 0x00, 0x00, 0x22, 0x4C, 0x54, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x23, 0x3C, 0x45, 0x10, 0x00, 0x00, 0x00, 0x00, 0x24, 0x2C, 0x36, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x25, 0x1C, 0x27, 0x10, 0x00, 0x00, 0x00, 0x00, 0x26, 0x0C, 0x18, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x27, 0x05, 0x43, 0x90, 0x00, 0x00, 0x00, 0x00, 0x27, 0xF5, 0x34, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x28, 0xE5, 0x25, 0x90, 0x00, 0x00, 0x00, 0x00, 0x29, 0xD5, 0x16, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x2A, 0xC5, 0x07, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xB4, 0xF8, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x2C, 0xA4, 0xE9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x94, 0xDA, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x2E, 0x84, 0xCB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x74, 0xBC, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x30, 0x64, 0xAD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x31, 0x5D, 0xD9, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x32, 0x72, 0xB4, 0x10, 0x00, 0x00, 0x00, 0x00, 0x33, 0x3D, 0xBB, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x34, 0x52, 0x96, 0x10, 0x00, 0x00, 0x00, 0x00, 0x35, 0x1D, 0x9D, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x36, 0x32, 0x78, 0x10, 0x00, 0x00, 0x00, 0x00, 0x36, 0xFD, 0x7F, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x38, 0x1B, 0x94, 0x90, 0x00, 0x00, 0x00, 0x00, 0x38, 0xDD, 0x61, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x39, 0xFB, 0x76, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xBD, 0x43, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x3B, 0xDB, 0x58, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xA6, 0x5F, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x3D, 0xBB, 0x3A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x86, 0x41, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x3F, 0x9B, 0x1C, 0x90, 0x00, 0x00, 0x00, 0x00, 0x40, 0x66, 0x23, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x41, 0x84, 0x39, 0x10, 0x00, 0x00, 0x00, 0x00, 0x42, 0x46, 0x05, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x43, 0x64, 0x1B, 0x10, 0x00, 0x00, 0x00, 0x00, 0x44, 0x25, 0xE7, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x45, 0x43, 0xFD, 0x10, 0x00, 0x00, 0x00, 0x00, 0x46, 0x05, 0xC9, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x47, 0x23, 0xDF, 0x10, 0x00, 0x00, 0x00, 0x00, 0x47, 0xEE, 0xE6, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x49, 0x03, 0xC1, 0x10, 0x00, 0x00, 0x00, 0x00, 0x49, 0xCE, 0xC8, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x4A, 0xE3, 0xA3, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4B, 0xAE, 0xAA, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x4C, 0xCC, 0xBF, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x8E, 0x8C, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x4E, 0xAC, 0xA1, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x6E, 0x6E, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x50, 0x8C, 0x83, 0x90, 0x00, 0x00, 0x00, 0x00, 0x51, 0x57, 0x8A, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x52, 0x6C, 0x65, 0x90, 0x00, 0x00, 0x00, 0x00, 0x53, 0x37, 0x6C, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x54, 0x4C, 0x47, 0x90, 0x00, 0x00, 0x00, 0x00, 0x55, 0x17, 0x4E, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x56, 0x2C, 0x29, 0x90, 0x00, 0x00, 0x00, 0x00, 0x56, 0xF7, 0x30, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x58, 0x15, 0x46, 0x10, 0x00, 0x00, 0x00, 0x00, 0x58, 0xD7, 0x12, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x59, 0xF5, 0x28, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xB6, 0xF4, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x5B, 0xD5, 0x0A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5C, 0xA0, 0x11, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x5D, 0xB4, 0xEC, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x7F, 0xF3, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x5F, 0x94, 0xCE, 0x10, 0x00, 0x00, 0x00, 0x00, 0x60, 0x5F, 0xD5, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x61, 0x7D, 0xEA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x62, 0x3F, 0xB7, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x63, 0x5D, 0xCC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x64, 0x1F, 0x99, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x65, 0x3D, 0xAE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x66, 0x08, 0xB5, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x67, 0x1D, 0x90, 0x90, 0x00, 0x00, 0x00, 0x00, 0x67, 0xE8, 0x97, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x68, 0xFD, 0x72, 0x90, 0x00, 0x00, 0x00, 0x00, 0x69, 0xC8, 0x79, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x6A, 0xDD, 0x54, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6B, 0xA8, 0x5B, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x6C, 0xC6, 0x71, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6D, 0x88, 0x3D, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x6E, 0xA6, 0x53, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6F, 0x68, 0x1F, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x70, 0x86, 0x35, 0x10, 0x00, 0x00, 0x00, 0x00, 0x71, 0x51, 0x3C, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x72, 0x66, 0x17, 0x10, 0x00, 0x00, 0x00, 0x00, 0x73, 0x31, 0x1E, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x74, 0x45, 0xF9, 0x10, 0x00, 0x00, 0x00, 0x00, 0x75, 0x11, 0x00, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x76, 0x2F, 0x15, 0x90, 0x00, 0x00, 0x00, 0x00, 0x76, 0xF0, 0xE2, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x78, 0x0E, 0xF7, 0x90, 0x00, 0x00, 0x00, 0x00, 0x78, 0xD0, 0xC4, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x79, 0xEE, 0xD9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7A, 0xB0, 0xA6, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x7B, 0xCE, 0xBB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x99, 0xC2, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x7D, 0xAE, 0x9D, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x79, 0xA4, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x7F, 0x8E, 0x7F, 0x90, 0x01, 0x00, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
-0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
-0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
-0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
-0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
-0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
-0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
-0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
-0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x00, 0x00, 0x0E,
-0x10, 0x00, 0x05, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x00, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x00, 0x00,
-0x00, 0x0E, 0x10, 0x00, 0x05, 0x43, 0x45, 0x53, 0x54, 0x00, 0x43, 0x45, 0x54, 0x00, 0x00, 0x00,
-0x01, 0x01, 0x0A, 0x43, 0x45, 0x54, 0x2D, 0x31, 0x43, 0x45, 0x53, 0x54, 0x2C, 0x4D, 0x33, 0x2E,
-0x35, 0x2E, 0x30, 0x2C, 0x4D, 0x31, 0x30, 0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x33, 0x0A, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x7D, 0xAE, 0x9D, 0x90, 0x7E, 0x79, 0xA4, 0x90, 0x7F, 0x8E, 0x7F, 0x90, 0x01, 0x02, 0x05, 0x02,
+0x03, 0x04, 0x03, 0x04, 0x08, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06,
+0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06,
+0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A,
+0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A,
+0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A,
+0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A,
+0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A,
+0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A,
+0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A,
+0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A,
+0x09, 0x0A, 0x09, 0x0A, 0x00, 0x00, 0x04, 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04,
+0x00, 0x00, 0x0E, 0x10, 0x00, 0x08, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x0C, 0x00, 0x00, 0x0E, 0x10,
+0x00, 0x08, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x0C, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x11, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x0C,
+0x00, 0x00, 0x0E, 0x10, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x57, 0x45, 0x54, 0x00, 0x43, 0x45,
+0x54, 0x00, 0x43, 0x45, 0x53, 0x54, 0x00, 0x57, 0x45, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01,
+0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
+0x01, 0x01, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0xB9, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x1A, 0xFF, 0xFF,
+0xFF, 0xFF, 0x56, 0xB6, 0xDF, 0xE6, 0xFF, 0xFF, 0xFF, 0xFF, 0x6D, 0xE8, 0xC8, 0x00, 0xFF, 0xFF,
+0xFF, 0xFF, 0x98, 0x44, 0x49, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0x9B, 0x0C, 0x25, 0x70, 0xFF, 0xFF,
+0xFF, 0xFF, 0x9B, 0xD5, 0xDA, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0x9C, 0xD9, 0xAE, 0x90, 0xFF, 0xFF,
+0xFF, 0xFF, 0x9D, 0xA4, 0xB5, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0x9E, 0xB9, 0x90, 0x90, 0xFF, 0xFF,
+0xFF, 0xFF, 0x9F, 0x84, 0x97, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0x9F, 0xCE, 0xF8, 0x30, 0xFF, 0xFF,
+0xFF, 0xFF, 0xA0, 0x60, 0xA5, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xA1, 0x7E, 0xBB, 0x70, 0xFF, 0xFF,
+0xFF, 0xFF, 0xA2, 0x2E, 0x12, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xA3, 0x7A, 0x4C, 0xF0, 0xFF, 0xFF,
+0xFF, 0xFF, 0xA4, 0x35, 0x81, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0x5E, 0x23, 0x70, 0xFF, 0xFF,
+0xFF, 0xFF, 0xA6, 0x25, 0x35, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xA7, 0x27, 0x9B, 0xF0, 0xFF, 0xFF,
+0xFF, 0xFF, 0xA8, 0x2A, 0x01, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xA9, 0x07, 0x7D, 0xF0, 0xFF, 0xFF,
+0xFF, 0xFF, 0xA9, 0xEE, 0x34, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAA, 0xE7, 0x5F, 0xF0, 0xFF, 0xFF,
+0xFF, 0xFF, 0xAB, 0xD7, 0x50, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xAC, 0xC7, 0x41, 0xF0, 0xFF, 0xFF,
+0xFF, 0xFF, 0xAD, 0xC9, 0xA7, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xAE, 0xA7, 0x23, 0xF0, 0xFF, 0xFF,
+0xFF, 0xFF, 0xAF, 0xA0, 0x4F, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB0, 0x87, 0x05, 0xF0, 0xFF, 0xFF,
+0xFF, 0xFF, 0xB1, 0x89, 0x6B, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB2, 0x70, 0x4C, 0xA0, 0xFF, 0xFF,
+0xFF, 0xFF, 0xB3, 0x72, 0xB2, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB4, 0x50, 0x2E, 0xA0, 0xFF, 0xFF,
+0xFF, 0xFF, 0xB5, 0x49, 0x5A, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xB6, 0x30, 0x10, 0xA0, 0xFF, 0xFF,
+0xFF, 0xFF, 0xB7, 0x32, 0x76, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0x0F, 0xF2, 0xA0, 0xFF, 0xFF,
+0xFF, 0xFF, 0xB8, 0xFF, 0xE3, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB9, 0xEF, 0xD4, 0xA0, 0xFF, 0xFF,
+0xFF, 0xFF, 0xBA, 0xD6, 0x8B, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xBB, 0xD8, 0xF1, 0x20, 0xFF, 0xFF,
+0xFF, 0xFF, 0xBC, 0xC8, 0xE2, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xBD, 0xB8, 0xD3, 0x20, 0xFF, 0xFF,
+0xFF, 0xFF, 0xBE, 0x9F, 0x89, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xBF, 0x98, 0xB5, 0x20, 0xFF, 0xFF,
+0xFF, 0xFF, 0xC0, 0x9B, 0x1B, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xC1, 0x78, 0x97, 0x20, 0xFF, 0xFF,
+0xFF, 0xFF, 0xC2, 0x68, 0x88, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xC3, 0x58, 0x79, 0x20, 0xFF, 0xFF,
+0xFF, 0xFF, 0xC4, 0x3F, 0x2F, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC5, 0x38, 0x5B, 0x20, 0xFF, 0xFF,
+0xFF, 0xFF, 0xC6, 0x3A, 0xC1, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xC7, 0x58, 0xD6, 0xA0, 0xFF, 0xFF,
+0xFF, 0xFF, 0xC7, 0xDA, 0x09, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC8, 0x4A, 0x19, 0x20, 0xFF, 0xFF,
+0xFF, 0xFF, 0xCC, 0xE7, 0x4B, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xCD, 0xA9, 0x17, 0x90, 0xFF, 0xFF,
+0xFF, 0xFF, 0xCE, 0xA2, 0x43, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xCF, 0x92, 0x34, 0x10, 0xFF, 0xFF,
+0xFF, 0xFF, 0xD0, 0x6E, 0x5E, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xD1, 0x72, 0x16, 0x10, 0xFF, 0xFF,
+0xFF, 0xFF, 0xD2, 0x4E, 0x40, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xD3, 0x91, 0x40, 0x10, 0xFF, 0xFF,
+0xFF, 0xFF, 0xD4, 0x4B, 0x23, 0x90, 0x00, 0x00, 0x00, 0x00, 0x0D, 0xA4, 0x63, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x0E, 0x8B, 0x1A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x84, 0x45, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x10, 0x74, 0x36, 0x90, 0x00, 0x00, 0x00, 0x00, 0x11, 0x64, 0x27, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x12, 0x54, 0x18, 0x90, 0x00, 0x00, 0x00, 0x00, 0x13, 0x4D, 0x44, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x14, 0x33, 0xFA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x15, 0x23, 0xEB, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x16, 0x13, 0xDC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x17, 0x03, 0xCD, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x17, 0xF3, 0xBE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x18, 0xE3, 0xAF, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x19, 0xD3, 0xA0, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xC3, 0x91, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x1B, 0xBC, 0xBD, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xAC, 0xAE, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x1D, 0x9C, 0x9F, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x8C, 0x90, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x1F, 0x7C, 0x81, 0x10, 0x00, 0x00, 0x00, 0x00, 0x20, 0x6C, 0x72, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x21, 0x5C, 0x63, 0x10, 0x00, 0x00, 0x00, 0x00, 0x22, 0x4C, 0x54, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x23, 0x3C, 0x45, 0x10, 0x00, 0x00, 0x00, 0x00, 0x24, 0x2C, 0x36, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x25, 0x1C, 0x27, 0x10, 0x00, 0x00, 0x00, 0x00, 0x26, 0x0C, 0x18, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x27, 0x05, 0x43, 0x90, 0x00, 0x00, 0x00, 0x00, 0x27, 0xF5, 0x34, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x28, 0xE5, 0x25, 0x90, 0x00, 0x00, 0x00, 0x00, 0x29, 0xD5, 0x16, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x2A, 0xC5, 0x07, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xB4, 0xF8, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x2C, 0xA4, 0xE9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x94, 0xDA, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x2E, 0x84, 0xCB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x74, 0xBC, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x30, 0x64, 0xAD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x31, 0x5D, 0xD9, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x32, 0x72, 0xB4, 0x10, 0x00, 0x00, 0x00, 0x00, 0x33, 0x3D, 0xBB, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x34, 0x52, 0x96, 0x10, 0x00, 0x00, 0x00, 0x00, 0x35, 0x1D, 0x9D, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x36, 0x32, 0x78, 0x10, 0x00, 0x00, 0x00, 0x00, 0x36, 0xFD, 0x7F, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x38, 0x1B, 0x94, 0x90, 0x00, 0x00, 0x00, 0x00, 0x38, 0xDD, 0x61, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x39, 0xFB, 0x76, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xBD, 0x43, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x3B, 0xDB, 0x58, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xA6, 0x5F, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x3D, 0xBB, 0x3A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x86, 0x41, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x3F, 0x9B, 0x1C, 0x90, 0x00, 0x00, 0x00, 0x00, 0x40, 0x66, 0x23, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x41, 0x84, 0x39, 0x10, 0x00, 0x00, 0x00, 0x00, 0x42, 0x46, 0x05, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x43, 0x64, 0x1B, 0x10, 0x00, 0x00, 0x00, 0x00, 0x44, 0x25, 0xE7, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x45, 0x43, 0xFD, 0x10, 0x00, 0x00, 0x00, 0x00, 0x46, 0x05, 0xC9, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x47, 0x23, 0xDF, 0x10, 0x00, 0x00, 0x00, 0x00, 0x47, 0xEE, 0xE6, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x49, 0x03, 0xC1, 0x10, 0x00, 0x00, 0x00, 0x00, 0x49, 0xCE, 0xC8, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x4A, 0xE3, 0xA3, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4B, 0xAE, 0xAA, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x4C, 0xCC, 0xBF, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x8E, 0x8C, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x4E, 0xAC, 0xA1, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x6E, 0x6E, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x50, 0x8C, 0x83, 0x90, 0x00, 0x00, 0x00, 0x00, 0x51, 0x57, 0x8A, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x52, 0x6C, 0x65, 0x90, 0x00, 0x00, 0x00, 0x00, 0x53, 0x37, 0x6C, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x54, 0x4C, 0x47, 0x90, 0x00, 0x00, 0x00, 0x00, 0x55, 0x17, 0x4E, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x56, 0x2C, 0x29, 0x90, 0x00, 0x00, 0x00, 0x00, 0x56, 0xF7, 0x30, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x58, 0x15, 0x46, 0x10, 0x00, 0x00, 0x00, 0x00, 0x58, 0xD7, 0x12, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x59, 0xF5, 0x28, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xB6, 0xF4, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x5B, 0xD5, 0x0A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5C, 0xA0, 0x11, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x5D, 0xB4, 0xEC, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x7F, 0xF3, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x5F, 0x94, 0xCE, 0x10, 0x00, 0x00, 0x00, 0x00, 0x60, 0x5F, 0xD5, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x61, 0x7D, 0xEA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x62, 0x3F, 0xB7, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x63, 0x5D, 0xCC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x64, 0x1F, 0x99, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x65, 0x3D, 0xAE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x66, 0x08, 0xB5, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x67, 0x1D, 0x90, 0x90, 0x00, 0x00, 0x00, 0x00, 0x67, 0xE8, 0x97, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x68, 0xFD, 0x72, 0x90, 0x00, 0x00, 0x00, 0x00, 0x69, 0xC8, 0x79, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x6A, 0xDD, 0x54, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6B, 0xA8, 0x5B, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x6C, 0xC6, 0x71, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6D, 0x88, 0x3D, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x6E, 0xA6, 0x53, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6F, 0x68, 0x1F, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x70, 0x86, 0x35, 0x10, 0x00, 0x00, 0x00, 0x00, 0x71, 0x51, 0x3C, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x72, 0x66, 0x17, 0x10, 0x00, 0x00, 0x00, 0x00, 0x73, 0x31, 0x1E, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x74, 0x45, 0xF9, 0x10, 0x00, 0x00, 0x00, 0x00, 0x75, 0x11, 0x00, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x76, 0x2F, 0x15, 0x90, 0x00, 0x00, 0x00, 0x00, 0x76, 0xF0, 0xE2, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x78, 0x0E, 0xF7, 0x90, 0x00, 0x00, 0x00, 0x00, 0x78, 0xD0, 0xC4, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x79, 0xEE, 0xD9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7A, 0xB0, 0xA6, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x7B, 0xCE, 0xBB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x99, 0xC2, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x7D, 0xAE, 0x9D, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x79, 0xA4, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x7F, 0x8E, 0x7F, 0x90, 0x01, 0x02, 0x03, 0x06, 0x03, 0x04, 0x05, 0x04, 0x05, 0x09,
+0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08,
+0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08,
+0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x04, 0x05, 0x04, 0x05, 0x04,
+0x05, 0x04, 0x05, 0x04, 0x05, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A,
+0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A,
+0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A,
+0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A,
+0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A,
+0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A,
+0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A,
+0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x00,
+0x00, 0x04, 0x1A, 0x00, 0x00, 0x00, 0x00, 0x04, 0x1A, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x08, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x0C, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x10, 0x00, 0x00, 0x0E,
+0x10, 0x00, 0x0C, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x10, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x15, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x1C, 0x20, 0x01,
+0x10, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x0C, 0x4C, 0x4D, 0x54, 0x00, 0x42, 0x4D, 0x54, 0x00, 0x57,
+0x45, 0x54, 0x00, 0x43, 0x45, 0x54, 0x00, 0x43, 0x45, 0x53, 0x54, 0x00, 0x57, 0x45, 0x53, 0x54,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x0A, 0x43, 0x45, 0x54, 0x2D, 0x31, 0x43,
+0x45, 0x53, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x35, 0x2E, 0x30, 0x2C, 0x4D, 0x31, 0x30, 0x2E, 0x35,
+0x2E, 0x30, 0x2F, 0x33, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 
 
 /* Chile/Continental */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -53366,151 +53920,231 @@
 
 /* CST6CDT */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x95, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x10, 0x9E, 0xA6, 0x2C, 0x80,
-0x9F, 0xBA, 0xF9, 0x70, 0xA0, 0x86, 0x0E, 0x80, 0xA1, 0x9A, 0xDB, 0x70, 0xCB, 0x88, 0xFE, 0x80,
-0xD2, 0x23, 0xF4, 0x70, 0xD2, 0x61, 0x09, 0xF0, 0xFA, 0xF8, 0x67, 0x00, 0xFB, 0xE8, 0x49, 0xF0,
-0xFC, 0xD8, 0x49, 0x00, 0xFD, 0xC8, 0x2B, 0xF0, 0xFE, 0xB8, 0x2B, 0x00, 0xFF, 0xA8, 0x0D, 0xF0,
-0x00, 0x98, 0x0D, 0x00, 0x01, 0x87, 0xEF, 0xF0, 0x02, 0x77, 0xEF, 0x00, 0x03, 0x71, 0x0C, 0x70,
-0x04, 0x61, 0x0B, 0x80, 0x05, 0x50, 0xEE, 0x70, 0x06, 0x40, 0xED, 0x80, 0x07, 0x30, 0xD0, 0x70,
-0x07, 0x8D, 0x27, 0x80, 0x09, 0x10, 0xB2, 0x70, 0x09, 0xAD, 0xA3, 0x00, 0x0A, 0xF0, 0x94, 0x70,
-0x0B, 0xE0, 0x93, 0x80, 0x0C, 0xD9, 0xB0, 0xF0, 0x0D, 0xC0, 0x75, 0x80, 0x0E, 0xB9, 0x92, 0xF0,
-0x0F, 0xA9, 0x92, 0x00, 0x10, 0x99, 0x74, 0xF0, 0x11, 0x89, 0x74, 0x00, 0x12, 0x79, 0x56, 0xF0,
-0x13, 0x69, 0x56, 0x00, 0x14, 0x59, 0x38, 0xF0, 0x15, 0x49, 0x38, 0x00, 0x16, 0x39, 0x1A, 0xF0,
-0x17, 0x29, 0x1A, 0x00, 0x18, 0x22, 0x37, 0x70, 0x19, 0x08, 0xFC, 0x00, 0x1A, 0x02, 0x19, 0x70,
-0x1A, 0xF2, 0x18, 0x80, 0x1B, 0xE1, 0xFB, 0x70, 0x1C, 0xD1, 0xFA, 0x80, 0x1D, 0xC1, 0xDD, 0x70,
-0x1E, 0xB1, 0xDC, 0x80, 0x1F, 0xA1, 0xBF, 0x70, 0x20, 0x76, 0x0F, 0x00, 0x21, 0x81, 0xA1, 0x70,
-0x22, 0x55, 0xF1, 0x00, 0x23, 0x6A, 0xBD, 0xF0, 0x24, 0x35, 0xD3, 0x00, 0x25, 0x4A, 0x9F, 0xF0,
-0x26, 0x15, 0xB5, 0x00, 0x27, 0x2A, 0x81, 0xF0, 0x27, 0xFE, 0xD1, 0x80, 0x29, 0x0A, 0x63, 0xF0,
-0x29, 0xDE, 0xB3, 0x80, 0x2A, 0xEA, 0x45, 0xF0, 0x2B, 0xBE, 0x95, 0x80, 0x2C, 0xD3, 0x62, 0x70,
-0x2D, 0x9E, 0x77, 0x80, 0x2E, 0xB3, 0x44, 0x70, 0x2F, 0x7E, 0x59, 0x80, 0x30, 0x93, 0x26, 0x70,
-0x31, 0x67, 0x76, 0x00, 0x32, 0x73, 0x08, 0x70, 0x33, 0x47, 0x58, 0x00, 0x34, 0x52, 0xEA, 0x70,
-0x35, 0x27, 0x3A, 0x00, 0x36, 0x32, 0xCC, 0x70, 0x37, 0x07, 0x1C, 0x00, 0x38, 0x1B, 0xE8, 0xF0,
-0x38, 0xE6, 0xFE, 0x00, 0x39, 0xFB, 0xCA, 0xF0, 0x3A, 0xC6, 0xE0, 0x00, 0x3B, 0xDB, 0xAC, 0xF0,
-0x3C, 0xAF, 0xFC, 0x80, 0x3D, 0xBB, 0x8E, 0xF0, 0x3E, 0x8F, 0xDE, 0x80, 0x3F, 0x9B, 0x70, 0xF0,
-0x40, 0x6F, 0xC0, 0x80, 0x41, 0x84, 0x8D, 0x70, 0x42, 0x4F, 0xA2, 0x80, 0x43, 0x64, 0x6F, 0x70,
-0x44, 0x2F, 0x84, 0x80, 0x45, 0x44, 0x51, 0x70, 0x45, 0xF3, 0xB7, 0x00, 0x47, 0x2D, 0x6D, 0xF0,
-0x47, 0xD3, 0x99, 0x00, 0x49, 0x0D, 0x4F, 0xF0, 0x49, 0xB3, 0x7B, 0x00, 0x4A, 0xED, 0x31, 0xF0,
-0x4B, 0x9C, 0x97, 0x80, 0x4C, 0xD6, 0x4E, 0x70, 0x4D, 0x7C, 0x79, 0x80, 0x4E, 0xB6, 0x30, 0x70,
-0x4F, 0x5C, 0x5B, 0x80, 0x50, 0x96, 0x12, 0x70, 0x51, 0x3C, 0x3D, 0x80, 0x52, 0x75, 0xF4, 0x70,
-0x53, 0x1C, 0x1F, 0x80, 0x54, 0x55, 0xD6, 0x70, 0x54, 0xFC, 0x01, 0x80, 0x56, 0x35, 0xB8, 0x70,
-0x56, 0xE5, 0x1E, 0x00, 0x58, 0x1E, 0xD4, 0xF0, 0x58, 0xC5, 0x00, 0x00, 0x59, 0xFE, 0xB6, 0xF0,
-0x5A, 0xA4, 0xE2, 0x00, 0x5B, 0xDE, 0x98, 0xF0, 0x5C, 0x84, 0xC4, 0x00, 0x5D, 0xBE, 0x7A, 0xF0,
-0x5E, 0x64, 0xA6, 0x00, 0x5F, 0x9E, 0x5C, 0xF0, 0x60, 0x4D, 0xC2, 0x80, 0x61, 0x87, 0x79, 0x70,
-0x62, 0x2D, 0xA4, 0x80, 0x63, 0x67, 0x5B, 0x70, 0x64, 0x0D, 0x86, 0x80, 0x65, 0x47, 0x3D, 0x70,
-0x65, 0xED, 0x68, 0x80, 0x67, 0x27, 0x1F, 0x70, 0x67, 0xCD, 0x4A, 0x80, 0x69, 0x07, 0x01, 0x70,
-0x69, 0xAD, 0x2C, 0x80, 0x6A, 0xE6, 0xE3, 0x70, 0x6B, 0x96, 0x49, 0x00, 0x6C, 0xCF, 0xFF, 0xF0,
-0x6D, 0x76, 0x2B, 0x00, 0x6E, 0xAF, 0xE1, 0xF0, 0x6F, 0x56, 0x0D, 0x00, 0x70, 0x8F, 0xC3, 0xF0,
-0x71, 0x35, 0xEF, 0x00, 0x72, 0x6F, 0xA5, 0xF0, 0x73, 0x15, 0xD1, 0x00, 0x74, 0x4F, 0x87, 0xF0,
-0x74, 0xFE, 0xED, 0x80, 0x76, 0x38, 0xA4, 0x70, 0x76, 0xDE, 0xCF, 0x80, 0x78, 0x18, 0x86, 0x70,
-0x78, 0xBE, 0xB1, 0x80, 0x79, 0xF8, 0x68, 0x70, 0x7A, 0x9E, 0x93, 0x80, 0x7B, 0xD8, 0x4A, 0x70,
-0x7C, 0x7E, 0x75, 0x80, 0x7D, 0xB8, 0x2C, 0x70, 0x7E, 0x5E, 0x57, 0x80, 0x7F, 0x98, 0x0E, 0x70,
-0x01, 0x00, 0x01, 0x00, 0x02, 0x03, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x04, 0xFF, 0xFF, 0xB9, 0xB0, 0x01,
-0x00, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x08, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x0C, 0xFF, 0xFF, 0xAB,
-0xA0, 0x00, 0x04, 0x43, 0x44, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x43, 0x57, 0x54, 0x00, 0x43,
-0x50, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x54, 0x5A, 0x69,
-0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x95, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0x9E, 0xA6, 0x2C,
-0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0x9F, 0xBA, 0xF9, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xA0, 0x86, 0x0E,
-0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xA1, 0x9A, 0xDB, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0x88, 0xFE,
-0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x23, 0xF4, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x61, 0x09,
-0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0xF8, 0x67, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFB, 0xE8, 0x49,
-0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0xD8, 0x49, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFD, 0xC8, 0x2B,
-0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xB8, 0x2B, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xA8, 0x0D,
-0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x98, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x87, 0xEF,
-0xF0, 0x00, 0x00, 0x00, 0x00, 0x02, 0x77, 0xEF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x71, 0x0C,
-0x70, 0x00, 0x00, 0x00, 0x00, 0x04, 0x61, 0x0B, 0x80, 0x00, 0x00, 0x00, 0x00, 0x05, 0x50, 0xEE,
-0x70, 0x00, 0x00, 0x00, 0x00, 0x06, 0x40, 0xED, 0x80, 0x00, 0x00, 0x00, 0x00, 0x07, 0x30, 0xD0,
-0x70, 0x00, 0x00, 0x00, 0x00, 0x07, 0x8D, 0x27, 0x80, 0x00, 0x00, 0x00, 0x00, 0x09, 0x10, 0xB2,
-0x70, 0x00, 0x00, 0x00, 0x00, 0x09, 0xAD, 0xA3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0xF0, 0x94,
-0x70, 0x00, 0x00, 0x00, 0x00, 0x0B, 0xE0, 0x93, 0x80, 0x00, 0x00, 0x00, 0x00, 0x0C, 0xD9, 0xB0,
-0xF0, 0x00, 0x00, 0x00, 0x00, 0x0D, 0xC0, 0x75, 0x80, 0x00, 0x00, 0x00, 0x00, 0x0E, 0xB9, 0x92,
-0xF0, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xA9, 0x92, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x99, 0x74,
-0xF0, 0x00, 0x00, 0x00, 0x00, 0x11, 0x89, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x79, 0x56,
-0xF0, 0x00, 0x00, 0x00, 0x00, 0x13, 0x69, 0x56, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x59, 0x38,
-0xF0, 0x00, 0x00, 0x00, 0x00, 0x15, 0x49, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16, 0x39, 0x1A,
-0xF0, 0x00, 0x00, 0x00, 0x00, 0x17, 0x29, 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x22, 0x37,
-0x70, 0x00, 0x00, 0x00, 0x00, 0x19, 0x08, 0xFC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1A, 0x02, 0x19,
-0x70, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xF2, 0x18, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xE1, 0xFB,
-0x70, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xD1, 0xFA, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC1, 0xDD,
-0x70, 0x00, 0x00, 0x00, 0x00, 0x1E, 0xB1, 0xDC, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA1, 0xBF,
-0x70, 0x00, 0x00, 0x00, 0x00, 0x20, 0x76, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x21, 0x81, 0xA1,
-0x70, 0x00, 0x00, 0x00, 0x00, 0x22, 0x55, 0xF1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x23, 0x6A, 0xBD,
-0xF0, 0x00, 0x00, 0x00, 0x00, 0x24, 0x35, 0xD3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x25, 0x4A, 0x9F,
-0xF0, 0x00, 0x00, 0x00, 0x00, 0x26, 0x15, 0xB5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x27, 0x2A, 0x81,
-0xF0, 0x00, 0x00, 0x00, 0x00, 0x27, 0xFE, 0xD1, 0x80, 0x00, 0x00, 0x00, 0x00, 0x29, 0x0A, 0x63,
-0xF0, 0x00, 0x00, 0x00, 0x00, 0x29, 0xDE, 0xB3, 0x80, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xEA, 0x45,
-0xF0, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xBE, 0x95, 0x80, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xD3, 0x62,
-0x70, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x9E, 0x77, 0x80, 0x00, 0x00, 0x00, 0x00, 0x2E, 0xB3, 0x44,
-0x70, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x7E, 0x59, 0x80, 0x00, 0x00, 0x00, 0x00, 0x30, 0x93, 0x26,
-0x70, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x76, 0x00, 0x00, 0x00, 0x00, 0x00, 0x32, 0x73, 0x08,
-0x70, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x34, 0x52, 0xEA,
-0x70, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x3A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0xCC,
-0x70, 0x00, 0x00, 0x00, 0x00, 0x37, 0x07, 0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x1B, 0xE8,
-0xF0, 0x00, 0x00, 0x00, 0x00, 0x38, 0xE6, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0xCA,
-0xF0, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xC6, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xDB, 0xAC,
-0xF0, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xAF, 0xFC, 0x80, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0x8E,
-0xF0, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x8F, 0xDE, 0x80, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x70,
-0xF0, 0x00, 0x00, 0x00, 0x00, 0x40, 0x6F, 0xC0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0x8D,
-0x70, 0x00, 0x00, 0x00, 0x00, 0x42, 0x4F, 0xA2, 0x80, 0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x6F,
-0x70, 0x00, 0x00, 0x00, 0x00, 0x44, 0x2F, 0x84, 0x80, 0x00, 0x00, 0x00, 0x00, 0x45, 0x44, 0x51,
-0x70, 0x00, 0x00, 0x00, 0x00, 0x45, 0xF3, 0xB7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x47, 0x2D, 0x6D,
-0xF0, 0x00, 0x00, 0x00, 0x00, 0x47, 0xD3, 0x99, 0x00, 0x00, 0x00, 0x00, 0x00, 0x49, 0x0D, 0x4F,
-0xF0, 0x00, 0x00, 0x00, 0x00, 0x49, 0xB3, 0x7B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4A, 0xED, 0x31,
-0xF0, 0x00, 0x00, 0x00, 0x00, 0x4B, 0x9C, 0x97, 0x80, 0x00, 0x00, 0x00, 0x00, 0x4C, 0xD6, 0x4E,
-0x70, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x7C, 0x79, 0x80, 0x00, 0x00, 0x00, 0x00, 0x4E, 0xB6, 0x30,
-0x70, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x5C, 0x5B, 0x80, 0x00, 0x00, 0x00, 0x00, 0x50, 0x96, 0x12,
-0x70, 0x00, 0x00, 0x00, 0x00, 0x51, 0x3C, 0x3D, 0x80, 0x00, 0x00, 0x00, 0x00, 0x52, 0x75, 0xF4,
-0x70, 0x00, 0x00, 0x00, 0x00, 0x53, 0x1C, 0x1F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x54, 0x55, 0xD6,
-0x70, 0x00, 0x00, 0x00, 0x00, 0x54, 0xFC, 0x01, 0x80, 0x00, 0x00, 0x00, 0x00, 0x56, 0x35, 0xB8,
-0x70, 0x00, 0x00, 0x00, 0x00, 0x56, 0xE5, 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x58, 0x1E, 0xD4,
-0xF0, 0x00, 0x00, 0x00, 0x00, 0x58, 0xC5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x59, 0xFE, 0xB6,
-0xF0, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xA4, 0xE2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5B, 0xDE, 0x98,
-0xF0, 0x00, 0x00, 0x00, 0x00, 0x5C, 0x84, 0xC4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5D, 0xBE, 0x7A,
-0xF0, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x64, 0xA6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5F, 0x9E, 0x5C,
-0xF0, 0x00, 0x00, 0x00, 0x00, 0x60, 0x4D, 0xC2, 0x80, 0x00, 0x00, 0x00, 0x00, 0x61, 0x87, 0x79,
-0x70, 0x00, 0x00, 0x00, 0x00, 0x62, 0x2D, 0xA4, 0x80, 0x00, 0x00, 0x00, 0x00, 0x63, 0x67, 0x5B,
-0x70, 0x00, 0x00, 0x00, 0x00, 0x64, 0x0D, 0x86, 0x80, 0x00, 0x00, 0x00, 0x00, 0x65, 0x47, 0x3D,
-0x70, 0x00, 0x00, 0x00, 0x00, 0x65, 0xED, 0x68, 0x80, 0x00, 0x00, 0x00, 0x00, 0x67, 0x27, 0x1F,
-0x70, 0x00, 0x00, 0x00, 0x00, 0x67, 0xCD, 0x4A, 0x80, 0x00, 0x00, 0x00, 0x00, 0x69, 0x07, 0x01,
-0x70, 0x00, 0x00, 0x00, 0x00, 0x69, 0xAD, 0x2C, 0x80, 0x00, 0x00, 0x00, 0x00, 0x6A, 0xE6, 0xE3,
-0x70, 0x00, 0x00, 0x00, 0x00, 0x6B, 0x96, 0x49, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6C, 0xCF, 0xFF,
-0xF0, 0x00, 0x00, 0x00, 0x00, 0x6D, 0x76, 0x2B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6E, 0xAF, 0xE1,
-0xF0, 0x00, 0x00, 0x00, 0x00, 0x6F, 0x56, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x8F, 0xC3,
-0xF0, 0x00, 0x00, 0x00, 0x00, 0x71, 0x35, 0xEF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x72, 0x6F, 0xA5,
-0xF0, 0x00, 0x00, 0x00, 0x00, 0x73, 0x15, 0xD1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x74, 0x4F, 0x87,
-0xF0, 0x00, 0x00, 0x00, 0x00, 0x74, 0xFE, 0xED, 0x80, 0x00, 0x00, 0x00, 0x00, 0x76, 0x38, 0xA4,
-0x70, 0x00, 0x00, 0x00, 0x00, 0x76, 0xDE, 0xCF, 0x80, 0x00, 0x00, 0x00, 0x00, 0x78, 0x18, 0x86,
-0x70, 0x00, 0x00, 0x00, 0x00, 0x78, 0xBE, 0xB1, 0x80, 0x00, 0x00, 0x00, 0x00, 0x79, 0xF8, 0x68,
-0x70, 0x00, 0x00, 0x00, 0x00, 0x7A, 0x9E, 0x93, 0x80, 0x00, 0x00, 0x00, 0x00, 0x7B, 0xD8, 0x4A,
-0x70, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x7E, 0x75, 0x80, 0x00, 0x00, 0x00, 0x00, 0x7D, 0xB8, 0x2C,
-0x70, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x5E, 0x57, 0x80, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x98, 0x0E,
-0x70, 0x01, 0x00, 0x01, 0x00, 0x02, 0x03, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x04, 0xFF, 0xFF, 0xB9, 0xB0,
-0x01, 0x00, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x08, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x0C, 0xFF, 0xFF,
-0xAB, 0xA0, 0x00, 0x04, 0x43, 0x44, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x43, 0x57, 0x54, 0x00,
-0x43, 0x50, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0A, 0x43,
-0x53, 0x54, 0x36, 0x43, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D, 0x31,
-0x31, 0x2E, 0x31, 0x2E, 0x30, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0xEC, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x18, 0x80, 0x00, 0x00, 0x00,
+0x9E, 0xA6, 0x2C, 0x80, 0x9F, 0xBA, 0xF9, 0x70, 0xA0, 0x86, 0x0E, 0x80, 0xA1, 0x9A, 0xDB, 0x70,
+0xA2, 0xCB, 0x74, 0x00, 0xA3, 0x83, 0xF7, 0xF0, 0xA4, 0x45, 0xD2, 0x80, 0xA5, 0x63, 0xD9, 0xF0,
+0xA6, 0x53, 0xD9, 0x00, 0xA7, 0x15, 0x97, 0x70, 0xA8, 0x33, 0xBB, 0x00, 0xA8, 0xFE, 0xB3, 0xF0,
+0xAA, 0x13, 0x9D, 0x00, 0xAA, 0xDE, 0x95, 0xF0, 0xAB, 0xF3, 0x7F, 0x00, 0xAC, 0xBE, 0x77, 0xF0,
+0xAD, 0xD3, 0x61, 0x00, 0xAE, 0x9E, 0x59, 0xF0, 0xAF, 0xB3, 0x43, 0x00, 0xB0, 0x7E, 0x3B, 0xF0,
+0xB1, 0x9C, 0x5F, 0x80, 0xB2, 0x67, 0x58, 0x70, 0xB3, 0x7C, 0x41, 0x80, 0xB4, 0x47, 0x3A, 0x70,
+0xB5, 0x5C, 0x23, 0x80, 0xB6, 0x27, 0x1C, 0x70, 0xB7, 0x3C, 0x05, 0x80, 0xB8, 0x06, 0xFE, 0x70,
+0xB9, 0x1B, 0xE7, 0x80, 0xB9, 0xE6, 0xE0, 0x70, 0xBB, 0x05, 0x04, 0x00, 0xBB, 0xC6, 0xC2, 0x70,
+0xBC, 0xE4, 0xE6, 0x00, 0xBD, 0xAF, 0xDE, 0xF0, 0xBE, 0xC4, 0xC8, 0x00, 0xBF, 0x8F, 0xC0, 0xF0,
+0xC0, 0x5A, 0xD6, 0x00, 0xC1, 0xB0, 0x3C, 0x70, 0xC2, 0x84, 0x8C, 0x00, 0xC3, 0x4F, 0x84, 0xF0,
+0xC4, 0x64, 0x6E, 0x00, 0xC5, 0x2F, 0x66, 0xF0, 0xC6, 0x4D, 0x8A, 0x80, 0xC7, 0x0F, 0x48, 0xF0,
+0xC8, 0x2D, 0x6C, 0x80, 0xC8, 0xF8, 0x65, 0x70, 0xCA, 0x0D, 0x4E, 0x80, 0xCA, 0xD8, 0x47, 0x70,
+0xCB, 0x88, 0xFE, 0x80, 0xD2, 0x23, 0xF4, 0x70, 0xD2, 0x61, 0x09, 0xF0, 0xD3, 0x75, 0xF3, 0x00,
+0xD4, 0x40, 0xEB, 0xF0, 0xD5, 0x55, 0xD5, 0x00, 0xD6, 0x20, 0xCD, 0xF0, 0xD7, 0x35, 0xB7, 0x00,
+0xD8, 0x00, 0xAF, 0xF0, 0xD9, 0x15, 0x99, 0x00, 0xD9, 0xE0, 0x91, 0xF0, 0xDA, 0xFE, 0xB5, 0x80,
+0xDB, 0xC0, 0x73, 0xF0, 0xDC, 0xDE, 0x97, 0x80, 0xDD, 0xA9, 0x90, 0x70, 0xDE, 0xBE, 0x79, 0x80,
+0xDF, 0x89, 0x72, 0x70, 0xE0, 0x9E, 0x5B, 0x80, 0xE1, 0x69, 0x54, 0x70, 0xE2, 0x7E, 0x3D, 0x80,
+0xE3, 0x49, 0x36, 0x70, 0xE4, 0x5E, 0x1F, 0x80, 0xE5, 0x57, 0x3C, 0xF0, 0xE6, 0x47, 0x3C, 0x00,
+0xE7, 0x37, 0x1E, 0xF0, 0xE8, 0x27, 0x1E, 0x00, 0xE9, 0x17, 0x00, 0xF0, 0xEA, 0x07, 0x00, 0x00,
+0xEA, 0xF6, 0xE2, 0xF0, 0xEB, 0xE6, 0xE2, 0x00, 0xEC, 0xD6, 0xC4, 0xF0, 0xED, 0xC6, 0xC4, 0x00,
+0xEE, 0xBF, 0xE1, 0x70, 0xEF, 0xAF, 0xE0, 0x80, 0xF0, 0x9F, 0xC3, 0x70, 0xF1, 0x8F, 0xC2, 0x80,
+0xF2, 0x7F, 0xA5, 0x70, 0xF3, 0x6F, 0xA4, 0x80, 0xF4, 0x5F, 0x87, 0x70, 0xF5, 0x4F, 0x86, 0x80,
+0xF6, 0x3F, 0x69, 0x70, 0xF7, 0x2F, 0x68, 0x80, 0xF8, 0x28, 0x85, 0xF0, 0xF9, 0x0F, 0x4A, 0x80,
+0xFA, 0x08, 0x67, 0xF0, 0xFA, 0xF8, 0x67, 0x00, 0xFB, 0xE8, 0x49, 0xF0, 0xFC, 0xD8, 0x49, 0x00,
+0xFD, 0xC8, 0x2B, 0xF0, 0xFE, 0xB8, 0x2B, 0x00, 0xFF, 0xA8, 0x0D, 0xF0, 0x00, 0x98, 0x0D, 0x00,
+0x01, 0x87, 0xEF, 0xF0, 0x02, 0x77, 0xEF, 0x00, 0x03, 0x71, 0x0C, 0x70, 0x04, 0x61, 0x0B, 0x80,
+0x05, 0x50, 0xEE, 0x70, 0x06, 0x40, 0xED, 0x80, 0x07, 0x30, 0xD0, 0x70, 0x07, 0x8D, 0x27, 0x80,
+0x09, 0x10, 0xB2, 0x70, 0x09, 0xAD, 0xA3, 0x00, 0x0A, 0xF0, 0x94, 0x70, 0x0B, 0xE0, 0x93, 0x80,
+0x0C, 0xD9, 0xB0, 0xF0, 0x0D, 0xC0, 0x75, 0x80, 0x0E, 0xB9, 0x92, 0xF0, 0x0F, 0xA9, 0x92, 0x00,
+0x10, 0x99, 0x74, 0xF0, 0x11, 0x89, 0x74, 0x00, 0x12, 0x79, 0x56, 0xF0, 0x13, 0x69, 0x56, 0x00,
+0x14, 0x59, 0x38, 0xF0, 0x15, 0x49, 0x38, 0x00, 0x16, 0x39, 0x1A, 0xF0, 0x17, 0x29, 0x1A, 0x00,
+0x18, 0x22, 0x37, 0x70, 0x19, 0x08, 0xFC, 0x00, 0x1A, 0x02, 0x19, 0x70, 0x1A, 0xF2, 0x18, 0x80,
+0x1B, 0xE1, 0xFB, 0x70, 0x1C, 0xD1, 0xFA, 0x80, 0x1D, 0xC1, 0xDD, 0x70, 0x1E, 0xB1, 0xDC, 0x80,
+0x1F, 0xA1, 0xBF, 0x70, 0x20, 0x76, 0x0F, 0x00, 0x21, 0x81, 0xA1, 0x70, 0x22, 0x55, 0xF1, 0x00,
+0x23, 0x6A, 0xBD, 0xF0, 0x24, 0x35, 0xD3, 0x00, 0x25, 0x4A, 0x9F, 0xF0, 0x26, 0x15, 0xB5, 0x00,
+0x27, 0x2A, 0x81, 0xF0, 0x27, 0xFE, 0xD1, 0x80, 0x29, 0x0A, 0x63, 0xF0, 0x29, 0xDE, 0xB3, 0x80,
+0x2A, 0xEA, 0x45, 0xF0, 0x2B, 0xBE, 0x95, 0x80, 0x2C, 0xD3, 0x62, 0x70, 0x2D, 0x9E, 0x77, 0x80,
+0x2E, 0xB3, 0x44, 0x70, 0x2F, 0x7E, 0x59, 0x80, 0x30, 0x93, 0x26, 0x70, 0x31, 0x67, 0x76, 0x00,
+0x32, 0x73, 0x08, 0x70, 0x33, 0x47, 0x58, 0x00, 0x34, 0x52, 0xEA, 0x70, 0x35, 0x27, 0x3A, 0x00,
+0x36, 0x32, 0xCC, 0x70, 0x37, 0x07, 0x1C, 0x00, 0x38, 0x1B, 0xE8, 0xF0, 0x38, 0xE6, 0xFE, 0x00,
+0x39, 0xFB, 0xCA, 0xF0, 0x3A, 0xC6, 0xE0, 0x00, 0x3B, 0xDB, 0xAC, 0xF0, 0x3C, 0xAF, 0xFC, 0x80,
+0x3D, 0xBB, 0x8E, 0xF0, 0x3E, 0x8F, 0xDE, 0x80, 0x3F, 0x9B, 0x70, 0xF0, 0x40, 0x6F, 0xC0, 0x80,
+0x41, 0x84, 0x8D, 0x70, 0x42, 0x4F, 0xA2, 0x80, 0x43, 0x64, 0x6F, 0x70, 0x44, 0x2F, 0x84, 0x80,
+0x45, 0x44, 0x51, 0x70, 0x45, 0xF3, 0xB7, 0x00, 0x47, 0x2D, 0x6D, 0xF0, 0x47, 0xD3, 0x99, 0x00,
+0x49, 0x0D, 0x4F, 0xF0, 0x49, 0xB3, 0x7B, 0x00, 0x4A, 0xED, 0x31, 0xF0, 0x4B, 0x9C, 0x97, 0x80,
+0x4C, 0xD6, 0x4E, 0x70, 0x4D, 0x7C, 0x79, 0x80, 0x4E, 0xB6, 0x30, 0x70, 0x4F, 0x5C, 0x5B, 0x80,
+0x50, 0x96, 0x12, 0x70, 0x51, 0x3C, 0x3D, 0x80, 0x52, 0x75, 0xF4, 0x70, 0x53, 0x1C, 0x1F, 0x80,
+0x54, 0x55, 0xD6, 0x70, 0x54, 0xFC, 0x01, 0x80, 0x56, 0x35, 0xB8, 0x70, 0x56, 0xE5, 0x1E, 0x00,
+0x58, 0x1E, 0xD4, 0xF0, 0x58, 0xC5, 0x00, 0x00, 0x59, 0xFE, 0xB6, 0xF0, 0x5A, 0xA4, 0xE2, 0x00,
+0x5B, 0xDE, 0x98, 0xF0, 0x5C, 0x84, 0xC4, 0x00, 0x5D, 0xBE, 0x7A, 0xF0, 0x5E, 0x64, 0xA6, 0x00,
+0x5F, 0x9E, 0x5C, 0xF0, 0x60, 0x4D, 0xC2, 0x80, 0x61, 0x87, 0x79, 0x70, 0x62, 0x2D, 0xA4, 0x80,
+0x63, 0x67, 0x5B, 0x70, 0x64, 0x0D, 0x86, 0x80, 0x65, 0x47, 0x3D, 0x70, 0x65, 0xED, 0x68, 0x80,
+0x67, 0x27, 0x1F, 0x70, 0x67, 0xCD, 0x4A, 0x80, 0x69, 0x07, 0x01, 0x70, 0x69, 0xAD, 0x2C, 0x80,
+0x6A, 0xE6, 0xE3, 0x70, 0x6B, 0x96, 0x49, 0x00, 0x6C, 0xCF, 0xFF, 0xF0, 0x6D, 0x76, 0x2B, 0x00,
+0x6E, 0xAF, 0xE1, 0xF0, 0x6F, 0x56, 0x0D, 0x00, 0x70, 0x8F, 0xC3, 0xF0, 0x71, 0x35, 0xEF, 0x00,
+0x72, 0x6F, 0xA5, 0xF0, 0x73, 0x15, 0xD1, 0x00, 0x74, 0x4F, 0x87, 0xF0, 0x74, 0xFE, 0xED, 0x80,
+0x76, 0x38, 0xA4, 0x70, 0x76, 0xDE, 0xCF, 0x80, 0x78, 0x18, 0x86, 0x70, 0x78, 0xBE, 0xB1, 0x80,
+0x79, 0xF8, 0x68, 0x70, 0x7A, 0x9E, 0x93, 0x80, 0x7B, 0xD8, 0x4A, 0x70, 0x7C, 0x7E, 0x75, 0x80,
+0x7D, 0xB8, 0x2C, 0x70, 0x7E, 0x5E, 0x57, 0x80, 0x7F, 0x98, 0x0E, 0x70, 0x03, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x04, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x05, 0x06, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0xFF, 0xFF, 0xAD, 0xD4, 0x00, 0x00, 0xFF, 0xFF,
+0xB9, 0xB0, 0x01, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08,
+0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x0C, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x10, 0xFF, 0xFF, 0xB9, 0xB0,
+0x01, 0x14, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00,
+0x43, 0x53, 0x54, 0x00, 0x45, 0x53, 0x54, 0x00, 0x43, 0x57, 0x54, 0x00, 0x43, 0x50, 0x54, 0x00,
+0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00,
+0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0xEC, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x18, 0xFF, 0xFF, 0xFF, 0xFF,
+0x5E, 0x03, 0xFE, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0x9E, 0xA6, 0x2C, 0x80, 0xFF, 0xFF, 0xFF, 0xFF,
+0x9F, 0xBA, 0xF9, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xA0, 0x86, 0x0E, 0x80, 0xFF, 0xFF, 0xFF, 0xFF,
+0xA1, 0x9A, 0xDB, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xA2, 0xCB, 0x74, 0x00, 0xFF, 0xFF, 0xFF, 0xFF,
+0xA3, 0x83, 0xF7, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xA4, 0x45, 0xD2, 0x80, 0xFF, 0xFF, 0xFF, 0xFF,
+0xA5, 0x63, 0xD9, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xA6, 0x53, 0xD9, 0x00, 0xFF, 0xFF, 0xFF, 0xFF,
+0xA7, 0x15, 0x97, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xA8, 0x33, 0xBB, 0x00, 0xFF, 0xFF, 0xFF, 0xFF,
+0xA8, 0xFE, 0xB3, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xAA, 0x13, 0x9D, 0x00, 0xFF, 0xFF, 0xFF, 0xFF,
+0xAA, 0xDE, 0x95, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xAB, 0xF3, 0x7F, 0x00, 0xFF, 0xFF, 0xFF, 0xFF,
+0xAC, 0xBE, 0x77, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xAD, 0xD3, 0x61, 0x00, 0xFF, 0xFF, 0xFF, 0xFF,
+0xAE, 0x9E, 0x59, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xB3, 0x43, 0x00, 0xFF, 0xFF, 0xFF, 0xFF,
+0xB0, 0x7E, 0x3B, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB1, 0x9C, 0x5F, 0x80, 0xFF, 0xFF, 0xFF, 0xFF,
+0xB2, 0x67, 0x58, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB3, 0x7C, 0x41, 0x80, 0xFF, 0xFF, 0xFF, 0xFF,
+0xB4, 0x47, 0x3A, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB5, 0x5C, 0x23, 0x80, 0xFF, 0xFF, 0xFF, 0xFF,
+0xB6, 0x27, 0x1C, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x3C, 0x05, 0x80, 0xFF, 0xFF, 0xFF, 0xFF,
+0xB8, 0x06, 0xFE, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB9, 0x1B, 0xE7, 0x80, 0xFF, 0xFF, 0xFF, 0xFF,
+0xB9, 0xE6, 0xE0, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xBB, 0x05, 0x04, 0x00, 0xFF, 0xFF, 0xFF, 0xFF,
+0xBB, 0xC6, 0xC2, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xBC, 0xE4, 0xE6, 0x00, 0xFF, 0xFF, 0xFF, 0xFF,
+0xBD, 0xAF, 0xDE, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xBE, 0xC4, 0xC8, 0x00, 0xFF, 0xFF, 0xFF, 0xFF,
+0xBF, 0x8F, 0xC0, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC0, 0x5A, 0xD6, 0x00, 0xFF, 0xFF, 0xFF, 0xFF,
+0xC1, 0xB0, 0x3C, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xC2, 0x84, 0x8C, 0x00, 0xFF, 0xFF, 0xFF, 0xFF,
+0xC3, 0x4F, 0x84, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC4, 0x64, 0x6E, 0x00, 0xFF, 0xFF, 0xFF, 0xFF,
+0xC5, 0x2F, 0x66, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC6, 0x4D, 0x8A, 0x80, 0xFF, 0xFF, 0xFF, 0xFF,
+0xC7, 0x0F, 0x48, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC8, 0x2D, 0x6C, 0x80, 0xFF, 0xFF, 0xFF, 0xFF,
+0xC8, 0xF8, 0x65, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xCA, 0x0D, 0x4E, 0x80, 0xFF, 0xFF, 0xFF, 0xFF,
+0xCA, 0xD8, 0x47, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0x88, 0xFE, 0x80, 0xFF, 0xFF, 0xFF, 0xFF,
+0xD2, 0x23, 0xF4, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x61, 0x09, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF,
+0xD3, 0x75, 0xF3, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xD4, 0x40, 0xEB, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF,
+0xD5, 0x55, 0xD5, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xD6, 0x20, 0xCD, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF,
+0xD7, 0x35, 0xB7, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xD8, 0x00, 0xAF, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF,
+0xD9, 0x15, 0x99, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xD9, 0xE0, 0x91, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF,
+0xDA, 0xFE, 0xB5, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xDB, 0xC0, 0x73, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF,
+0xDC, 0xDE, 0x97, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xDD, 0xA9, 0x90, 0x70, 0xFF, 0xFF, 0xFF, 0xFF,
+0xDE, 0xBE, 0x79, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0x89, 0x72, 0x70, 0xFF, 0xFF, 0xFF, 0xFF,
+0xE0, 0x9E, 0x5B, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xE1, 0x69, 0x54, 0x70, 0xFF, 0xFF, 0xFF, 0xFF,
+0xE2, 0x7E, 0x3D, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xE3, 0x49, 0x36, 0x70, 0xFF, 0xFF, 0xFF, 0xFF,
+0xE4, 0x5E, 0x1F, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xE5, 0x57, 0x3C, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF,
+0xE6, 0x47, 0x3C, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xE7, 0x37, 0x1E, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF,
+0xE8, 0x27, 0x1E, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xE9, 0x17, 0x00, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF,
+0xEA, 0x07, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xEA, 0xF6, 0xE2, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF,
+0xEB, 0xE6, 0xE2, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xEC, 0xD6, 0xC4, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF,
+0xED, 0xC6, 0xC4, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xEE, 0xBF, 0xE1, 0x70, 0xFF, 0xFF, 0xFF, 0xFF,
+0xEF, 0xAF, 0xE0, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xF0, 0x9F, 0xC3, 0x70, 0xFF, 0xFF, 0xFF, 0xFF,
+0xF1, 0x8F, 0xC2, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xF2, 0x7F, 0xA5, 0x70, 0xFF, 0xFF, 0xFF, 0xFF,
+0xF3, 0x6F, 0xA4, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x5F, 0x87, 0x70, 0xFF, 0xFF, 0xFF, 0xFF,
+0xF5, 0x4F, 0x86, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xF6, 0x3F, 0x69, 0x70, 0xFF, 0xFF, 0xFF, 0xFF,
+0xF7, 0x2F, 0x68, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x28, 0x85, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF,
+0xF9, 0x0F, 0x4A, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x08, 0x67, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF,
+0xFA, 0xF8, 0x67, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFB, 0xE8, 0x49, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF,
+0xFC, 0xD8, 0x49, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFD, 0xC8, 0x2B, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF,
+0xFE, 0xB8, 0x2B, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xA8, 0x0D, 0xF0, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x98, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x87, 0xEF, 0xF0, 0x00, 0x00, 0x00, 0x00,
+0x02, 0x77, 0xEF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x71, 0x0C, 0x70, 0x00, 0x00, 0x00, 0x00,
+0x04, 0x61, 0x0B, 0x80, 0x00, 0x00, 0x00, 0x00, 0x05, 0x50, 0xEE, 0x70, 0x00, 0x00, 0x00, 0x00,
+0x06, 0x40, 0xED, 0x80, 0x00, 0x00, 0x00, 0x00, 0x07, 0x30, 0xD0, 0x70, 0x00, 0x00, 0x00, 0x00,
+0x07, 0x8D, 0x27, 0x80, 0x00, 0x00, 0x00, 0x00, 0x09, 0x10, 0xB2, 0x70, 0x00, 0x00, 0x00, 0x00,
+0x09, 0xAD, 0xA3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0xF0, 0x94, 0x70, 0x00, 0x00, 0x00, 0x00,
+0x0B, 0xE0, 0x93, 0x80, 0x00, 0x00, 0x00, 0x00, 0x0C, 0xD9, 0xB0, 0xF0, 0x00, 0x00, 0x00, 0x00,
+0x0D, 0xC0, 0x75, 0x80, 0x00, 0x00, 0x00, 0x00, 0x0E, 0xB9, 0x92, 0xF0, 0x00, 0x00, 0x00, 0x00,
+0x0F, 0xA9, 0x92, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x99, 0x74, 0xF0, 0x00, 0x00, 0x00, 0x00,
+0x11, 0x89, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x79, 0x56, 0xF0, 0x00, 0x00, 0x00, 0x00,
+0x13, 0x69, 0x56, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x59, 0x38, 0xF0, 0x00, 0x00, 0x00, 0x00,
+0x15, 0x49, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16, 0x39, 0x1A, 0xF0, 0x00, 0x00, 0x00, 0x00,
+0x17, 0x29, 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x22, 0x37, 0x70, 0x00, 0x00, 0x00, 0x00,
+0x19, 0x08, 0xFC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1A, 0x02, 0x19, 0x70, 0x00, 0x00, 0x00, 0x00,
+0x1A, 0xF2, 0x18, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xE1, 0xFB, 0x70, 0x00, 0x00, 0x00, 0x00,
+0x1C, 0xD1, 0xFA, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC1, 0xDD, 0x70, 0x00, 0x00, 0x00, 0x00,
+0x1E, 0xB1, 0xDC, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA1, 0xBF, 0x70, 0x00, 0x00, 0x00, 0x00,
+0x20, 0x76, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x21, 0x81, 0xA1, 0x70, 0x00, 0x00, 0x00, 0x00,
+0x22, 0x55, 0xF1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x23, 0x6A, 0xBD, 0xF0, 0x00, 0x00, 0x00, 0x00,
+0x24, 0x35, 0xD3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x25, 0x4A, 0x9F, 0xF0, 0x00, 0x00, 0x00, 0x00,
+0x26, 0x15, 0xB5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x27, 0x2A, 0x81, 0xF0, 0x00, 0x00, 0x00, 0x00,
+0x27, 0xFE, 0xD1, 0x80, 0x00, 0x00, 0x00, 0x00, 0x29, 0x0A, 0x63, 0xF0, 0x00, 0x00, 0x00, 0x00,
+0x29, 0xDE, 0xB3, 0x80, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xEA, 0x45, 0xF0, 0x00, 0x00, 0x00, 0x00,
+0x2B, 0xBE, 0x95, 0x80, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xD3, 0x62, 0x70, 0x00, 0x00, 0x00, 0x00,
+0x2D, 0x9E, 0x77, 0x80, 0x00, 0x00, 0x00, 0x00, 0x2E, 0xB3, 0x44, 0x70, 0x00, 0x00, 0x00, 0x00,
+0x2F, 0x7E, 0x59, 0x80, 0x00, 0x00, 0x00, 0x00, 0x30, 0x93, 0x26, 0x70, 0x00, 0x00, 0x00, 0x00,
+0x31, 0x67, 0x76, 0x00, 0x00, 0x00, 0x00, 0x00, 0x32, 0x73, 0x08, 0x70, 0x00, 0x00, 0x00, 0x00,
+0x33, 0x47, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x34, 0x52, 0xEA, 0x70, 0x00, 0x00, 0x00, 0x00,
+0x35, 0x27, 0x3A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0xCC, 0x70, 0x00, 0x00, 0x00, 0x00,
+0x37, 0x07, 0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x1B, 0xE8, 0xF0, 0x00, 0x00, 0x00, 0x00,
+0x38, 0xE6, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0xCA, 0xF0, 0x00, 0x00, 0x00, 0x00,
+0x3A, 0xC6, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xDB, 0xAC, 0xF0, 0x00, 0x00, 0x00, 0x00,
+0x3C, 0xAF, 0xFC, 0x80, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0x8E, 0xF0, 0x00, 0x00, 0x00, 0x00,
+0x3E, 0x8F, 0xDE, 0x80, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x70, 0xF0, 0x00, 0x00, 0x00, 0x00,
+0x40, 0x6F, 0xC0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0x8D, 0x70, 0x00, 0x00, 0x00, 0x00,
+0x42, 0x4F, 0xA2, 0x80, 0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x6F, 0x70, 0x00, 0x00, 0x00, 0x00,
+0x44, 0x2F, 0x84, 0x80, 0x00, 0x00, 0x00, 0x00, 0x45, 0x44, 0x51, 0x70, 0x00, 0x00, 0x00, 0x00,
+0x45, 0xF3, 0xB7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x47, 0x2D, 0x6D, 0xF0, 0x00, 0x00, 0x00, 0x00,
+0x47, 0xD3, 0x99, 0x00, 0x00, 0x00, 0x00, 0x00, 0x49, 0x0D, 0x4F, 0xF0, 0x00, 0x00, 0x00, 0x00,
+0x49, 0xB3, 0x7B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4A, 0xED, 0x31, 0xF0, 0x00, 0x00, 0x00, 0x00,
+0x4B, 0x9C, 0x97, 0x80, 0x00, 0x00, 0x00, 0x00, 0x4C, 0xD6, 0x4E, 0x70, 0x00, 0x00, 0x00, 0x00,
+0x4D, 0x7C, 0x79, 0x80, 0x00, 0x00, 0x00, 0x00, 0x4E, 0xB6, 0x30, 0x70, 0x00, 0x00, 0x00, 0x00,
+0x4F, 0x5C, 0x5B, 0x80, 0x00, 0x00, 0x00, 0x00, 0x50, 0x96, 0x12, 0x70, 0x00, 0x00, 0x00, 0x00,
+0x51, 0x3C, 0x3D, 0x80, 0x00, 0x00, 0x00, 0x00, 0x52, 0x75, 0xF4, 0x70, 0x00, 0x00, 0x00, 0x00,
+0x53, 0x1C, 0x1F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x54, 0x55, 0xD6, 0x70, 0x00, 0x00, 0x00, 0x00,
+0x54, 0xFC, 0x01, 0x80, 0x00, 0x00, 0x00, 0x00, 0x56, 0x35, 0xB8, 0x70, 0x00, 0x00, 0x00, 0x00,
+0x56, 0xE5, 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x58, 0x1E, 0xD4, 0xF0, 0x00, 0x00, 0x00, 0x00,
+0x58, 0xC5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x59, 0xFE, 0xB6, 0xF0, 0x00, 0x00, 0x00, 0x00,
+0x5A, 0xA4, 0xE2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5B, 0xDE, 0x98, 0xF0, 0x00, 0x00, 0x00, 0x00,
+0x5C, 0x84, 0xC4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5D, 0xBE, 0x7A, 0xF0, 0x00, 0x00, 0x00, 0x00,
+0x5E, 0x64, 0xA6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5F, 0x9E, 0x5C, 0xF0, 0x00, 0x00, 0x00, 0x00,
+0x60, 0x4D, 0xC2, 0x80, 0x00, 0x00, 0x00, 0x00, 0x61, 0x87, 0x79, 0x70, 0x00, 0x00, 0x00, 0x00,
+0x62, 0x2D, 0xA4, 0x80, 0x00, 0x00, 0x00, 0x00, 0x63, 0x67, 0x5B, 0x70, 0x00, 0x00, 0x00, 0x00,
+0x64, 0x0D, 0x86, 0x80, 0x00, 0x00, 0x00, 0x00, 0x65, 0x47, 0x3D, 0x70, 0x00, 0x00, 0x00, 0x00,
+0x65, 0xED, 0x68, 0x80, 0x00, 0x00, 0x00, 0x00, 0x67, 0x27, 0x1F, 0x70, 0x00, 0x00, 0x00, 0x00,
+0x67, 0xCD, 0x4A, 0x80, 0x00, 0x00, 0x00, 0x00, 0x69, 0x07, 0x01, 0x70, 0x00, 0x00, 0x00, 0x00,
+0x69, 0xAD, 0x2C, 0x80, 0x00, 0x00, 0x00, 0x00, 0x6A, 0xE6, 0xE3, 0x70, 0x00, 0x00, 0x00, 0x00,
+0x6B, 0x96, 0x49, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6C, 0xCF, 0xFF, 0xF0, 0x00, 0x00, 0x00, 0x00,
+0x6D, 0x76, 0x2B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6E, 0xAF, 0xE1, 0xF0, 0x00, 0x00, 0x00, 0x00,
+0x6F, 0x56, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x8F, 0xC3, 0xF0, 0x00, 0x00, 0x00, 0x00,
+0x71, 0x35, 0xEF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x72, 0x6F, 0xA5, 0xF0, 0x00, 0x00, 0x00, 0x00,
+0x73, 0x15, 0xD1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x74, 0x4F, 0x87, 0xF0, 0x00, 0x00, 0x00, 0x00,
+0x74, 0xFE, 0xED, 0x80, 0x00, 0x00, 0x00, 0x00, 0x76, 0x38, 0xA4, 0x70, 0x00, 0x00, 0x00, 0x00,
+0x76, 0xDE, 0xCF, 0x80, 0x00, 0x00, 0x00, 0x00, 0x78, 0x18, 0x86, 0x70, 0x00, 0x00, 0x00, 0x00,
+0x78, 0xBE, 0xB1, 0x80, 0x00, 0x00, 0x00, 0x00, 0x79, 0xF8, 0x68, 0x70, 0x00, 0x00, 0x00, 0x00,
+0x7A, 0x9E, 0x93, 0x80, 0x00, 0x00, 0x00, 0x00, 0x7B, 0xD8, 0x4A, 0x70, 0x00, 0x00, 0x00, 0x00,
+0x7C, 0x7E, 0x75, 0x80, 0x00, 0x00, 0x00, 0x00, 0x7D, 0xB8, 0x2C, 0x70, 0x00, 0x00, 0x00, 0x00,
+0x7E, 0x5E, 0x57, 0x80, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x98, 0x0E, 0x70, 0x03, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x04, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x05, 0x06, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0xFF, 0xFF, 0xAD, 0xD4, 0x00, 0x00, 0xFF, 0xFF,
+0xB9, 0xB0, 0x01, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08,
+0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x0C, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x10, 0xFF, 0xFF, 0xB9, 0xB0,
+0x01, 0x14, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00,
+0x43, 0x53, 0x54, 0x00, 0x45, 0x53, 0x54, 0x00, 0x43, 0x57, 0x54, 0x00, 0x43, 0x50, 0x54, 0x00,
+0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00,
+0x0A, 0x43, 0x53, 0x54, 0x36, 0x43, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C,
+0x4D, 0x31, 0x31, 0x2E, 0x31, 0x2E, 0x30, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 
 
 /* Cuba */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -53668,10 +54302,14 @@
 
 /* EET */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x7A, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x09, 0x0D, 0xA4, 0x63, 0x90,
-0x0E, 0x8B, 0x1A, 0x10, 0x0F, 0x84, 0x45, 0x90, 0x10, 0x74, 0x36, 0x90, 0x11, 0x64, 0x27, 0x90,
-0x12, 0x54, 0x18, 0x90, 0x13, 0x4D, 0x44, 0x10, 0x14, 0x33, 0xFA, 0x90, 0x15, 0x23, 0xEB, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x8A, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x1A, 0x80, 0x00, 0x00, 0x00,
+0x9B, 0x80, 0x21, 0x80, 0xB9, 0x7C, 0xE9, 0xE0, 0xB9, 0xC6, 0xAF, 0xD0, 0xC9, 0xF2, 0x63, 0xE0,
+0xCA, 0x10, 0xA8, 0x50, 0xCC, 0xE7, 0x4B, 0x10, 0xCD, 0xAA, 0x4C, 0xF0, 0xCE, 0xA2, 0x18, 0xE0,
+0xCF, 0x93, 0x69, 0x70, 0xDF, 0x13, 0x9E, 0x60, 0xDF, 0xB7, 0x0A, 0x50, 0x09, 0xEC, 0x5E, 0x60,
+0x0B, 0x18, 0xF4, 0x60, 0x0B, 0xCD, 0xAE, 0x00, 0x0C, 0xBD, 0x9F, 0x00, 0x0D, 0xA4, 0x55, 0x80,
+0x0E, 0x8C, 0x5D, 0x80, 0x0F, 0x84, 0x37, 0x80, 0x10, 0x6A, 0xFC, 0x10, 0x11, 0x64, 0x7B, 0xF0,
+0x12, 0x52, 0xAA, 0xF0, 0x13, 0x46, 0x82, 0x60, 0x14, 0x33, 0xC2, 0x50, 0x15, 0x23, 0xEB, 0x90,
 0x16, 0x13, 0xDC, 0x90, 0x17, 0x03, 0xCD, 0x90, 0x17, 0xF3, 0xBE, 0x90, 0x18, 0xE3, 0xAF, 0x90,
 0x19, 0xD3, 0xA0, 0x90, 0x1A, 0xC3, 0x91, 0x90, 0x1B, 0xBC, 0xBD, 0x10, 0x1C, 0xAC, 0xAE, 0x10,
 0x1D, 0x9C, 0x9F, 0x10, 0x1E, 0x8C, 0x90, 0x10, 0x1F, 0x7C, 0x81, 0x10, 0x20, 0x6C, 0x72, 0x10,
@@ -53700,94 +54338,112 @@
 0x74, 0x45, 0xF9, 0x10, 0x75, 0x11, 0x00, 0x10, 0x76, 0x2F, 0x15, 0x90, 0x76, 0xF0, 0xE2, 0x10,
 0x78, 0x0E, 0xF7, 0x90, 0x78, 0xD0, 0xC4, 0x10, 0x79, 0xEE, 0xD9, 0x90, 0x7A, 0xB0, 0xA6, 0x10,
 0x7B, 0xCE, 0xBB, 0x90, 0x7C, 0x99, 0xC2, 0x90, 0x7D, 0xAE, 0x9D, 0x90, 0x7E, 0x79, 0xA4, 0x90,
-0x7F, 0x8E, 0x7F, 0x90, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00,
-0x1C, 0x20, 0x00, 0x05, 0x00, 0x00, 0x2A, 0x30, 0x01, 0x00, 0x00, 0x00, 0x2A, 0x30, 0x01, 0x00,
-0x00, 0x00, 0x1C, 0x20, 0x00, 0x05, 0x45, 0x45, 0x53, 0x54, 0x00, 0x45, 0x45, 0x54, 0x00, 0x01,
-0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00,
-0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7A, 0x00, 0x00, 0x00, 0x04, 0x00,
-0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x0D, 0xA4, 0x63, 0x90, 0x00, 0x00, 0x00, 0x00, 0x0E,
-0x8B, 0x1A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x84, 0x45, 0x90, 0x00, 0x00, 0x00, 0x00, 0x10,
-0x74, 0x36, 0x90, 0x00, 0x00, 0x00, 0x00, 0x11, 0x64, 0x27, 0x90, 0x00, 0x00, 0x00, 0x00, 0x12,
-0x54, 0x18, 0x90, 0x00, 0x00, 0x00, 0x00, 0x13, 0x4D, 0x44, 0x10, 0x00, 0x00, 0x00, 0x00, 0x14,
-0x33, 0xFA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x15, 0x23, 0xEB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x16,
-0x13, 0xDC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x17, 0x03, 0xCD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x17,
-0xF3, 0xBE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x18, 0xE3, 0xAF, 0x90, 0x00, 0x00, 0x00, 0x00, 0x19,
-0xD3, 0xA0, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xC3, 0x91, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1B,
-0xBC, 0xBD, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xAC, 0xAE, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1D,
-0x9C, 0x9F, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x8C, 0x90, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1F,
-0x7C, 0x81, 0x10, 0x00, 0x00, 0x00, 0x00, 0x20, 0x6C, 0x72, 0x10, 0x00, 0x00, 0x00, 0x00, 0x21,
-0x5C, 0x63, 0x10, 0x00, 0x00, 0x00, 0x00, 0x22, 0x4C, 0x54, 0x10, 0x00, 0x00, 0x00, 0x00, 0x23,
-0x3C, 0x45, 0x10, 0x00, 0x00, 0x00, 0x00, 0x24, 0x2C, 0x36, 0x10, 0x00, 0x00, 0x00, 0x00, 0x25,
-0x1C, 0x27, 0x10, 0x00, 0x00, 0x00, 0x00, 0x26, 0x0C, 0x18, 0x10, 0x00, 0x00, 0x00, 0x00, 0x27,
-0x05, 0x43, 0x90, 0x00, 0x00, 0x00, 0x00, 0x27, 0xF5, 0x34, 0x90, 0x00, 0x00, 0x00, 0x00, 0x28,
-0xE5, 0x25, 0x90, 0x00, 0x00, 0x00, 0x00, 0x29, 0xD5, 0x16, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2A,
-0xC5, 0x07, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xB4, 0xF8, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2C,
-0xA4, 0xE9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x94, 0xDA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2E,
-0x84, 0xCB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x74, 0xBC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x30,
-0x64, 0xAD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x31, 0x5D, 0xD9, 0x10, 0x00, 0x00, 0x00, 0x00, 0x32,
-0x72, 0xB4, 0x10, 0x00, 0x00, 0x00, 0x00, 0x33, 0x3D, 0xBB, 0x10, 0x00, 0x00, 0x00, 0x00, 0x34,
-0x52, 0x96, 0x10, 0x00, 0x00, 0x00, 0x00, 0x35, 0x1D, 0x9D, 0x10, 0x00, 0x00, 0x00, 0x00, 0x36,
-0x32, 0x78, 0x10, 0x00, 0x00, 0x00, 0x00, 0x36, 0xFD, 0x7F, 0x10, 0x00, 0x00, 0x00, 0x00, 0x38,
-0x1B, 0x94, 0x90, 0x00, 0x00, 0x00, 0x00, 0x38, 0xDD, 0x61, 0x10, 0x00, 0x00, 0x00, 0x00, 0x39,
-0xFB, 0x76, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xBD, 0x43, 0x10, 0x00, 0x00, 0x00, 0x00, 0x3B,
-0xDB, 0x58, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xA6, 0x5F, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3D,
-0xBB, 0x3A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x86, 0x41, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3F,
-0x9B, 0x1C, 0x90, 0x00, 0x00, 0x00, 0x00, 0x40, 0x66, 0x23, 0x90, 0x00, 0x00, 0x00, 0x00, 0x41,
-0x84, 0x39, 0x10, 0x00, 0x00, 0x00, 0x00, 0x42, 0x46, 0x05, 0x90, 0x00, 0x00, 0x00, 0x00, 0x43,
-0x64, 0x1B, 0x10, 0x00, 0x00, 0x00, 0x00, 0x44, 0x25, 0xE7, 0x90, 0x00, 0x00, 0x00, 0x00, 0x45,
-0x43, 0xFD, 0x10, 0x00, 0x00, 0x00, 0x00, 0x46, 0x05, 0xC9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x47,
-0x23, 0xDF, 0x10, 0x00, 0x00, 0x00, 0x00, 0x47, 0xEE, 0xE6, 0x10, 0x00, 0x00, 0x00, 0x00, 0x49,
-0x03, 0xC1, 0x10, 0x00, 0x00, 0x00, 0x00, 0x49, 0xCE, 0xC8, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4A,
-0xE3, 0xA3, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4B, 0xAE, 0xAA, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4C,
-0xCC, 0xBF, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x8E, 0x8C, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4E,
-0xAC, 0xA1, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x6E, 0x6E, 0x10, 0x00, 0x00, 0x00, 0x00, 0x50,
-0x8C, 0x83, 0x90, 0x00, 0x00, 0x00, 0x00, 0x51, 0x57, 0x8A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x52,
-0x6C, 0x65, 0x90, 0x00, 0x00, 0x00, 0x00, 0x53, 0x37, 0x6C, 0x90, 0x00, 0x00, 0x00, 0x00, 0x54,
-0x4C, 0x47, 0x90, 0x00, 0x00, 0x00, 0x00, 0x55, 0x17, 0x4E, 0x90, 0x00, 0x00, 0x00, 0x00, 0x56,
-0x2C, 0x29, 0x90, 0x00, 0x00, 0x00, 0x00, 0x56, 0xF7, 0x30, 0x90, 0x00, 0x00, 0x00, 0x00, 0x58,
-0x15, 0x46, 0x10, 0x00, 0x00, 0x00, 0x00, 0x58, 0xD7, 0x12, 0x90, 0x00, 0x00, 0x00, 0x00, 0x59,
-0xF5, 0x28, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xB6, 0xF4, 0x90, 0x00, 0x00, 0x00, 0x00, 0x5B,
-0xD5, 0x0A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5C, 0xA0, 0x11, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5D,
-0xB4, 0xEC, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x7F, 0xF3, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5F,
-0x94, 0xCE, 0x10, 0x00, 0x00, 0x00, 0x00, 0x60, 0x5F, 0xD5, 0x10, 0x00, 0x00, 0x00, 0x00, 0x61,
-0x7D, 0xEA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x62, 0x3F, 0xB7, 0x10, 0x00, 0x00, 0x00, 0x00, 0x63,
-0x5D, 0xCC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x64, 0x1F, 0x99, 0x10, 0x00, 0x00, 0x00, 0x00, 0x65,
-0x3D, 0xAE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x66, 0x08, 0xB5, 0x90, 0x00, 0x00, 0x00, 0x00, 0x67,
-0x1D, 0x90, 0x90, 0x00, 0x00, 0x00, 0x00, 0x67, 0xE8, 0x97, 0x90, 0x00, 0x00, 0x00, 0x00, 0x68,
-0xFD, 0x72, 0x90, 0x00, 0x00, 0x00, 0x00, 0x69, 0xC8, 0x79, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6A,
-0xDD, 0x54, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6B, 0xA8, 0x5B, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6C,
-0xC6, 0x71, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6D, 0x88, 0x3D, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6E,
-0xA6, 0x53, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6F, 0x68, 0x1F, 0x90, 0x00, 0x00, 0x00, 0x00, 0x70,
-0x86, 0x35, 0x10, 0x00, 0x00, 0x00, 0x00, 0x71, 0x51, 0x3C, 0x10, 0x00, 0x00, 0x00, 0x00, 0x72,
-0x66, 0x17, 0x10, 0x00, 0x00, 0x00, 0x00, 0x73, 0x31, 0x1E, 0x10, 0x00, 0x00, 0x00, 0x00, 0x74,
-0x45, 0xF9, 0x10, 0x00, 0x00, 0x00, 0x00, 0x75, 0x11, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x76,
-0x2F, 0x15, 0x90, 0x00, 0x00, 0x00, 0x00, 0x76, 0xF0, 0xE2, 0x10, 0x00, 0x00, 0x00, 0x00, 0x78,
-0x0E, 0xF7, 0x90, 0x00, 0x00, 0x00, 0x00, 0x78, 0xD0, 0xC4, 0x10, 0x00, 0x00, 0x00, 0x00, 0x79,
-0xEE, 0xD9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7A, 0xB0, 0xA6, 0x10, 0x00, 0x00, 0x00, 0x00, 0x7B,
-0xCE, 0xBB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x99, 0xC2, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7D,
-0xAE, 0x9D, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x79, 0xA4, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7F,
-0x8E, 0x7F, 0x90, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x1C,
-0x20, 0x00, 0x05, 0x00, 0x00, 0x2A, 0x30, 0x01, 0x00, 0x00, 0x00, 0x2A, 0x30, 0x01, 0x00, 0x00,
-0x00, 0x1C, 0x20, 0x00, 0x05, 0x45, 0x45, 0x53, 0x54, 0x00, 0x45, 0x45, 0x54, 0x00, 0x01, 0x01,
-0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x0A, 0x45, 0x45, 0x54, 0x2D, 0x32, 0x45, 0x45, 0x53, 0x54,
-0x2C, 0x4D, 0x33, 0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x33, 0x2C, 0x4D, 0x31, 0x30, 0x2E, 0x35, 0x2E,
-0x30, 0x2F, 0x34, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-
+0x7F, 0x8E, 0x7F, 0x90, 0x01, 0x03, 0x02, 0x03, 0x02, 0x05, 0x04, 0x05, 0x04, 0x03, 0x02, 0x03,
+0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x03, 0x02, 0x03, 0x02, 0x03, 0x08, 0x09, 0x08, 0x09,
+0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09,
+0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09,
+0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09,
+0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09,
+0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09,
+0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09,
+0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x00, 0x00,
+0x16, 0x3C, 0x00, 0x00, 0x00, 0x00, 0x16, 0x3C, 0x00, 0x04, 0x00, 0x00, 0x2A, 0x30, 0x01, 0x08,
+0x00, 0x00, 0x1C, 0x20, 0x00, 0x0D, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x11, 0x00, 0x00, 0x1C, 0x20,
+0x01, 0x15, 0x00, 0x00, 0x2A, 0x30, 0x01, 0x08, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x0D, 0x00, 0x00,
+0x2A, 0x30, 0x01, 0x08, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x0D, 0x4C, 0x4D, 0x54, 0x00, 0x41, 0x4D,
+0x54, 0x00, 0x45, 0x45, 0x53, 0x54, 0x00, 0x45, 0x45, 0x54, 0x00, 0x43, 0x45, 0x54, 0x00, 0x43,
+0x45, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A,
+0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8A, 0x00, 0x00, 0x00, 0x0A,
+0x00, 0x00, 0x00, 0x1A, 0xFF, 0xFF, 0xFF, 0xFF, 0x74, 0x3F, 0x98, 0x44, 0xFF, 0xFF, 0xFF, 0xFF,
+0x9B, 0x80, 0x21, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xB9, 0x7C, 0xE9, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF,
+0xB9, 0xC6, 0xAF, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0xF2, 0x63, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF,
+0xCA, 0x10, 0xA8, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, 0xCC, 0xE7, 0x4B, 0x10, 0xFF, 0xFF, 0xFF, 0xFF,
+0xCD, 0xAA, 0x4C, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCE, 0xA2, 0x18, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF,
+0xCF, 0x93, 0x69, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0x13, 0x9E, 0x60, 0xFF, 0xFF, 0xFF, 0xFF,
+0xDF, 0xB7, 0x0A, 0x50, 0x00, 0x00, 0x00, 0x00, 0x09, 0xEC, 0x5E, 0x60, 0x00, 0x00, 0x00, 0x00,
+0x0B, 0x18, 0xF4, 0x60, 0x00, 0x00, 0x00, 0x00, 0x0B, 0xCD, 0xAE, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x0C, 0xBD, 0x9F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0D, 0xA4, 0x55, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x0E, 0x8C, 0x5D, 0x80, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x84, 0x37, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x10, 0x6A, 0xFC, 0x10, 0x00, 0x00, 0x00, 0x00, 0x11, 0x64, 0x7B, 0xF0, 0x00, 0x00, 0x00, 0x00,
+0x12, 0x52, 0xAA, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x13, 0x46, 0x82, 0x60, 0x00, 0x00, 0x00, 0x00,
+0x14, 0x33, 0xC2, 0x50, 0x00, 0x00, 0x00, 0x00, 0x15, 0x23, 0xEB, 0x90, 0x00, 0x00, 0x00, 0x00,
+0x16, 0x13, 0xDC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x17, 0x03, 0xCD, 0x90, 0x00, 0x00, 0x00, 0x00,
+0x17, 0xF3, 0xBE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x18, 0xE3, 0xAF, 0x90, 0x00, 0x00, 0x00, 0x00,
+0x19, 0xD3, 0xA0, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xC3, 0x91, 0x90, 0x00, 0x00, 0x00, 0x00,
+0x1B, 0xBC, 0xBD, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xAC, 0xAE, 0x10, 0x00, 0x00, 0x00, 0x00,
+0x1D, 0x9C, 0x9F, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x8C, 0x90, 0x10, 0x00, 0x00, 0x00, 0x00,
+0x1F, 0x7C, 0x81, 0x10, 0x00, 0x00, 0x00, 0x00, 0x20, 0x6C, 0x72, 0x10, 0x00, 0x00, 0x00, 0x00,
+0x21, 0x5C, 0x63, 0x10, 0x00, 0x00, 0x00, 0x00, 0x22, 0x4C, 0x54, 0x10, 0x00, 0x00, 0x00, 0x00,
+0x23, 0x3C, 0x45, 0x10, 0x00, 0x00, 0x00, 0x00, 0x24, 0x2C, 0x36, 0x10, 0x00, 0x00, 0x00, 0x00,
+0x25, 0x1C, 0x27, 0x10, 0x00, 0x00, 0x00, 0x00, 0x26, 0x0C, 0x18, 0x10, 0x00, 0x00, 0x00, 0x00,
+0x27, 0x05, 0x43, 0x90, 0x00, 0x00, 0x00, 0x00, 0x27, 0xF5, 0x34, 0x90, 0x00, 0x00, 0x00, 0x00,
+0x28, 0xE5, 0x25, 0x90, 0x00, 0x00, 0x00, 0x00, 0x29, 0xD5, 0x16, 0x90, 0x00, 0x00, 0x00, 0x00,
+0x2A, 0xC5, 0x07, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xB4, 0xF8, 0x90, 0x00, 0x00, 0x00, 0x00,
+0x2C, 0xA4, 0xE9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x94, 0xDA, 0x90, 0x00, 0x00, 0x00, 0x00,
+0x2E, 0x84, 0xCB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x74, 0xBC, 0x90, 0x00, 0x00, 0x00, 0x00,
+0x30, 0x64, 0xAD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x31, 0x5D, 0xD9, 0x10, 0x00, 0x00, 0x00, 0x00,
+0x32, 0x72, 0xB4, 0x10, 0x00, 0x00, 0x00, 0x00, 0x33, 0x3D, 0xBB, 0x10, 0x00, 0x00, 0x00, 0x00,
+0x34, 0x52, 0x96, 0x10, 0x00, 0x00, 0x00, 0x00, 0x35, 0x1D, 0x9D, 0x10, 0x00, 0x00, 0x00, 0x00,
+0x36, 0x32, 0x78, 0x10, 0x00, 0x00, 0x00, 0x00, 0x36, 0xFD, 0x7F, 0x10, 0x00, 0x00, 0x00, 0x00,
+0x38, 0x1B, 0x94, 0x90, 0x00, 0x00, 0x00, 0x00, 0x38, 0xDD, 0x61, 0x10, 0x00, 0x00, 0x00, 0x00,
+0x39, 0xFB, 0x76, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xBD, 0x43, 0x10, 0x00, 0x00, 0x00, 0x00,
+0x3B, 0xDB, 0x58, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xA6, 0x5F, 0x90, 0x00, 0x00, 0x00, 0x00,
+0x3D, 0xBB, 0x3A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x86, 0x41, 0x90, 0x00, 0x00, 0x00, 0x00,
+0x3F, 0x9B, 0x1C, 0x90, 0x00, 0x00, 0x00, 0x00, 0x40, 0x66, 0x23, 0x90, 0x00, 0x00, 0x00, 0x00,
+0x41, 0x84, 0x39, 0x10, 0x00, 0x00, 0x00, 0x00, 0x42, 0x46, 0x05, 0x90, 0x00, 0x00, 0x00, 0x00,
+0x43, 0x64, 0x1B, 0x10, 0x00, 0x00, 0x00, 0x00, 0x44, 0x25, 0xE7, 0x90, 0x00, 0x00, 0x00, 0x00,
+0x45, 0x43, 0xFD, 0x10, 0x00, 0x00, 0x00, 0x00, 0x46, 0x05, 0xC9, 0x90, 0x00, 0x00, 0x00, 0x00,
+0x47, 0x23, 0xDF, 0x10, 0x00, 0x00, 0x00, 0x00, 0x47, 0xEE, 0xE6, 0x10, 0x00, 0x00, 0x00, 0x00,
+0x49, 0x03, 0xC1, 0x10, 0x00, 0x00, 0x00, 0x00, 0x49, 0xCE, 0xC8, 0x10, 0x00, 0x00, 0x00, 0x00,
+0x4A, 0xE3, 0xA3, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4B, 0xAE, 0xAA, 0x10, 0x00, 0x00, 0x00, 0x00,
+0x4C, 0xCC, 0xBF, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x8E, 0x8C, 0x10, 0x00, 0x00, 0x00, 0x00,
+0x4E, 0xAC, 0xA1, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x6E, 0x6E, 0x10, 0x00, 0x00, 0x00, 0x00,
+0x50, 0x8C, 0x83, 0x90, 0x00, 0x00, 0x00, 0x00, 0x51, 0x57, 0x8A, 0x90, 0x00, 0x00, 0x00, 0x00,
+0x52, 0x6C, 0x65, 0x90, 0x00, 0x00, 0x00, 0x00, 0x53, 0x37, 0x6C, 0x90, 0x00, 0x00, 0x00, 0x00,
+0x54, 0x4C, 0x47, 0x90, 0x00, 0x00, 0x00, 0x00, 0x55, 0x17, 0x4E, 0x90, 0x00, 0x00, 0x00, 0x00,
+0x56, 0x2C, 0x29, 0x90, 0x00, 0x00, 0x00, 0x00, 0x56, 0xF7, 0x30, 0x90, 0x00, 0x00, 0x00, 0x00,
+0x58, 0x15, 0x46, 0x10, 0x00, 0x00, 0x00, 0x00, 0x58, 0xD7, 0x12, 0x90, 0x00, 0x00, 0x00, 0x00,
+0x59, 0xF5, 0x28, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xB6, 0xF4, 0x90, 0x00, 0x00, 0x00, 0x00,
+0x5B, 0xD5, 0x0A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5C, 0xA0, 0x11, 0x10, 0x00, 0x00, 0x00, 0x00,
+0x5D, 0xB4, 0xEC, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x7F, 0xF3, 0x10, 0x00, 0x00, 0x00, 0x00,
+0x5F, 0x94, 0xCE, 0x10, 0x00, 0x00, 0x00, 0x00, 0x60, 0x5F, 0xD5, 0x10, 0x00, 0x00, 0x00, 0x00,
+0x61, 0x7D, 0xEA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x62, 0x3F, 0xB7, 0x10, 0x00, 0x00, 0x00, 0x00,
+0x63, 0x5D, 0xCC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x64, 0x1F, 0x99, 0x10, 0x00, 0x00, 0x00, 0x00,
+0x65, 0x3D, 0xAE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x66, 0x08, 0xB5, 0x90, 0x00, 0x00, 0x00, 0x00,
+0x67, 0x1D, 0x90, 0x90, 0x00, 0x00, 0x00, 0x00, 0x67, 0xE8, 0x97, 0x90, 0x00, 0x00, 0x00, 0x00,
+0x68, 0xFD, 0x72, 0x90, 0x00, 0x00, 0x00, 0x00, 0x69, 0xC8, 0x79, 0x90, 0x00, 0x00, 0x00, 0x00,
+0x6A, 0xDD, 0x54, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6B, 0xA8, 0x5B, 0x90, 0x00, 0x00, 0x00, 0x00,
+0x6C, 0xC6, 0x71, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6D, 0x88, 0x3D, 0x90, 0x00, 0x00, 0x00, 0x00,
+0x6E, 0xA6, 0x53, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6F, 0x68, 0x1F, 0x90, 0x00, 0x00, 0x00, 0x00,
+0x70, 0x86, 0x35, 0x10, 0x00, 0x00, 0x00, 0x00, 0x71, 0x51, 0x3C, 0x10, 0x00, 0x00, 0x00, 0x00,
+0x72, 0x66, 0x17, 0x10, 0x00, 0x00, 0x00, 0x00, 0x73, 0x31, 0x1E, 0x10, 0x00, 0x00, 0x00, 0x00,
+0x74, 0x45, 0xF9, 0x10, 0x00, 0x00, 0x00, 0x00, 0x75, 0x11, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00,
+0x76, 0x2F, 0x15, 0x90, 0x00, 0x00, 0x00, 0x00, 0x76, 0xF0, 0xE2, 0x10, 0x00, 0x00, 0x00, 0x00,
+0x78, 0x0E, 0xF7, 0x90, 0x00, 0x00, 0x00, 0x00, 0x78, 0xD0, 0xC4, 0x10, 0x00, 0x00, 0x00, 0x00,
+0x79, 0xEE, 0xD9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7A, 0xB0, 0xA6, 0x10, 0x00, 0x00, 0x00, 0x00,
+0x7B, 0xCE, 0xBB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x99, 0xC2, 0x90, 0x00, 0x00, 0x00, 0x00,
+0x7D, 0xAE, 0x9D, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x79, 0xA4, 0x90, 0x00, 0x00, 0x00, 0x00,
+0x7F, 0x8E, 0x7F, 0x90, 0x01, 0x03, 0x02, 0x03, 0x02, 0x05, 0x04, 0x05, 0x04, 0x03, 0x02, 0x03,
+0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x03, 0x02, 0x03, 0x02, 0x03, 0x08, 0x09, 0x08, 0x09,
+0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09,
+0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09,
+0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09,
+0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09,
+0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09,
+0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09,
+0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x00, 0x00,
+0x16, 0x3C, 0x00, 0x00, 0x00, 0x00, 0x16, 0x3C, 0x00, 0x04, 0x00, 0x00, 0x2A, 0x30, 0x01, 0x08,
+0x00, 0x00, 0x1C, 0x20, 0x00, 0x0D, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x11, 0x00, 0x00, 0x1C, 0x20,
+0x01, 0x15, 0x00, 0x00, 0x2A, 0x30, 0x01, 0x08, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x0D, 0x00, 0x00,
+0x2A, 0x30, 0x01, 0x08, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x0D, 0x4C, 0x4D, 0x54, 0x00, 0x41, 0x4D,
+0x54, 0x00, 0x45, 0x45, 0x53, 0x54, 0x00, 0x45, 0x45, 0x54, 0x00, 0x43, 0x45, 0x54, 0x00, 0x43,
+0x45, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x0A, 0x45, 0x45, 0x54, 0x2D, 0x32, 0x45, 0x45,
+0x53, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x33, 0x2C, 0x4D, 0x31, 0x30, 0x2E,
+0x35, 0x2E, 0x30, 0x2F, 0x34, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 
 
 /* Egypt */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -54167,160 +54823,242 @@
 /* EST */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x04, 0xFF, 0xFF, 0xB9, 0xB0,
-0x00, 0x00, 0x45, 0x53, 0x54, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0C, 0x80, 0x00, 0x00, 0x00,
+0x8B, 0xF4, 0x61, 0xE8, 0x01, 0x02, 0xFF, 0xFF, 0xB5, 0x70, 0x00, 0x00, 0xFF, 0xFF, 0xB5, 0x18,
+0x00, 0x04, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x43, 0x4D, 0x54, 0x00,
+0x45, 0x53, 0x54, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x04, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x00, 0x45, 0x53, 0x54, 0x00, 0x0A, 0x45, 0x53, 0x54,
-0x35, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0C,
+0xFF, 0xFF, 0xFF, 0xFF, 0x69, 0x87, 0x26, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0x8B, 0xF4, 0x61, 0xE8,
+0x01, 0x02, 0xFF, 0xFF, 0xB5, 0x70, 0x00, 0x00, 0xFF, 0xFF, 0xB5, 0x18, 0x00, 0x04, 0xFF, 0xFF,
+0xB9, 0xB0, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x43, 0x4D, 0x54, 0x00, 0x45, 0x53, 0x54, 0x00,
+0x0A, 0x45, 0x53, 0x54, 0x35, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 
 
 /* EST5EDT */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x95, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x10, 0x9E, 0xA6, 0x1E, 0x70,
-0x9F, 0xBA, 0xEB, 0x60, 0xA0, 0x86, 0x00, 0x70, 0xA1, 0x9A, 0xCD, 0x60, 0xCB, 0x88, 0xF0, 0x70,
-0xD2, 0x23, 0xF4, 0x70, 0xD2, 0x60, 0xFB, 0xE0, 0xFA, 0xF8, 0x58, 0xF0, 0xFB, 0xE8, 0x3B, 0xE0,
-0xFC, 0xD8, 0x3A, 0xF0, 0xFD, 0xC8, 0x1D, 0xE0, 0xFE, 0xB8, 0x1C, 0xF0, 0xFF, 0xA7, 0xFF, 0xE0,
-0x00, 0x97, 0xFE, 0xF0, 0x01, 0x87, 0xE1, 0xE0, 0x02, 0x77, 0xE0, 0xF0, 0x03, 0x70, 0xFE, 0x60,
-0x04, 0x60, 0xFD, 0x70, 0x05, 0x50, 0xE0, 0x60, 0x06, 0x40, 0xDF, 0x70, 0x07, 0x30, 0xC2, 0x60,
-0x07, 0x8D, 0x19, 0x70, 0x09, 0x10, 0xA4, 0x60, 0x09, 0xAD, 0x94, 0xF0, 0x0A, 0xF0, 0x86, 0x60,
-0x0B, 0xE0, 0x85, 0x70, 0x0C, 0xD9, 0xA2, 0xE0, 0x0D, 0xC0, 0x67, 0x70, 0x0E, 0xB9, 0x84, 0xE0,
-0x0F, 0xA9, 0x83, 0xF0, 0x10, 0x99, 0x66, 0xE0, 0x11, 0x89, 0x65, 0xF0, 0x12, 0x79, 0x48, 0xE0,
-0x13, 0x69, 0x47, 0xF0, 0x14, 0x59, 0x2A, 0xE0, 0x15, 0x49, 0x29, 0xF0, 0x16, 0x39, 0x0C, 0xE0,
-0x17, 0x29, 0x0B, 0xF0, 0x18, 0x22, 0x29, 0x60, 0x19, 0x08, 0xED, 0xF0, 0x1A, 0x02, 0x0B, 0x60,
-0x1A, 0xF2, 0x0A, 0x70, 0x1B, 0xE1, 0xED, 0x60, 0x1C, 0xD1, 0xEC, 0x70, 0x1D, 0xC1, 0xCF, 0x60,
-0x1E, 0xB1, 0xCE, 0x70, 0x1F, 0xA1, 0xB1, 0x60, 0x20, 0x76, 0x00, 0xF0, 0x21, 0x81, 0x93, 0x60,
-0x22, 0x55, 0xE2, 0xF0, 0x23, 0x6A, 0xAF, 0xE0, 0x24, 0x35, 0xC4, 0xF0, 0x25, 0x4A, 0x91, 0xE0,
-0x26, 0x15, 0xA6, 0xF0, 0x27, 0x2A, 0x73, 0xE0, 0x27, 0xFE, 0xC3, 0x70, 0x29, 0x0A, 0x55, 0xE0,
-0x29, 0xDE, 0xA5, 0x70, 0x2A, 0xEA, 0x37, 0xE0, 0x2B, 0xBE, 0x87, 0x70, 0x2C, 0xD3, 0x54, 0x60,
-0x2D, 0x9E, 0x69, 0x70, 0x2E, 0xB3, 0x36, 0x60, 0x2F, 0x7E, 0x4B, 0x70, 0x30, 0x93, 0x18, 0x60,
-0x31, 0x67, 0x67, 0xF0, 0x32, 0x72, 0xFA, 0x60, 0x33, 0x47, 0x49, 0xF0, 0x34, 0x52, 0xDC, 0x60,
-0x35, 0x27, 0x2B, 0xF0, 0x36, 0x32, 0xBE, 0x60, 0x37, 0x07, 0x0D, 0xF0, 0x38, 0x1B, 0xDA, 0xE0,
-0x38, 0xE6, 0xEF, 0xF0, 0x39, 0xFB, 0xBC, 0xE0, 0x3A, 0xC6, 0xD1, 0xF0, 0x3B, 0xDB, 0x9E, 0xE0,
-0x3C, 0xAF, 0xEE, 0x70, 0x3D, 0xBB, 0x80, 0xE0, 0x3E, 0x8F, 0xD0, 0x70, 0x3F, 0x9B, 0x62, 0xE0,
-0x40, 0x6F, 0xB2, 0x70, 0x41, 0x84, 0x7F, 0x60, 0x42, 0x4F, 0x94, 0x70, 0x43, 0x64, 0x61, 0x60,
-0x44, 0x2F, 0x76, 0x70, 0x45, 0x44, 0x43, 0x60, 0x45, 0xF3, 0xA8, 0xF0, 0x47, 0x2D, 0x5F, 0xE0,
-0x47, 0xD3, 0x8A, 0xF0, 0x49, 0x0D, 0x41, 0xE0, 0x49, 0xB3, 0x6C, 0xF0, 0x4A, 0xED, 0x23, 0xE0,
-0x4B, 0x9C, 0x89, 0x70, 0x4C, 0xD6, 0x40, 0x60, 0x4D, 0x7C, 0x6B, 0x70, 0x4E, 0xB6, 0x22, 0x60,
-0x4F, 0x5C, 0x4D, 0x70, 0x50, 0x96, 0x04, 0x60, 0x51, 0x3C, 0x2F, 0x70, 0x52, 0x75, 0xE6, 0x60,
-0x53, 0x1C, 0x11, 0x70, 0x54, 0x55, 0xC8, 0x60, 0x54, 0xFB, 0xF3, 0x70, 0x56, 0x35, 0xAA, 0x60,
-0x56, 0xE5, 0x0F, 0xF0, 0x58, 0x1E, 0xC6, 0xE0, 0x58, 0xC4, 0xF1, 0xF0, 0x59, 0xFE, 0xA8, 0xE0,
-0x5A, 0xA4, 0xD3, 0xF0, 0x5B, 0xDE, 0x8A, 0xE0, 0x5C, 0x84, 0xB5, 0xF0, 0x5D, 0xBE, 0x6C, 0xE0,
-0x5E, 0x64, 0x97, 0xF0, 0x5F, 0x9E, 0x4E, 0xE0, 0x60, 0x4D, 0xB4, 0x70, 0x61, 0x87, 0x6B, 0x60,
-0x62, 0x2D, 0x96, 0x70, 0x63, 0x67, 0x4D, 0x60, 0x64, 0x0D, 0x78, 0x70, 0x65, 0x47, 0x2F, 0x60,
-0x65, 0xED, 0x5A, 0x70, 0x67, 0x27, 0x11, 0x60, 0x67, 0xCD, 0x3C, 0x70, 0x69, 0x06, 0xF3, 0x60,
-0x69, 0xAD, 0x1E, 0x70, 0x6A, 0xE6, 0xD5, 0x60, 0x6B, 0x96, 0x3A, 0xF0, 0x6C, 0xCF, 0xF1, 0xE0,
-0x6D, 0x76, 0x1C, 0xF0, 0x6E, 0xAF, 0xD3, 0xE0, 0x6F, 0x55, 0xFE, 0xF0, 0x70, 0x8F, 0xB5, 0xE0,
-0x71, 0x35, 0xE0, 0xF0, 0x72, 0x6F, 0x97, 0xE0, 0x73, 0x15, 0xC2, 0xF0, 0x74, 0x4F, 0x79, 0xE0,
-0x74, 0xFE, 0xDF, 0x70, 0x76, 0x38, 0x96, 0x60, 0x76, 0xDE, 0xC1, 0x70, 0x78, 0x18, 0x78, 0x60,
-0x78, 0xBE, 0xA3, 0x70, 0x79, 0xF8, 0x5A, 0x60, 0x7A, 0x9E, 0x85, 0x70, 0x7B, 0xD8, 0x3C, 0x60,
-0x7C, 0x7E, 0x67, 0x70, 0x7D, 0xB8, 0x1E, 0x60, 0x7E, 0x5E, 0x49, 0x70, 0x7F, 0x98, 0x00, 0x60,
-0x01, 0x00, 0x01, 0x00, 0x02, 0x03, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x04, 0xFF, 0xFF, 0xC7, 0xC0, 0x01,
-0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x08, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x0C, 0xFF, 0xFF, 0xB9,
-0xB0, 0x00, 0x04, 0x45, 0x44, 0x54, 0x00, 0x45, 0x53, 0x54, 0x00, 0x45, 0x57, 0x54, 0x00, 0x45,
-0x50, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x54, 0x5A, 0x69,
-0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x95, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0x9E, 0xA6, 0x1E,
-0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0x9F, 0xBA, 0xEB, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xA0, 0x86, 0x00,
-0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xA1, 0x9A, 0xCD, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0x88, 0xF0,
-0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x23, 0xF4, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x60, 0xFB,
-0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0xF8, 0x58, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFB, 0xE8, 0x3B,
-0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0xD8, 0x3A, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFD, 0xC8, 0x1D,
-0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xB8, 0x1C, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xA7, 0xFF,
-0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x97, 0xFE, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x01, 0x87, 0xE1,
-0xE0, 0x00, 0x00, 0x00, 0x00, 0x02, 0x77, 0xE0, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x03, 0x70, 0xFE,
-0x60, 0x00, 0x00, 0x00, 0x00, 0x04, 0x60, 0xFD, 0x70, 0x00, 0x00, 0x00, 0x00, 0x05, 0x50, 0xE0,
-0x60, 0x00, 0x00, 0x00, 0x00, 0x06, 0x40, 0xDF, 0x70, 0x00, 0x00, 0x00, 0x00, 0x07, 0x30, 0xC2,
-0x60, 0x00, 0x00, 0x00, 0x00, 0x07, 0x8D, 0x19, 0x70, 0x00, 0x00, 0x00, 0x00, 0x09, 0x10, 0xA4,
-0x60, 0x00, 0x00, 0x00, 0x00, 0x09, 0xAD, 0x94, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x0A, 0xF0, 0x86,
-0x60, 0x00, 0x00, 0x00, 0x00, 0x0B, 0xE0, 0x85, 0x70, 0x00, 0x00, 0x00, 0x00, 0x0C, 0xD9, 0xA2,
-0xE0, 0x00, 0x00, 0x00, 0x00, 0x0D, 0xC0, 0x67, 0x70, 0x00, 0x00, 0x00, 0x00, 0x0E, 0xB9, 0x84,
-0xE0, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xA9, 0x83, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x10, 0x99, 0x66,
-0xE0, 0x00, 0x00, 0x00, 0x00, 0x11, 0x89, 0x65, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x12, 0x79, 0x48,
-0xE0, 0x00, 0x00, 0x00, 0x00, 0x13, 0x69, 0x47, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x14, 0x59, 0x2A,
-0xE0, 0x00, 0x00, 0x00, 0x00, 0x15, 0x49, 0x29, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x16, 0x39, 0x0C,
-0xE0, 0x00, 0x00, 0x00, 0x00, 0x17, 0x29, 0x0B, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x18, 0x22, 0x29,
-0x60, 0x00, 0x00, 0x00, 0x00, 0x19, 0x08, 0xED, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x1A, 0x02, 0x0B,
-0x60, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xF2, 0x0A, 0x70, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xE1, 0xED,
-0x60, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xD1, 0xEC, 0x70, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC1, 0xCF,
-0x60, 0x00, 0x00, 0x00, 0x00, 0x1E, 0xB1, 0xCE, 0x70, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA1, 0xB1,
-0x60, 0x00, 0x00, 0x00, 0x00, 0x20, 0x76, 0x00, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x21, 0x81, 0x93,
-0x60, 0x00, 0x00, 0x00, 0x00, 0x22, 0x55, 0xE2, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x23, 0x6A, 0xAF,
-0xE0, 0x00, 0x00, 0x00, 0x00, 0x24, 0x35, 0xC4, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x25, 0x4A, 0x91,
-0xE0, 0x00, 0x00, 0x00, 0x00, 0x26, 0x15, 0xA6, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x27, 0x2A, 0x73,
-0xE0, 0x00, 0x00, 0x00, 0x00, 0x27, 0xFE, 0xC3, 0x70, 0x00, 0x00, 0x00, 0x00, 0x29, 0x0A, 0x55,
-0xE0, 0x00, 0x00, 0x00, 0x00, 0x29, 0xDE, 0xA5, 0x70, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xEA, 0x37,
-0xE0, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xBE, 0x87, 0x70, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xD3, 0x54,
-0x60, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x9E, 0x69, 0x70, 0x00, 0x00, 0x00, 0x00, 0x2E, 0xB3, 0x36,
-0x60, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x7E, 0x4B, 0x70, 0x00, 0x00, 0x00, 0x00, 0x30, 0x93, 0x18,
-0x60, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x67, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x32, 0x72, 0xFA,
-0x60, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x49, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x34, 0x52, 0xDC,
-0x60, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x2B, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0xBE,
-0x60, 0x00, 0x00, 0x00, 0x00, 0x37, 0x07, 0x0D, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x38, 0x1B, 0xDA,
-0xE0, 0x00, 0x00, 0x00, 0x00, 0x38, 0xE6, 0xEF, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0xBC,
-0xE0, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xC6, 0xD1, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xDB, 0x9E,
-0xE0, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xAF, 0xEE, 0x70, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0x80,
-0xE0, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x8F, 0xD0, 0x70, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x62,
-0xE0, 0x00, 0x00, 0x00, 0x00, 0x40, 0x6F, 0xB2, 0x70, 0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0x7F,
-0x60, 0x00, 0x00, 0x00, 0x00, 0x42, 0x4F, 0x94, 0x70, 0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x61,
-0x60, 0x00, 0x00, 0x00, 0x00, 0x44, 0x2F, 0x76, 0x70, 0x00, 0x00, 0x00, 0x00, 0x45, 0x44, 0x43,
-0x60, 0x00, 0x00, 0x00, 0x00, 0x45, 0xF3, 0xA8, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x47, 0x2D, 0x5F,
-0xE0, 0x00, 0x00, 0x00, 0x00, 0x47, 0xD3, 0x8A, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x49, 0x0D, 0x41,
-0xE0, 0x00, 0x00, 0x00, 0x00, 0x49, 0xB3, 0x6C, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x4A, 0xED, 0x23,
-0xE0, 0x00, 0x00, 0x00, 0x00, 0x4B, 0x9C, 0x89, 0x70, 0x00, 0x00, 0x00, 0x00, 0x4C, 0xD6, 0x40,
-0x60, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x7C, 0x6B, 0x70, 0x00, 0x00, 0x00, 0x00, 0x4E, 0xB6, 0x22,
-0x60, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x5C, 0x4D, 0x70, 0x00, 0x00, 0x00, 0x00, 0x50, 0x96, 0x04,
-0x60, 0x00, 0x00, 0x00, 0x00, 0x51, 0x3C, 0x2F, 0x70, 0x00, 0x00, 0x00, 0x00, 0x52, 0x75, 0xE6,
-0x60, 0x00, 0x00, 0x00, 0x00, 0x53, 0x1C, 0x11, 0x70, 0x00, 0x00, 0x00, 0x00, 0x54, 0x55, 0xC8,
-0x60, 0x00, 0x00, 0x00, 0x00, 0x54, 0xFB, 0xF3, 0x70, 0x00, 0x00, 0x00, 0x00, 0x56, 0x35, 0xAA,
-0x60, 0x00, 0x00, 0x00, 0x00, 0x56, 0xE5, 0x0F, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x58, 0x1E, 0xC6,
-0xE0, 0x00, 0x00, 0x00, 0x00, 0x58, 0xC4, 0xF1, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x59, 0xFE, 0xA8,
-0xE0, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xA4, 0xD3, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x5B, 0xDE, 0x8A,
-0xE0, 0x00, 0x00, 0x00, 0x00, 0x5C, 0x84, 0xB5, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x5D, 0xBE, 0x6C,
-0xE0, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x64, 0x97, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x5F, 0x9E, 0x4E,
-0xE0, 0x00, 0x00, 0x00, 0x00, 0x60, 0x4D, 0xB4, 0x70, 0x00, 0x00, 0x00, 0x00, 0x61, 0x87, 0x6B,
-0x60, 0x00, 0x00, 0x00, 0x00, 0x62, 0x2D, 0x96, 0x70, 0x00, 0x00, 0x00, 0x00, 0x63, 0x67, 0x4D,
-0x60, 0x00, 0x00, 0x00, 0x00, 0x64, 0x0D, 0x78, 0x70, 0x00, 0x00, 0x00, 0x00, 0x65, 0x47, 0x2F,
-0x60, 0x00, 0x00, 0x00, 0x00, 0x65, 0xED, 0x5A, 0x70, 0x00, 0x00, 0x00, 0x00, 0x67, 0x27, 0x11,
-0x60, 0x00, 0x00, 0x00, 0x00, 0x67, 0xCD, 0x3C, 0x70, 0x00, 0x00, 0x00, 0x00, 0x69, 0x06, 0xF3,
-0x60, 0x00, 0x00, 0x00, 0x00, 0x69, 0xAD, 0x1E, 0x70, 0x00, 0x00, 0x00, 0x00, 0x6A, 0xE6, 0xD5,
-0x60, 0x00, 0x00, 0x00, 0x00, 0x6B, 0x96, 0x3A, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x6C, 0xCF, 0xF1,
-0xE0, 0x00, 0x00, 0x00, 0x00, 0x6D, 0x76, 0x1C, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x6E, 0xAF, 0xD3,
-0xE0, 0x00, 0x00, 0x00, 0x00, 0x6F, 0x55, 0xFE, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x70, 0x8F, 0xB5,
-0xE0, 0x00, 0x00, 0x00, 0x00, 0x71, 0x35, 0xE0, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x72, 0x6F, 0x97,
-0xE0, 0x00, 0x00, 0x00, 0x00, 0x73, 0x15, 0xC2, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x74, 0x4F, 0x79,
-0xE0, 0x00, 0x00, 0x00, 0x00, 0x74, 0xFE, 0xDF, 0x70, 0x00, 0x00, 0x00, 0x00, 0x76, 0x38, 0x96,
-0x60, 0x00, 0x00, 0x00, 0x00, 0x76, 0xDE, 0xC1, 0x70, 0x00, 0x00, 0x00, 0x00, 0x78, 0x18, 0x78,
-0x60, 0x00, 0x00, 0x00, 0x00, 0x78, 0xBE, 0xA3, 0x70, 0x00, 0x00, 0x00, 0x00, 0x79, 0xF8, 0x5A,
-0x60, 0x00, 0x00, 0x00, 0x00, 0x7A, 0x9E, 0x85, 0x70, 0x00, 0x00, 0x00, 0x00, 0x7B, 0xD8, 0x3C,
-0x60, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x7E, 0x67, 0x70, 0x00, 0x00, 0x00, 0x00, 0x7D, 0xB8, 0x1E,
-0x60, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x5E, 0x49, 0x70, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x98, 0x00,
-0x60, 0x01, 0x00, 0x01, 0x00, 0x02, 0x03, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x04, 0xFF, 0xFF, 0xC7, 0xC0,
-0x01, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x08, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x0C, 0xFF, 0xFF,
-0xB9, 0xB0, 0x00, 0x04, 0x45, 0x44, 0x54, 0x00, 0x45, 0x53, 0x54, 0x00, 0x45, 0x57, 0x54, 0x00,
-0x45, 0x50, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0A, 0x45,
-0x53, 0x54, 0x35, 0x45, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D, 0x31,
-0x31, 0x2E, 0x31, 0x2E, 0x30, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0xEC, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x14, 0x80, 0x00, 0x00, 0x00,
+0x9E, 0xA6, 0x1E, 0x70, 0x9F, 0xBA, 0xEB, 0x60, 0xA0, 0x86, 0x00, 0x70, 0xA1, 0x9A, 0xCD, 0x60,
+0xA2, 0x65, 0xE2, 0x70, 0xA3, 0x83, 0xE9, 0xE0, 0xA4, 0x6A, 0xAE, 0x70, 0xA5, 0x35, 0xA7, 0x60,
+0xA6, 0x53, 0xCA, 0xF0, 0xA7, 0x15, 0x89, 0x60, 0xA8, 0x33, 0xAC, 0xF0, 0xA8, 0xFE, 0xA5, 0xE0,
+0xAA, 0x13, 0x8E, 0xF0, 0xAA, 0xDE, 0x87, 0xE0, 0xAB, 0xF3, 0x70, 0xF0, 0xAC, 0xBE, 0x69, 0xE0,
+0xAD, 0xD3, 0x52, 0xF0, 0xAE, 0x9E, 0x4B, 0xE0, 0xAF, 0xB3, 0x34, 0xF0, 0xB0, 0x7E, 0x2D, 0xE0,
+0xB1, 0x9C, 0x51, 0x70, 0xB2, 0x67, 0x4A, 0x60, 0xB3, 0x7C, 0x33, 0x70, 0xB4, 0x47, 0x2C, 0x60,
+0xB5, 0x5C, 0x15, 0x70, 0xB6, 0x27, 0x0E, 0x60, 0xB7, 0x3B, 0xF7, 0x70, 0xB8, 0x06, 0xF0, 0x60,
+0xB9, 0x1B, 0xD9, 0x70, 0xB9, 0xE6, 0xD2, 0x60, 0xBB, 0x04, 0xF5, 0xF0, 0xBB, 0xC6, 0xB4, 0x60,
+0xBC, 0xE4, 0xD7, 0xF0, 0xBD, 0xAF, 0xD0, 0xE0, 0xBE, 0xC4, 0xB9, 0xF0, 0xBF, 0x8F, 0xB2, 0xE0,
+0xC0, 0xA4, 0x9B, 0xF0, 0xC1, 0x6F, 0x94, 0xE0, 0xC2, 0x84, 0x7D, 0xF0, 0xC3, 0x4F, 0x76, 0xE0,
+0xC4, 0x64, 0x5F, 0xF0, 0xC5, 0x2F, 0x58, 0xE0, 0xC6, 0x4D, 0x7C, 0x70, 0xC7, 0x0F, 0x3A, 0xE0,
+0xC8, 0x2D, 0x5E, 0x70, 0xC8, 0xF8, 0x57, 0x60, 0xCA, 0x0D, 0x40, 0x70, 0xCA, 0xD8, 0x39, 0x60,
+0xCB, 0x88, 0xF0, 0x70, 0xD2, 0x23, 0xF4, 0x70, 0xD2, 0x60, 0xFB, 0xE0, 0xD3, 0x75, 0xE4, 0xF0,
+0xD4, 0x40, 0xDD, 0xE0, 0xD5, 0x55, 0xC6, 0xF0, 0xD6, 0x20, 0xBF, 0xE0, 0xD7, 0x35, 0xA8, 0xF0,
+0xD8, 0x00, 0xA1, 0xE0, 0xD9, 0x15, 0x8A, 0xF0, 0xD9, 0xE0, 0x83, 0xE0, 0xDA, 0xFE, 0xA7, 0x70,
+0xDB, 0xC0, 0x65, 0xE0, 0xDC, 0xDE, 0x89, 0x70, 0xDD, 0xA9, 0x82, 0x60, 0xDE, 0xBE, 0x6B, 0x70,
+0xDF, 0x89, 0x64, 0x60, 0xE0, 0x9E, 0x4D, 0x70, 0xE1, 0x69, 0x46, 0x60, 0xE2, 0x7E, 0x2F, 0x70,
+0xE3, 0x49, 0x28, 0x60, 0xE4, 0x5E, 0x11, 0x70, 0xE5, 0x57, 0x2E, 0xE0, 0xE6, 0x47, 0x2D, 0xF0,
+0xE7, 0x37, 0x10, 0xE0, 0xE8, 0x27, 0x0F, 0xF0, 0xE9, 0x16, 0xF2, 0xE0, 0xEA, 0x06, 0xF1, 0xF0,
+0xEA, 0xF6, 0xD4, 0xE0, 0xEB, 0xE6, 0xD3, 0xF0, 0xEC, 0xD6, 0xB6, 0xE0, 0xED, 0xC6, 0xB5, 0xF0,
+0xEE, 0xBF, 0xD3, 0x60, 0xEF, 0xAF, 0xD2, 0x70, 0xF0, 0x9F, 0xB5, 0x60, 0xF1, 0x8F, 0xB4, 0x70,
+0xF2, 0x7F, 0x97, 0x60, 0xF3, 0x6F, 0x96, 0x70, 0xF4, 0x5F, 0x79, 0x60, 0xF5, 0x4F, 0x78, 0x70,
+0xF6, 0x3F, 0x5B, 0x60, 0xF7, 0x2F, 0x5A, 0x70, 0xF8, 0x28, 0x77, 0xE0, 0xF9, 0x0F, 0x3C, 0x70,
+0xFA, 0x08, 0x59, 0xE0, 0xFA, 0xF8, 0x58, 0xF0, 0xFB, 0xE8, 0x3B, 0xE0, 0xFC, 0xD8, 0x3A, 0xF0,
+0xFD, 0xC8, 0x1D, 0xE0, 0xFE, 0xB8, 0x1C, 0xF0, 0xFF, 0xA7, 0xFF, 0xE0, 0x00, 0x97, 0xFE, 0xF0,
+0x01, 0x87, 0xE1, 0xE0, 0x02, 0x77, 0xE0, 0xF0, 0x03, 0x70, 0xFE, 0x60, 0x04, 0x60, 0xFD, 0x70,
+0x05, 0x50, 0xE0, 0x60, 0x06, 0x40, 0xDF, 0x70, 0x07, 0x30, 0xC2, 0x60, 0x07, 0x8D, 0x19, 0x70,
+0x09, 0x10, 0xA4, 0x60, 0x09, 0xAD, 0x94, 0xF0, 0x0A, 0xF0, 0x86, 0x60, 0x0B, 0xE0, 0x85, 0x70,
+0x0C, 0xD9, 0xA2, 0xE0, 0x0D, 0xC0, 0x67, 0x70, 0x0E, 0xB9, 0x84, 0xE0, 0x0F, 0xA9, 0x83, 0xF0,
+0x10, 0x99, 0x66, 0xE0, 0x11, 0x89, 0x65, 0xF0, 0x12, 0x79, 0x48, 0xE0, 0x13, 0x69, 0x47, 0xF0,
+0x14, 0x59, 0x2A, 0xE0, 0x15, 0x49, 0x29, 0xF0, 0x16, 0x39, 0x0C, 0xE0, 0x17, 0x29, 0x0B, 0xF0,
+0x18, 0x22, 0x29, 0x60, 0x19, 0x08, 0xED, 0xF0, 0x1A, 0x02, 0x0B, 0x60, 0x1A, 0xF2, 0x0A, 0x70,
+0x1B, 0xE1, 0xED, 0x60, 0x1C, 0xD1, 0xEC, 0x70, 0x1D, 0xC1, 0xCF, 0x60, 0x1E, 0xB1, 0xCE, 0x70,
+0x1F, 0xA1, 0xB1, 0x60, 0x20, 0x76, 0x00, 0xF0, 0x21, 0x81, 0x93, 0x60, 0x22, 0x55, 0xE2, 0xF0,
+0x23, 0x6A, 0xAF, 0xE0, 0x24, 0x35, 0xC4, 0xF0, 0x25, 0x4A, 0x91, 0xE0, 0x26, 0x15, 0xA6, 0xF0,
+0x27, 0x2A, 0x73, 0xE0, 0x27, 0xFE, 0xC3, 0x70, 0x29, 0x0A, 0x55, 0xE0, 0x29, 0xDE, 0xA5, 0x70,
+0x2A, 0xEA, 0x37, 0xE0, 0x2B, 0xBE, 0x87, 0x70, 0x2C, 0xD3, 0x54, 0x60, 0x2D, 0x9E, 0x69, 0x70,
+0x2E, 0xB3, 0x36, 0x60, 0x2F, 0x7E, 0x4B, 0x70, 0x30, 0x93, 0x18, 0x60, 0x31, 0x67, 0x67, 0xF0,
+0x32, 0x72, 0xFA, 0x60, 0x33, 0x47, 0x49, 0xF0, 0x34, 0x52, 0xDC, 0x60, 0x35, 0x27, 0x2B, 0xF0,
+0x36, 0x32, 0xBE, 0x60, 0x37, 0x07, 0x0D, 0xF0, 0x38, 0x1B, 0xDA, 0xE0, 0x38, 0xE6, 0xEF, 0xF0,
+0x39, 0xFB, 0xBC, 0xE0, 0x3A, 0xC6, 0xD1, 0xF0, 0x3B, 0xDB, 0x9E, 0xE0, 0x3C, 0xAF, 0xEE, 0x70,
+0x3D, 0xBB, 0x80, 0xE0, 0x3E, 0x8F, 0xD0, 0x70, 0x3F, 0x9B, 0x62, 0xE0, 0x40, 0x6F, 0xB2, 0x70,
+0x41, 0x84, 0x7F, 0x60, 0x42, 0x4F, 0x94, 0x70, 0x43, 0x64, 0x61, 0x60, 0x44, 0x2F, 0x76, 0x70,
+0x45, 0x44, 0x43, 0x60, 0x45, 0xF3, 0xA8, 0xF0, 0x47, 0x2D, 0x5F, 0xE0, 0x47, 0xD3, 0x8A, 0xF0,
+0x49, 0x0D, 0x41, 0xE0, 0x49, 0xB3, 0x6C, 0xF0, 0x4A, 0xED, 0x23, 0xE0, 0x4B, 0x9C, 0x89, 0x70,
+0x4C, 0xD6, 0x40, 0x60, 0x4D, 0x7C, 0x6B, 0x70, 0x4E, 0xB6, 0x22, 0x60, 0x4F, 0x5C, 0x4D, 0x70,
+0x50, 0x96, 0x04, 0x60, 0x51, 0x3C, 0x2F, 0x70, 0x52, 0x75, 0xE6, 0x60, 0x53, 0x1C, 0x11, 0x70,
+0x54, 0x55, 0xC8, 0x60, 0x54, 0xFB, 0xF3, 0x70, 0x56, 0x35, 0xAA, 0x60, 0x56, 0xE5, 0x0F, 0xF0,
+0x58, 0x1E, 0xC6, 0xE0, 0x58, 0xC4, 0xF1, 0xF0, 0x59, 0xFE, 0xA8, 0xE0, 0x5A, 0xA4, 0xD3, 0xF0,
+0x5B, 0xDE, 0x8A, 0xE0, 0x5C, 0x84, 0xB5, 0xF0, 0x5D, 0xBE, 0x6C, 0xE0, 0x5E, 0x64, 0x97, 0xF0,
+0x5F, 0x9E, 0x4E, 0xE0, 0x60, 0x4D, 0xB4, 0x70, 0x61, 0x87, 0x6B, 0x60, 0x62, 0x2D, 0x96, 0x70,
+0x63, 0x67, 0x4D, 0x60, 0x64, 0x0D, 0x78, 0x70, 0x65, 0x47, 0x2F, 0x60, 0x65, 0xED, 0x5A, 0x70,
+0x67, 0x27, 0x11, 0x60, 0x67, 0xCD, 0x3C, 0x70, 0x69, 0x06, 0xF3, 0x60, 0x69, 0xAD, 0x1E, 0x70,
+0x6A, 0xE6, 0xD5, 0x60, 0x6B, 0x96, 0x3A, 0xF0, 0x6C, 0xCF, 0xF1, 0xE0, 0x6D, 0x76, 0x1C, 0xF0,
+0x6E, 0xAF, 0xD3, 0xE0, 0x6F, 0x55, 0xFE, 0xF0, 0x70, 0x8F, 0xB5, 0xE0, 0x71, 0x35, 0xE0, 0xF0,
+0x72, 0x6F, 0x97, 0xE0, 0x73, 0x15, 0xC2, 0xF0, 0x74, 0x4F, 0x79, 0xE0, 0x74, 0xFE, 0xDF, 0x70,
+0x76, 0x38, 0x96, 0x60, 0x76, 0xDE, 0xC1, 0x70, 0x78, 0x18, 0x78, 0x60, 0x78, 0xBE, 0xA3, 0x70,
+0x79, 0xF8, 0x5A, 0x60, 0x7A, 0x9E, 0x85, 0x70, 0x7B, 0xD8, 0x3C, 0x60, 0x7C, 0x7E, 0x67, 0x70,
+0x7D, 0xB8, 0x1E, 0x60, 0x7E, 0x5E, 0x49, 0x70, 0x7F, 0x98, 0x00, 0x60, 0x03, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x04, 0x05, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0xFF, 0xFF, 0xBA, 0x9E, 0x00, 0x00, 0xFF, 0xFF,
+0xC7, 0xC0, 0x01, 0x04, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x08, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x08,
+0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x0C, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x10, 0x4C, 0x4D, 0x54, 0x00,
+0x45, 0x44, 0x54, 0x00, 0x45, 0x53, 0x54, 0x00, 0x45, 0x57, 0x54, 0x00, 0x45, 0x50, 0x54, 0x00,
+0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x54, 0x5A, 0x69, 0x66,
+0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xEC,
+0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x14, 0xFF, 0xFF, 0xFF, 0xFF, 0x5E, 0x03, 0xF0, 0x90,
+0xFF, 0xFF, 0xFF, 0xFF, 0x9E, 0xA6, 0x1E, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0x9F, 0xBA, 0xEB, 0x60,
+0xFF, 0xFF, 0xFF, 0xFF, 0xA0, 0x86, 0x00, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xA1, 0x9A, 0xCD, 0x60,
+0xFF, 0xFF, 0xFF, 0xFF, 0xA2, 0x65, 0xE2, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xA3, 0x83, 0xE9, 0xE0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xA4, 0x6A, 0xAE, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0x35, 0xA7, 0x60,
+0xFF, 0xFF, 0xFF, 0xFF, 0xA6, 0x53, 0xCA, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xA7, 0x15, 0x89, 0x60,
+0xFF, 0xFF, 0xFF, 0xFF, 0xA8, 0x33, 0xAC, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xA8, 0xFE, 0xA5, 0xE0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xAA, 0x13, 0x8E, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xAA, 0xDE, 0x87, 0xE0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xAB, 0xF3, 0x70, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xAC, 0xBE, 0x69, 0xE0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xAD, 0xD3, 0x52, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xAE, 0x9E, 0x4B, 0xE0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xB3, 0x34, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB0, 0x7E, 0x2D, 0xE0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xB1, 0x9C, 0x51, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB2, 0x67, 0x4A, 0x60,
+0xFF, 0xFF, 0xFF, 0xFF, 0xB3, 0x7C, 0x33, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB4, 0x47, 0x2C, 0x60,
+0xFF, 0xFF, 0xFF, 0xFF, 0xB5, 0x5C, 0x15, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB6, 0x27, 0x0E, 0x60,
+0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x3B, 0xF7, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0x06, 0xF0, 0x60,
+0xFF, 0xFF, 0xFF, 0xFF, 0xB9, 0x1B, 0xD9, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB9, 0xE6, 0xD2, 0x60,
+0xFF, 0xFF, 0xFF, 0xFF, 0xBB, 0x04, 0xF5, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xBB, 0xC6, 0xB4, 0x60,
+0xFF, 0xFF, 0xFF, 0xFF, 0xBC, 0xE4, 0xD7, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xBD, 0xAF, 0xD0, 0xE0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xBE, 0xC4, 0xB9, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xBF, 0x8F, 0xB2, 0xE0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xC0, 0xA4, 0x9B, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC1, 0x6F, 0x94, 0xE0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xC2, 0x84, 0x7D, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC3, 0x4F, 0x76, 0xE0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xC4, 0x64, 0x5F, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC5, 0x2F, 0x58, 0xE0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xC6, 0x4D, 0x7C, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xC7, 0x0F, 0x3A, 0xE0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xC8, 0x2D, 0x5E, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xC8, 0xF8, 0x57, 0x60,
+0xFF, 0xFF, 0xFF, 0xFF, 0xCA, 0x0D, 0x40, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xCA, 0xD8, 0x39, 0x60,
+0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0x88, 0xF0, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x23, 0xF4, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x60, 0xFB, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD3, 0x75, 0xE4, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xD4, 0x40, 0xDD, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD5, 0x55, 0xC6, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xD6, 0x20, 0xBF, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD7, 0x35, 0xA8, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xD8, 0x00, 0xA1, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD9, 0x15, 0x8A, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xD9, 0xE0, 0x83, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xDA, 0xFE, 0xA7, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xDB, 0xC0, 0x65, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xDC, 0xDE, 0x89, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xDD, 0xA9, 0x82, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xDE, 0xBE, 0x6B, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0x89, 0x64, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xE0, 0x9E, 0x4D, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xE1, 0x69, 0x46, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xE2, 0x7E, 0x2F, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xE3, 0x49, 0x28, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xE4, 0x5E, 0x11, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xE5, 0x57, 0x2E, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE6, 0x47, 0x2D, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xE7, 0x37, 0x10, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE8, 0x27, 0x0F, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xE9, 0x16, 0xF2, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xEA, 0x06, 0xF1, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xEA, 0xF6, 0xD4, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xEB, 0xE6, 0xD3, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xEC, 0xD6, 0xB6, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xED, 0xC6, 0xB5, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xEE, 0xBF, 0xD3, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xEF, 0xAF, 0xD2, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xF0, 0x9F, 0xB5, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xF1, 0x8F, 0xB4, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xF2, 0x7F, 0x97, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xF3, 0x6F, 0x96, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x5F, 0x79, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x4F, 0x78, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xF6, 0x3F, 0x5B, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x2F, 0x5A, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x28, 0x77, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF9, 0x0F, 0x3C, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x08, 0x59, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0xF8, 0x58, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xFB, 0xE8, 0x3B, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0xD8, 0x3A, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xFD, 0xC8, 0x1D, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xB8, 0x1C, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xA7, 0xFF, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x97, 0xFE, 0xF0,
+0x00, 0x00, 0x00, 0x00, 0x01, 0x87, 0xE1, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x02, 0x77, 0xE0, 0xF0,
+0x00, 0x00, 0x00, 0x00, 0x03, 0x70, 0xFE, 0x60, 0x00, 0x00, 0x00, 0x00, 0x04, 0x60, 0xFD, 0x70,
+0x00, 0x00, 0x00, 0x00, 0x05, 0x50, 0xE0, 0x60, 0x00, 0x00, 0x00, 0x00, 0x06, 0x40, 0xDF, 0x70,
+0x00, 0x00, 0x00, 0x00, 0x07, 0x30, 0xC2, 0x60, 0x00, 0x00, 0x00, 0x00, 0x07, 0x8D, 0x19, 0x70,
+0x00, 0x00, 0x00, 0x00, 0x09, 0x10, 0xA4, 0x60, 0x00, 0x00, 0x00, 0x00, 0x09, 0xAD, 0x94, 0xF0,
+0x00, 0x00, 0x00, 0x00, 0x0A, 0xF0, 0x86, 0x60, 0x00, 0x00, 0x00, 0x00, 0x0B, 0xE0, 0x85, 0x70,
+0x00, 0x00, 0x00, 0x00, 0x0C, 0xD9, 0xA2, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x0D, 0xC0, 0x67, 0x70,
+0x00, 0x00, 0x00, 0x00, 0x0E, 0xB9, 0x84, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xA9, 0x83, 0xF0,
+0x00, 0x00, 0x00, 0x00, 0x10, 0x99, 0x66, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x11, 0x89, 0x65, 0xF0,
+0x00, 0x00, 0x00, 0x00, 0x12, 0x79, 0x48, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x13, 0x69, 0x47, 0xF0,
+0x00, 0x00, 0x00, 0x00, 0x14, 0x59, 0x2A, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x15, 0x49, 0x29, 0xF0,
+0x00, 0x00, 0x00, 0x00, 0x16, 0x39, 0x0C, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x17, 0x29, 0x0B, 0xF0,
+0x00, 0x00, 0x00, 0x00, 0x18, 0x22, 0x29, 0x60, 0x00, 0x00, 0x00, 0x00, 0x19, 0x08, 0xED, 0xF0,
+0x00, 0x00, 0x00, 0x00, 0x1A, 0x02, 0x0B, 0x60, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xF2, 0x0A, 0x70,
+0x00, 0x00, 0x00, 0x00, 0x1B, 0xE1, 0xED, 0x60, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xD1, 0xEC, 0x70,
+0x00, 0x00, 0x00, 0x00, 0x1D, 0xC1, 0xCF, 0x60, 0x00, 0x00, 0x00, 0x00, 0x1E, 0xB1, 0xCE, 0x70,
+0x00, 0x00, 0x00, 0x00, 0x1F, 0xA1, 0xB1, 0x60, 0x00, 0x00, 0x00, 0x00, 0x20, 0x76, 0x00, 0xF0,
+0x00, 0x00, 0x00, 0x00, 0x21, 0x81, 0x93, 0x60, 0x00, 0x00, 0x00, 0x00, 0x22, 0x55, 0xE2, 0xF0,
+0x00, 0x00, 0x00, 0x00, 0x23, 0x6A, 0xAF, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x24, 0x35, 0xC4, 0xF0,
+0x00, 0x00, 0x00, 0x00, 0x25, 0x4A, 0x91, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x26, 0x15, 0xA6, 0xF0,
+0x00, 0x00, 0x00, 0x00, 0x27, 0x2A, 0x73, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x27, 0xFE, 0xC3, 0x70,
+0x00, 0x00, 0x00, 0x00, 0x29, 0x0A, 0x55, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x29, 0xDE, 0xA5, 0x70,
+0x00, 0x00, 0x00, 0x00, 0x2A, 0xEA, 0x37, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xBE, 0x87, 0x70,
+0x00, 0x00, 0x00, 0x00, 0x2C, 0xD3, 0x54, 0x60, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x9E, 0x69, 0x70,
+0x00, 0x00, 0x00, 0x00, 0x2E, 0xB3, 0x36, 0x60, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x7E, 0x4B, 0x70,
+0x00, 0x00, 0x00, 0x00, 0x30, 0x93, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x67, 0xF0,
+0x00, 0x00, 0x00, 0x00, 0x32, 0x72, 0xFA, 0x60, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x49, 0xF0,
+0x00, 0x00, 0x00, 0x00, 0x34, 0x52, 0xDC, 0x60, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x2B, 0xF0,
+0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0xBE, 0x60, 0x00, 0x00, 0x00, 0x00, 0x37, 0x07, 0x0D, 0xF0,
+0x00, 0x00, 0x00, 0x00, 0x38, 0x1B, 0xDA, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x38, 0xE6, 0xEF, 0xF0,
+0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0xBC, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xC6, 0xD1, 0xF0,
+0x00, 0x00, 0x00, 0x00, 0x3B, 0xDB, 0x9E, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xAF, 0xEE, 0x70,
+0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0x80, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x8F, 0xD0, 0x70,
+0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x62, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x40, 0x6F, 0xB2, 0x70,
+0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0x7F, 0x60, 0x00, 0x00, 0x00, 0x00, 0x42, 0x4F, 0x94, 0x70,
+0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x61, 0x60, 0x00, 0x00, 0x00, 0x00, 0x44, 0x2F, 0x76, 0x70,
+0x00, 0x00, 0x00, 0x00, 0x45, 0x44, 0x43, 0x60, 0x00, 0x00, 0x00, 0x00, 0x45, 0xF3, 0xA8, 0xF0,
+0x00, 0x00, 0x00, 0x00, 0x47, 0x2D, 0x5F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x47, 0xD3, 0x8A, 0xF0,
+0x00, 0x00, 0x00, 0x00, 0x49, 0x0D, 0x41, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x49, 0xB3, 0x6C, 0xF0,
+0x00, 0x00, 0x00, 0x00, 0x4A, 0xED, 0x23, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x4B, 0x9C, 0x89, 0x70,
+0x00, 0x00, 0x00, 0x00, 0x4C, 0xD6, 0x40, 0x60, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x7C, 0x6B, 0x70,
+0x00, 0x00, 0x00, 0x00, 0x4E, 0xB6, 0x22, 0x60, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x5C, 0x4D, 0x70,
+0x00, 0x00, 0x00, 0x00, 0x50, 0x96, 0x04, 0x60, 0x00, 0x00, 0x00, 0x00, 0x51, 0x3C, 0x2F, 0x70,
+0x00, 0x00, 0x00, 0x00, 0x52, 0x75, 0xE6, 0x60, 0x00, 0x00, 0x00, 0x00, 0x53, 0x1C, 0x11, 0x70,
+0x00, 0x00, 0x00, 0x00, 0x54, 0x55, 0xC8, 0x60, 0x00, 0x00, 0x00, 0x00, 0x54, 0xFB, 0xF3, 0x70,
+0x00, 0x00, 0x00, 0x00, 0x56, 0x35, 0xAA, 0x60, 0x00, 0x00, 0x00, 0x00, 0x56, 0xE5, 0x0F, 0xF0,
+0x00, 0x00, 0x00, 0x00, 0x58, 0x1E, 0xC6, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x58, 0xC4, 0xF1, 0xF0,
+0x00, 0x00, 0x00, 0x00, 0x59, 0xFE, 0xA8, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xA4, 0xD3, 0xF0,
+0x00, 0x00, 0x00, 0x00, 0x5B, 0xDE, 0x8A, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x5C, 0x84, 0xB5, 0xF0,
+0x00, 0x00, 0x00, 0x00, 0x5D, 0xBE, 0x6C, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x64, 0x97, 0xF0,
+0x00, 0x00, 0x00, 0x00, 0x5F, 0x9E, 0x4E, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x60, 0x4D, 0xB4, 0x70,
+0x00, 0x00, 0x00, 0x00, 0x61, 0x87, 0x6B, 0x60, 0x00, 0x00, 0x00, 0x00, 0x62, 0x2D, 0x96, 0x70,
+0x00, 0x00, 0x00, 0x00, 0x63, 0x67, 0x4D, 0x60, 0x00, 0x00, 0x00, 0x00, 0x64, 0x0D, 0x78, 0x70,
+0x00, 0x00, 0x00, 0x00, 0x65, 0x47, 0x2F, 0x60, 0x00, 0x00, 0x00, 0x00, 0x65, 0xED, 0x5A, 0x70,
+0x00, 0x00, 0x00, 0x00, 0x67, 0x27, 0x11, 0x60, 0x00, 0x00, 0x00, 0x00, 0x67, 0xCD, 0x3C, 0x70,
+0x00, 0x00, 0x00, 0x00, 0x69, 0x06, 0xF3, 0x60, 0x00, 0x00, 0x00, 0x00, 0x69, 0xAD, 0x1E, 0x70,
+0x00, 0x00, 0x00, 0x00, 0x6A, 0xE6, 0xD5, 0x60, 0x00, 0x00, 0x00, 0x00, 0x6B, 0x96, 0x3A, 0xF0,
+0x00, 0x00, 0x00, 0x00, 0x6C, 0xCF, 0xF1, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x6D, 0x76, 0x1C, 0xF0,
+0x00, 0x00, 0x00, 0x00, 0x6E, 0xAF, 0xD3, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x6F, 0x55, 0xFE, 0xF0,
+0x00, 0x00, 0x00, 0x00, 0x70, 0x8F, 0xB5, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x71, 0x35, 0xE0, 0xF0,
+0x00, 0x00, 0x00, 0x00, 0x72, 0x6F, 0x97, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x73, 0x15, 0xC2, 0xF0,
+0x00, 0x00, 0x00, 0x00, 0x74, 0x4F, 0x79, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x74, 0xFE, 0xDF, 0x70,
+0x00, 0x00, 0x00, 0x00, 0x76, 0x38, 0x96, 0x60, 0x00, 0x00, 0x00, 0x00, 0x76, 0xDE, 0xC1, 0x70,
+0x00, 0x00, 0x00, 0x00, 0x78, 0x18, 0x78, 0x60, 0x00, 0x00, 0x00, 0x00, 0x78, 0xBE, 0xA3, 0x70,
+0x00, 0x00, 0x00, 0x00, 0x79, 0xF8, 0x5A, 0x60, 0x00, 0x00, 0x00, 0x00, 0x7A, 0x9E, 0x85, 0x70,
+0x00, 0x00, 0x00, 0x00, 0x7B, 0xD8, 0x3C, 0x60, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x7E, 0x67, 0x70,
+0x00, 0x00, 0x00, 0x00, 0x7D, 0xB8, 0x1E, 0x60, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x5E, 0x49, 0x70,
+0x00, 0x00, 0x00, 0x00, 0x7F, 0x98, 0x00, 0x60, 0x03, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x04, 0x05, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0xFF, 0xFF, 0xBA, 0x9E, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x04,
+0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x08, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x08, 0xFF, 0xFF, 0xC7, 0xC0,
+0x01, 0x0C, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x10, 0x4C, 0x4D, 0x54, 0x00, 0x45, 0x44, 0x54, 0x00,
+0x45, 0x53, 0x54, 0x00, 0x45, 0x57, 0x54, 0x00, 0x45, 0x50, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01,
+0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x0A, 0x45, 0x53, 0x54, 0x35, 0x45, 0x44, 0x54,
+0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D, 0x31, 0x31, 0x2E, 0x31, 0x2E, 0x30, 0x0A,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 
 /* Etc/GMT */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -58576,19 +59314,19 @@
 
 /* Europe/Lisbon */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x50, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x1B, 0x80, 0x00, 0x00, 0x00,
-0x92, 0xE6, 0x8E, 0x80, 0x9B, 0x4B, 0x6D, 0x70, 0x9B, 0xFE, 0xC7, 0x80, 0x9C, 0x9C, 0xED, 0x70,
-0x9D, 0xC9, 0x83, 0x70, 0x9E, 0x7F, 0x72, 0x70, 0x9F, 0xAA, 0xB6, 0xF0, 0xA0, 0x5F, 0x54, 0x70,
-0xA1, 0x8B, 0xEA, 0x70, 0xA2, 0x41, 0xD9, 0x70, 0xA3, 0x6E, 0x6F, 0x70, 0xA4, 0x23, 0x0C, 0xF0,
-0xA5, 0x4F, 0xA2, 0xF0, 0xAA, 0x05, 0xEF, 0x70, 0xAA, 0xF4, 0x8E, 0xF0, 0xAD, 0xC9, 0xA7, 0xF0,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0xE1, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x1B, 0x80, 0x00, 0x00, 0x00,
+0x92, 0xE6, 0x8E, 0x80, 0x9B, 0x4B, 0x6D, 0x70, 0x9B, 0xFE, 0xC7, 0x80, 0x9C, 0x9C, 0xFB, 0x80,
+0x9D, 0xC9, 0x83, 0x70, 0x9E, 0x7E, 0x2F, 0x00, 0x9F, 0xAA, 0xB6, 0xF0, 0xA0, 0x5F, 0x62, 0x80,
+0xA1, 0x8B, 0xEA, 0x70, 0xA2, 0x41, 0xE7, 0x80, 0xA3, 0x6E, 0x6F, 0x70, 0xA4, 0x23, 0x1B, 0x00,
+0xA5, 0x4F, 0xA2, 0xF0, 0xAA, 0x05, 0xEF, 0x70, 0xAA, 0xE7, 0x5F, 0xF0, 0xAD, 0xC9, 0xA7, 0xF0,
 0xAE, 0xA7, 0x23, 0xF0, 0xAF, 0xA0, 0x4F, 0x70, 0xB0, 0x87, 0x05, 0xF0, 0xB1, 0x89, 0x6B, 0xF0,
 0xB2, 0x70, 0x22, 0x70, 0xB3, 0x72, 0x88, 0x70, 0xB4, 0x50, 0x04, 0x70, 0xB7, 0x32, 0x4C, 0x70,
 0xB8, 0x0F, 0xC8, 0x70, 0xB8, 0xFF, 0xB9, 0x70, 0xB9, 0xEF, 0xAA, 0x70, 0xBC, 0xC8, 0xB7, 0xF0,
 0xBD, 0xB8, 0xA8, 0xF0, 0xBE, 0x9F, 0x5F, 0x70, 0xBF, 0x98, 0x8A, 0xF0, 0xC0, 0x9A, 0xF0, 0xF0,
 0xC1, 0x78, 0x6C, 0xF0, 0xC2, 0x68, 0x5D, 0xF0, 0xC3, 0x58, 0x4E, 0xF0, 0xC4, 0x3F, 0x05, 0x70,
 0xC5, 0x38, 0x30, 0xF0, 0xC6, 0x3A, 0x96, 0xF0, 0xC7, 0x58, 0xAC, 0x70, 0xC7, 0xD9, 0xDF, 0x70,
-0xC9, 0x01, 0x2F, 0x70, 0xC9, 0xF1, 0x20, 0x70, 0xCA, 0xE2, 0x62, 0xF0, 0xCB, 0xB5, 0x52, 0xF0,
+0xC9, 0x03, 0xD2, 0x70, 0xC9, 0xF1, 0x20, 0x70, 0xCA, 0xE2, 0x62, 0xF0, 0xCB, 0xB5, 0x52, 0xF0,
 0xCB, 0xEC, 0xA3, 0xE0, 0xCC, 0x80, 0x4B, 0xE0, 0xCC, 0xDC, 0xA2, 0xF0, 0xCD, 0x95, 0x34, 0xF0,
 0xCD, 0xC3, 0x4B, 0x60, 0xCE, 0x72, 0xA2, 0xE0, 0xCE, 0xC5, 0xBF, 0x70, 0xCF, 0x75, 0x16, 0xF0,
 0xCF, 0xAC, 0x67, 0xE0, 0xD0, 0x52, 0x84, 0xE0, 0xD0, 0xA5, 0xA1, 0x70, 0xD1, 0x54, 0xF8, 0xF0,
@@ -58603,199 +59341,201 @@
 0xEE, 0x9A, 0xB1, 0x20, 0xEF, 0x8A, 0xA2, 0x20, 0xF0, 0x7A, 0x93, 0x20, 0xF1, 0x6A, 0x84, 0x20,
 0xF2, 0x63, 0xAF, 0xA0, 0xF3, 0x53, 0xA0, 0xA0, 0xF4, 0x43, 0x91, 0xA0, 0xF5, 0x33, 0x82, 0xA0,
 0xF6, 0x23, 0x73, 0xA0, 0xF7, 0x13, 0x64, 0xA0, 0xF8, 0x03, 0x55, 0xA0, 0xF8, 0xF3, 0x46, 0xA0,
-0x0C, 0xAB, 0x2A, 0x00, 0x0D, 0x9B, 0x1B, 0x00, 0x0E, 0x8B, 0x0C, 0x00, 0x0F, 0x84, 0x37, 0x80,
-0x10, 0x74, 0x28, 0x80, 0x11, 0x64, 0x19, 0x80, 0x12, 0x54, 0x18, 0x90, 0x13, 0x43, 0xFB, 0x80,
-0x14, 0x33, 0xFA, 0x90, 0x15, 0x23, 0xEB, 0x90, 0x16, 0x13, 0xDC, 0x90, 0x17, 0x03, 0xCD, 0x90,
-0x17, 0xF3, 0xBE, 0x90, 0x18, 0xE3, 0xBD, 0xA0, 0x19, 0xD3, 0xA0, 0x90, 0x1A, 0xC3, 0x91, 0x90,
-0x1B, 0xBC, 0xBD, 0x10, 0x1C, 0xAC, 0xAE, 0x10, 0x1D, 0x9C, 0x9F, 0x10, 0x1E, 0x8C, 0x90, 0x10,
-0x1F, 0x7C, 0x81, 0x10, 0x20, 0x6C, 0x72, 0x10, 0x21, 0x5C, 0x63, 0x10, 0x22, 0x4C, 0x54, 0x10,
-0x23, 0x3C, 0x45, 0x10, 0x24, 0x2C, 0x36, 0x10, 0x25, 0x1C, 0x27, 0x10, 0x26, 0x0C, 0x18, 0x10,
-0x27, 0x05, 0x43, 0x90, 0x27, 0xF5, 0x34, 0x90, 0x28, 0xE5, 0x25, 0x90, 0x29, 0xD5, 0x16, 0x90,
-0x2A, 0xC5, 0x07, 0x90, 0x2B, 0xB4, 0xF8, 0x90, 0x2C, 0xA4, 0xE9, 0x90, 0x2D, 0x94, 0xDA, 0x90,
-0x2E, 0x84, 0xCB, 0x90, 0x2F, 0x74, 0xBC, 0x90, 0x30, 0x64, 0xAD, 0x90, 0x31, 0x5D, 0xD9, 0x10,
-0x32, 0x72, 0xB4, 0x10, 0x33, 0x3D, 0xBB, 0x10, 0x34, 0x52, 0x96, 0x10, 0x35, 0x1D, 0x9D, 0x10,
-0x36, 0x32, 0x78, 0x10, 0x36, 0xFD, 0x7F, 0x10, 0x38, 0x1B, 0x94, 0x90, 0x38, 0xDD, 0x61, 0x10,
-0x39, 0xFB, 0x76, 0x90, 0x3A, 0xBD, 0x43, 0x10, 0x3B, 0xDB, 0x58, 0x90, 0x3C, 0xA6, 0x5F, 0x90,
-0x3D, 0xBB, 0x3A, 0x90, 0x3E, 0x86, 0x41, 0x90, 0x3F, 0x9B, 0x1C, 0x90, 0x40, 0x66, 0x23, 0x90,
-0x41, 0x84, 0x39, 0x10, 0x42, 0x46, 0x05, 0x90, 0x43, 0x64, 0x1B, 0x10, 0x44, 0x25, 0xE7, 0x90,
-0x45, 0x43, 0xFD, 0x10, 0x46, 0x05, 0xC9, 0x90, 0x47, 0x23, 0xDF, 0x10, 0x47, 0xEE, 0xE6, 0x10,
-0x49, 0x03, 0xC1, 0x10, 0x49, 0xCE, 0xC8, 0x10, 0x4A, 0xE3, 0xA3, 0x10, 0x4B, 0xAE, 0xAA, 0x10,
-0x4C, 0xCC, 0xBF, 0x90, 0x4D, 0x8E, 0x8C, 0x10, 0x4E, 0xAC, 0xA1, 0x90, 0x4F, 0x6E, 0x6E, 0x10,
-0x50, 0x8C, 0x83, 0x90, 0x51, 0x57, 0x8A, 0x90, 0x52, 0x6C, 0x65, 0x90, 0x53, 0x37, 0x6C, 0x90,
-0x54, 0x4C, 0x47, 0x90, 0x55, 0x17, 0x4E, 0x90, 0x56, 0x2C, 0x29, 0x90, 0x56, 0xF7, 0x30, 0x90,
-0x58, 0x15, 0x46, 0x10, 0x58, 0xD7, 0x12, 0x90, 0x59, 0xF5, 0x28, 0x10, 0x5A, 0xB6, 0xF4, 0x90,
-0x5B, 0xD5, 0x0A, 0x10, 0x5C, 0xA0, 0x11, 0x10, 0x5D, 0xB4, 0xEC, 0x10, 0x5E, 0x7F, 0xF3, 0x10,
-0x5F, 0x94, 0xCE, 0x10, 0x60, 0x5F, 0xD5, 0x10, 0x61, 0x7D, 0xEA, 0x90, 0x62, 0x3F, 0xB7, 0x10,
-0x63, 0x5D, 0xCC, 0x90, 0x64, 0x1F, 0x99, 0x10, 0x65, 0x3D, 0xAE, 0x90, 0x66, 0x08, 0xB5, 0x90,
-0x67, 0x1D, 0x90, 0x90, 0x67, 0xE8, 0x97, 0x90, 0x68, 0xFD, 0x72, 0x90, 0x69, 0xC8, 0x79, 0x90,
-0x6A, 0xDD, 0x54, 0x90, 0x6B, 0xA8, 0x5B, 0x90, 0x6C, 0xC6, 0x71, 0x10, 0x6D, 0x88, 0x3D, 0x90,
-0x6E, 0xA6, 0x53, 0x10, 0x6F, 0x68, 0x1F, 0x90, 0x70, 0x86, 0x35, 0x10, 0x71, 0x51, 0x3C, 0x10,
-0x72, 0x66, 0x17, 0x10, 0x73, 0x31, 0x1E, 0x10, 0x74, 0x45, 0xF9, 0x10, 0x75, 0x11, 0x00, 0x10,
-0x76, 0x2F, 0x15, 0x90, 0x76, 0xF0, 0xE2, 0x10, 0x78, 0x0E, 0xF7, 0x90, 0x78, 0xD0, 0xC4, 0x10,
-0x79, 0xEE, 0xD9, 0x90, 0x7A, 0xB0, 0xA6, 0x10, 0x7B, 0xCE, 0xBB, 0x90, 0x7C, 0x99, 0xC2, 0x90,
-0x7D, 0xAE, 0x9D, 0x90, 0x7E, 0x79, 0xA4, 0x90, 0x7F, 0x8E, 0x7F, 0x90, 0x00, 0x06, 0x01, 0x02,
+0xF9, 0xE3, 0x37, 0xA0, 0x0C, 0xAB, 0x2A, 0x00, 0x0D, 0x9B, 0x1B, 0x00, 0x0E, 0x8B, 0x0C, 0x00,
+0x0F, 0x84, 0x45, 0x90, 0x10, 0x74, 0x36, 0x90, 0x11, 0x64, 0x27, 0x90, 0x12, 0x54, 0x18, 0x90,
+0x13, 0x4D, 0x44, 0x10, 0x14, 0x33, 0xFA, 0x90, 0x15, 0x23, 0xDD, 0x80, 0x16, 0x13, 0xCE, 0x80,
+0x17, 0x03, 0xBF, 0x80, 0x17, 0xF3, 0xB0, 0x80, 0x18, 0xE3, 0xA1, 0x80, 0x19, 0xD3, 0x92, 0x80,
+0x1A, 0xC3, 0x83, 0x80, 0x1B, 0xBC, 0xAF, 0x00, 0x1C, 0xAC, 0xA0, 0x00, 0x1D, 0x9C, 0x91, 0x00,
+0x1E, 0x8C, 0x90, 0x10, 0x1F, 0x7C, 0x81, 0x10, 0x20, 0x6C, 0x72, 0x10, 0x21, 0x5C, 0x63, 0x10,
+0x22, 0x4C, 0x54, 0x10, 0x23, 0x3C, 0x45, 0x10, 0x24, 0x2C, 0x36, 0x10, 0x25, 0x1C, 0x27, 0x10,
+0x26, 0x0C, 0x18, 0x10, 0x27, 0x05, 0x43, 0x90, 0x27, 0xF5, 0x34, 0x90, 0x28, 0xE5, 0x25, 0x90,
+0x29, 0xD5, 0x16, 0x90, 0x2A, 0xC5, 0x07, 0x90, 0x2B, 0xB4, 0xF8, 0x90, 0x2C, 0xA4, 0xE9, 0x90,
+0x2D, 0x94, 0xDA, 0x90, 0x2E, 0x84, 0xCB, 0x90, 0x2F, 0x74, 0xBC, 0x90, 0x30, 0x64, 0xAD, 0x90,
+0x31, 0x5D, 0xD9, 0x10, 0x32, 0x72, 0xB4, 0x10, 0x33, 0x3D, 0xBB, 0x10, 0x34, 0x52, 0x96, 0x10,
+0x35, 0x1D, 0x9D, 0x10, 0x36, 0x32, 0x78, 0x10, 0x36, 0xFD, 0x7F, 0x10, 0x38, 0x1B, 0x94, 0x90,
+0x38, 0xDD, 0x61, 0x10, 0x39, 0xFB, 0x76, 0x90, 0x3A, 0xBD, 0x43, 0x10, 0x3B, 0xDB, 0x58, 0x90,
+0x3C, 0xA6, 0x5F, 0x90, 0x3D, 0xBB, 0x3A, 0x90, 0x3E, 0x86, 0x41, 0x90, 0x3F, 0x9B, 0x1C, 0x90,
+0x40, 0x66, 0x23, 0x90, 0x41, 0x84, 0x39, 0x10, 0x42, 0x46, 0x05, 0x90, 0x43, 0x64, 0x1B, 0x10,
+0x44, 0x25, 0xE7, 0x90, 0x45, 0x43, 0xFD, 0x10, 0x46, 0x05, 0xC9, 0x90, 0x47, 0x23, 0xDF, 0x10,
+0x47, 0xEE, 0xE6, 0x10, 0x49, 0x03, 0xC1, 0x10, 0x49, 0xCE, 0xC8, 0x10, 0x4A, 0xE3, 0xA3, 0x10,
+0x4B, 0xAE, 0xAA, 0x10, 0x4C, 0xCC, 0xBF, 0x90, 0x4D, 0x8E, 0x8C, 0x10, 0x4E, 0xAC, 0xA1, 0x90,
+0x4F, 0x6E, 0x6E, 0x10, 0x50, 0x8C, 0x83, 0x90, 0x51, 0x57, 0x8A, 0x90, 0x52, 0x6C, 0x65, 0x90,
+0x53, 0x37, 0x6C, 0x90, 0x54, 0x4C, 0x47, 0x90, 0x55, 0x17, 0x4E, 0x90, 0x56, 0x2C, 0x29, 0x90,
+0x56, 0xF7, 0x30, 0x90, 0x58, 0x15, 0x46, 0x10, 0x58, 0xD7, 0x12, 0x90, 0x59, 0xF5, 0x28, 0x10,
+0x5A, 0xB6, 0xF4, 0x90, 0x5B, 0xD5, 0x0A, 0x10, 0x5C, 0xA0, 0x11, 0x10, 0x5D, 0xB4, 0xEC, 0x10,
+0x5E, 0x7F, 0xF3, 0x10, 0x5F, 0x94, 0xCE, 0x10, 0x60, 0x5F, 0xD5, 0x10, 0x61, 0x7D, 0xEA, 0x90,
+0x62, 0x3F, 0xB7, 0x10, 0x63, 0x5D, 0xCC, 0x90, 0x64, 0x1F, 0x99, 0x10, 0x65, 0x3D, 0xAE, 0x90,
+0x66, 0x08, 0xB5, 0x90, 0x67, 0x1D, 0x90, 0x90, 0x67, 0xE8, 0x97, 0x90, 0x68, 0xFD, 0x72, 0x90,
+0x69, 0xC8, 0x79, 0x90, 0x6A, 0xDD, 0x54, 0x90, 0x6B, 0xA8, 0x5B, 0x90, 0x6C, 0xC6, 0x71, 0x10,
+0x6D, 0x88, 0x3D, 0x90, 0x6E, 0xA6, 0x53, 0x10, 0x6F, 0x68, 0x1F, 0x90, 0x70, 0x86, 0x35, 0x10,
+0x71, 0x51, 0x3C, 0x10, 0x72, 0x66, 0x17, 0x10, 0x73, 0x31, 0x1E, 0x10, 0x74, 0x45, 0xF9, 0x10,
+0x75, 0x11, 0x00, 0x10, 0x76, 0x2F, 0x15, 0x90, 0x76, 0xF0, 0xE2, 0x10, 0x78, 0x0E, 0xF7, 0x90,
+0x78, 0xD0, 0xC4, 0x10, 0x79, 0xEE, 0xD9, 0x90, 0x7A, 0xB0, 0xA6, 0x10, 0x7B, 0xCE, 0xBB, 0x90,
+0x7C, 0x99, 0xC2, 0x90, 0x7D, 0xAE, 0x9D, 0x90, 0x7E, 0x79, 0xA4, 0x90, 0x7F, 0x8E, 0x7F, 0x90,
+0x00, 0x06, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x03, 0x04,
 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x05, 0x03, 0x04,
+0x03, 0x05, 0x03, 0x04, 0x03, 0x05, 0x03, 0x04, 0x03, 0x05, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
-0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x05, 0x03, 0x04, 0x03, 0x05, 0x03, 0x04,
-0x03, 0x05, 0x03, 0x04, 0x03, 0x05, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x07, 0x02, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
+0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08,
+0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x08, 0x06, 0x08,
+0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08,
+0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08,
+0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08,
+0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08,
+0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08,
+0x06, 0xFF, 0xFF, 0xF7, 0x63, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x04, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x09, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00,
+0x00, 0x1C, 0x20, 0x01, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x0E, 0x10, 0x00,
+0x12, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x04, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x12, 0x00, 0x00, 0x1C,
+0x20, 0x01, 0x16, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x4C,
+0x4D, 0x54, 0x00, 0x57, 0x45, 0x53, 0x54, 0x00, 0x57, 0x45, 0x54, 0x00, 0x57, 0x45, 0x4D, 0x54,
+0x00, 0x43, 0x45, 0x54, 0x00, 0x43, 0x45, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01,
+0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01,
+0x01, 0x01, 0x01, 0x01, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x0D,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE1, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x1B,
+0xFF, 0xFF, 0xFF, 0xFF, 0x5E, 0x3D, 0x0C, 0x1D, 0xFF, 0xFF, 0xFF, 0xFF, 0x92, 0xE6, 0x8E, 0x80,
+0xFF, 0xFF, 0xFF, 0xFF, 0x9B, 0x4B, 0x6D, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0x9B, 0xFE, 0xC7, 0x80,
+0xFF, 0xFF, 0xFF, 0xFF, 0x9C, 0x9C, 0xFB, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0x9D, 0xC9, 0x83, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0x9E, 0x7E, 0x2F, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x9F, 0xAA, 0xB6, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xA0, 0x5F, 0x62, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xA1, 0x8B, 0xEA, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xA2, 0x41, 0xE7, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xA3, 0x6E, 0x6F, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xA4, 0x23, 0x1B, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0x4F, 0xA2, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xAA, 0x05, 0xEF, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAA, 0xE7, 0x5F, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xAD, 0xC9, 0xA7, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xAE, 0xA7, 0x23, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xA0, 0x4F, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB0, 0x87, 0x05, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xB1, 0x89, 0x6B, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB2, 0x70, 0x22, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xB3, 0x72, 0x88, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB4, 0x50, 0x04, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x32, 0x4C, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0x0F, 0xC8, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0xFF, 0xB9, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB9, 0xEF, 0xAA, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xBC, 0xC8, 0xB7, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xBD, 0xB8, 0xA8, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xBE, 0x9F, 0x5F, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xBF, 0x98, 0x8A, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xC0, 0x9A, 0xF0, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC1, 0x78, 0x6C, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xC2, 0x68, 0x5D, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC3, 0x58, 0x4E, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xC4, 0x3F, 0x05, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xC5, 0x38, 0x30, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xC6, 0x3A, 0x96, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC7, 0x58, 0xAC, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xC7, 0xD9, 0xDF, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0x03, 0xD2, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0xF1, 0x20, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xCA, 0xE2, 0x62, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0xB5, 0x52, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0xEC, 0xA3, 0xE0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xCC, 0x80, 0x4B, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCC, 0xDC, 0xA2, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xCD, 0x95, 0x34, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCD, 0xC3, 0x4B, 0x60,
+0xFF, 0xFF, 0xFF, 0xFF, 0xCE, 0x72, 0xA2, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCE, 0xC5, 0xBF, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xCF, 0x75, 0x16, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCF, 0xAC, 0x67, 0xE0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xD0, 0x52, 0x84, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD0, 0xA5, 0xA1, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xD1, 0x54, 0xF8, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD1, 0x8C, 0x49, 0xE0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x32, 0x66, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x85, 0x83, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xD3, 0x59, 0xC4, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD4, 0x49, 0xB5, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xD5, 0x39, 0xD1, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xD6, 0x29, 0xC2, 0x20,
+0xFF, 0xFF, 0xFF, 0xFF, 0xD7, 0x19, 0xB3, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xD8, 0x09, 0xA4, 0x20,
+0xFF, 0xFF, 0xFF, 0xFF, 0xD8, 0xF9, 0x95, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xD9, 0xE9, 0x86, 0x20,
+0xFF, 0xFF, 0xFF, 0xFF, 0xDA, 0xD9, 0x77, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xDB, 0xC9, 0x68, 0x20,
+0xFF, 0xFF, 0xFF, 0xFF, 0xDC, 0xB9, 0x59, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xDD, 0xB2, 0x84, 0xA0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xDE, 0xA2, 0x75, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0x92, 0x66, 0xA0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xE0, 0x82, 0x57, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE1, 0x72, 0x48, 0xA0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xE2, 0x62, 0x39, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE3, 0x52, 0x2A, 0xA0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xE4, 0x42, 0x1B, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE5, 0x32, 0x0C, 0xA0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xE6, 0x21, 0xFD, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE7, 0x1B, 0x29, 0x20,
+0xFF, 0xFF, 0xFF, 0xFF, 0xE8, 0x0B, 0x1A, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xE8, 0xFB, 0x0B, 0x20,
+0xFF, 0xFF, 0xFF, 0xFF, 0xE9, 0xEA, 0xFC, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xEA, 0xDA, 0xED, 0x20,
+0xFF, 0xFF, 0xFF, 0xFF, 0xEB, 0xCA, 0xDE, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xEC, 0xBA, 0xCF, 0x20,
+0xFF, 0xFF, 0xFF, 0xFF, 0xED, 0xAA, 0xC0, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xEE, 0x9A, 0xB1, 0x20,
+0xFF, 0xFF, 0xFF, 0xFF, 0xEF, 0x8A, 0xA2, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF0, 0x7A, 0x93, 0x20,
+0xFF, 0xFF, 0xFF, 0xFF, 0xF1, 0x6A, 0x84, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF2, 0x63, 0xAF, 0xA0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xF3, 0x53, 0xA0, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x43, 0x91, 0xA0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x33, 0x82, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF6, 0x23, 0x73, 0xA0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x13, 0x64, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x03, 0x55, 0xA0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0xF3, 0x46, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF9, 0xE3, 0x37, 0xA0,
+0x00, 0x00, 0x00, 0x00, 0x0C, 0xAB, 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0D, 0x9B, 0x1B, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x0E, 0x8B, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x84, 0x45, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x10, 0x74, 0x36, 0x90, 0x00, 0x00, 0x00, 0x00, 0x11, 0x64, 0x27, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x12, 0x54, 0x18, 0x90, 0x00, 0x00, 0x00, 0x00, 0x13, 0x4D, 0x44, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x14, 0x33, 0xFA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x15, 0x23, 0xDD, 0x80,
+0x00, 0x00, 0x00, 0x00, 0x16, 0x13, 0xCE, 0x80, 0x00, 0x00, 0x00, 0x00, 0x17, 0x03, 0xBF, 0x80,
+0x00, 0x00, 0x00, 0x00, 0x17, 0xF3, 0xB0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x18, 0xE3, 0xA1, 0x80,
+0x00, 0x00, 0x00, 0x00, 0x19, 0xD3, 0x92, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xC3, 0x83, 0x80,
+0x00, 0x00, 0x00, 0x00, 0x1B, 0xBC, 0xAF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xAC, 0xA0, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x1D, 0x9C, 0x91, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x8C, 0x90, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x1F, 0x7C, 0x81, 0x10, 0x00, 0x00, 0x00, 0x00, 0x20, 0x6C, 0x72, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x21, 0x5C, 0x63, 0x10, 0x00, 0x00, 0x00, 0x00, 0x22, 0x4C, 0x54, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x23, 0x3C, 0x45, 0x10, 0x00, 0x00, 0x00, 0x00, 0x24, 0x2C, 0x36, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x25, 0x1C, 0x27, 0x10, 0x00, 0x00, 0x00, 0x00, 0x26, 0x0C, 0x18, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x27, 0x05, 0x43, 0x90, 0x00, 0x00, 0x00, 0x00, 0x27, 0xF5, 0x34, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x28, 0xE5, 0x25, 0x90, 0x00, 0x00, 0x00, 0x00, 0x29, 0xD5, 0x16, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x2A, 0xC5, 0x07, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xB4, 0xF8, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x2C, 0xA4, 0xE9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x94, 0xDA, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x2E, 0x84, 0xCB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x74, 0xBC, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x30, 0x64, 0xAD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x31, 0x5D, 0xD9, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x32, 0x72, 0xB4, 0x10, 0x00, 0x00, 0x00, 0x00, 0x33, 0x3D, 0xBB, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x34, 0x52, 0x96, 0x10, 0x00, 0x00, 0x00, 0x00, 0x35, 0x1D, 0x9D, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0x78, 0x10, 0x00, 0x00, 0x00, 0x00, 0x36, 0xFD, 0x7F, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x38, 0x1B, 0x94, 0x90, 0x00, 0x00, 0x00, 0x00, 0x38, 0xDD, 0x61, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0x76, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xBD, 0x43, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x3B, 0xDB, 0x58, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xA6, 0x5F, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0x3A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x86, 0x41, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x1C, 0x90, 0x00, 0x00, 0x00, 0x00, 0x40, 0x66, 0x23, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0x39, 0x10, 0x00, 0x00, 0x00, 0x00, 0x42, 0x46, 0x05, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x1B, 0x10, 0x00, 0x00, 0x00, 0x00, 0x44, 0x25, 0xE7, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x45, 0x43, 0xFD, 0x10, 0x00, 0x00, 0x00, 0x00, 0x46, 0x05, 0xC9, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x47, 0x23, 0xDF, 0x10, 0x00, 0x00, 0x00, 0x00, 0x47, 0xEE, 0xE6, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x49, 0x03, 0xC1, 0x10, 0x00, 0x00, 0x00, 0x00, 0x49, 0xCE, 0xC8, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x4A, 0xE3, 0xA3, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4B, 0xAE, 0xAA, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x4C, 0xCC, 0xBF, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x8E, 0x8C, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x4E, 0xAC, 0xA1, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x6E, 0x6E, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x50, 0x8C, 0x83, 0x90, 0x00, 0x00, 0x00, 0x00, 0x51, 0x57, 0x8A, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x52, 0x6C, 0x65, 0x90, 0x00, 0x00, 0x00, 0x00, 0x53, 0x37, 0x6C, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x54, 0x4C, 0x47, 0x90, 0x00, 0x00, 0x00, 0x00, 0x55, 0x17, 0x4E, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x56, 0x2C, 0x29, 0x90, 0x00, 0x00, 0x00, 0x00, 0x56, 0xF7, 0x30, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x58, 0x15, 0x46, 0x10, 0x00, 0x00, 0x00, 0x00, 0x58, 0xD7, 0x12, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x59, 0xF5, 0x28, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xB6, 0xF4, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x5B, 0xD5, 0x0A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5C, 0xA0, 0x11, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x5D, 0xB4, 0xEC, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x7F, 0xF3, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x5F, 0x94, 0xCE, 0x10, 0x00, 0x00, 0x00, 0x00, 0x60, 0x5F, 0xD5, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x61, 0x7D, 0xEA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x62, 0x3F, 0xB7, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x63, 0x5D, 0xCC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x64, 0x1F, 0x99, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x65, 0x3D, 0xAE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x66, 0x08, 0xB5, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x67, 0x1D, 0x90, 0x90, 0x00, 0x00, 0x00, 0x00, 0x67, 0xE8, 0x97, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x68, 0xFD, 0x72, 0x90, 0x00, 0x00, 0x00, 0x00, 0x69, 0xC8, 0x79, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x6A, 0xDD, 0x54, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6B, 0xA8, 0x5B, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x6C, 0xC6, 0x71, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6D, 0x88, 0x3D, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x6E, 0xA6, 0x53, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6F, 0x68, 0x1F, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x70, 0x86, 0x35, 0x10, 0x00, 0x00, 0x00, 0x00, 0x71, 0x51, 0x3C, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x72, 0x66, 0x17, 0x10, 0x00, 0x00, 0x00, 0x00, 0x73, 0x31, 0x1E, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x74, 0x45, 0xF9, 0x10, 0x00, 0x00, 0x00, 0x00, 0x75, 0x11, 0x00, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x76, 0x2F, 0x15, 0x90, 0x00, 0x00, 0x00, 0x00, 0x76, 0xF0, 0xE2, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x78, 0x0E, 0xF7, 0x90, 0x00, 0x00, 0x00, 0x00, 0x78, 0xD0, 0xC4, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x79, 0xEE, 0xD9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7A, 0xB0, 0xA6, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x7B, 0xCE, 0xBB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x99, 0xC2, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x7D, 0xAE, 0x9D, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x79, 0xA4, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x7F, 0x8E, 0x7F, 0x90, 0x00, 0x06, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
-0x07, 0x02, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x05, 0x03, 0x04, 0x03, 0x05, 0x03, 0x04, 0x03, 0x05, 0x03, 0x04,
+0x03, 0x05, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
-0x03, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06,
-0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06,
-0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06,
-0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06,
-0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06,
-0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0xFF, 0xFF, 0xF7, 0x63,
-0x00, 0x00, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00,
-0x0E, 0x10, 0x01, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x0D,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x12, 0x00, 0x00, 0x0E, 0x10,
-0x00, 0x12, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x16, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x04, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x09, 0x4C, 0x4D, 0x54, 0x00, 0x57, 0x45, 0x53, 0x54, 0x00, 0x57, 0x45, 0x54,
-0x00, 0x57, 0x45, 0x4D, 0x54, 0x00, 0x43, 0x45, 0x54, 0x00, 0x43, 0x45, 0x53, 0x54, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x00,
-0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, 0x0C, 0x00,
-0x00, 0x00, 0x1B, 0xFF, 0xFF, 0xFF, 0xFF, 0x5E, 0x3D, 0x0C, 0x1D, 0xFF, 0xFF, 0xFF, 0xFF, 0x92,
-0xE6, 0x8E, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0x9B, 0x4B, 0x6D, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0x9B,
-0xFE, 0xC7, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0x9C, 0x9C, 0xED, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0x9D,
-0xC9, 0x83, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0x9E, 0x7F, 0x72, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0x9F,
-0xAA, 0xB6, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xA0, 0x5F, 0x54, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xA1,
-0x8B, 0xEA, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xA2, 0x41, 0xD9, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xA3,
-0x6E, 0x6F, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xA4, 0x23, 0x0C, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5,
-0x4F, 0xA2, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xAA, 0x05, 0xEF, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAA,
-0xF4, 0x8E, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xAD, 0xC9, 0xA7, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xAE,
-0xA7, 0x23, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xA0, 0x4F, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB0,
-0x87, 0x05, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB1, 0x89, 0x6B, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB2,
-0x70, 0x22, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB3, 0x72, 0x88, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB4,
-0x50, 0x04, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x32, 0x4C, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8,
-0x0F, 0xC8, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0xFF, 0xB9, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB9,
-0xEF, 0xAA, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xBC, 0xC8, 0xB7, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xBD,
-0xB8, 0xA8, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xBE, 0x9F, 0x5F, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xBF,
-0x98, 0x8A, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC0, 0x9A, 0xF0, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC1,
-0x78, 0x6C, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC2, 0x68, 0x5D, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC3,
-0x58, 0x4E, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC4, 0x3F, 0x05, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xC5,
-0x38, 0x30, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC6, 0x3A, 0x96, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC7,
-0x58, 0xAC, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xC7, 0xD9, 0xDF, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9,
-0x01, 0x2F, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0xF1, 0x20, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xCA,
-0xE2, 0x62, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0xB5, 0x52, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB,
-0xEC, 0xA3, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCC, 0x80, 0x4B, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCC,
-0xDC, 0xA2, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCD, 0x95, 0x34, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCD,
-0xC3, 0x4B, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xCE, 0x72, 0xA2, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCE,
-0xC5, 0xBF, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xCF, 0x75, 0x16, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCF,
-0xAC, 0x67, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD0, 0x52, 0x84, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD0,
-0xA5, 0xA1, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD1, 0x54, 0xF8, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD1,
-0x8C, 0x49, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x32, 0x66, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2,
-0x85, 0x83, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD3, 0x59, 0xC4, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD4,
-0x49, 0xB5, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD5, 0x39, 0xD1, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xD6,
-0x29, 0xC2, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xD7, 0x19, 0xB3, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xD8,
-0x09, 0xA4, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xD8, 0xF9, 0x95, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xD9,
-0xE9, 0x86, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xDA, 0xD9, 0x77, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xDB,
-0xC9, 0x68, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xDC, 0xB9, 0x59, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xDD,
-0xB2, 0x84, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xDE, 0xA2, 0x75, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF,
-0x92, 0x66, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE0, 0x82, 0x57, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE1,
-0x72, 0x48, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE2, 0x62, 0x39, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE3,
-0x52, 0x2A, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE4, 0x42, 0x1B, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE5,
-0x32, 0x0C, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE6, 0x21, 0xFD, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE7,
-0x1B, 0x29, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xE8, 0x0B, 0x1A, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xE8,
-0xFB, 0x0B, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xE9, 0xEA, 0xFC, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xEA,
-0xDA, 0xED, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xEB, 0xCA, 0xDE, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xEC,
-0xBA, 0xCF, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xED, 0xAA, 0xC0, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xEE,
-0x9A, 0xB1, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xEF, 0x8A, 0xA2, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF0,
-0x7A, 0x93, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF1, 0x6A, 0x84, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF2,
-0x63, 0xAF, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF3, 0x53, 0xA0, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4,
-0x43, 0x91, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x33, 0x82, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF6,
-0x23, 0x73, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x13, 0x64, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8,
-0x03, 0x55, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0xF3, 0x46, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x0C,
-0xAB, 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0D, 0x9B, 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0E,
-0x8B, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x84, 0x37, 0x80, 0x00, 0x00, 0x00, 0x00, 0x10,
-0x74, 0x28, 0x80, 0x00, 0x00, 0x00, 0x00, 0x11, 0x64, 0x19, 0x80, 0x00, 0x00, 0x00, 0x00, 0x12,
-0x54, 0x18, 0x90, 0x00, 0x00, 0x00, 0x00, 0x13, 0x43, 0xFB, 0x80, 0x00, 0x00, 0x00, 0x00, 0x14,
-0x33, 0xFA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x15, 0x23, 0xEB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x16,
-0x13, 0xDC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x17, 0x03, 0xCD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x17,
-0xF3, 0xBE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x18, 0xE3, 0xBD, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x19,
-0xD3, 0xA0, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xC3, 0x91, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1B,
-0xBC, 0xBD, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xAC, 0xAE, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1D,
-0x9C, 0x9F, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x8C, 0x90, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1F,
-0x7C, 0x81, 0x10, 0x00, 0x00, 0x00, 0x00, 0x20, 0x6C, 0x72, 0x10, 0x00, 0x00, 0x00, 0x00, 0x21,
-0x5C, 0x63, 0x10, 0x00, 0x00, 0x00, 0x00, 0x22, 0x4C, 0x54, 0x10, 0x00, 0x00, 0x00, 0x00, 0x23,
-0x3C, 0x45, 0x10, 0x00, 0x00, 0x00, 0x00, 0x24, 0x2C, 0x36, 0x10, 0x00, 0x00, 0x00, 0x00, 0x25,
-0x1C, 0x27, 0x10, 0x00, 0x00, 0x00, 0x00, 0x26, 0x0C, 0x18, 0x10, 0x00, 0x00, 0x00, 0x00, 0x27,
-0x05, 0x43, 0x90, 0x00, 0x00, 0x00, 0x00, 0x27, 0xF5, 0x34, 0x90, 0x00, 0x00, 0x00, 0x00, 0x28,
-0xE5, 0x25, 0x90, 0x00, 0x00, 0x00, 0x00, 0x29, 0xD5, 0x16, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2A,
-0xC5, 0x07, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xB4, 0xF8, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2C,
-0xA4, 0xE9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x94, 0xDA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2E,
-0x84, 0xCB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x74, 0xBC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x30,
-0x64, 0xAD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x31, 0x5D, 0xD9, 0x10, 0x00, 0x00, 0x00, 0x00, 0x32,
-0x72, 0xB4, 0x10, 0x00, 0x00, 0x00, 0x00, 0x33, 0x3D, 0xBB, 0x10, 0x00, 0x00, 0x00, 0x00, 0x34,
-0x52, 0x96, 0x10, 0x00, 0x00, 0x00, 0x00, 0x35, 0x1D, 0x9D, 0x10, 0x00, 0x00, 0x00, 0x00, 0x36,
-0x32, 0x78, 0x10, 0x00, 0x00, 0x00, 0x00, 0x36, 0xFD, 0x7F, 0x10, 0x00, 0x00, 0x00, 0x00, 0x38,
-0x1B, 0x94, 0x90, 0x00, 0x00, 0x00, 0x00, 0x38, 0xDD, 0x61, 0x10, 0x00, 0x00, 0x00, 0x00, 0x39,
-0xFB, 0x76, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xBD, 0x43, 0x10, 0x00, 0x00, 0x00, 0x00, 0x3B,
-0xDB, 0x58, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xA6, 0x5F, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3D,
-0xBB, 0x3A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x86, 0x41, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3F,
-0x9B, 0x1C, 0x90, 0x00, 0x00, 0x00, 0x00, 0x40, 0x66, 0x23, 0x90, 0x00, 0x00, 0x00, 0x00, 0x41,
-0x84, 0x39, 0x10, 0x00, 0x00, 0x00, 0x00, 0x42, 0x46, 0x05, 0x90, 0x00, 0x00, 0x00, 0x00, 0x43,
-0x64, 0x1B, 0x10, 0x00, 0x00, 0x00, 0x00, 0x44, 0x25, 0xE7, 0x90, 0x00, 0x00, 0x00, 0x00, 0x45,
-0x43, 0xFD, 0x10, 0x00, 0x00, 0x00, 0x00, 0x46, 0x05, 0xC9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x47,
-0x23, 0xDF, 0x10, 0x00, 0x00, 0x00, 0x00, 0x47, 0xEE, 0xE6, 0x10, 0x00, 0x00, 0x00, 0x00, 0x49,
-0x03, 0xC1, 0x10, 0x00, 0x00, 0x00, 0x00, 0x49, 0xCE, 0xC8, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4A,
-0xE3, 0xA3, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4B, 0xAE, 0xAA, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4C,
-0xCC, 0xBF, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x8E, 0x8C, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4E,
-0xAC, 0xA1, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x6E, 0x6E, 0x10, 0x00, 0x00, 0x00, 0x00, 0x50,
-0x8C, 0x83, 0x90, 0x00, 0x00, 0x00, 0x00, 0x51, 0x57, 0x8A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x52,
-0x6C, 0x65, 0x90, 0x00, 0x00, 0x00, 0x00, 0x53, 0x37, 0x6C, 0x90, 0x00, 0x00, 0x00, 0x00, 0x54,
-0x4C, 0x47, 0x90, 0x00, 0x00, 0x00, 0x00, 0x55, 0x17, 0x4E, 0x90, 0x00, 0x00, 0x00, 0x00, 0x56,
-0x2C, 0x29, 0x90, 0x00, 0x00, 0x00, 0x00, 0x56, 0xF7, 0x30, 0x90, 0x00, 0x00, 0x00, 0x00, 0x58,
-0x15, 0x46, 0x10, 0x00, 0x00, 0x00, 0x00, 0x58, 0xD7, 0x12, 0x90, 0x00, 0x00, 0x00, 0x00, 0x59,
-0xF5, 0x28, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xB6, 0xF4, 0x90, 0x00, 0x00, 0x00, 0x00, 0x5B,
-0xD5, 0x0A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5C, 0xA0, 0x11, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5D,
-0xB4, 0xEC, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x7F, 0xF3, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5F,
-0x94, 0xCE, 0x10, 0x00, 0x00, 0x00, 0x00, 0x60, 0x5F, 0xD5, 0x10, 0x00, 0x00, 0x00, 0x00, 0x61,
-0x7D, 0xEA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x62, 0x3F, 0xB7, 0x10, 0x00, 0x00, 0x00, 0x00, 0x63,
-0x5D, 0xCC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x64, 0x1F, 0x99, 0x10, 0x00, 0x00, 0x00, 0x00, 0x65,
-0x3D, 0xAE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x66, 0x08, 0xB5, 0x90, 0x00, 0x00, 0x00, 0x00, 0x67,
-0x1D, 0x90, 0x90, 0x00, 0x00, 0x00, 0x00, 0x67, 0xE8, 0x97, 0x90, 0x00, 0x00, 0x00, 0x00, 0x68,
-0xFD, 0x72, 0x90, 0x00, 0x00, 0x00, 0x00, 0x69, 0xC8, 0x79, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6A,
-0xDD, 0x54, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6B, 0xA8, 0x5B, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6C,
-0xC6, 0x71, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6D, 0x88, 0x3D, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6E,
-0xA6, 0x53, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6F, 0x68, 0x1F, 0x90, 0x00, 0x00, 0x00, 0x00, 0x70,
-0x86, 0x35, 0x10, 0x00, 0x00, 0x00, 0x00, 0x71, 0x51, 0x3C, 0x10, 0x00, 0x00, 0x00, 0x00, 0x72,
-0x66, 0x17, 0x10, 0x00, 0x00, 0x00, 0x00, 0x73, 0x31, 0x1E, 0x10, 0x00, 0x00, 0x00, 0x00, 0x74,
-0x45, 0xF9, 0x10, 0x00, 0x00, 0x00, 0x00, 0x75, 0x11, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x76,
-0x2F, 0x15, 0x90, 0x00, 0x00, 0x00, 0x00, 0x76, 0xF0, 0xE2, 0x10, 0x00, 0x00, 0x00, 0x00, 0x78,
-0x0E, 0xF7, 0x90, 0x00, 0x00, 0x00, 0x00, 0x78, 0xD0, 0xC4, 0x10, 0x00, 0x00, 0x00, 0x00, 0x79,
-0xEE, 0xD9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7A, 0xB0, 0xA6, 0x10, 0x00, 0x00, 0x00, 0x00, 0x7B,
-0xCE, 0xBB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x99, 0xC2, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7D,
-0xAE, 0x9D, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x79, 0xA4, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7F,
-0x8E, 0x7F, 0x90, 0x00, 0x06, 0x01, 0x02, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
-0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
-0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
-0x05, 0x03, 0x04, 0x03, 0x05, 0x03, 0x04, 0x03, 0x05, 0x03, 0x04, 0x03, 0x05, 0x03, 0x04, 0x03,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x07, 0x02, 0x03,
 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
-0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
-0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x07, 0x02, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
-0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
-0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x0A,
-0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A,
-0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A,
-0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A,
-0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A,
-0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A,
-0x06, 0x0A, 0x06, 0xFF, 0xFF, 0xF7, 0x63, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x04, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x09, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x0E,
-0x10, 0x00, 0x12, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x12, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x16, 0x00,
-0x00, 0x0E, 0x10, 0x01, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x4C, 0x4D, 0x54, 0x00, 0x57,
-0x45, 0x53, 0x54, 0x00, 0x57, 0x45, 0x54, 0x00, 0x57, 0x45, 0x4D, 0x54, 0x00, 0x43, 0x45, 0x54,
-0x00, 0x43, 0x45, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01,
-0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x0A, 0x57,
-0x45, 0x54, 0x30, 0x57, 0x45, 0x53, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x31,
-0x2C, 0x4D, 0x31, 0x30, 0x2E, 0x35, 0x2E, 0x30, 0x0A, 0x00, 0xC4, 0x67, 0xF2, 0x01, 0x04, 0xB8,
-0xCA, 0x00, 0x00, 0x00, 0x13, 0x50, 0x6F, 0x72, 0x74, 0x75, 0x67, 0x61, 0x6C, 0x20, 0x28, 0x6D,
-0x61, 0x69, 0x6E, 0x6C, 0x61, 0x6E, 0x64, 0x29, 
+0x04, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x09, 0x0A,
+0x09, 0x0A, 0x09, 0x0A, 0x09, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08,
+0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08,
+0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08,
+0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08,
+0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08,
+0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0xFF, 0xFF, 0xF7, 0x63, 0x00, 0x00, 0x00,
+0x00, 0x0E, 0x10, 0x01, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x0E, 0x10, 0x01,
+0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x0D, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x09, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x12, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x04, 0x00,
+0x00, 0x0E, 0x10, 0x00, 0x12, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x16, 0x00, 0x00, 0x0E, 0x10, 0x01,
+0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x4C, 0x4D, 0x54, 0x00, 0x57, 0x45, 0x53, 0x54, 0x00,
+0x57, 0x45, 0x54, 0x00, 0x57, 0x45, 0x4D, 0x54, 0x00, 0x43, 0x45, 0x54, 0x00, 0x43, 0x45, 0x53,
+0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x0A, 0x57, 0x45, 0x54,
+0x30, 0x57, 0x45, 0x53, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x31, 0x2C, 0x4D,
+0x31, 0x30, 0x2E, 0x35, 0x2E, 0x30, 0x0A, 0x00, 0xC4, 0x67, 0xF2, 0x01, 0x04, 0xB8, 0xCA, 0x00,
+0x00, 0x00, 0x13, 0x50, 0x6F, 0x72, 0x74, 0x75, 0x67, 0x61, 0x6C, 0x20, 0x28, 0x6D, 0x61, 0x69,
+0x6E, 0x6C, 0x61, 0x6E, 0x64, 0x29, 
 
 /* Europe/Ljubljana */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x53, 0x49, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -64577,13 +65317,27 @@
 
 /* HST */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x04, 0xFF, 0xFF, 0x73, 0x60,
-0x00, 0x00, 0x48, 0x53, 0x54, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x04, 0xFF, 0xFF, 0x73, 0x60, 0x00, 0x00, 0x48, 0x53, 0x54, 0x00, 0x0A, 0x48, 0x53, 0x54,
-0x31, 0x30, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x14, 0x80, 0x00, 0x00, 0x00,
+0xBB, 0x05, 0x43, 0x48, 0xBB, 0x21, 0x71, 0x58, 0xCB, 0x89, 0x3D, 0xC8, 0xD2, 0x23, 0xF4, 0x70,
+0xD2, 0x61, 0x49, 0x38, 0xD5, 0x8D, 0x73, 0x48, 0x01, 0x02, 0x01, 0x03, 0x04, 0x01, 0x05, 0xFF,
+0xFF, 0x6C, 0x02, 0x00, 0x00, 0xFF, 0xFF, 0x6C, 0x58, 0x00, 0x04, 0xFF, 0xFF, 0x7A, 0x68, 0x01,
+0x08, 0xFF, 0xFF, 0x7A, 0x68, 0x01, 0x0C, 0xFF, 0xFF, 0x7A, 0x68, 0x01, 0x10, 0xFF, 0xFF, 0x73,
+0x60, 0x00, 0x04, 0x4C, 0x4D, 0x54, 0x00, 0x48, 0x53, 0x54, 0x00, 0x48, 0x44, 0x54, 0x00, 0x48,
+0x57, 0x54, 0x00, 0x48, 0x50, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x01, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x06, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x14, 0xFF,
+0xFF, 0xFF, 0xFF, 0x74, 0xE0, 0x70, 0xBE, 0xFF, 0xFF, 0xFF, 0xFF, 0xBB, 0x05, 0x43, 0x48, 0xFF,
+0xFF, 0xFF, 0xFF, 0xBB, 0x21, 0x71, 0x58, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0x89, 0x3D, 0xC8, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD2, 0x23, 0xF4, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x61, 0x49, 0x38, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD5, 0x8D, 0x73, 0x48, 0x01, 0x02, 0x01, 0x03, 0x04, 0x01, 0x05, 0xFF, 0xFF,
+0x6C, 0x02, 0x00, 0x00, 0xFF, 0xFF, 0x6C, 0x58, 0x00, 0x04, 0xFF, 0xFF, 0x7A, 0x68, 0x01, 0x08,
+0xFF, 0xFF, 0x7A, 0x68, 0x01, 0x0C, 0xFF, 0xFF, 0x7A, 0x68, 0x01, 0x10, 0xFF, 0xFF, 0x73, 0x60,
+0x00, 0x04, 0x4C, 0x4D, 0x54, 0x00, 0x48, 0x53, 0x54, 0x00, 0x48, 0x44, 0x54, 0x00, 0x48, 0x57,
+0x54, 0x00, 0x48, 0x50, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x01, 0x00, 0x0A, 0x48, 0x53, 0x54, 0x31, 0x30, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 
 
 /* Iceland */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -64758,7 +65512,7 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x47, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x1C, 0x9A, 0x6C, 0x7D, 0xC8,
 0xBF, 0x00, 0xCC, 0x48, 0x0D, 0x94, 0x44, 0x38, 0x0E, 0xAD, 0x13, 0xB8, 0x0F, 0x79, 0x73, 0x40,
-0x10, 0x28, 0xCA, 0xC0, 0x10, 0xED, 0x3A, 0x40, 0x11, 0xAD, 0xBC, 0x48, 0x12, 0x45, 0x4A, 0xB8,
+0x10, 0x28, 0xCA, 0xC0, 0x10, 0xA9, 0xFD, 0xC0, 0x11, 0xAD, 0xBC, 0x48, 0x12, 0x45, 0x4A, 0xB8,
 0x13, 0x37, 0xEC, 0xC8, 0x14, 0x2D, 0x15, 0xB8, 0x28, 0x20, 0x76, 0xC8, 0x28, 0xDB, 0x9D, 0xB8,
 0x29, 0xCB, 0x9C, 0xC8, 0x2A, 0xBE, 0x22, 0xB8, 0x2B, 0xAC, 0xD0, 0x48, 0x2C, 0x9F, 0x56, 0x38,
 0x2D, 0x8E, 0x03, 0xC8, 0x2E, 0x80, 0x89, 0xB8, 0x2F, 0x6F, 0x37, 0x48, 0x30, 0x61, 0xBD, 0x38,
@@ -64789,7 +65543,7 @@
 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x1C, 0xFF, 0xFF, 0xFF, 0xFF, 0x9A, 0x6C, 0x7D, 0xC8, 0xFF,
 0xFF, 0xFF, 0xFF, 0xBF, 0x00, 0xCC, 0x48, 0x00, 0x00, 0x00, 0x00, 0x0D, 0x94, 0x44, 0x38, 0x00,
 0x00, 0x00, 0x00, 0x0E, 0xAD, 0x13, 0xB8, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x79, 0x73, 0x40, 0x00,
-0x00, 0x00, 0x00, 0x10, 0x28, 0xCA, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x10, 0xED, 0x3A, 0x40, 0x00,
+0x00, 0x00, 0x00, 0x10, 0x28, 0xCA, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x10, 0xA9, 0xFD, 0xC0, 0x00,
 0x00, 0x00, 0x00, 0x11, 0xAD, 0xBC, 0x48, 0x00, 0x00, 0x00, 0x00, 0x12, 0x45, 0x4A, 0xB8, 0x00,
 0x00, 0x00, 0x00, 0x13, 0x37, 0xEC, 0xC8, 0x00, 0x00, 0x00, 0x00, 0x14, 0x2D, 0x15, 0xB8, 0x00,
 0x00, 0x00, 0x00, 0x28, 0x20, 0x76, 0xC8, 0x00, 0x00, 0x00, 0x00, 0x28, 0xDB, 0x9D, 0xB8, 0x00,
@@ -65109,12 +65863,24 @@
 
 /* MET */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x88, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x09, 0x9B, 0x0C, 0x17, 0x60,
-0x9B, 0xD5, 0xDA, 0xF0, 0x9C, 0xD9, 0xAE, 0x90, 0x9D, 0xA4, 0xB5, 0x90, 0x9E, 0xB9, 0x90, 0x90,
-0x9F, 0x84, 0x97, 0x90, 0xC8, 0x09, 0x71, 0x90, 0xCC, 0xE7, 0x4B, 0x10, 0xCD, 0xA9, 0x17, 0x90,
-0xCE, 0xA2, 0x43, 0x10, 0xCF, 0x92, 0x34, 0x10, 0xD0, 0x82, 0x25, 0x10, 0xD1, 0x72, 0x16, 0x10,
-0xD2, 0x4E, 0x40, 0x90, 0x0D, 0xA4, 0x63, 0x90, 0x0E, 0x8B, 0x1A, 0x10, 0x0F, 0x84, 0x45, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0xB8, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x16, 0x80, 0x00, 0x00, 0x00,
+0x98, 0x44, 0x49, 0x80, 0x9B, 0x0C, 0x25, 0x70, 0x9B, 0xD5, 0xDA, 0xF0, 0x9C, 0xD9, 0xAE, 0x90,
+0x9D, 0xA4, 0xB5, 0x90, 0x9E, 0xB9, 0x90, 0x90, 0x9F, 0x84, 0x97, 0x90, 0x9F, 0xCE, 0xF8, 0x30,
+0xA0, 0x60, 0xA5, 0xF0, 0xA1, 0x7E, 0xBB, 0x70, 0xA2, 0x2E, 0x12, 0xF0, 0xA3, 0x7A, 0x4C, 0xF0,
+0xA4, 0x35, 0x81, 0xF0, 0xA5, 0x5E, 0x23, 0x70, 0xA6, 0x25, 0x35, 0xF0, 0xA7, 0x27, 0x9B, 0xF0,
+0xA8, 0x2A, 0x01, 0xF0, 0xA9, 0x07, 0x7D, 0xF0, 0xA9, 0xEE, 0x34, 0x70, 0xAA, 0xE7, 0x5F, 0xF0,
+0xAB, 0xD7, 0x50, 0xF0, 0xAC, 0xC7, 0x41, 0xF0, 0xAD, 0xC9, 0xA7, 0xF0, 0xAE, 0xA7, 0x23, 0xF0,
+0xAF, 0xA0, 0x4F, 0x70, 0xB0, 0x87, 0x05, 0xF0, 0xB1, 0x89, 0x6B, 0xF0, 0xB2, 0x70, 0x4C, 0xA0,
+0xB3, 0x72, 0xB2, 0xA0, 0xB4, 0x50, 0x2E, 0xA0, 0xB5, 0x49, 0x5A, 0x20, 0xB6, 0x30, 0x10, 0xA0,
+0xB7, 0x32, 0x76, 0xA0, 0xB8, 0x0F, 0xF2, 0xA0, 0xB8, 0xFF, 0xE3, 0xA0, 0xB9, 0xEF, 0xD4, 0xA0,
+0xBA, 0xD6, 0x8B, 0x20, 0xBB, 0xD8, 0xF1, 0x20, 0xBC, 0xC8, 0xE2, 0x20, 0xBD, 0xB8, 0xD3, 0x20,
+0xBE, 0x9F, 0x89, 0xA0, 0xBF, 0x98, 0xB5, 0x20, 0xC0, 0x9B, 0x1B, 0x20, 0xC1, 0x78, 0x97, 0x20,
+0xC2, 0x68, 0x88, 0x20, 0xC3, 0x58, 0x79, 0x20, 0xC4, 0x3F, 0x2F, 0xA0, 0xC5, 0x38, 0x5B, 0x20,
+0xC6, 0x3A, 0xC1, 0x20, 0xC7, 0x58, 0xD6, 0xA0, 0xC7, 0xDA, 0x09, 0xA0, 0xC8, 0x4A, 0x19, 0x20,
+0xCC, 0xE7, 0x4B, 0x10, 0xCD, 0xA9, 0x17, 0x90, 0xCE, 0xA2, 0x43, 0x10, 0xCF, 0x92, 0x34, 0x10,
+0xD0, 0x6E, 0x5E, 0x90, 0xD1, 0x72, 0x16, 0x10, 0xD2, 0x4E, 0x40, 0x90, 0xD3, 0x91, 0x40, 0x10,
+0xD4, 0x4B, 0x23, 0x90, 0x0D, 0xA4, 0x63, 0x90, 0x0E, 0x8B, 0x1A, 0x10, 0x0F, 0x84, 0x45, 0x90,
 0x10, 0x74, 0x36, 0x90, 0x11, 0x64, 0x27, 0x90, 0x12, 0x54, 0x18, 0x90, 0x13, 0x4D, 0x44, 0x10,
 0x14, 0x33, 0xFA, 0x90, 0x15, 0x23, 0xEB, 0x90, 0x16, 0x13, 0xDC, 0x90, 0x17, 0x03, 0xCD, 0x90,
 0x17, 0xF3, 0xBE, 0x90, 0x18, 0xE3, 0xAF, 0x90, 0x19, 0xD3, 0xA0, 0x90, 0x1A, 0xC3, 0x91, 0x90,
@@ -65144,145 +65910,187 @@
 0x72, 0x66, 0x17, 0x10, 0x73, 0x31, 0x1E, 0x10, 0x74, 0x45, 0xF9, 0x10, 0x75, 0x11, 0x00, 0x10,
 0x76, 0x2F, 0x15, 0x90, 0x76, 0xF0, 0xE2, 0x10, 0x78, 0x0E, 0xF7, 0x90, 0x78, 0xD0, 0xC4, 0x10,
 0x79, 0xEE, 0xD9, 0x90, 0x7A, 0xB0, 0xA6, 0x10, 0x7B, 0xCE, 0xBB, 0x90, 0x7C, 0x99, 0xC2, 0x90,
-0x7D, 0xAE, 0x9D, 0x90, 0x7E, 0x79, 0xA4, 0x90, 0x7F, 0x8E, 0x7F, 0x90, 0x01, 0x00, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x05, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x00,
-0x00, 0x00, 0x1C, 0x20, 0x01, 0x00, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x05, 0x4D, 0x45, 0x53, 0x54,
-0x00, 0x4D, 0x45, 0x54, 0x00, 0x00, 0x00, 0x01, 0x01, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, 0x00, 0x00, 0x00,
-0x04, 0x00, 0x00, 0x00, 0x09, 0xFF, 0xFF, 0xFF, 0xFF, 0x9B, 0x0C, 0x17, 0x60, 0xFF, 0xFF, 0xFF,
-0xFF, 0x9B, 0xD5, 0xDA, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0x9C, 0xD9, 0xAE, 0x90, 0xFF, 0xFF, 0xFF,
-0xFF, 0x9D, 0xA4, 0xB5, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0x9E, 0xB9, 0x90, 0x90, 0xFF, 0xFF, 0xFF,
-0xFF, 0x9F, 0x84, 0x97, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xC8, 0x09, 0x71, 0x90, 0xFF, 0xFF, 0xFF,
-0xFF, 0xCC, 0xE7, 0x4B, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xCD, 0xA9, 0x17, 0x90, 0xFF, 0xFF, 0xFF,
-0xFF, 0xCE, 0xA2, 0x43, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xCF, 0x92, 0x34, 0x10, 0xFF, 0xFF, 0xFF,
-0xFF, 0xD0, 0x82, 0x25, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xD1, 0x72, 0x16, 0x10, 0xFF, 0xFF, 0xFF,
-0xFF, 0xD2, 0x4E, 0x40, 0x90, 0x00, 0x00, 0x00, 0x00, 0x0D, 0xA4, 0x63, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x0E, 0x8B, 0x1A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x84, 0x45, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x10, 0x74, 0x36, 0x90, 0x00, 0x00, 0x00, 0x00, 0x11, 0x64, 0x27, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x12, 0x54, 0x18, 0x90, 0x00, 0x00, 0x00, 0x00, 0x13, 0x4D, 0x44, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x14, 0x33, 0xFA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x15, 0x23, 0xEB, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x16, 0x13, 0xDC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x17, 0x03, 0xCD, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x17, 0xF3, 0xBE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x18, 0xE3, 0xAF, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x19, 0xD3, 0xA0, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xC3, 0x91, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x1B, 0xBC, 0xBD, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xAC, 0xAE, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x1D, 0x9C, 0x9F, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x8C, 0x90, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x1F, 0x7C, 0x81, 0x10, 0x00, 0x00, 0x00, 0x00, 0x20, 0x6C, 0x72, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x21, 0x5C, 0x63, 0x10, 0x00, 0x00, 0x00, 0x00, 0x22, 0x4C, 0x54, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x23, 0x3C, 0x45, 0x10, 0x00, 0x00, 0x00, 0x00, 0x24, 0x2C, 0x36, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x25, 0x1C, 0x27, 0x10, 0x00, 0x00, 0x00, 0x00, 0x26, 0x0C, 0x18, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x27, 0x05, 0x43, 0x90, 0x00, 0x00, 0x00, 0x00, 0x27, 0xF5, 0x34, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x28, 0xE5, 0x25, 0x90, 0x00, 0x00, 0x00, 0x00, 0x29, 0xD5, 0x16, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x2A, 0xC5, 0x07, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xB4, 0xF8, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x2C, 0xA4, 0xE9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x94, 0xDA, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x2E, 0x84, 0xCB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x74, 0xBC, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x30, 0x64, 0xAD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x31, 0x5D, 0xD9, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x32, 0x72, 0xB4, 0x10, 0x00, 0x00, 0x00, 0x00, 0x33, 0x3D, 0xBB, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x34, 0x52, 0x96, 0x10, 0x00, 0x00, 0x00, 0x00, 0x35, 0x1D, 0x9D, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x36, 0x32, 0x78, 0x10, 0x00, 0x00, 0x00, 0x00, 0x36, 0xFD, 0x7F, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x38, 0x1B, 0x94, 0x90, 0x00, 0x00, 0x00, 0x00, 0x38, 0xDD, 0x61, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x39, 0xFB, 0x76, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xBD, 0x43, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x3B, 0xDB, 0x58, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xA6, 0x5F, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x3D, 0xBB, 0x3A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x86, 0x41, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x3F, 0x9B, 0x1C, 0x90, 0x00, 0x00, 0x00, 0x00, 0x40, 0x66, 0x23, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x41, 0x84, 0x39, 0x10, 0x00, 0x00, 0x00, 0x00, 0x42, 0x46, 0x05, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x43, 0x64, 0x1B, 0x10, 0x00, 0x00, 0x00, 0x00, 0x44, 0x25, 0xE7, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x45, 0x43, 0xFD, 0x10, 0x00, 0x00, 0x00, 0x00, 0x46, 0x05, 0xC9, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x47, 0x23, 0xDF, 0x10, 0x00, 0x00, 0x00, 0x00, 0x47, 0xEE, 0xE6, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x49, 0x03, 0xC1, 0x10, 0x00, 0x00, 0x00, 0x00, 0x49, 0xCE, 0xC8, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x4A, 0xE3, 0xA3, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4B, 0xAE, 0xAA, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x4C, 0xCC, 0xBF, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x8E, 0x8C, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x4E, 0xAC, 0xA1, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x6E, 0x6E, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x50, 0x8C, 0x83, 0x90, 0x00, 0x00, 0x00, 0x00, 0x51, 0x57, 0x8A, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x52, 0x6C, 0x65, 0x90, 0x00, 0x00, 0x00, 0x00, 0x53, 0x37, 0x6C, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x54, 0x4C, 0x47, 0x90, 0x00, 0x00, 0x00, 0x00, 0x55, 0x17, 0x4E, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x56, 0x2C, 0x29, 0x90, 0x00, 0x00, 0x00, 0x00, 0x56, 0xF7, 0x30, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x58, 0x15, 0x46, 0x10, 0x00, 0x00, 0x00, 0x00, 0x58, 0xD7, 0x12, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x59, 0xF5, 0x28, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xB6, 0xF4, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x5B, 0xD5, 0x0A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5C, 0xA0, 0x11, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x5D, 0xB4, 0xEC, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x7F, 0xF3, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x5F, 0x94, 0xCE, 0x10, 0x00, 0x00, 0x00, 0x00, 0x60, 0x5F, 0xD5, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x61, 0x7D, 0xEA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x62, 0x3F, 0xB7, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x63, 0x5D, 0xCC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x64, 0x1F, 0x99, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x65, 0x3D, 0xAE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x66, 0x08, 0xB5, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x67, 0x1D, 0x90, 0x90, 0x00, 0x00, 0x00, 0x00, 0x67, 0xE8, 0x97, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x68, 0xFD, 0x72, 0x90, 0x00, 0x00, 0x00, 0x00, 0x69, 0xC8, 0x79, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x6A, 0xDD, 0x54, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6B, 0xA8, 0x5B, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x6C, 0xC6, 0x71, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6D, 0x88, 0x3D, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x6E, 0xA6, 0x53, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6F, 0x68, 0x1F, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x70, 0x86, 0x35, 0x10, 0x00, 0x00, 0x00, 0x00, 0x71, 0x51, 0x3C, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x72, 0x66, 0x17, 0x10, 0x00, 0x00, 0x00, 0x00, 0x73, 0x31, 0x1E, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x74, 0x45, 0xF9, 0x10, 0x00, 0x00, 0x00, 0x00, 0x75, 0x11, 0x00, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x76, 0x2F, 0x15, 0x90, 0x00, 0x00, 0x00, 0x00, 0x76, 0xF0, 0xE2, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x78, 0x0E, 0xF7, 0x90, 0x00, 0x00, 0x00, 0x00, 0x78, 0xD0, 0xC4, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x79, 0xEE, 0xD9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7A, 0xB0, 0xA6, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x7B, 0xCE, 0xBB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x99, 0xC2, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x7D, 0xAE, 0x9D, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x79, 0xA4, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x7F, 0x8E, 0x7F, 0x90, 0x01, 0x00, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
-0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
-0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
-0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
-0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
-0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
-0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
-0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
-0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x00, 0x00, 0x0E,
-0x10, 0x00, 0x05, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x00, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x00, 0x00,
-0x00, 0x0E, 0x10, 0x00, 0x05, 0x4D, 0x45, 0x53, 0x54, 0x00, 0x4D, 0x45, 0x54, 0x00, 0x00, 0x00,
-0x01, 0x01, 0x0A, 0x4D, 0x45, 0x54, 0x2D, 0x31, 0x4D, 0x45, 0x53, 0x54, 0x2C, 0x4D, 0x33, 0x2E,
-0x35, 0x2E, 0x30, 0x2C, 0x4D, 0x31, 0x30, 0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x33, 0x0A, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x7D, 0xAE, 0x9D, 0x90, 0x7E, 0x79, 0xA4, 0x90, 0x7F, 0x8E, 0x7F, 0x90, 0x01, 0x02, 0x05, 0x02,
+0x03, 0x04, 0x03, 0x04, 0x08, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06,
+0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06,
+0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A,
+0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A,
+0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A,
+0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A,
+0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A,
+0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A,
+0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A,
+0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A,
+0x09, 0x0A, 0x09, 0x0A, 0x00, 0x00, 0x04, 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04,
+0x00, 0x00, 0x0E, 0x10, 0x00, 0x08, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x0C, 0x00, 0x00, 0x0E, 0x10,
+0x00, 0x08, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x0C, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x11, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x0C,
+0x00, 0x00, 0x0E, 0x10, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x57, 0x45, 0x54, 0x00, 0x43, 0x45,
+0x54, 0x00, 0x43, 0x45, 0x53, 0x54, 0x00, 0x57, 0x45, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01,
+0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
+0x01, 0x01, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0xB9, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x1A, 0xFF, 0xFF,
+0xFF, 0xFF, 0x56, 0xB6, 0xDF, 0xE6, 0xFF, 0xFF, 0xFF, 0xFF, 0x6D, 0xE8, 0xC8, 0x00, 0xFF, 0xFF,
+0xFF, 0xFF, 0x98, 0x44, 0x49, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0x9B, 0x0C, 0x25, 0x70, 0xFF, 0xFF,
+0xFF, 0xFF, 0x9B, 0xD5, 0xDA, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0x9C, 0xD9, 0xAE, 0x90, 0xFF, 0xFF,
+0xFF, 0xFF, 0x9D, 0xA4, 0xB5, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0x9E, 0xB9, 0x90, 0x90, 0xFF, 0xFF,
+0xFF, 0xFF, 0x9F, 0x84, 0x97, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0x9F, 0xCE, 0xF8, 0x30, 0xFF, 0xFF,
+0xFF, 0xFF, 0xA0, 0x60, 0xA5, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xA1, 0x7E, 0xBB, 0x70, 0xFF, 0xFF,
+0xFF, 0xFF, 0xA2, 0x2E, 0x12, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xA3, 0x7A, 0x4C, 0xF0, 0xFF, 0xFF,
+0xFF, 0xFF, 0xA4, 0x35, 0x81, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0x5E, 0x23, 0x70, 0xFF, 0xFF,
+0xFF, 0xFF, 0xA6, 0x25, 0x35, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xA7, 0x27, 0x9B, 0xF0, 0xFF, 0xFF,
+0xFF, 0xFF, 0xA8, 0x2A, 0x01, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xA9, 0x07, 0x7D, 0xF0, 0xFF, 0xFF,
+0xFF, 0xFF, 0xA9, 0xEE, 0x34, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAA, 0xE7, 0x5F, 0xF0, 0xFF, 0xFF,
+0xFF, 0xFF, 0xAB, 0xD7, 0x50, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xAC, 0xC7, 0x41, 0xF0, 0xFF, 0xFF,
+0xFF, 0xFF, 0xAD, 0xC9, 0xA7, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xAE, 0xA7, 0x23, 0xF0, 0xFF, 0xFF,
+0xFF, 0xFF, 0xAF, 0xA0, 0x4F, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB0, 0x87, 0x05, 0xF0, 0xFF, 0xFF,
+0xFF, 0xFF, 0xB1, 0x89, 0x6B, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB2, 0x70, 0x4C, 0xA0, 0xFF, 0xFF,
+0xFF, 0xFF, 0xB3, 0x72, 0xB2, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB4, 0x50, 0x2E, 0xA0, 0xFF, 0xFF,
+0xFF, 0xFF, 0xB5, 0x49, 0x5A, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xB6, 0x30, 0x10, 0xA0, 0xFF, 0xFF,
+0xFF, 0xFF, 0xB7, 0x32, 0x76, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0x0F, 0xF2, 0xA0, 0xFF, 0xFF,
+0xFF, 0xFF, 0xB8, 0xFF, 0xE3, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB9, 0xEF, 0xD4, 0xA0, 0xFF, 0xFF,
+0xFF, 0xFF, 0xBA, 0xD6, 0x8B, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xBB, 0xD8, 0xF1, 0x20, 0xFF, 0xFF,
+0xFF, 0xFF, 0xBC, 0xC8, 0xE2, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xBD, 0xB8, 0xD3, 0x20, 0xFF, 0xFF,
+0xFF, 0xFF, 0xBE, 0x9F, 0x89, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xBF, 0x98, 0xB5, 0x20, 0xFF, 0xFF,
+0xFF, 0xFF, 0xC0, 0x9B, 0x1B, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xC1, 0x78, 0x97, 0x20, 0xFF, 0xFF,
+0xFF, 0xFF, 0xC2, 0x68, 0x88, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xC3, 0x58, 0x79, 0x20, 0xFF, 0xFF,
+0xFF, 0xFF, 0xC4, 0x3F, 0x2F, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC5, 0x38, 0x5B, 0x20, 0xFF, 0xFF,
+0xFF, 0xFF, 0xC6, 0x3A, 0xC1, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xC7, 0x58, 0xD6, 0xA0, 0xFF, 0xFF,
+0xFF, 0xFF, 0xC7, 0xDA, 0x09, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC8, 0x4A, 0x19, 0x20, 0xFF, 0xFF,
+0xFF, 0xFF, 0xCC, 0xE7, 0x4B, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xCD, 0xA9, 0x17, 0x90, 0xFF, 0xFF,
+0xFF, 0xFF, 0xCE, 0xA2, 0x43, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xCF, 0x92, 0x34, 0x10, 0xFF, 0xFF,
+0xFF, 0xFF, 0xD0, 0x6E, 0x5E, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xD1, 0x72, 0x16, 0x10, 0xFF, 0xFF,
+0xFF, 0xFF, 0xD2, 0x4E, 0x40, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xD3, 0x91, 0x40, 0x10, 0xFF, 0xFF,
+0xFF, 0xFF, 0xD4, 0x4B, 0x23, 0x90, 0x00, 0x00, 0x00, 0x00, 0x0D, 0xA4, 0x63, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x0E, 0x8B, 0x1A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x84, 0x45, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x10, 0x74, 0x36, 0x90, 0x00, 0x00, 0x00, 0x00, 0x11, 0x64, 0x27, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x12, 0x54, 0x18, 0x90, 0x00, 0x00, 0x00, 0x00, 0x13, 0x4D, 0x44, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x14, 0x33, 0xFA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x15, 0x23, 0xEB, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x16, 0x13, 0xDC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x17, 0x03, 0xCD, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x17, 0xF3, 0xBE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x18, 0xE3, 0xAF, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x19, 0xD3, 0xA0, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xC3, 0x91, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x1B, 0xBC, 0xBD, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xAC, 0xAE, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x1D, 0x9C, 0x9F, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x8C, 0x90, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x1F, 0x7C, 0x81, 0x10, 0x00, 0x00, 0x00, 0x00, 0x20, 0x6C, 0x72, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x21, 0x5C, 0x63, 0x10, 0x00, 0x00, 0x00, 0x00, 0x22, 0x4C, 0x54, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x23, 0x3C, 0x45, 0x10, 0x00, 0x00, 0x00, 0x00, 0x24, 0x2C, 0x36, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x25, 0x1C, 0x27, 0x10, 0x00, 0x00, 0x00, 0x00, 0x26, 0x0C, 0x18, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x27, 0x05, 0x43, 0x90, 0x00, 0x00, 0x00, 0x00, 0x27, 0xF5, 0x34, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x28, 0xE5, 0x25, 0x90, 0x00, 0x00, 0x00, 0x00, 0x29, 0xD5, 0x16, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x2A, 0xC5, 0x07, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xB4, 0xF8, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x2C, 0xA4, 0xE9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x94, 0xDA, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x2E, 0x84, 0xCB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x74, 0xBC, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x30, 0x64, 0xAD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x31, 0x5D, 0xD9, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x32, 0x72, 0xB4, 0x10, 0x00, 0x00, 0x00, 0x00, 0x33, 0x3D, 0xBB, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x34, 0x52, 0x96, 0x10, 0x00, 0x00, 0x00, 0x00, 0x35, 0x1D, 0x9D, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x36, 0x32, 0x78, 0x10, 0x00, 0x00, 0x00, 0x00, 0x36, 0xFD, 0x7F, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x38, 0x1B, 0x94, 0x90, 0x00, 0x00, 0x00, 0x00, 0x38, 0xDD, 0x61, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x39, 0xFB, 0x76, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xBD, 0x43, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x3B, 0xDB, 0x58, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xA6, 0x5F, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x3D, 0xBB, 0x3A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x86, 0x41, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x3F, 0x9B, 0x1C, 0x90, 0x00, 0x00, 0x00, 0x00, 0x40, 0x66, 0x23, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x41, 0x84, 0x39, 0x10, 0x00, 0x00, 0x00, 0x00, 0x42, 0x46, 0x05, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x43, 0x64, 0x1B, 0x10, 0x00, 0x00, 0x00, 0x00, 0x44, 0x25, 0xE7, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x45, 0x43, 0xFD, 0x10, 0x00, 0x00, 0x00, 0x00, 0x46, 0x05, 0xC9, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x47, 0x23, 0xDF, 0x10, 0x00, 0x00, 0x00, 0x00, 0x47, 0xEE, 0xE6, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x49, 0x03, 0xC1, 0x10, 0x00, 0x00, 0x00, 0x00, 0x49, 0xCE, 0xC8, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x4A, 0xE3, 0xA3, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4B, 0xAE, 0xAA, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x4C, 0xCC, 0xBF, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x8E, 0x8C, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x4E, 0xAC, 0xA1, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x6E, 0x6E, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x50, 0x8C, 0x83, 0x90, 0x00, 0x00, 0x00, 0x00, 0x51, 0x57, 0x8A, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x52, 0x6C, 0x65, 0x90, 0x00, 0x00, 0x00, 0x00, 0x53, 0x37, 0x6C, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x54, 0x4C, 0x47, 0x90, 0x00, 0x00, 0x00, 0x00, 0x55, 0x17, 0x4E, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x56, 0x2C, 0x29, 0x90, 0x00, 0x00, 0x00, 0x00, 0x56, 0xF7, 0x30, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x58, 0x15, 0x46, 0x10, 0x00, 0x00, 0x00, 0x00, 0x58, 0xD7, 0x12, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x59, 0xF5, 0x28, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xB6, 0xF4, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x5B, 0xD5, 0x0A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5C, 0xA0, 0x11, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x5D, 0xB4, 0xEC, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x7F, 0xF3, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x5F, 0x94, 0xCE, 0x10, 0x00, 0x00, 0x00, 0x00, 0x60, 0x5F, 0xD5, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x61, 0x7D, 0xEA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x62, 0x3F, 0xB7, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x63, 0x5D, 0xCC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x64, 0x1F, 0x99, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x65, 0x3D, 0xAE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x66, 0x08, 0xB5, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x67, 0x1D, 0x90, 0x90, 0x00, 0x00, 0x00, 0x00, 0x67, 0xE8, 0x97, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x68, 0xFD, 0x72, 0x90, 0x00, 0x00, 0x00, 0x00, 0x69, 0xC8, 0x79, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x6A, 0xDD, 0x54, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6B, 0xA8, 0x5B, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x6C, 0xC6, 0x71, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6D, 0x88, 0x3D, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x6E, 0xA6, 0x53, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6F, 0x68, 0x1F, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x70, 0x86, 0x35, 0x10, 0x00, 0x00, 0x00, 0x00, 0x71, 0x51, 0x3C, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x72, 0x66, 0x17, 0x10, 0x00, 0x00, 0x00, 0x00, 0x73, 0x31, 0x1E, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x74, 0x45, 0xF9, 0x10, 0x00, 0x00, 0x00, 0x00, 0x75, 0x11, 0x00, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x76, 0x2F, 0x15, 0x90, 0x00, 0x00, 0x00, 0x00, 0x76, 0xF0, 0xE2, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x78, 0x0E, 0xF7, 0x90, 0x00, 0x00, 0x00, 0x00, 0x78, 0xD0, 0xC4, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x79, 0xEE, 0xD9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7A, 0xB0, 0xA6, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x7B, 0xCE, 0xBB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x99, 0xC2, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x7D, 0xAE, 0x9D, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x79, 0xA4, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x7F, 0x8E, 0x7F, 0x90, 0x01, 0x02, 0x03, 0x06, 0x03, 0x04, 0x05, 0x04, 0x05, 0x09,
+0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08,
+0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08,
+0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x04, 0x05, 0x04, 0x05, 0x04,
+0x05, 0x04, 0x05, 0x04, 0x05, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A,
+0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A,
+0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A,
+0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A,
+0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A,
+0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A,
+0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A,
+0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x00,
+0x00, 0x04, 0x1A, 0x00, 0x00, 0x00, 0x00, 0x04, 0x1A, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x08, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x0C, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x10, 0x00, 0x00, 0x0E,
+0x10, 0x00, 0x0C, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x10, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x15, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x1C, 0x20, 0x01,
+0x10, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x0C, 0x4C, 0x4D, 0x54, 0x00, 0x42, 0x4D, 0x54, 0x00, 0x57,
+0x45, 0x54, 0x00, 0x43, 0x45, 0x54, 0x00, 0x43, 0x45, 0x53, 0x54, 0x00, 0x57, 0x45, 0x53, 0x54,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x0A, 0x43, 0x45, 0x54, 0x2D, 0x31, 0x43,
+0x45, 0x53, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x35, 0x2E, 0x30, 0x2C, 0x4D, 0x31, 0x30, 0x2E, 0x35,
+0x2E, 0x30, 0x2F, 0x33, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 
 
 /* Mexico/BajaNorte */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x95, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x18, 0xA5, 0xB6, 0xE8, 0x70,
-0xA9, 0x79, 0x4F, 0x70, 0xAF, 0xF2, 0x7C, 0xF0, 0xB6, 0x66, 0x64, 0x70, 0xB7, 0x1B, 0x10, 0x00,
-0xB8, 0x0A, 0xF2, 0xF0, 0xCB, 0xEA, 0x8D, 0x80, 0xD2, 0x23, 0xF4, 0x70, 0xD2, 0x99, 0xBA, 0x70,
-0xD7, 0x1B, 0x59, 0x00, 0xD8, 0x91, 0xB4, 0xF0, 0xE2, 0x7E, 0x4B, 0x90, 0xE3, 0x49, 0x52, 0x90,
-0xE4, 0x5E, 0x2D, 0x90, 0xE5, 0x29, 0x34, 0x90, 0xE6, 0x47, 0x4A, 0x10, 0xE7, 0x12, 0x51, 0x10,
-0xE8, 0x27, 0x2C, 0x10, 0xE8, 0xF2, 0x33, 0x10, 0xEA, 0x07, 0x0E, 0x10, 0xEA, 0xD2, 0x15, 0x10,
-0xEB, 0xE6, 0xF0, 0x10, 0xEC, 0xB1, 0xF7, 0x10, 0xED, 0xC6, 0xD2, 0x10, 0xEE, 0x91, 0xD9, 0x10,
-0x0B, 0xE0, 0xAF, 0xA0, 0x0C, 0xD9, 0xCD, 0x10, 0x0D, 0xC0, 0x91, 0xA0, 0x0E, 0xB9, 0xAF, 0x10,
-0x0F, 0xA9, 0xAE, 0x20, 0x10, 0x99, 0x91, 0x10, 0x11, 0x89, 0x90, 0x20, 0x12, 0x79, 0x73, 0x10,
-0x13, 0x69, 0x72, 0x20, 0x14, 0x59, 0x55, 0x10, 0x15, 0x49, 0x54, 0x20, 0x16, 0x39, 0x37, 0x10,
-0x17, 0x29, 0x36, 0x20, 0x18, 0x22, 0x53, 0x90, 0x19, 0x09, 0x18, 0x20, 0x1A, 0x02, 0x35, 0x90,
-0x1A, 0xF2, 0x34, 0xA0, 0x1B, 0xE2, 0x17, 0x90, 0x1C, 0xD2, 0x16, 0xA0, 0x1D, 0xC1, 0xF9, 0x90,
-0x1E, 0xB1, 0xF8, 0xA0, 0x1F, 0xA1, 0xDB, 0x90, 0x20, 0x76, 0x2B, 0x20, 0x21, 0x81, 0xBD, 0x90,
-0x22, 0x56, 0x0D, 0x20, 0x23, 0x6A, 0xDA, 0x10, 0x24, 0x35, 0xEF, 0x20, 0x25, 0x4A, 0xBC, 0x10,
-0x26, 0x15, 0xD1, 0x20, 0x27, 0x2A, 0x9E, 0x10, 0x27, 0xFE, 0xED, 0xA0, 0x29, 0x0A, 0x80, 0x10,
-0x29, 0xDE, 0xCF, 0xA0, 0x2A, 0xEA, 0x62, 0x10, 0x2B, 0xBE, 0xB1, 0xA0, 0x2C, 0xD3, 0x7E, 0x90,
-0x2D, 0x9E, 0x93, 0xA0, 0x2E, 0xB3, 0x60, 0x90, 0x2F, 0x7E, 0x75, 0xA0, 0x30, 0x93, 0x42, 0x90,
-0x31, 0x67, 0x92, 0x20, 0x32, 0x73, 0x24, 0x90, 0x33, 0x47, 0x74, 0x20, 0x34, 0x53, 0x06, 0x90,
-0x35, 0x27, 0x56, 0x20, 0x36, 0x32, 0xE8, 0x90, 0x37, 0x07, 0x38, 0x20, 0x38, 0x1C, 0x05, 0x10,
-0x38, 0xE7, 0x1A, 0x20, 0x39, 0xFB, 0xE7, 0x10, 0x3A, 0xC6, 0xFC, 0x20, 0x3B, 0xDB, 0xC9, 0x10,
-0x3C, 0xB0, 0x18, 0xA0, 0x3D, 0xBB, 0xAB, 0x10, 0x3E, 0x8F, 0xFA, 0xA0, 0x3F, 0x9B, 0x8D, 0x10,
-0x40, 0x6F, 0xDC, 0xA0, 0x41, 0x84, 0xA9, 0x90, 0x42, 0x4F, 0xBE, 0xA0, 0x43, 0x64, 0x8B, 0x90,
-0x44, 0x2F, 0xA0, 0xA0, 0x45, 0x44, 0x6D, 0x90, 0x46, 0x0F, 0x82, 0xA0, 0x47, 0x24, 0x4F, 0x90,
-0x47, 0xF8, 0x9F, 0x20, 0x49, 0x04, 0x31, 0x90, 0x49, 0xD8, 0x81, 0x20, 0x4A, 0xE4, 0x13, 0x90,
-0x4B, 0x9C, 0xB3, 0xA0, 0x4C, 0xD6, 0x6A, 0x90, 0x4D, 0x7C, 0x95, 0xA0, 0x4E, 0xB6, 0x4C, 0x90,
-0x4F, 0x5C, 0x77, 0xA0, 0x50, 0x96, 0x2E, 0x90, 0x51, 0x3C, 0x59, 0xA0, 0x52, 0x76, 0x10, 0x90,
-0x53, 0x1C, 0x3B, 0xA0, 0x54, 0x55, 0xF2, 0x90, 0x54, 0xFC, 0x1D, 0xA0, 0x56, 0x35, 0xD4, 0x90,
-0x56, 0xE5, 0x3A, 0x20, 0x58, 0x1E, 0xF1, 0x10, 0x58, 0xC5, 0x1C, 0x20, 0x59, 0xFE, 0xD3, 0x10,
-0x5A, 0xA4, 0xFE, 0x20, 0x5B, 0xDE, 0xB5, 0x10, 0x5C, 0x84, 0xE0, 0x20, 0x5D, 0xBE, 0x97, 0x10,
-0x5E, 0x64, 0xC2, 0x20, 0x5F, 0x9E, 0x79, 0x10, 0x60, 0x4D, 0xDE, 0xA0, 0x61, 0x87, 0x95, 0x90,
-0x62, 0x2D, 0xC0, 0xA0, 0x63, 0x67, 0x77, 0x90, 0x64, 0x0D, 0xA2, 0xA0, 0x65, 0x47, 0x59, 0x90,
-0x65, 0xED, 0x84, 0xA0, 0x67, 0x27, 0x3B, 0x90, 0x67, 0xCD, 0x66, 0xA0, 0x69, 0x07, 0x1D, 0x90,
-0x69, 0xAD, 0x48, 0xA0, 0x6A, 0xE6, 0xFF, 0x90, 0x6B, 0x96, 0x65, 0x20, 0x6C, 0xD0, 0x1C, 0x10,
-0x6D, 0x76, 0x47, 0x20, 0x6E, 0xAF, 0xFE, 0x10, 0x6F, 0x56, 0x29, 0x20, 0x70, 0x8F, 0xE0, 0x10,
-0x71, 0x36, 0x0B, 0x20, 0x72, 0x6F, 0xC2, 0x10, 0x73, 0x15, 0xED, 0x20, 0x74, 0x4F, 0xA4, 0x10,
-0x74, 0xFF, 0x09, 0xA0, 0x76, 0x38, 0xC0, 0x90, 0x76, 0xDE, 0xEB, 0xA0, 0x78, 0x18, 0xA2, 0x90,
-0x78, 0xBE, 0xCD, 0xA0, 0x79, 0xF8, 0x84, 0x90, 0x7A, 0x9E, 0xAF, 0xA0, 0x7B, 0xD8, 0x66, 0x90,
-0x7C, 0x7E, 0x91, 0xA0, 0x7D, 0xB8, 0x48, 0x90, 0x7E, 0x5E, 0x73, 0xA0, 0x7F, 0x98, 0x2A, 0x90,
-0x01, 0x02, 0x03, 0x02, 0x04, 0x02, 0x05, 0x06, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
+0x00, 0x00, 0x00, 0x9B, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x18, 0xA5, 0xB6, 0xE8, 0x70,
+0xA9, 0x79, 0x4F, 0x70, 0xAF, 0xF1, 0x39, 0x80, 0xB6, 0x66, 0x64, 0x70, 0xB7, 0x1B, 0x10, 0x00,
+0xB8, 0x0A, 0xF2, 0xF0, 0xCB, 0xEA, 0x8D, 0x80, 0xD2, 0x23, 0xF4, 0x70, 0xD2, 0x9D, 0xAE, 0xF0,
+0xD7, 0x1B, 0x59, 0x00, 0xD8, 0x91, 0xB4, 0xF0, 0xDB, 0x00, 0x07, 0x00, 0xDB, 0xC0, 0x73, 0xF0,
+0xDC, 0xDE, 0xB3, 0xA0, 0xDD, 0xA9, 0xAC, 0x90, 0xDE, 0xBE, 0x95, 0xA0, 0xDF, 0x89, 0x8E, 0x90,
+0xE2, 0x7E, 0x4B, 0x90, 0xE3, 0x49, 0x52, 0x90, 0xE4, 0x5E, 0x2D, 0x90, 0xE5, 0x29, 0x34, 0x90,
+0xE6, 0x47, 0x4A, 0x10, 0xE7, 0x12, 0x51, 0x10, 0xE8, 0x27, 0x2C, 0x10, 0xE8, 0xF2, 0x33, 0x10,
+0xEA, 0x07, 0x0E, 0x10, 0xEA, 0xD2, 0x15, 0x10, 0xEB, 0xE6, 0xF0, 0x10, 0xEC, 0xB1, 0xF7, 0x10,
+0xED, 0xC6, 0xD2, 0x10, 0xEE, 0x91, 0xD9, 0x10, 0x0B, 0xE0, 0xAF, 0xA0, 0x0C, 0xD9, 0xCD, 0x10,
+0x0D, 0xC0, 0x91, 0xA0, 0x0E, 0xB9, 0xAF, 0x10, 0x0F, 0xA9, 0xAE, 0x20, 0x10, 0x99, 0x91, 0x10,
+0x11, 0x89, 0x90, 0x20, 0x12, 0x79, 0x73, 0x10, 0x13, 0x69, 0x72, 0x20, 0x14, 0x59, 0x55, 0x10,
+0x15, 0x49, 0x54, 0x20, 0x16, 0x39, 0x37, 0x10, 0x17, 0x29, 0x36, 0x20, 0x18, 0x22, 0x53, 0x90,
+0x19, 0x09, 0x18, 0x20, 0x1A, 0x02, 0x35, 0x90, 0x1A, 0xF2, 0x34, 0xA0, 0x1B, 0xE2, 0x17, 0x90,
+0x1C, 0xD2, 0x16, 0xA0, 0x1D, 0xC1, 0xF9, 0x90, 0x1E, 0xB1, 0xF8, 0xA0, 0x1F, 0xA1, 0xDB, 0x90,
+0x20, 0x76, 0x2B, 0x20, 0x21, 0x81, 0xBD, 0x90, 0x22, 0x56, 0x0D, 0x20, 0x23, 0x6A, 0xDA, 0x10,
+0x24, 0x35, 0xEF, 0x20, 0x25, 0x4A, 0xBC, 0x10, 0x26, 0x15, 0xD1, 0x20, 0x27, 0x2A, 0x9E, 0x10,
+0x27, 0xFE, 0xED, 0xA0, 0x29, 0x0A, 0x80, 0x10, 0x29, 0xDE, 0xCF, 0xA0, 0x2A, 0xEA, 0x62, 0x10,
+0x2B, 0xBE, 0xB1, 0xA0, 0x2C, 0xD3, 0x7E, 0x90, 0x2D, 0x9E, 0x93, 0xA0, 0x2E, 0xB3, 0x60, 0x90,
+0x2F, 0x7E, 0x75, 0xA0, 0x30, 0x93, 0x42, 0x90, 0x31, 0x67, 0x92, 0x20, 0x32, 0x73, 0x24, 0x90,
+0x33, 0x47, 0x74, 0x20, 0x34, 0x53, 0x06, 0x90, 0x35, 0x27, 0x56, 0x20, 0x36, 0x32, 0xE8, 0x90,
+0x37, 0x07, 0x38, 0x20, 0x38, 0x1C, 0x05, 0x10, 0x38, 0xE7, 0x1A, 0x20, 0x39, 0xFB, 0xE7, 0x10,
+0x3A, 0xC6, 0xFC, 0x20, 0x3B, 0xDB, 0xC9, 0x10, 0x3C, 0xB0, 0x18, 0xA0, 0x3D, 0xBB, 0xAB, 0x10,
+0x3E, 0x8F, 0xFA, 0xA0, 0x3F, 0x9B, 0x8D, 0x10, 0x40, 0x6F, 0xDC, 0xA0, 0x41, 0x84, 0xA9, 0x90,
+0x42, 0x4F, 0xBE, 0xA0, 0x43, 0x64, 0x8B, 0x90, 0x44, 0x2F, 0xA0, 0xA0, 0x45, 0x44, 0x6D, 0x90,
+0x46, 0x0F, 0x82, 0xA0, 0x47, 0x24, 0x4F, 0x90, 0x47, 0xF8, 0x9F, 0x20, 0x49, 0x04, 0x31, 0x90,
+0x49, 0xD8, 0x81, 0x20, 0x4A, 0xE4, 0x13, 0x90, 0x4B, 0x9C, 0xB3, 0xA0, 0x4C, 0xD6, 0x6A, 0x90,
+0x4D, 0x7C, 0x95, 0xA0, 0x4E, 0xB6, 0x4C, 0x90, 0x4F, 0x5C, 0x77, 0xA0, 0x50, 0x96, 0x2E, 0x90,
+0x51, 0x3C, 0x59, 0xA0, 0x52, 0x76, 0x10, 0x90, 0x53, 0x1C, 0x3B, 0xA0, 0x54, 0x55, 0xF2, 0x90,
+0x54, 0xFC, 0x1D, 0xA0, 0x56, 0x35, 0xD4, 0x90, 0x56, 0xE5, 0x3A, 0x20, 0x58, 0x1E, 0xF1, 0x10,
+0x58, 0xC5, 0x1C, 0x20, 0x59, 0xFE, 0xD3, 0x10, 0x5A, 0xA4, 0xFE, 0x20, 0x5B, 0xDE, 0xB5, 0x10,
+0x5C, 0x84, 0xE0, 0x20, 0x5D, 0xBE, 0x97, 0x10, 0x5E, 0x64, 0xC2, 0x20, 0x5F, 0x9E, 0x79, 0x10,
+0x60, 0x4D, 0xDE, 0xA0, 0x61, 0x87, 0x95, 0x90, 0x62, 0x2D, 0xC0, 0xA0, 0x63, 0x67, 0x77, 0x90,
+0x64, 0x0D, 0xA2, 0xA0, 0x65, 0x47, 0x59, 0x90, 0x65, 0xED, 0x84, 0xA0, 0x67, 0x27, 0x3B, 0x90,
+0x67, 0xCD, 0x66, 0xA0, 0x69, 0x07, 0x1D, 0x90, 0x69, 0xAD, 0x48, 0xA0, 0x6A, 0xE6, 0xFF, 0x90,
+0x6B, 0x96, 0x65, 0x20, 0x6C, 0xD0, 0x1C, 0x10, 0x6D, 0x76, 0x47, 0x20, 0x6E, 0xAF, 0xFE, 0x10,
+0x6F, 0x56, 0x29, 0x20, 0x70, 0x8F, 0xE0, 0x10, 0x71, 0x36, 0x0B, 0x20, 0x72, 0x6F, 0xC2, 0x10,
+0x73, 0x15, 0xED, 0x20, 0x74, 0x4F, 0xA4, 0x10, 0x74, 0xFF, 0x09, 0xA0, 0x76, 0x38, 0xC0, 0x90,
+0x76, 0xDE, 0xEB, 0xA0, 0x78, 0x18, 0xA2, 0x90, 0x78, 0xBE, 0xCD, 0xA0, 0x79, 0xF8, 0x84, 0x90,
+0x7A, 0x9E, 0xAF, 0xA0, 0x7B, 0xD8, 0x66, 0x90, 0x7C, 0x7E, 0x91, 0xA0, 0x7D, 0xB8, 0x48, 0x90,
+0x7E, 0x5E, 0x73, 0xA0, 0x7F, 0x98, 0x2A, 0x90, 0x01, 0x02, 0x03, 0x02, 0x04, 0x02, 0x05, 0x06,
 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
@@ -65291,90 +66099,94 @@
 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
-0x02, 0x04, 0x02, 0x04, 0x02, 0xFF, 0xFF, 0x92, 0x4C, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x00,
-0x04, 0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x08, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0x9D,
-0x90, 0x01, 0x0C, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x10, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x14, 0xFF,
-0xFF, 0x8F, 0x80, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x50, 0x53, 0x54,
-0x00, 0x50, 0x44, 0x54, 0x00, 0x50, 0x57, 0x54, 0x00, 0x50, 0x50, 0x54, 0x00, 0x00, 0x01, 0x00,
-0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x54, 0x5A, 0x69,
-0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x95, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x18, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8,
-0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xA9, 0x79, 0x4F, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF2, 0x7C,
-0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x64, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x1B, 0x10,
-0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0x0A, 0xF2, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0xEA, 0x8D,
-0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x23, 0xF4, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x99, 0xBA,
-0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD7, 0x1B, 0x59, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xD8, 0x91, 0xB4,
-0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE2, 0x7E, 0x4B, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE3, 0x49, 0x52,
-0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE4, 0x5E, 0x2D, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE5, 0x29, 0x34,
-0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE6, 0x47, 0x4A, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xE7, 0x12, 0x51,
-0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xE8, 0x27, 0x2C, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xE8, 0xF2, 0x33,
-0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xEA, 0x07, 0x0E, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xEA, 0xD2, 0x15,
-0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xEB, 0xE6, 0xF0, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xEC, 0xB1, 0xF7,
-0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xED, 0xC6, 0xD2, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xEE, 0x91, 0xD9,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x0B, 0xE0, 0xAF, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x0C, 0xD9, 0xCD,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x0D, 0xC0, 0x91, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x0E, 0xB9, 0xAF,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xA9, 0xAE, 0x20, 0x00, 0x00, 0x00, 0x00, 0x10, 0x99, 0x91,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x11, 0x89, 0x90, 0x20, 0x00, 0x00, 0x00, 0x00, 0x12, 0x79, 0x73,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x13, 0x69, 0x72, 0x20, 0x00, 0x00, 0x00, 0x00, 0x14, 0x59, 0x55,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x15, 0x49, 0x54, 0x20, 0x00, 0x00, 0x00, 0x00, 0x16, 0x39, 0x37,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x17, 0x29, 0x36, 0x20, 0x00, 0x00, 0x00, 0x00, 0x18, 0x22, 0x53,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x19, 0x09, 0x18, 0x20, 0x00, 0x00, 0x00, 0x00, 0x1A, 0x02, 0x35,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xF2, 0x34, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xE2, 0x17,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xD2, 0x16, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC1, 0xF9,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x1E, 0xB1, 0xF8, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA1, 0xDB,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x20, 0x76, 0x2B, 0x20, 0x00, 0x00, 0x00, 0x00, 0x21, 0x81, 0xBD,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x22, 0x56, 0x0D, 0x20, 0x00, 0x00, 0x00, 0x00, 0x23, 0x6A, 0xDA,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x24, 0x35, 0xEF, 0x20, 0x00, 0x00, 0x00, 0x00, 0x25, 0x4A, 0xBC,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x26, 0x15, 0xD1, 0x20, 0x00, 0x00, 0x00, 0x00, 0x27, 0x2A, 0x9E,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x27, 0xFE, 0xED, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x29, 0x0A, 0x80,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x29, 0xDE, 0xCF, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xEA, 0x62,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xBE, 0xB1, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xD3, 0x7E,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x9E, 0x93, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x2E, 0xB3, 0x60,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x7E, 0x75, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x30, 0x93, 0x42,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x92, 0x20, 0x00, 0x00, 0x00, 0x00, 0x32, 0x73, 0x24,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x74, 0x20, 0x00, 0x00, 0x00, 0x00, 0x34, 0x53, 0x06,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x56, 0x20, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0xE8,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x37, 0x07, 0x38, 0x20, 0x00, 0x00, 0x00, 0x00, 0x38, 0x1C, 0x05,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x38, 0xE7, 0x1A, 0x20, 0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0xE7,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xC6, 0xFC, 0x20, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xDB, 0xC9,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xB0, 0x18, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0xAB,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x8F, 0xFA, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x8D,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x40, 0x6F, 0xDC, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0xA9,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x42, 0x4F, 0xBE, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x8B,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x44, 0x2F, 0xA0, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x45, 0x44, 0x6D,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x46, 0x0F, 0x82, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x47, 0x24, 0x4F,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x47, 0xF8, 0x9F, 0x20, 0x00, 0x00, 0x00, 0x00, 0x49, 0x04, 0x31,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x49, 0xD8, 0x81, 0x20, 0x00, 0x00, 0x00, 0x00, 0x4A, 0xE4, 0x13,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x4B, 0x9C, 0xB3, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x4C, 0xD6, 0x6A,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x7C, 0x95, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x4E, 0xB6, 0x4C,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x5C, 0x77, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x50, 0x96, 0x2E,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x51, 0x3C, 0x59, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x52, 0x76, 0x10,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x53, 0x1C, 0x3B, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x54, 0x55, 0xF2,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x54, 0xFC, 0x1D, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x56, 0x35, 0xD4,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x56, 0xE5, 0x3A, 0x20, 0x00, 0x00, 0x00, 0x00, 0x58, 0x1E, 0xF1,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x58, 0xC5, 0x1C, 0x20, 0x00, 0x00, 0x00, 0x00, 0x59, 0xFE, 0xD3,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xA4, 0xFE, 0x20, 0x00, 0x00, 0x00, 0x00, 0x5B, 0xDE, 0xB5,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x5C, 0x84, 0xE0, 0x20, 0x00, 0x00, 0x00, 0x00, 0x5D, 0xBE, 0x97,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x64, 0xC2, 0x20, 0x00, 0x00, 0x00, 0x00, 0x5F, 0x9E, 0x79,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x60, 0x4D, 0xDE, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x61, 0x87, 0x95,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x62, 0x2D, 0xC0, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x63, 0x67, 0x77,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x64, 0x0D, 0xA2, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x65, 0x47, 0x59,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x65, 0xED, 0x84, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x67, 0x27, 0x3B,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x67, 0xCD, 0x66, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x69, 0x07, 0x1D,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x69, 0xAD, 0x48, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x6A, 0xE6, 0xFF,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x6B, 0x96, 0x65, 0x20, 0x00, 0x00, 0x00, 0x00, 0x6C, 0xD0, 0x1C,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x6D, 0x76, 0x47, 0x20, 0x00, 0x00, 0x00, 0x00, 0x6E, 0xAF, 0xFE,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x6F, 0x56, 0x29, 0x20, 0x00, 0x00, 0x00, 0x00, 0x70, 0x8F, 0xE0,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x71, 0x36, 0x0B, 0x20, 0x00, 0x00, 0x00, 0x00, 0x72, 0x6F, 0xC2,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x73, 0x15, 0xED, 0x20, 0x00, 0x00, 0x00, 0x00, 0x74, 0x4F, 0xA4,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x74, 0xFF, 0x09, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x76, 0x38, 0xC0,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x76, 0xDE, 0xEB, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x78, 0x18, 0xA2,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x78, 0xBE, 0xCD, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x79, 0xF8, 0x84,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x7A, 0x9E, 0xAF, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x7B, 0xD8, 0x66,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x7E, 0x91, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x7D, 0xB8, 0x48,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x5E, 0x73, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x98, 0x2A,
-0x90, 0x01, 0x02, 0x03, 0x02, 0x04, 0x02, 0x05, 0x06, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
+0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
+0x02, 0x04, 0x02, 0xFF, 0xFF, 0x92, 0x4C, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF,
+0xFF, 0x8F, 0x80, 0x00, 0x08, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0x9D, 0x90, 0x01,
+0x0C, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x10, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x14, 0xFF, 0xFF, 0x8F,
+0x80, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x50, 0x53, 0x54, 0x00, 0x50,
+0x44, 0x54, 0x00, 0x50, 0x57, 0x54, 0x00, 0x50, 0x50, 0x54, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9B, 0x00,
+0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x18, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA9, 0x79, 0x4F, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF1, 0x39, 0x80, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x64, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x1B, 0x10, 0x00, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB8, 0x0A, 0xF2, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0xEA, 0x8D, 0x80, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD2, 0x23, 0xF4, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x9D, 0xAE, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD7, 0x1B, 0x59, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xD8, 0x91, 0xB4, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xDB, 0x00, 0x07, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xDB, 0xC0, 0x73, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xDC, 0xDE, 0xB3, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xDD, 0xA9, 0xAC, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xDE, 0xBE, 0x95, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0x89, 0x8E, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xE2, 0x7E, 0x4B, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE3, 0x49, 0x52, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xE4, 0x5E, 0x2D, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE5, 0x29, 0x34, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xE6, 0x47, 0x4A, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xE7, 0x12, 0x51, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xE8, 0x27, 0x2C, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xE8, 0xF2, 0x33, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xEA, 0x07, 0x0E, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xEA, 0xD2, 0x15, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xEB, 0xE6, 0xF0, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xEC, 0xB1, 0xF7, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xED, 0xC6, 0xD2, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xEE, 0x91, 0xD9, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x0B, 0xE0, 0xAF, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x0C, 0xD9, 0xCD, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x0D, 0xC0, 0x91, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x0E, 0xB9, 0xAF, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x0F, 0xA9, 0xAE, 0x20, 0x00, 0x00, 0x00, 0x00, 0x10, 0x99, 0x91, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x11, 0x89, 0x90, 0x20, 0x00, 0x00, 0x00, 0x00, 0x12, 0x79, 0x73, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x13, 0x69, 0x72, 0x20, 0x00, 0x00, 0x00, 0x00, 0x14, 0x59, 0x55, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x15, 0x49, 0x54, 0x20, 0x00, 0x00, 0x00, 0x00, 0x16, 0x39, 0x37, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x17, 0x29, 0x36, 0x20, 0x00, 0x00, 0x00, 0x00, 0x18, 0x22, 0x53, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x19, 0x09, 0x18, 0x20, 0x00, 0x00, 0x00, 0x00, 0x1A, 0x02, 0x35, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x1A, 0xF2, 0x34, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xE2, 0x17, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x1C, 0xD2, 0x16, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC1, 0xF9, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x1E, 0xB1, 0xF8, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA1, 0xDB, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x20, 0x76, 0x2B, 0x20, 0x00, 0x00, 0x00, 0x00, 0x21, 0x81, 0xBD, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x22, 0x56, 0x0D, 0x20, 0x00, 0x00, 0x00, 0x00, 0x23, 0x6A, 0xDA, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x24, 0x35, 0xEF, 0x20, 0x00, 0x00, 0x00, 0x00, 0x25, 0x4A, 0xBC, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x26, 0x15, 0xD1, 0x20, 0x00, 0x00, 0x00, 0x00, 0x27, 0x2A, 0x9E, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x27, 0xFE, 0xED, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x29, 0x0A, 0x80, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x29, 0xDE, 0xCF, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xEA, 0x62, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x2B, 0xBE, 0xB1, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xD3, 0x7E, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x2D, 0x9E, 0x93, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x2E, 0xB3, 0x60, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x2F, 0x7E, 0x75, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x30, 0x93, 0x42, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x31, 0x67, 0x92, 0x20, 0x00, 0x00, 0x00, 0x00, 0x32, 0x73, 0x24, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x33, 0x47, 0x74, 0x20, 0x00, 0x00, 0x00, 0x00, 0x34, 0x53, 0x06, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x35, 0x27, 0x56, 0x20, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0xE8, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x37, 0x07, 0x38, 0x20, 0x00, 0x00, 0x00, 0x00, 0x38, 0x1C, 0x05, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x38, 0xE7, 0x1A, 0x20, 0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0xE7, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x3A, 0xC6, 0xFC, 0x20, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xDB, 0xC9, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x3C, 0xB0, 0x18, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0xAB, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x3E, 0x8F, 0xFA, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x8D, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x40, 0x6F, 0xDC, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0xA9, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x42, 0x4F, 0xBE, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x8B, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x44, 0x2F, 0xA0, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x45, 0x44, 0x6D, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x46, 0x0F, 0x82, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x47, 0x24, 0x4F, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x47, 0xF8, 0x9F, 0x20, 0x00, 0x00, 0x00, 0x00, 0x49, 0x04, 0x31, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x49, 0xD8, 0x81, 0x20, 0x00, 0x00, 0x00, 0x00, 0x4A, 0xE4, 0x13, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x4B, 0x9C, 0xB3, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x4C, 0xD6, 0x6A, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x4D, 0x7C, 0x95, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x4E, 0xB6, 0x4C, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x4F, 0x5C, 0x77, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x50, 0x96, 0x2E, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x51, 0x3C, 0x59, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x52, 0x76, 0x10, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x53, 0x1C, 0x3B, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x54, 0x55, 0xF2, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x54, 0xFC, 0x1D, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x56, 0x35, 0xD4, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x56, 0xE5, 0x3A, 0x20, 0x00, 0x00, 0x00, 0x00, 0x58, 0x1E, 0xF1, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x58, 0xC5, 0x1C, 0x20, 0x00, 0x00, 0x00, 0x00, 0x59, 0xFE, 0xD3, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x5A, 0xA4, 0xFE, 0x20, 0x00, 0x00, 0x00, 0x00, 0x5B, 0xDE, 0xB5, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x5C, 0x84, 0xE0, 0x20, 0x00, 0x00, 0x00, 0x00, 0x5D, 0xBE, 0x97, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x5E, 0x64, 0xC2, 0x20, 0x00, 0x00, 0x00, 0x00, 0x5F, 0x9E, 0x79, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x60, 0x4D, 0xDE, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x61, 0x87, 0x95, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x62, 0x2D, 0xC0, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x63, 0x67, 0x77, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x64, 0x0D, 0xA2, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x65, 0x47, 0x59, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x65, 0xED, 0x84, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x67, 0x27, 0x3B, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x67, 0xCD, 0x66, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x69, 0x07, 0x1D, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x69, 0xAD, 0x48, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x6A, 0xE6, 0xFF, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x6B, 0x96, 0x65, 0x20, 0x00, 0x00, 0x00, 0x00, 0x6C, 0xD0, 0x1C, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x6D, 0x76, 0x47, 0x20, 0x00, 0x00, 0x00, 0x00, 0x6E, 0xAF, 0xFE, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x6F, 0x56, 0x29, 0x20, 0x00, 0x00, 0x00, 0x00, 0x70, 0x8F, 0xE0, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x71, 0x36, 0x0B, 0x20, 0x00, 0x00, 0x00, 0x00, 0x72, 0x6F, 0xC2, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x73, 0x15, 0xED, 0x20, 0x00, 0x00, 0x00, 0x00, 0x74, 0x4F, 0xA4, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x74, 0xFF, 0x09, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x76, 0x38, 0xC0, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x76, 0xDE, 0xEB, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x78, 0x18, 0xA2, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x78, 0xBE, 0xCD, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x79, 0xF8, 0x84, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x7A, 0x9E, 0xAF, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x7B, 0xD8, 0x66, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x7C, 0x7E, 0x91, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x7D, 0xB8, 0x48, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x7E, 0x5E, 0x73, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x98, 0x2A, 0x90, 0x01,
+0x02, 0x03, 0x02, 0x04, 0x02, 0x05, 0x06, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
@@ -65383,95 +66195,91 @@
 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
-0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0xFF, 0xFF, 0x92, 0x4C, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90,
-0x00, 0x04, 0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x08, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF,
-0x9D, 0x90, 0x01, 0x0C, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x10, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x14,
-0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x50, 0x53,
-0x54, 0x00, 0x50, 0x44, 0x54, 0x00, 0x50, 0x57, 0x54, 0x00, 0x50, 0x50, 0x54, 0x00, 0x00, 0x01,
-0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0A, 0x50,
-0x53, 0x54, 0x38, 0x50, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D, 0x31,
-0x31, 0x2E, 0x31, 0x2E, 0x30, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 
+0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0xFF, 0xFF, 0x92, 0x4C, 0x00, 0x00,
+0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x08, 0xFF, 0xFF, 0x9D, 0x90,
+0x00, 0x04, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x0C, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x10, 0xFF, 0xFF,
+0x9D, 0x90, 0x01, 0x14, 0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53,
+0x54, 0x00, 0x50, 0x53, 0x54, 0x00, 0x50, 0x44, 0x54, 0x00, 0x50, 0x57, 0x54, 0x00, 0x50, 0x50,
+0x54, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
+0x01, 0x00, 0x0A, 0x50, 0x53, 0x54, 0x38, 0x50, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E,
+0x30, 0x2C, 0x4D, 0x31, 0x31, 0x2E, 0x31, 0x2E, 0x30, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 
 /* Mexico/BajaSur */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x14, 0xA5, 0xB6, 0xE8, 0x70,
-0xAF, 0xF2, 0x6E, 0xE0, 0xB6, 0x66, 0x56, 0x60, 0xB7, 0x43, 0xD2, 0x60, 0xB8, 0x0C, 0x36, 0x60,
-0xB8, 0xFD, 0x86, 0xF0, 0xCB, 0xEA, 0x71, 0x60, 0xD8, 0x91, 0xB4, 0xF0, 0x00, 0x00, 0x70, 0x80,
-0x31, 0x67, 0x84, 0x10, 0x32, 0x73, 0x16, 0x80, 0x33, 0x47, 0x66, 0x10, 0x34, 0x52, 0xF8, 0x80,
-0x35, 0x27, 0x48, 0x10, 0x36, 0x32, 0xDA, 0x80, 0x37, 0x07, 0x2A, 0x10, 0x38, 0x1B, 0xF7, 0x00,
-0x38, 0xE7, 0x0C, 0x10, 0x39, 0xFB, 0xD9, 0x00, 0x3A, 0xF5, 0x12, 0x90, 0x3B, 0xB6, 0xD1, 0x00,
-0x3C, 0xB0, 0x0A, 0x90, 0x3D, 0xBB, 0x9D, 0x00, 0x3E, 0x8F, 0xEC, 0x90, 0x3F, 0x9B, 0x7F, 0x00,
-0x40, 0x6F, 0xCE, 0x90, 0x41, 0x84, 0x9B, 0x80, 0x42, 0x4F, 0xB0, 0x90, 0x43, 0x64, 0x7D, 0x80,
-0x44, 0x2F, 0x92, 0x90, 0x45, 0x44, 0x5F, 0x80, 0x46, 0x0F, 0x74, 0x90, 0x47, 0x24, 0x41, 0x80,
-0x47, 0xF8, 0x91, 0x10, 0x49, 0x04, 0x23, 0x80, 0x49, 0xD8, 0x73, 0x10, 0x4A, 0xE4, 0x05, 0x80,
-0x4B, 0xB8, 0x55, 0x10, 0x4C, 0xCD, 0x22, 0x00, 0x4D, 0x98, 0x37, 0x10, 0x4E, 0xAD, 0x04, 0x00,
-0x4F, 0x78, 0x19, 0x10, 0x50, 0x8C, 0xE6, 0x00, 0x51, 0x61, 0x35, 0x90, 0x52, 0x6C, 0xC8, 0x00,
-0x53, 0x41, 0x17, 0x90, 0x54, 0x4C, 0xAA, 0x00, 0x55, 0x20, 0xF9, 0x90, 0x56, 0x2C, 0x8C, 0x00,
-0x57, 0x00, 0xDB, 0x90, 0x58, 0x15, 0xA8, 0x80, 0x58, 0xE0, 0xBD, 0x90, 0x59, 0xF5, 0x8A, 0x80,
-0x5A, 0xC0, 0x9F, 0x90, 0x5B, 0xD5, 0x6C, 0x80, 0x5C, 0xA9, 0xBC, 0x10, 0x5D, 0xB5, 0x4E, 0x80,
-0x5E, 0x89, 0x9E, 0x10, 0x5F, 0x95, 0x30, 0x80, 0x60, 0x69, 0x80, 0x10, 0x61, 0x7E, 0x4D, 0x00,
-0x62, 0x49, 0x62, 0x10, 0x63, 0x5E, 0x2F, 0x00, 0x01, 0x02, 0x04, 0x03, 0x04, 0x02, 0x04, 0x05,
-0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
-0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
-0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
-0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0xFF, 0xFF, 0x9C, 0x3C, 0x00, 0x00, 0xFF, 0xFF, 0x9D,
-0x90, 0x00, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x0C, 0xFF,
-0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x10, 0xFF, 0xFF, 0x9D, 0x90, 0x00,
-0x04, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x4D, 0x44, 0x54,
-0x00, 0x50, 0x53, 0x54, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x07, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x14, 0xFF,
-0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF2, 0x6E, 0xE0, 0xFF,
-0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x56, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x43, 0xD2, 0x60, 0xFF,
-0xFF, 0xFF, 0xFF, 0xB8, 0x0C, 0x36, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0xFD, 0x86, 0xF0, 0xFF,
-0xFF, 0xFF, 0xFF, 0xCB, 0xEA, 0x71, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xD8, 0x91, 0xB4, 0xF0, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x80, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x84, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x32, 0x73, 0x16, 0x80, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x66, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x34, 0x52, 0xF8, 0x80, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x48, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x36, 0x32, 0xDA, 0x80, 0x00, 0x00, 0x00, 0x00, 0x37, 0x07, 0x2A, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x38, 0x1B, 0xF7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0xE7, 0x0C, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x39, 0xFB, 0xD9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xF5, 0x12, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x3B, 0xB6, 0xD1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xB0, 0x0A, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x3D, 0xBB, 0x9D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x8F, 0xEC, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x3F, 0x9B, 0x7F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x6F, 0xCE, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x41, 0x84, 0x9B, 0x80, 0x00, 0x00, 0x00, 0x00, 0x42, 0x4F, 0xB0, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x43, 0x64, 0x7D, 0x80, 0x00, 0x00, 0x00, 0x00, 0x44, 0x2F, 0x92, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x45, 0x44, 0x5F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x46, 0x0F, 0x74, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x47, 0x24, 0x41, 0x80, 0x00, 0x00, 0x00, 0x00, 0x47, 0xF8, 0x91, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x49, 0x04, 0x23, 0x80, 0x00, 0x00, 0x00, 0x00, 0x49, 0xD8, 0x73, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x4A, 0xE4, 0x05, 0x80, 0x00, 0x00, 0x00, 0x00, 0x4B, 0xB8, 0x55, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x4C, 0xCD, 0x22, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x98, 0x37, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x4E, 0xAD, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x78, 0x19, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x50, 0x8C, 0xE6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x51, 0x61, 0x35, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x52, 0x6C, 0xC8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x53, 0x41, 0x17, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x54, 0x4C, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x20, 0xF9, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x56, 0x2C, 0x8C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x57, 0x00, 0xDB, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x58, 0x15, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00, 0x58, 0xE0, 0xBD, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x59, 0xF5, 0x8A, 0x80, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xC0, 0x9F, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x5B, 0xD5, 0x6C, 0x80, 0x00, 0x00, 0x00, 0x00, 0x5C, 0xA9, 0xBC, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x5D, 0xB5, 0x4E, 0x80, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x89, 0x9E, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x5F, 0x95, 0x30, 0x80, 0x00, 0x00, 0x00, 0x00, 0x60, 0x69, 0x80, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x61, 0x7E, 0x4D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x62, 0x49, 0x62, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x63, 0x5E, 0x2F, 0x00, 0x01, 0x02, 0x04, 0x03, 0x04, 0x02, 0x04, 0x05, 0x04,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x3D, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x10, 0xA5, 0xB6, 0xE8, 0x70,
+0xAF, 0xF1, 0x2B, 0x70, 0xB6, 0x66, 0x56, 0x60, 0xB7, 0x41, 0x3D, 0x70, 0xB8, 0x0C, 0x36, 0x60,
+0xB8, 0xFD, 0x86, 0xF0, 0xCB, 0xEA, 0x71, 0x60, 0x31, 0x67, 0x84, 0x10, 0x32, 0x73, 0x16, 0x80,
+0x33, 0x47, 0x66, 0x10, 0x34, 0x52, 0xF8, 0x80, 0x35, 0x27, 0x48, 0x10, 0x36, 0x32, 0xDA, 0x80,
+0x37, 0x07, 0x2A, 0x10, 0x38, 0x1B, 0xF7, 0x00, 0x38, 0xE7, 0x0C, 0x10, 0x39, 0xFB, 0xD9, 0x00,
+0x3A, 0xF5, 0x12, 0x90, 0x3B, 0xB6, 0xD1, 0x00, 0x3C, 0xB0, 0x0A, 0x90, 0x3D, 0xBB, 0x9D, 0x00,
+0x3E, 0x8F, 0xEC, 0x90, 0x3F, 0x9B, 0x7F, 0x00, 0x40, 0x6F, 0xCE, 0x90, 0x41, 0x84, 0x9B, 0x80,
+0x42, 0x4F, 0xB0, 0x90, 0x43, 0x64, 0x7D, 0x80, 0x44, 0x2F, 0x92, 0x90, 0x45, 0x44, 0x5F, 0x80,
+0x46, 0x0F, 0x74, 0x90, 0x47, 0x24, 0x41, 0x80, 0x47, 0xF8, 0x91, 0x10, 0x49, 0x04, 0x23, 0x80,
+0x49, 0xD8, 0x73, 0x10, 0x4A, 0xE4, 0x05, 0x80, 0x4B, 0xB8, 0x55, 0x10, 0x4C, 0xCD, 0x22, 0x00,
+0x4D, 0x98, 0x37, 0x10, 0x4E, 0xAD, 0x04, 0x00, 0x4F, 0x78, 0x19, 0x10, 0x50, 0x8C, 0xE6, 0x00,
+0x51, 0x61, 0x35, 0x90, 0x52, 0x6C, 0xC8, 0x00, 0x53, 0x41, 0x17, 0x90, 0x54, 0x4C, 0xAA, 0x00,
+0x55, 0x20, 0xF9, 0x90, 0x56, 0x2C, 0x8C, 0x00, 0x57, 0x00, 0xDB, 0x90, 0x58, 0x15, 0xA8, 0x80,
+0x58, 0xE0, 0xBD, 0x90, 0x59, 0xF5, 0x8A, 0x80, 0x5A, 0xC0, 0x9F, 0x90, 0x5B, 0xD5, 0x6C, 0x80,
+0x5C, 0xA9, 0xBC, 0x10, 0x5D, 0xB5, 0x4E, 0x80, 0x5E, 0x89, 0x9E, 0x10, 0x5F, 0x95, 0x30, 0x80,
+0x60, 0x69, 0x80, 0x10, 0x61, 0x7E, 0x4D, 0x00, 0x62, 0x49, 0x62, 0x10, 0x63, 0x5E, 0x2F, 0x00,
+0x01, 0x02, 0x04, 0x03, 0x04, 0x02, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
+0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
+0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
+0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0xFF, 0xFF, 0x9C,
+0x3C, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0xFF,
+0xFF, 0xAB, 0xA0, 0x01, 0x0C, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0x4C, 0x4D, 0x54, 0x00, 0x4D,
+0x53, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x4D, 0x44, 0x54, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+0x00, 0x01, 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00,
+0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3D, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00,
+0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF1, 0x2B,
+0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x56, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x41, 0x3D,
+0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0x0C, 0x36, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0xFD, 0x86,
+0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0xEA, 0x71, 0x60, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x84,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x32, 0x73, 0x16, 0x80, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x66,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x34, 0x52, 0xF8, 0x80, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x48,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0xDA, 0x80, 0x00, 0x00, 0x00, 0x00, 0x37, 0x07, 0x2A,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x38, 0x1B, 0xF7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0xE7, 0x0C,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0xD9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xF5, 0x12,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xB6, 0xD1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xB0, 0x0A,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0x9D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x8F, 0xEC,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x7F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x6F, 0xCE,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0x9B, 0x80, 0x00, 0x00, 0x00, 0x00, 0x42, 0x4F, 0xB0,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x7D, 0x80, 0x00, 0x00, 0x00, 0x00, 0x44, 0x2F, 0x92,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x45, 0x44, 0x5F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x46, 0x0F, 0x74,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x47, 0x24, 0x41, 0x80, 0x00, 0x00, 0x00, 0x00, 0x47, 0xF8, 0x91,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x49, 0x04, 0x23, 0x80, 0x00, 0x00, 0x00, 0x00, 0x49, 0xD8, 0x73,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x4A, 0xE4, 0x05, 0x80, 0x00, 0x00, 0x00, 0x00, 0x4B, 0xB8, 0x55,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x4C, 0xCD, 0x22, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x98, 0x37,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x4E, 0xAD, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x78, 0x19,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x50, 0x8C, 0xE6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x51, 0x61, 0x35,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x52, 0x6C, 0xC8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x53, 0x41, 0x17,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x54, 0x4C, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x20, 0xF9,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x56, 0x2C, 0x8C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x57, 0x00, 0xDB,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x58, 0x15, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00, 0x58, 0xE0, 0xBD,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x59, 0xF5, 0x8A, 0x80, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xC0, 0x9F,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x5B, 0xD5, 0x6C, 0x80, 0x00, 0x00, 0x00, 0x00, 0x5C, 0xA9, 0xBC,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x5D, 0xB5, 0x4E, 0x80, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x89, 0x9E,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x5F, 0x95, 0x30, 0x80, 0x00, 0x00, 0x00, 0x00, 0x60, 0x69, 0x80,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x61, 0x7E, 0x4D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x62, 0x49, 0x62,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x63, 0x5E, 0x2F, 0x00, 0x01, 0x02, 0x04, 0x03, 0x04, 0x02, 0x04,
 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0xFF, 0xFF, 0x9C, 0x3C, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90,
 0x00, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x0C, 0xFF, 0xFF,
-0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x10, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04,
-0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x4D, 0x44, 0x54, 0x00,
-0x50, 0x53, 0x54, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x0A, 0x4D, 0x53, 0x54, 0x37, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 
+0x9D, 0x90, 0x00, 0x04, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00,
+0x4D, 0x44, 0x54, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0A, 0x4D,
+0x53, 0x54, 0x37, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+
 
 /* Mexico/General */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x44, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x18, 0xA5, 0xB6, 0xE8, 0x70,
-0xAF, 0xF2, 0x6E, 0xE0, 0xB6, 0x66, 0x56, 0x60, 0xB7, 0x43, 0xD2, 0x60, 0xB8, 0x0C, 0x36, 0x60,
+0xAF, 0xF1, 0x2B, 0x70, 0xB6, 0x66, 0x56, 0x60, 0xB7, 0x41, 0x3D, 0x70, 0xB8, 0x0C, 0x36, 0x60,
 0xB8, 0xFD, 0x86, 0xF0, 0xC5, 0xDE, 0xB0, 0x60, 0xC6, 0x97, 0x34, 0x50, 0xC9, 0x55, 0xF1, 0xE0,
 0xC9, 0xEA, 0xDD, 0x50, 0xCF, 0x02, 0xC6, 0xE0, 0xCF, 0xB7, 0x56, 0x50, 0xDA, 0x99, 0x15, 0xE0,
 0xDB, 0x76, 0x83, 0xD0, 0x31, 0x67, 0x76, 0x00, 0x32, 0x73, 0x08, 0x70, 0x33, 0x47, 0x58, 0x00,
@@ -65501,8 +66309,8 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08,
 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x00, 0x00, 0x00, 0x08,
 0x00, 0x00, 0x00, 0x18, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8, 0x70, 0xFF, 0xFF, 0xFF, 0xFF,
-0xAF, 0xF2, 0x6E, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x56, 0x60, 0xFF, 0xFF, 0xFF, 0xFF,
-0xB7, 0x43, 0xD2, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0x0C, 0x36, 0x60, 0xFF, 0xFF, 0xFF, 0xFF,
+0xAF, 0xF1, 0x2B, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x56, 0x60, 0xFF, 0xFF, 0xFF, 0xFF,
+0xB7, 0x41, 0x3D, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0x0C, 0x36, 0x60, 0xFF, 0xFF, 0xFF, 0xFF,
 0xB8, 0xFD, 0x86, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC5, 0xDE, 0xB0, 0x60, 0xFF, 0xFF, 0xFF, 0xFF,
 0xC6, 0x97, 0x34, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0x55, 0xF1, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF,
 0xC9, 0xEA, 0xDD, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, 0xCF, 0x02, 0xC6, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF,
@@ -65549,161 +66357,186 @@
 
 /* MST */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x10, 0x80, 0x00, 0x00, 0x00,
+0x9E, 0xA6, 0x3A, 0x90, 0x9F, 0xBB, 0x07, 0x80, 0xA0, 0x86, 0x1C, 0x90, 0xA1, 0x9A, 0xE9, 0x80,
+0xCB, 0x89, 0x0C, 0x90, 0xCF, 0x17, 0xDF, 0x1C, 0xCF, 0x8F, 0xE5, 0xAC, 0xD0, 0x81, 0x1A, 0x1C,
+0xFA, 0xF8, 0x75, 0x10, 0xFB, 0xE8, 0x58, 0x00, 0x04, 0x01, 0x02, 0x01, 0x02, 0x03, 0x02, 0x03,
+0x02, 0x01, 0x02, 0xFF, 0xFF, 0x96, 0xEE, 0x00, 0x00, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x04, 0xFF,
+0xFF, 0x9D, 0x90, 0x00, 0x08, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x0C, 0xFF, 0xFF, 0x9D, 0x90, 0x00,
+0x08, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x44, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x4D, 0x57, 0x54,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x54, 0x5A, 0x69, 0x66, 0x32,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x04, 0xFF, 0xFF, 0x9D, 0x90,
-0x00, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x04, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x0A, 0x4D, 0x53, 0x54,
-0x37, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0B, 0x00,
+0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0x5E, 0x04, 0x0C, 0xB0, 0xFF,
+0xFF, 0xFF, 0xFF, 0x9E, 0xA6, 0x3A, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0x9F, 0xBB, 0x07, 0x80, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA0, 0x86, 0x1C, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xA1, 0x9A, 0xE9, 0x80, 0xFF,
+0xFF, 0xFF, 0xFF, 0xCB, 0x89, 0x0C, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xCF, 0x17, 0xDF, 0x1C, 0xFF,
+0xFF, 0xFF, 0xFF, 0xCF, 0x8F, 0xE5, 0xAC, 0xFF, 0xFF, 0xFF, 0xFF, 0xD0, 0x81, 0x1A, 0x1C, 0xFF,
+0xFF, 0xFF, 0xFF, 0xFA, 0xF8, 0x75, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xFB, 0xE8, 0x58, 0x00, 0x04,
+0x01, 0x02, 0x01, 0x02, 0x03, 0x02, 0x03, 0x02, 0x01, 0x02, 0xFF, 0xFF, 0x96, 0xEE, 0x00, 0x00,
+0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x04, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x08, 0xFF, 0xFF, 0xAB, 0xA0,
+0x01, 0x0C, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x44, 0x54, 0x00,
+0x4D, 0x53, 0x54, 0x00, 0x4D, 0x57, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+0x00, 0x01, 0x0A, 0x4D, 0x53, 0x54, 0x37, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 
 
 /* MST7MDT */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x95, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x10, 0x9E, 0xA6, 0x3A, 0x90,
-0x9F, 0xBB, 0x07, 0x80, 0xA0, 0x86, 0x1C, 0x90, 0xA1, 0x9A, 0xE9, 0x80, 0xCB, 0x89, 0x0C, 0x90,
-0xD2, 0x23, 0xF4, 0x70, 0xD2, 0x61, 0x18, 0x00, 0xFA, 0xF8, 0x75, 0x10, 0xFB, 0xE8, 0x58, 0x00,
-0xFC, 0xD8, 0x57, 0x10, 0xFD, 0xC8, 0x3A, 0x00, 0xFE, 0xB8, 0x39, 0x10, 0xFF, 0xA8, 0x1C, 0x00,
-0x00, 0x98, 0x1B, 0x10, 0x01, 0x87, 0xFE, 0x00, 0x02, 0x77, 0xFD, 0x10, 0x03, 0x71, 0x1A, 0x80,
-0x04, 0x61, 0x19, 0x90, 0x05, 0x50, 0xFC, 0x80, 0x06, 0x40, 0xFB, 0x90, 0x07, 0x30, 0xDE, 0x80,
-0x07, 0x8D, 0x35, 0x90, 0x09, 0x10, 0xC0, 0x80, 0x09, 0xAD, 0xB1, 0x10, 0x0A, 0xF0, 0xA2, 0x80,
-0x0B, 0xE0, 0xA1, 0x90, 0x0C, 0xD9, 0xBF, 0x00, 0x0D, 0xC0, 0x83, 0x90, 0x0E, 0xB9, 0xA1, 0x00,
-0x0F, 0xA9, 0xA0, 0x10, 0x10, 0x99, 0x83, 0x00, 0x11, 0x89, 0x82, 0x10, 0x12, 0x79, 0x65, 0x00,
-0x13, 0x69, 0x64, 0x10, 0x14, 0x59, 0x47, 0x00, 0x15, 0x49, 0x46, 0x10, 0x16, 0x39, 0x29, 0x00,
-0x17, 0x29, 0x28, 0x10, 0x18, 0x22, 0x45, 0x80, 0x19, 0x09, 0x0A, 0x10, 0x1A, 0x02, 0x27, 0x80,
-0x1A, 0xF2, 0x26, 0x90, 0x1B, 0xE2, 0x09, 0x80, 0x1C, 0xD2, 0x08, 0x90, 0x1D, 0xC1, 0xEB, 0x80,
-0x1E, 0xB1, 0xEA, 0x90, 0x1F, 0xA1, 0xCD, 0x80, 0x20, 0x76, 0x1D, 0x10, 0x21, 0x81, 0xAF, 0x80,
-0x22, 0x55, 0xFF, 0x10, 0x23, 0x6A, 0xCC, 0x00, 0x24, 0x35, 0xE1, 0x10, 0x25, 0x4A, 0xAE, 0x00,
-0x26, 0x15, 0xC3, 0x10, 0x27, 0x2A, 0x90, 0x00, 0x27, 0xFE, 0xDF, 0x90, 0x29, 0x0A, 0x72, 0x00,
-0x29, 0xDE, 0xC1, 0x90, 0x2A, 0xEA, 0x54, 0x00, 0x2B, 0xBE, 0xA3, 0x90, 0x2C, 0xD3, 0x70, 0x80,
-0x2D, 0x9E, 0x85, 0x90, 0x2E, 0xB3, 0x52, 0x80, 0x2F, 0x7E, 0x67, 0x90, 0x30, 0x93, 0x34, 0x80,
-0x31, 0x67, 0x84, 0x10, 0x32, 0x73, 0x16, 0x80, 0x33, 0x47, 0x66, 0x10, 0x34, 0x52, 0xF8, 0x80,
-0x35, 0x27, 0x48, 0x10, 0x36, 0x32, 0xDA, 0x80, 0x37, 0x07, 0x2A, 0x10, 0x38, 0x1B, 0xF7, 0x00,
-0x38, 0xE7, 0x0C, 0x10, 0x39, 0xFB, 0xD9, 0x00, 0x3A, 0xC6, 0xEE, 0x10, 0x3B, 0xDB, 0xBB, 0x00,
-0x3C, 0xB0, 0x0A, 0x90, 0x3D, 0xBB, 0x9D, 0x00, 0x3E, 0x8F, 0xEC, 0x90, 0x3F, 0x9B, 0x7F, 0x00,
-0x40, 0x6F, 0xCE, 0x90, 0x41, 0x84, 0x9B, 0x80, 0x42, 0x4F, 0xB0, 0x90, 0x43, 0x64, 0x7D, 0x80,
-0x44, 0x2F, 0x92, 0x90, 0x45, 0x44, 0x5F, 0x80, 0x45, 0xF3, 0xC5, 0x10, 0x47, 0x2D, 0x7C, 0x00,
-0x47, 0xD3, 0xA7, 0x10, 0x49, 0x0D, 0x5E, 0x00, 0x49, 0xB3, 0x89, 0x10, 0x4A, 0xED, 0x40, 0x00,
-0x4B, 0x9C, 0xA5, 0x90, 0x4C, 0xD6, 0x5C, 0x80, 0x4D, 0x7C, 0x87, 0x90, 0x4E, 0xB6, 0x3E, 0x80,
-0x4F, 0x5C, 0x69, 0x90, 0x50, 0x96, 0x20, 0x80, 0x51, 0x3C, 0x4B, 0x90, 0x52, 0x76, 0x02, 0x80,
-0x53, 0x1C, 0x2D, 0x90, 0x54, 0x55, 0xE4, 0x80, 0x54, 0xFC, 0x0F, 0x90, 0x56, 0x35, 0xC6, 0x80,
-0x56, 0xE5, 0x2C, 0x10, 0x58, 0x1E, 0xE3, 0x00, 0x58, 0xC5, 0x0E, 0x10, 0x59, 0xFE, 0xC5, 0x00,
-0x5A, 0xA4, 0xF0, 0x10, 0x5B, 0xDE, 0xA7, 0x00, 0x5C, 0x84, 0xD2, 0x10, 0x5D, 0xBE, 0x89, 0x00,
-0x5E, 0x64, 0xB4, 0x10, 0x5F, 0x9E, 0x6B, 0x00, 0x60, 0x4D, 0xD0, 0x90, 0x61, 0x87, 0x87, 0x80,
-0x62, 0x2D, 0xB2, 0x90, 0x63, 0x67, 0x69, 0x80, 0x64, 0x0D, 0x94, 0x90, 0x65, 0x47, 0x4B, 0x80,
-0x65, 0xED, 0x76, 0x90, 0x67, 0x27, 0x2D, 0x80, 0x67, 0xCD, 0x58, 0x90, 0x69, 0x07, 0x0F, 0x80,
-0x69, 0xAD, 0x3A, 0x90, 0x6A, 0xE6, 0xF1, 0x80, 0x6B, 0x96, 0x57, 0x10, 0x6C, 0xD0, 0x0E, 0x00,
-0x6D, 0x76, 0x39, 0x10, 0x6E, 0xAF, 0xF0, 0x00, 0x6F, 0x56, 0x1B, 0x10, 0x70, 0x8F, 0xD2, 0x00,
-0x71, 0x35, 0xFD, 0x10, 0x72, 0x6F, 0xB4, 0x00, 0x73, 0x15, 0xDF, 0x10, 0x74, 0x4F, 0x96, 0x00,
-0x74, 0xFE, 0xFB, 0x90, 0x76, 0x38, 0xB2, 0x80, 0x76, 0xDE, 0xDD, 0x90, 0x78, 0x18, 0x94, 0x80,
-0x78, 0xBE, 0xBF, 0x90, 0x79, 0xF8, 0x76, 0x80, 0x7A, 0x9E, 0xA1, 0x90, 0x7B, 0xD8, 0x58, 0x80,
-0x7C, 0x7E, 0x83, 0x90, 0x7D, 0xB8, 0x3A, 0x80, 0x7E, 0x5E, 0x65, 0x90, 0x7F, 0x98, 0x1C, 0x80,
-0x01, 0x00, 0x01, 0x00, 0x02, 0x03, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x01,
-0x00, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x08, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x0C, 0xFF, 0xFF, 0x9D,
-0x90, 0x00, 0x04, 0x4D, 0x44, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x4D, 0x57, 0x54, 0x00, 0x4D,
-0x50, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x54, 0x5A, 0x69,
-0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x95, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0x9E, 0xA6, 0x3A,
-0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0x9F, 0xBB, 0x07, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xA0, 0x86, 0x1C,
-0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xA1, 0x9A, 0xE9, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0x89, 0x0C,
-0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x23, 0xF4, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x61, 0x18,
-0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0xF8, 0x75, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xFB, 0xE8, 0x58,
-0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0xD8, 0x57, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xFD, 0xC8, 0x3A,
-0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xB8, 0x39, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xA8, 0x1C,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x98, 0x1B, 0x10, 0x00, 0x00, 0x00, 0x00, 0x01, 0x87, 0xFE,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x77, 0xFD, 0x10, 0x00, 0x00, 0x00, 0x00, 0x03, 0x71, 0x1A,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x04, 0x61, 0x19, 0x90, 0x00, 0x00, 0x00, 0x00, 0x05, 0x50, 0xFC,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x06, 0x40, 0xFB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x07, 0x30, 0xDE,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x07, 0x8D, 0x35, 0x90, 0x00, 0x00, 0x00, 0x00, 0x09, 0x10, 0xC0,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x09, 0xAD, 0xB1, 0x10, 0x00, 0x00, 0x00, 0x00, 0x0A, 0xF0, 0xA2,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x0B, 0xE0, 0xA1, 0x90, 0x00, 0x00, 0x00, 0x00, 0x0C, 0xD9, 0xBF,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x0D, 0xC0, 0x83, 0x90, 0x00, 0x00, 0x00, 0x00, 0x0E, 0xB9, 0xA1,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xA9, 0xA0, 0x10, 0x00, 0x00, 0x00, 0x00, 0x10, 0x99, 0x83,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x89, 0x82, 0x10, 0x00, 0x00, 0x00, 0x00, 0x12, 0x79, 0x65,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0x69, 0x64, 0x10, 0x00, 0x00, 0x00, 0x00, 0x14, 0x59, 0x47,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x49, 0x46, 0x10, 0x00, 0x00, 0x00, 0x00, 0x16, 0x39, 0x29,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x17, 0x29, 0x28, 0x10, 0x00, 0x00, 0x00, 0x00, 0x18, 0x22, 0x45,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x19, 0x09, 0x0A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1A, 0x02, 0x27,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xF2, 0x26, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xE2, 0x09,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xD2, 0x08, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC1, 0xEB,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x1E, 0xB1, 0xEA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA1, 0xCD,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x20, 0x76, 0x1D, 0x10, 0x00, 0x00, 0x00, 0x00, 0x21, 0x81, 0xAF,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x22, 0x55, 0xFF, 0x10, 0x00, 0x00, 0x00, 0x00, 0x23, 0x6A, 0xCC,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x35, 0xE1, 0x10, 0x00, 0x00, 0x00, 0x00, 0x25, 0x4A, 0xAE,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x26, 0x15, 0xC3, 0x10, 0x00, 0x00, 0x00, 0x00, 0x27, 0x2A, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x27, 0xFE, 0xDF, 0x90, 0x00, 0x00, 0x00, 0x00, 0x29, 0x0A, 0x72,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x29, 0xDE, 0xC1, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xEA, 0x54,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xBE, 0xA3, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xD3, 0x70,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x9E, 0x85, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2E, 0xB3, 0x52,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x7E, 0x67, 0x90, 0x00, 0x00, 0x00, 0x00, 0x30, 0x93, 0x34,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x84, 0x10, 0x00, 0x00, 0x00, 0x00, 0x32, 0x73, 0x16,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x66, 0x10, 0x00, 0x00, 0x00, 0x00, 0x34, 0x52, 0xF8,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x48, 0x10, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0xDA,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x37, 0x07, 0x2A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x38, 0x1B, 0xF7,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0xE7, 0x0C, 0x10, 0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0xD9,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xC6, 0xEE, 0x10, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xDB, 0xBB,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xB0, 0x0A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0x9D,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x8F, 0xEC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x7F,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x6F, 0xCE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0x9B,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x42, 0x4F, 0xB0, 0x90, 0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x7D,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x44, 0x2F, 0x92, 0x90, 0x00, 0x00, 0x00, 0x00, 0x45, 0x44, 0x5F,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x45, 0xF3, 0xC5, 0x10, 0x00, 0x00, 0x00, 0x00, 0x47, 0x2D, 0x7C,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x47, 0xD3, 0xA7, 0x10, 0x00, 0x00, 0x00, 0x00, 0x49, 0x0D, 0x5E,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x49, 0xB3, 0x89, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4A, 0xED, 0x40,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x4B, 0x9C, 0xA5, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4C, 0xD6, 0x5C,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x7C, 0x87, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4E, 0xB6, 0x3E,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x5C, 0x69, 0x90, 0x00, 0x00, 0x00, 0x00, 0x50, 0x96, 0x20,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x51, 0x3C, 0x4B, 0x90, 0x00, 0x00, 0x00, 0x00, 0x52, 0x76, 0x02,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x53, 0x1C, 0x2D, 0x90, 0x00, 0x00, 0x00, 0x00, 0x54, 0x55, 0xE4,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x54, 0xFC, 0x0F, 0x90, 0x00, 0x00, 0x00, 0x00, 0x56, 0x35, 0xC6,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x56, 0xE5, 0x2C, 0x10, 0x00, 0x00, 0x00, 0x00, 0x58, 0x1E, 0xE3,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x58, 0xC5, 0x0E, 0x10, 0x00, 0x00, 0x00, 0x00, 0x59, 0xFE, 0xC5,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xA4, 0xF0, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5B, 0xDE, 0xA7,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x5C, 0x84, 0xD2, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5D, 0xBE, 0x89,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x64, 0xB4, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5F, 0x9E, 0x6B,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x4D, 0xD0, 0x90, 0x00, 0x00, 0x00, 0x00, 0x61, 0x87, 0x87,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x62, 0x2D, 0xB2, 0x90, 0x00, 0x00, 0x00, 0x00, 0x63, 0x67, 0x69,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x64, 0x0D, 0x94, 0x90, 0x00, 0x00, 0x00, 0x00, 0x65, 0x47, 0x4B,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x65, 0xED, 0x76, 0x90, 0x00, 0x00, 0x00, 0x00, 0x67, 0x27, 0x2D,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x67, 0xCD, 0x58, 0x90, 0x00, 0x00, 0x00, 0x00, 0x69, 0x07, 0x0F,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x69, 0xAD, 0x3A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6A, 0xE6, 0xF1,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x6B, 0x96, 0x57, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6C, 0xD0, 0x0E,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x6D, 0x76, 0x39, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6E, 0xAF, 0xF0,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x6F, 0x56, 0x1B, 0x10, 0x00, 0x00, 0x00, 0x00, 0x70, 0x8F, 0xD2,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x71, 0x35, 0xFD, 0x10, 0x00, 0x00, 0x00, 0x00, 0x72, 0x6F, 0xB4,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x73, 0x15, 0xDF, 0x10, 0x00, 0x00, 0x00, 0x00, 0x74, 0x4F, 0x96,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x74, 0xFE, 0xFB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x76, 0x38, 0xB2,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x76, 0xDE, 0xDD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x78, 0x18, 0x94,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x78, 0xBE, 0xBF, 0x90, 0x00, 0x00, 0x00, 0x00, 0x79, 0xF8, 0x76,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x7A, 0x9E, 0xA1, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7B, 0xD8, 0x58,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x7E, 0x83, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7D, 0xB8, 0x3A,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x5E, 0x65, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x98, 0x1C,
-0x80, 0x01, 0x00, 0x01, 0x00, 0x02, 0x03, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0xAB, 0xA0,
-0x01, 0x00, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x08, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x0C, 0xFF, 0xFF,
-0x9D, 0x90, 0x00, 0x04, 0x4D, 0x44, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x4D, 0x57, 0x54, 0x00,
-0x4D, 0x50, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0A, 0x4D,
-0x53, 0x54, 0x37, 0x4D, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D, 0x31,
-0x31, 0x2E, 0x31, 0x2E, 0x30, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x9E, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x14, 0x80, 0x00, 0x00, 0x00,
+0x9E, 0xA6, 0x3A, 0x90, 0x9F, 0xBB, 0x07, 0x80, 0xA0, 0x86, 0x1C, 0x90, 0xA1, 0x9A, 0xE9, 0x80,
+0xA2, 0x65, 0xFE, 0x90, 0xA3, 0x84, 0x06, 0x00, 0xA4, 0x45, 0xE0, 0x90, 0xA4, 0x8F, 0xA6, 0x80,
+0xCB, 0x89, 0x0C, 0x90, 0xD2, 0x23, 0xF4, 0x70, 0xD2, 0x61, 0x18, 0x00, 0xF7, 0x2F, 0x76, 0x90,
+0xF8, 0x28, 0x94, 0x00, 0xF9, 0x0F, 0x58, 0x90, 0xFA, 0x08, 0x76, 0x00, 0xFA, 0xF8, 0x75, 0x10,
+0xFB, 0xE8, 0x58, 0x00, 0xFC, 0xD8, 0x57, 0x10, 0xFD, 0xC8, 0x3A, 0x00, 0xFE, 0xB8, 0x39, 0x10,
+0xFF, 0xA8, 0x1C, 0x00, 0x00, 0x98, 0x1B, 0x10, 0x01, 0x87, 0xFE, 0x00, 0x02, 0x77, 0xFD, 0x10,
+0x03, 0x71, 0x1A, 0x80, 0x04, 0x61, 0x19, 0x90, 0x05, 0x50, 0xFC, 0x80, 0x06, 0x40, 0xFB, 0x90,
+0x07, 0x30, 0xDE, 0x80, 0x07, 0x8D, 0x35, 0x90, 0x09, 0x10, 0xC0, 0x80, 0x09, 0xAD, 0xB1, 0x10,
+0x0A, 0xF0, 0xA2, 0x80, 0x0B, 0xE0, 0xA1, 0x90, 0x0C, 0xD9, 0xBF, 0x00, 0x0D, 0xC0, 0x83, 0x90,
+0x0E, 0xB9, 0xA1, 0x00, 0x0F, 0xA9, 0xA0, 0x10, 0x10, 0x99, 0x83, 0x00, 0x11, 0x89, 0x82, 0x10,
+0x12, 0x79, 0x65, 0x00, 0x13, 0x69, 0x64, 0x10, 0x14, 0x59, 0x47, 0x00, 0x15, 0x49, 0x46, 0x10,
+0x16, 0x39, 0x29, 0x00, 0x17, 0x29, 0x28, 0x10, 0x18, 0x22, 0x45, 0x80, 0x19, 0x09, 0x0A, 0x10,
+0x1A, 0x02, 0x27, 0x80, 0x1A, 0xF2, 0x26, 0x90, 0x1B, 0xE2, 0x09, 0x80, 0x1C, 0xD2, 0x08, 0x90,
+0x1D, 0xC1, 0xEB, 0x80, 0x1E, 0xB1, 0xEA, 0x90, 0x1F, 0xA1, 0xCD, 0x80, 0x20, 0x76, 0x1D, 0x10,
+0x21, 0x81, 0xAF, 0x80, 0x22, 0x55, 0xFF, 0x10, 0x23, 0x6A, 0xCC, 0x00, 0x24, 0x35, 0xE1, 0x10,
+0x25, 0x4A, 0xAE, 0x00, 0x26, 0x15, 0xC3, 0x10, 0x27, 0x2A, 0x90, 0x00, 0x27, 0xFE, 0xDF, 0x90,
+0x29, 0x0A, 0x72, 0x00, 0x29, 0xDE, 0xC1, 0x90, 0x2A, 0xEA, 0x54, 0x00, 0x2B, 0xBE, 0xA3, 0x90,
+0x2C, 0xD3, 0x70, 0x80, 0x2D, 0x9E, 0x85, 0x90, 0x2E, 0xB3, 0x52, 0x80, 0x2F, 0x7E, 0x67, 0x90,
+0x30, 0x93, 0x34, 0x80, 0x31, 0x67, 0x84, 0x10, 0x32, 0x73, 0x16, 0x80, 0x33, 0x47, 0x66, 0x10,
+0x34, 0x52, 0xF8, 0x80, 0x35, 0x27, 0x48, 0x10, 0x36, 0x32, 0xDA, 0x80, 0x37, 0x07, 0x2A, 0x10,
+0x38, 0x1B, 0xF7, 0x00, 0x38, 0xE7, 0x0C, 0x10, 0x39, 0xFB, 0xD9, 0x00, 0x3A, 0xC6, 0xEE, 0x10,
+0x3B, 0xDB, 0xBB, 0x00, 0x3C, 0xB0, 0x0A, 0x90, 0x3D, 0xBB, 0x9D, 0x00, 0x3E, 0x8F, 0xEC, 0x90,
+0x3F, 0x9B, 0x7F, 0x00, 0x40, 0x6F, 0xCE, 0x90, 0x41, 0x84, 0x9B, 0x80, 0x42, 0x4F, 0xB0, 0x90,
+0x43, 0x64, 0x7D, 0x80, 0x44, 0x2F, 0x92, 0x90, 0x45, 0x44, 0x5F, 0x80, 0x45, 0xF3, 0xC5, 0x10,
+0x47, 0x2D, 0x7C, 0x00, 0x47, 0xD3, 0xA7, 0x10, 0x49, 0x0D, 0x5E, 0x00, 0x49, 0xB3, 0x89, 0x10,
+0x4A, 0xED, 0x40, 0x00, 0x4B, 0x9C, 0xA5, 0x90, 0x4C, 0xD6, 0x5C, 0x80, 0x4D, 0x7C, 0x87, 0x90,
+0x4E, 0xB6, 0x3E, 0x80, 0x4F, 0x5C, 0x69, 0x90, 0x50, 0x96, 0x20, 0x80, 0x51, 0x3C, 0x4B, 0x90,
+0x52, 0x76, 0x02, 0x80, 0x53, 0x1C, 0x2D, 0x90, 0x54, 0x55, 0xE4, 0x80, 0x54, 0xFC, 0x0F, 0x90,
+0x56, 0x35, 0xC6, 0x80, 0x56, 0xE5, 0x2C, 0x10, 0x58, 0x1E, 0xE3, 0x00, 0x58, 0xC5, 0x0E, 0x10,
+0x59, 0xFE, 0xC5, 0x00, 0x5A, 0xA4, 0xF0, 0x10, 0x5B, 0xDE, 0xA7, 0x00, 0x5C, 0x84, 0xD2, 0x10,
+0x5D, 0xBE, 0x89, 0x00, 0x5E, 0x64, 0xB4, 0x10, 0x5F, 0x9E, 0x6B, 0x00, 0x60, 0x4D, 0xD0, 0x90,
+0x61, 0x87, 0x87, 0x80, 0x62, 0x2D, 0xB2, 0x90, 0x63, 0x67, 0x69, 0x80, 0x64, 0x0D, 0x94, 0x90,
+0x65, 0x47, 0x4B, 0x80, 0x65, 0xED, 0x76, 0x90, 0x67, 0x27, 0x2D, 0x80, 0x67, 0xCD, 0x58, 0x90,
+0x69, 0x07, 0x0F, 0x80, 0x69, 0xAD, 0x3A, 0x90, 0x6A, 0xE6, 0xF1, 0x80, 0x6B, 0x96, 0x57, 0x10,
+0x6C, 0xD0, 0x0E, 0x00, 0x6D, 0x76, 0x39, 0x10, 0x6E, 0xAF, 0xF0, 0x00, 0x6F, 0x56, 0x1B, 0x10,
+0x70, 0x8F, 0xD2, 0x00, 0x71, 0x35, 0xFD, 0x10, 0x72, 0x6F, 0xB4, 0x00, 0x73, 0x15, 0xDF, 0x10,
+0x74, 0x4F, 0x96, 0x00, 0x74, 0xFE, 0xFB, 0x90, 0x76, 0x38, 0xB2, 0x80, 0x76, 0xDE, 0xDD, 0x90,
+0x78, 0x18, 0x94, 0x80, 0x78, 0xBE, 0xBF, 0x90, 0x79, 0xF8, 0x76, 0x80, 0x7A, 0x9E, 0xA1, 0x90,
+0x7B, 0xD8, 0x58, 0x80, 0x7C, 0x7E, 0x83, 0x90, 0x7D, 0xB8, 0x3A, 0x80, 0x7E, 0x5E, 0x65, 0x90,
+0x7F, 0x98, 0x1C, 0x80, 0x03, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x04, 0x05, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0xFF, 0xFF, 0x9D, 0x94, 0x00, 0x00, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x04, 0xFF, 0xFF,
+0x9D, 0x90, 0x00, 0x08, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x08, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x0C,
+0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x10, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x44, 0x54, 0x00, 0x4D, 0x53,
+0x54, 0x00, 0x4D, 0x57, 0x54, 0x00, 0x4D, 0x50, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01,
+0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00,
+0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9E, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00,
+0x00, 0x14, 0xFF, 0xFF, 0xFF, 0xFF, 0x5E, 0x04, 0x0C, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0x9E, 0xA6,
+0x3A, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0x9F, 0xBB, 0x07, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xA0, 0x86,
+0x1C, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xA1, 0x9A, 0xE9, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xA2, 0x65,
+0xFE, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xA3, 0x84, 0x06, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xA4, 0x45,
+0xE0, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xA4, 0x8F, 0xA6, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0x89,
+0x0C, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x23, 0xF4, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x61,
+0x18, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x2F, 0x76, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x28,
+0x94, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xF9, 0x0F, 0x58, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x08,
+0x76, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0xF8, 0x75, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xFB, 0xE8,
+0x58, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0xD8, 0x57, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xFD, 0xC8,
+0x3A, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xB8, 0x39, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xA8,
+0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x98, 0x1B, 0x10, 0x00, 0x00, 0x00, 0x00, 0x01, 0x87,
+0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x77, 0xFD, 0x10, 0x00, 0x00, 0x00, 0x00, 0x03, 0x71,
+0x1A, 0x80, 0x00, 0x00, 0x00, 0x00, 0x04, 0x61, 0x19, 0x90, 0x00, 0x00, 0x00, 0x00, 0x05, 0x50,
+0xFC, 0x80, 0x00, 0x00, 0x00, 0x00, 0x06, 0x40, 0xFB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x07, 0x30,
+0xDE, 0x80, 0x00, 0x00, 0x00, 0x00, 0x07, 0x8D, 0x35, 0x90, 0x00, 0x00, 0x00, 0x00, 0x09, 0x10,
+0xC0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x09, 0xAD, 0xB1, 0x10, 0x00, 0x00, 0x00, 0x00, 0x0A, 0xF0,
+0xA2, 0x80, 0x00, 0x00, 0x00, 0x00, 0x0B, 0xE0, 0xA1, 0x90, 0x00, 0x00, 0x00, 0x00, 0x0C, 0xD9,
+0xBF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0D, 0xC0, 0x83, 0x90, 0x00, 0x00, 0x00, 0x00, 0x0E, 0xB9,
+0xA1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xA9, 0xA0, 0x10, 0x00, 0x00, 0x00, 0x00, 0x10, 0x99,
+0x83, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x89, 0x82, 0x10, 0x00, 0x00, 0x00, 0x00, 0x12, 0x79,
+0x65, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0x69, 0x64, 0x10, 0x00, 0x00, 0x00, 0x00, 0x14, 0x59,
+0x47, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x49, 0x46, 0x10, 0x00, 0x00, 0x00, 0x00, 0x16, 0x39,
+0x29, 0x00, 0x00, 0x00, 0x00, 0x00, 0x17, 0x29, 0x28, 0x10, 0x00, 0x00, 0x00, 0x00, 0x18, 0x22,
+0x45, 0x80, 0x00, 0x00, 0x00, 0x00, 0x19, 0x09, 0x0A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1A, 0x02,
+0x27, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xF2, 0x26, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xE2,
+0x09, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xD2, 0x08, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC1,
+0xEB, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1E, 0xB1, 0xEA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA1,
+0xCD, 0x80, 0x00, 0x00, 0x00, 0x00, 0x20, 0x76, 0x1D, 0x10, 0x00, 0x00, 0x00, 0x00, 0x21, 0x81,
+0xAF, 0x80, 0x00, 0x00, 0x00, 0x00, 0x22, 0x55, 0xFF, 0x10, 0x00, 0x00, 0x00, 0x00, 0x23, 0x6A,
+0xCC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x35, 0xE1, 0x10, 0x00, 0x00, 0x00, 0x00, 0x25, 0x4A,
+0xAE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x26, 0x15, 0xC3, 0x10, 0x00, 0x00, 0x00, 0x00, 0x27, 0x2A,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x00, 0x27, 0xFE, 0xDF, 0x90, 0x00, 0x00, 0x00, 0x00, 0x29, 0x0A,
+0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 0x29, 0xDE, 0xC1, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xEA,
+0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xBE, 0xA3, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xD3,
+0x70, 0x80, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x9E, 0x85, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2E, 0xB3,
+0x52, 0x80, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x7E, 0x67, 0x90, 0x00, 0x00, 0x00, 0x00, 0x30, 0x93,
+0x34, 0x80, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x84, 0x10, 0x00, 0x00, 0x00, 0x00, 0x32, 0x73,
+0x16, 0x80, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x66, 0x10, 0x00, 0x00, 0x00, 0x00, 0x34, 0x52,
+0xF8, 0x80, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x48, 0x10, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32,
+0xDA, 0x80, 0x00, 0x00, 0x00, 0x00, 0x37, 0x07, 0x2A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x38, 0x1B,
+0xF7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0xE7, 0x0C, 0x10, 0x00, 0x00, 0x00, 0x00, 0x39, 0xFB,
+0xD9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xC6, 0xEE, 0x10, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xDB,
+0xBB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xB0, 0x0A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB,
+0x9D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x8F, 0xEC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B,
+0x7F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x6F, 0xCE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x41, 0x84,
+0x9B, 0x80, 0x00, 0x00, 0x00, 0x00, 0x42, 0x4F, 0xB0, 0x90, 0x00, 0x00, 0x00, 0x00, 0x43, 0x64,
+0x7D, 0x80, 0x00, 0x00, 0x00, 0x00, 0x44, 0x2F, 0x92, 0x90, 0x00, 0x00, 0x00, 0x00, 0x45, 0x44,
+0x5F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x45, 0xF3, 0xC5, 0x10, 0x00, 0x00, 0x00, 0x00, 0x47, 0x2D,
+0x7C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x47, 0xD3, 0xA7, 0x10, 0x00, 0x00, 0x00, 0x00, 0x49, 0x0D,
+0x5E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x49, 0xB3, 0x89, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4A, 0xED,
+0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4B, 0x9C, 0xA5, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4C, 0xD6,
+0x5C, 0x80, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x7C, 0x87, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4E, 0xB6,
+0x3E, 0x80, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x5C, 0x69, 0x90, 0x00, 0x00, 0x00, 0x00, 0x50, 0x96,
+0x20, 0x80, 0x00, 0x00, 0x00, 0x00, 0x51, 0x3C, 0x4B, 0x90, 0x00, 0x00, 0x00, 0x00, 0x52, 0x76,
+0x02, 0x80, 0x00, 0x00, 0x00, 0x00, 0x53, 0x1C, 0x2D, 0x90, 0x00, 0x00, 0x00, 0x00, 0x54, 0x55,
+0xE4, 0x80, 0x00, 0x00, 0x00, 0x00, 0x54, 0xFC, 0x0F, 0x90, 0x00, 0x00, 0x00, 0x00, 0x56, 0x35,
+0xC6, 0x80, 0x00, 0x00, 0x00, 0x00, 0x56, 0xE5, 0x2C, 0x10, 0x00, 0x00, 0x00, 0x00, 0x58, 0x1E,
+0xE3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x58, 0xC5, 0x0E, 0x10, 0x00, 0x00, 0x00, 0x00, 0x59, 0xFE,
+0xC5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xA4, 0xF0, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5B, 0xDE,
+0xA7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5C, 0x84, 0xD2, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5D, 0xBE,
+0x89, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x64, 0xB4, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5F, 0x9E,
+0x6B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x4D, 0xD0, 0x90, 0x00, 0x00, 0x00, 0x00, 0x61, 0x87,
+0x87, 0x80, 0x00, 0x00, 0x00, 0x00, 0x62, 0x2D, 0xB2, 0x90, 0x00, 0x00, 0x00, 0x00, 0x63, 0x67,
+0x69, 0x80, 0x00, 0x00, 0x00, 0x00, 0x64, 0x0D, 0x94, 0x90, 0x00, 0x00, 0x00, 0x00, 0x65, 0x47,
+0x4B, 0x80, 0x00, 0x00, 0x00, 0x00, 0x65, 0xED, 0x76, 0x90, 0x00, 0x00, 0x00, 0x00, 0x67, 0x27,
+0x2D, 0x80, 0x00, 0x00, 0x00, 0x00, 0x67, 0xCD, 0x58, 0x90, 0x00, 0x00, 0x00, 0x00, 0x69, 0x07,
+0x0F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x69, 0xAD, 0x3A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6A, 0xE6,
+0xF1, 0x80, 0x00, 0x00, 0x00, 0x00, 0x6B, 0x96, 0x57, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6C, 0xD0,
+0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6D, 0x76, 0x39, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6E, 0xAF,
+0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6F, 0x56, 0x1B, 0x10, 0x00, 0x00, 0x00, 0x00, 0x70, 0x8F,
+0xD2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x71, 0x35, 0xFD, 0x10, 0x00, 0x00, 0x00, 0x00, 0x72, 0x6F,
+0xB4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x73, 0x15, 0xDF, 0x10, 0x00, 0x00, 0x00, 0x00, 0x74, 0x4F,
+0x96, 0x00, 0x00, 0x00, 0x00, 0x00, 0x74, 0xFE, 0xFB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x76, 0x38,
+0xB2, 0x80, 0x00, 0x00, 0x00, 0x00, 0x76, 0xDE, 0xDD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x78, 0x18,
+0x94, 0x80, 0x00, 0x00, 0x00, 0x00, 0x78, 0xBE, 0xBF, 0x90, 0x00, 0x00, 0x00, 0x00, 0x79, 0xF8,
+0x76, 0x80, 0x00, 0x00, 0x00, 0x00, 0x7A, 0x9E, 0xA1, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7B, 0xD8,
+0x58, 0x80, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x7E, 0x83, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7D, 0xB8,
+0x3A, 0x80, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x5E, 0x65, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x98,
+0x1C, 0x80, 0x03, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x04, 0x05, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0xFF, 0xFF, 0x9D, 0x94, 0x00, 0x00, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x04, 0xFF, 0xFF, 0x9D, 0x90,
+0x00, 0x08, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x08, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x0C, 0xFF, 0xFF,
+0xAB, 0xA0, 0x01, 0x10, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x44, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00,
+0x4D, 0x57, 0x54, 0x00, 0x4D, 0x50, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00,
+0x00, 0x01, 0x00, 0x01, 0x0A, 0x4D, 0x53, 0x54, 0x37, 0x4D, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E,
+0x32, 0x2E, 0x30, 0x2C, 0x4D, 0x31, 0x31, 0x2E, 0x31, 0x2E, 0x30, 0x0A, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 
 /* Navajo */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -67621,19 +68454,19 @@
 
 /* Portugal */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x1B, 0x80, 0x00, 0x00, 0x00,
-0x92, 0xE6, 0x8E, 0x80, 0x9B, 0x4B, 0x6D, 0x70, 0x9B, 0xFE, 0xC7, 0x80, 0x9C, 0x9C, 0xED, 0x70,
-0x9D, 0xC9, 0x83, 0x70, 0x9E, 0x7F, 0x72, 0x70, 0x9F, 0xAA, 0xB6, 0xF0, 0xA0, 0x5F, 0x54, 0x70,
-0xA1, 0x8B, 0xEA, 0x70, 0xA2, 0x41, 0xD9, 0x70, 0xA3, 0x6E, 0x6F, 0x70, 0xA4, 0x23, 0x0C, 0xF0,
-0xA5, 0x4F, 0xA2, 0xF0, 0xAA, 0x05, 0xEF, 0x70, 0xAA, 0xF4, 0x8E, 0xF0, 0xAD, 0xC9, 0xA7, 0xF0,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0xE1, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x1B, 0x80, 0x00, 0x00, 0x00,
+0x92, 0xE6, 0x8E, 0x80, 0x9B, 0x4B, 0x6D, 0x70, 0x9B, 0xFE, 0xC7, 0x80, 0x9C, 0x9C, 0xFB, 0x80,
+0x9D, 0xC9, 0x83, 0x70, 0x9E, 0x7E, 0x2F, 0x00, 0x9F, 0xAA, 0xB6, 0xF0, 0xA0, 0x5F, 0x62, 0x80,
+0xA1, 0x8B, 0xEA, 0x70, 0xA2, 0x41, 0xE7, 0x80, 0xA3, 0x6E, 0x6F, 0x70, 0xA4, 0x23, 0x1B, 0x00,
+0xA5, 0x4F, 0xA2, 0xF0, 0xAA, 0x05, 0xEF, 0x70, 0xAA, 0xE7, 0x5F, 0xF0, 0xAD, 0xC9, 0xA7, 0xF0,
 0xAE, 0xA7, 0x23, 0xF0, 0xAF, 0xA0, 0x4F, 0x70, 0xB0, 0x87, 0x05, 0xF0, 0xB1, 0x89, 0x6B, 0xF0,
 0xB2, 0x70, 0x22, 0x70, 0xB3, 0x72, 0x88, 0x70, 0xB4, 0x50, 0x04, 0x70, 0xB7, 0x32, 0x4C, 0x70,
 0xB8, 0x0F, 0xC8, 0x70, 0xB8, 0xFF, 0xB9, 0x70, 0xB9, 0xEF, 0xAA, 0x70, 0xBC, 0xC8, 0xB7, 0xF0,
 0xBD, 0xB8, 0xA8, 0xF0, 0xBE, 0x9F, 0x5F, 0x70, 0xBF, 0x98, 0x8A, 0xF0, 0xC0, 0x9A, 0xF0, 0xF0,
 0xC1, 0x78, 0x6C, 0xF0, 0xC2, 0x68, 0x5D, 0xF0, 0xC3, 0x58, 0x4E, 0xF0, 0xC4, 0x3F, 0x05, 0x70,
 0xC5, 0x38, 0x30, 0xF0, 0xC6, 0x3A, 0x96, 0xF0, 0xC7, 0x58, 0xAC, 0x70, 0xC7, 0xD9, 0xDF, 0x70,
-0xC9, 0x01, 0x2F, 0x70, 0xC9, 0xF1, 0x20, 0x70, 0xCA, 0xE2, 0x62, 0xF0, 0xCB, 0xB5, 0x52, 0xF0,
+0xC9, 0x03, 0xD2, 0x70, 0xC9, 0xF1, 0x20, 0x70, 0xCA, 0xE2, 0x62, 0xF0, 0xCB, 0xB5, 0x52, 0xF0,
 0xCB, 0xEC, 0xA3, 0xE0, 0xCC, 0x80, 0x4B, 0xE0, 0xCC, 0xDC, 0xA2, 0xF0, 0xCD, 0x95, 0x34, 0xF0,
 0xCD, 0xC3, 0x4B, 0x60, 0xCE, 0x72, 0xA2, 0xE0, 0xCE, 0xC5, 0xBF, 0x70, 0xCF, 0x75, 0x16, 0xF0,
 0xCF, 0xAC, 0x67, 0xE0, 0xD0, 0x52, 0x84, 0xE0, 0xD0, 0xA5, 0xA1, 0x70, 0xD1, 0x54, 0xF8, 0xF0,
@@ -67648,198 +68481,200 @@
 0xEE, 0x9A, 0xB1, 0x20, 0xEF, 0x8A, 0xA2, 0x20, 0xF0, 0x7A, 0x93, 0x20, 0xF1, 0x6A, 0x84, 0x20,
 0xF2, 0x63, 0xAF, 0xA0, 0xF3, 0x53, 0xA0, 0xA0, 0xF4, 0x43, 0x91, 0xA0, 0xF5, 0x33, 0x82, 0xA0,
 0xF6, 0x23, 0x73, 0xA0, 0xF7, 0x13, 0x64, 0xA0, 0xF8, 0x03, 0x55, 0xA0, 0xF8, 0xF3, 0x46, 0xA0,
-0x0C, 0xAB, 0x2A, 0x00, 0x0D, 0x9B, 0x1B, 0x00, 0x0E, 0x8B, 0x0C, 0x00, 0x0F, 0x84, 0x37, 0x80,
-0x10, 0x74, 0x28, 0x80, 0x11, 0x64, 0x19, 0x80, 0x12, 0x54, 0x18, 0x90, 0x13, 0x43, 0xFB, 0x80,
-0x14, 0x33, 0xFA, 0x90, 0x15, 0x23, 0xEB, 0x90, 0x16, 0x13, 0xDC, 0x90, 0x17, 0x03, 0xCD, 0x90,
-0x17, 0xF3, 0xBE, 0x90, 0x18, 0xE3, 0xBD, 0xA0, 0x19, 0xD3, 0xA0, 0x90, 0x1A, 0xC3, 0x91, 0x90,
-0x1B, 0xBC, 0xBD, 0x10, 0x1C, 0xAC, 0xAE, 0x10, 0x1D, 0x9C, 0x9F, 0x10, 0x1E, 0x8C, 0x90, 0x10,
-0x1F, 0x7C, 0x81, 0x10, 0x20, 0x6C, 0x72, 0x10, 0x21, 0x5C, 0x63, 0x10, 0x22, 0x4C, 0x54, 0x10,
-0x23, 0x3C, 0x45, 0x10, 0x24, 0x2C, 0x36, 0x10, 0x25, 0x1C, 0x27, 0x10, 0x26, 0x0C, 0x18, 0x10,
-0x27, 0x05, 0x43, 0x90, 0x27, 0xF5, 0x34, 0x90, 0x28, 0xE5, 0x25, 0x90, 0x29, 0xD5, 0x16, 0x90,
-0x2A, 0xC5, 0x07, 0x90, 0x2B, 0xB4, 0xF8, 0x90, 0x2C, 0xA4, 0xE9, 0x90, 0x2D, 0x94, 0xDA, 0x90,
-0x2E, 0x84, 0xCB, 0x90, 0x2F, 0x74, 0xBC, 0x90, 0x30, 0x64, 0xAD, 0x90, 0x31, 0x5D, 0xD9, 0x10,
-0x32, 0x72, 0xB4, 0x10, 0x33, 0x3D, 0xBB, 0x10, 0x34, 0x52, 0x96, 0x10, 0x35, 0x1D, 0x9D, 0x10,
-0x36, 0x32, 0x78, 0x10, 0x36, 0xFD, 0x7F, 0x10, 0x38, 0x1B, 0x94, 0x90, 0x38, 0xDD, 0x61, 0x10,
-0x39, 0xFB, 0x76, 0x90, 0x3A, 0xBD, 0x43, 0x10, 0x3B, 0xDB, 0x58, 0x90, 0x3C, 0xA6, 0x5F, 0x90,
-0x3D, 0xBB, 0x3A, 0x90, 0x3E, 0x86, 0x41, 0x90, 0x3F, 0x9B, 0x1C, 0x90, 0x40, 0x66, 0x23, 0x90,
-0x41, 0x84, 0x39, 0x10, 0x42, 0x46, 0x05, 0x90, 0x43, 0x64, 0x1B, 0x10, 0x44, 0x25, 0xE7, 0x90,
-0x45, 0x43, 0xFD, 0x10, 0x46, 0x05, 0xC9, 0x90, 0x47, 0x23, 0xDF, 0x10, 0x47, 0xEE, 0xE6, 0x10,
-0x49, 0x03, 0xC1, 0x10, 0x49, 0xCE, 0xC8, 0x10, 0x4A, 0xE3, 0xA3, 0x10, 0x4B, 0xAE, 0xAA, 0x10,
-0x4C, 0xCC, 0xBF, 0x90, 0x4D, 0x8E, 0x8C, 0x10, 0x4E, 0xAC, 0xA1, 0x90, 0x4F, 0x6E, 0x6E, 0x10,
-0x50, 0x8C, 0x83, 0x90, 0x51, 0x57, 0x8A, 0x90, 0x52, 0x6C, 0x65, 0x90, 0x53, 0x37, 0x6C, 0x90,
-0x54, 0x4C, 0x47, 0x90, 0x55, 0x17, 0x4E, 0x90, 0x56, 0x2C, 0x29, 0x90, 0x56, 0xF7, 0x30, 0x90,
-0x58, 0x15, 0x46, 0x10, 0x58, 0xD7, 0x12, 0x90, 0x59, 0xF5, 0x28, 0x10, 0x5A, 0xB6, 0xF4, 0x90,
-0x5B, 0xD5, 0x0A, 0x10, 0x5C, 0xA0, 0x11, 0x10, 0x5D, 0xB4, 0xEC, 0x10, 0x5E, 0x7F, 0xF3, 0x10,
-0x5F, 0x94, 0xCE, 0x10, 0x60, 0x5F, 0xD5, 0x10, 0x61, 0x7D, 0xEA, 0x90, 0x62, 0x3F, 0xB7, 0x10,
-0x63, 0x5D, 0xCC, 0x90, 0x64, 0x1F, 0x99, 0x10, 0x65, 0x3D, 0xAE, 0x90, 0x66, 0x08, 0xB5, 0x90,
-0x67, 0x1D, 0x90, 0x90, 0x67, 0xE8, 0x97, 0x90, 0x68, 0xFD, 0x72, 0x90, 0x69, 0xC8, 0x79, 0x90,
-0x6A, 0xDD, 0x54, 0x90, 0x6B, 0xA8, 0x5B, 0x90, 0x6C, 0xC6, 0x71, 0x10, 0x6D, 0x88, 0x3D, 0x90,
-0x6E, 0xA6, 0x53, 0x10, 0x6F, 0x68, 0x1F, 0x90, 0x70, 0x86, 0x35, 0x10, 0x71, 0x51, 0x3C, 0x10,
-0x72, 0x66, 0x17, 0x10, 0x73, 0x31, 0x1E, 0x10, 0x74, 0x45, 0xF9, 0x10, 0x75, 0x11, 0x00, 0x10,
-0x76, 0x2F, 0x15, 0x90, 0x76, 0xF0, 0xE2, 0x10, 0x78, 0x0E, 0xF7, 0x90, 0x78, 0xD0, 0xC4, 0x10,
-0x79, 0xEE, 0xD9, 0x90, 0x7A, 0xB0, 0xA6, 0x10, 0x7B, 0xCE, 0xBB, 0x90, 0x7C, 0x99, 0xC2, 0x90,
-0x7D, 0xAE, 0x9D, 0x90, 0x7E, 0x79, 0xA4, 0x90, 0x7F, 0x8E, 0x7F, 0x90, 0x00, 0x06, 0x01, 0x02,
+0xF9, 0xE3, 0x37, 0xA0, 0x0C, 0xAB, 0x2A, 0x00, 0x0D, 0x9B, 0x1B, 0x00, 0x0E, 0x8B, 0x0C, 0x00,
+0x0F, 0x84, 0x45, 0x90, 0x10, 0x74, 0x36, 0x90, 0x11, 0x64, 0x27, 0x90, 0x12, 0x54, 0x18, 0x90,
+0x13, 0x4D, 0x44, 0x10, 0x14, 0x33, 0xFA, 0x90, 0x15, 0x23, 0xDD, 0x80, 0x16, 0x13, 0xCE, 0x80,
+0x17, 0x03, 0xBF, 0x80, 0x17, 0xF3, 0xB0, 0x80, 0x18, 0xE3, 0xA1, 0x80, 0x19, 0xD3, 0x92, 0x80,
+0x1A, 0xC3, 0x83, 0x80, 0x1B, 0xBC, 0xAF, 0x00, 0x1C, 0xAC, 0xA0, 0x00, 0x1D, 0x9C, 0x91, 0x00,
+0x1E, 0x8C, 0x90, 0x10, 0x1F, 0x7C, 0x81, 0x10, 0x20, 0x6C, 0x72, 0x10, 0x21, 0x5C, 0x63, 0x10,
+0x22, 0x4C, 0x54, 0x10, 0x23, 0x3C, 0x45, 0x10, 0x24, 0x2C, 0x36, 0x10, 0x25, 0x1C, 0x27, 0x10,
+0x26, 0x0C, 0x18, 0x10, 0x27, 0x05, 0x43, 0x90, 0x27, 0xF5, 0x34, 0x90, 0x28, 0xE5, 0x25, 0x90,
+0x29, 0xD5, 0x16, 0x90, 0x2A, 0xC5, 0x07, 0x90, 0x2B, 0xB4, 0xF8, 0x90, 0x2C, 0xA4, 0xE9, 0x90,
+0x2D, 0x94, 0xDA, 0x90, 0x2E, 0x84, 0xCB, 0x90, 0x2F, 0x74, 0xBC, 0x90, 0x30, 0x64, 0xAD, 0x90,
+0x31, 0x5D, 0xD9, 0x10, 0x32, 0x72, 0xB4, 0x10, 0x33, 0x3D, 0xBB, 0x10, 0x34, 0x52, 0x96, 0x10,
+0x35, 0x1D, 0x9D, 0x10, 0x36, 0x32, 0x78, 0x10, 0x36, 0xFD, 0x7F, 0x10, 0x38, 0x1B, 0x94, 0x90,
+0x38, 0xDD, 0x61, 0x10, 0x39, 0xFB, 0x76, 0x90, 0x3A, 0xBD, 0x43, 0x10, 0x3B, 0xDB, 0x58, 0x90,
+0x3C, 0xA6, 0x5F, 0x90, 0x3D, 0xBB, 0x3A, 0x90, 0x3E, 0x86, 0x41, 0x90, 0x3F, 0x9B, 0x1C, 0x90,
+0x40, 0x66, 0x23, 0x90, 0x41, 0x84, 0x39, 0x10, 0x42, 0x46, 0x05, 0x90, 0x43, 0x64, 0x1B, 0x10,
+0x44, 0x25, 0xE7, 0x90, 0x45, 0x43, 0xFD, 0x10, 0x46, 0x05, 0xC9, 0x90, 0x47, 0x23, 0xDF, 0x10,
+0x47, 0xEE, 0xE6, 0x10, 0x49, 0x03, 0xC1, 0x10, 0x49, 0xCE, 0xC8, 0x10, 0x4A, 0xE3, 0xA3, 0x10,
+0x4B, 0xAE, 0xAA, 0x10, 0x4C, 0xCC, 0xBF, 0x90, 0x4D, 0x8E, 0x8C, 0x10, 0x4E, 0xAC, 0xA1, 0x90,
+0x4F, 0x6E, 0x6E, 0x10, 0x50, 0x8C, 0x83, 0x90, 0x51, 0x57, 0x8A, 0x90, 0x52, 0x6C, 0x65, 0x90,
+0x53, 0x37, 0x6C, 0x90, 0x54, 0x4C, 0x47, 0x90, 0x55, 0x17, 0x4E, 0x90, 0x56, 0x2C, 0x29, 0x90,
+0x56, 0xF7, 0x30, 0x90, 0x58, 0x15, 0x46, 0x10, 0x58, 0xD7, 0x12, 0x90, 0x59, 0xF5, 0x28, 0x10,
+0x5A, 0xB6, 0xF4, 0x90, 0x5B, 0xD5, 0x0A, 0x10, 0x5C, 0xA0, 0x11, 0x10, 0x5D, 0xB4, 0xEC, 0x10,
+0x5E, 0x7F, 0xF3, 0x10, 0x5F, 0x94, 0xCE, 0x10, 0x60, 0x5F, 0xD5, 0x10, 0x61, 0x7D, 0xEA, 0x90,
+0x62, 0x3F, 0xB7, 0x10, 0x63, 0x5D, 0xCC, 0x90, 0x64, 0x1F, 0x99, 0x10, 0x65, 0x3D, 0xAE, 0x90,
+0x66, 0x08, 0xB5, 0x90, 0x67, 0x1D, 0x90, 0x90, 0x67, 0xE8, 0x97, 0x90, 0x68, 0xFD, 0x72, 0x90,
+0x69, 0xC8, 0x79, 0x90, 0x6A, 0xDD, 0x54, 0x90, 0x6B, 0xA8, 0x5B, 0x90, 0x6C, 0xC6, 0x71, 0x10,
+0x6D, 0x88, 0x3D, 0x90, 0x6E, 0xA6, 0x53, 0x10, 0x6F, 0x68, 0x1F, 0x90, 0x70, 0x86, 0x35, 0x10,
+0x71, 0x51, 0x3C, 0x10, 0x72, 0x66, 0x17, 0x10, 0x73, 0x31, 0x1E, 0x10, 0x74, 0x45, 0xF9, 0x10,
+0x75, 0x11, 0x00, 0x10, 0x76, 0x2F, 0x15, 0x90, 0x76, 0xF0, 0xE2, 0x10, 0x78, 0x0E, 0xF7, 0x90,
+0x78, 0xD0, 0xC4, 0x10, 0x79, 0xEE, 0xD9, 0x90, 0x7A, 0xB0, 0xA6, 0x10, 0x7B, 0xCE, 0xBB, 0x90,
+0x7C, 0x99, 0xC2, 0x90, 0x7D, 0xAE, 0x9D, 0x90, 0x7E, 0x79, 0xA4, 0x90, 0x7F, 0x8E, 0x7F, 0x90,
+0x00, 0x06, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x03, 0x04,
 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x05, 0x03, 0x04,
+0x03, 0x05, 0x03, 0x04, 0x03, 0x05, 0x03, 0x04, 0x03, 0x05, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
-0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x05, 0x03, 0x04, 0x03, 0x05, 0x03, 0x04,
-0x03, 0x05, 0x03, 0x04, 0x03, 0x05, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x07, 0x02, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
+0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08,
+0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x08, 0x06, 0x08,
+0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08,
+0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08,
+0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08,
+0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08,
+0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08,
+0x06, 0xFF, 0xFF, 0xF7, 0x63, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x04, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x09, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00,
+0x00, 0x1C, 0x20, 0x01, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x0E, 0x10, 0x00,
+0x12, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x04, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x12, 0x00, 0x00, 0x1C,
+0x20, 0x01, 0x16, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x4C,
+0x4D, 0x54, 0x00, 0x57, 0x45, 0x53, 0x54, 0x00, 0x57, 0x45, 0x54, 0x00, 0x57, 0x45, 0x4D, 0x54,
+0x00, 0x43, 0x45, 0x54, 0x00, 0x43, 0x45, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01,
+0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01,
+0x01, 0x01, 0x01, 0x01, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x0D,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE1, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x1B,
+0xFF, 0xFF, 0xFF, 0xFF, 0x5E, 0x3D, 0x0C, 0x1D, 0xFF, 0xFF, 0xFF, 0xFF, 0x92, 0xE6, 0x8E, 0x80,
+0xFF, 0xFF, 0xFF, 0xFF, 0x9B, 0x4B, 0x6D, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0x9B, 0xFE, 0xC7, 0x80,
+0xFF, 0xFF, 0xFF, 0xFF, 0x9C, 0x9C, 0xFB, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0x9D, 0xC9, 0x83, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0x9E, 0x7E, 0x2F, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x9F, 0xAA, 0xB6, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xA0, 0x5F, 0x62, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xA1, 0x8B, 0xEA, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xA2, 0x41, 0xE7, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xA3, 0x6E, 0x6F, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xA4, 0x23, 0x1B, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0x4F, 0xA2, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xAA, 0x05, 0xEF, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAA, 0xE7, 0x5F, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xAD, 0xC9, 0xA7, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xAE, 0xA7, 0x23, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xA0, 0x4F, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB0, 0x87, 0x05, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xB1, 0x89, 0x6B, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB2, 0x70, 0x22, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xB3, 0x72, 0x88, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB4, 0x50, 0x04, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x32, 0x4C, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0x0F, 0xC8, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0xFF, 0xB9, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB9, 0xEF, 0xAA, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xBC, 0xC8, 0xB7, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xBD, 0xB8, 0xA8, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xBE, 0x9F, 0x5F, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xBF, 0x98, 0x8A, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xC0, 0x9A, 0xF0, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC1, 0x78, 0x6C, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xC2, 0x68, 0x5D, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC3, 0x58, 0x4E, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xC4, 0x3F, 0x05, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xC5, 0x38, 0x30, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xC6, 0x3A, 0x96, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC7, 0x58, 0xAC, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xC7, 0xD9, 0xDF, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0x03, 0xD2, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0xF1, 0x20, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xCA, 0xE2, 0x62, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0xB5, 0x52, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0xEC, 0xA3, 0xE0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xCC, 0x80, 0x4B, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCC, 0xDC, 0xA2, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xCD, 0x95, 0x34, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCD, 0xC3, 0x4B, 0x60,
+0xFF, 0xFF, 0xFF, 0xFF, 0xCE, 0x72, 0xA2, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCE, 0xC5, 0xBF, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xCF, 0x75, 0x16, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCF, 0xAC, 0x67, 0xE0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xD0, 0x52, 0x84, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD0, 0xA5, 0xA1, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xD1, 0x54, 0xF8, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD1, 0x8C, 0x49, 0xE0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x32, 0x66, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x85, 0x83, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xD3, 0x59, 0xC4, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD4, 0x49, 0xB5, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xD5, 0x39, 0xD1, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xD6, 0x29, 0xC2, 0x20,
+0xFF, 0xFF, 0xFF, 0xFF, 0xD7, 0x19, 0xB3, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xD8, 0x09, 0xA4, 0x20,
+0xFF, 0xFF, 0xFF, 0xFF, 0xD8, 0xF9, 0x95, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xD9, 0xE9, 0x86, 0x20,
+0xFF, 0xFF, 0xFF, 0xFF, 0xDA, 0xD9, 0x77, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xDB, 0xC9, 0x68, 0x20,
+0xFF, 0xFF, 0xFF, 0xFF, 0xDC, 0xB9, 0x59, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xDD, 0xB2, 0x84, 0xA0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xDE, 0xA2, 0x75, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0x92, 0x66, 0xA0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xE0, 0x82, 0x57, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE1, 0x72, 0x48, 0xA0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xE2, 0x62, 0x39, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE3, 0x52, 0x2A, 0xA0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xE4, 0x42, 0x1B, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE5, 0x32, 0x0C, 0xA0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xE6, 0x21, 0xFD, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE7, 0x1B, 0x29, 0x20,
+0xFF, 0xFF, 0xFF, 0xFF, 0xE8, 0x0B, 0x1A, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xE8, 0xFB, 0x0B, 0x20,
+0xFF, 0xFF, 0xFF, 0xFF, 0xE9, 0xEA, 0xFC, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xEA, 0xDA, 0xED, 0x20,
+0xFF, 0xFF, 0xFF, 0xFF, 0xEB, 0xCA, 0xDE, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xEC, 0xBA, 0xCF, 0x20,
+0xFF, 0xFF, 0xFF, 0xFF, 0xED, 0xAA, 0xC0, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xEE, 0x9A, 0xB1, 0x20,
+0xFF, 0xFF, 0xFF, 0xFF, 0xEF, 0x8A, 0xA2, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF0, 0x7A, 0x93, 0x20,
+0xFF, 0xFF, 0xFF, 0xFF, 0xF1, 0x6A, 0x84, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF2, 0x63, 0xAF, 0xA0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xF3, 0x53, 0xA0, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x43, 0x91, 0xA0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x33, 0x82, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF6, 0x23, 0x73, 0xA0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x13, 0x64, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x03, 0x55, 0xA0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0xF3, 0x46, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF9, 0xE3, 0x37, 0xA0,
+0x00, 0x00, 0x00, 0x00, 0x0C, 0xAB, 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0D, 0x9B, 0x1B, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x0E, 0x8B, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x84, 0x45, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x10, 0x74, 0x36, 0x90, 0x00, 0x00, 0x00, 0x00, 0x11, 0x64, 0x27, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x12, 0x54, 0x18, 0x90, 0x00, 0x00, 0x00, 0x00, 0x13, 0x4D, 0x44, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x14, 0x33, 0xFA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x15, 0x23, 0xDD, 0x80,
+0x00, 0x00, 0x00, 0x00, 0x16, 0x13, 0xCE, 0x80, 0x00, 0x00, 0x00, 0x00, 0x17, 0x03, 0xBF, 0x80,
+0x00, 0x00, 0x00, 0x00, 0x17, 0xF3, 0xB0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x18, 0xE3, 0xA1, 0x80,
+0x00, 0x00, 0x00, 0x00, 0x19, 0xD3, 0x92, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xC3, 0x83, 0x80,
+0x00, 0x00, 0x00, 0x00, 0x1B, 0xBC, 0xAF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xAC, 0xA0, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x1D, 0x9C, 0x91, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x8C, 0x90, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x1F, 0x7C, 0x81, 0x10, 0x00, 0x00, 0x00, 0x00, 0x20, 0x6C, 0x72, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x21, 0x5C, 0x63, 0x10, 0x00, 0x00, 0x00, 0x00, 0x22, 0x4C, 0x54, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x23, 0x3C, 0x45, 0x10, 0x00, 0x00, 0x00, 0x00, 0x24, 0x2C, 0x36, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x25, 0x1C, 0x27, 0x10, 0x00, 0x00, 0x00, 0x00, 0x26, 0x0C, 0x18, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x27, 0x05, 0x43, 0x90, 0x00, 0x00, 0x00, 0x00, 0x27, 0xF5, 0x34, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x28, 0xE5, 0x25, 0x90, 0x00, 0x00, 0x00, 0x00, 0x29, 0xD5, 0x16, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x2A, 0xC5, 0x07, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xB4, 0xF8, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x2C, 0xA4, 0xE9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x94, 0xDA, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x2E, 0x84, 0xCB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x74, 0xBC, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x30, 0x64, 0xAD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x31, 0x5D, 0xD9, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x32, 0x72, 0xB4, 0x10, 0x00, 0x00, 0x00, 0x00, 0x33, 0x3D, 0xBB, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x34, 0x52, 0x96, 0x10, 0x00, 0x00, 0x00, 0x00, 0x35, 0x1D, 0x9D, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0x78, 0x10, 0x00, 0x00, 0x00, 0x00, 0x36, 0xFD, 0x7F, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x38, 0x1B, 0x94, 0x90, 0x00, 0x00, 0x00, 0x00, 0x38, 0xDD, 0x61, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0x76, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xBD, 0x43, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x3B, 0xDB, 0x58, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xA6, 0x5F, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0x3A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x86, 0x41, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x1C, 0x90, 0x00, 0x00, 0x00, 0x00, 0x40, 0x66, 0x23, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0x39, 0x10, 0x00, 0x00, 0x00, 0x00, 0x42, 0x46, 0x05, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x1B, 0x10, 0x00, 0x00, 0x00, 0x00, 0x44, 0x25, 0xE7, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x45, 0x43, 0xFD, 0x10, 0x00, 0x00, 0x00, 0x00, 0x46, 0x05, 0xC9, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x47, 0x23, 0xDF, 0x10, 0x00, 0x00, 0x00, 0x00, 0x47, 0xEE, 0xE6, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x49, 0x03, 0xC1, 0x10, 0x00, 0x00, 0x00, 0x00, 0x49, 0xCE, 0xC8, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x4A, 0xE3, 0xA3, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4B, 0xAE, 0xAA, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x4C, 0xCC, 0xBF, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x8E, 0x8C, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x4E, 0xAC, 0xA1, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x6E, 0x6E, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x50, 0x8C, 0x83, 0x90, 0x00, 0x00, 0x00, 0x00, 0x51, 0x57, 0x8A, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x52, 0x6C, 0x65, 0x90, 0x00, 0x00, 0x00, 0x00, 0x53, 0x37, 0x6C, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x54, 0x4C, 0x47, 0x90, 0x00, 0x00, 0x00, 0x00, 0x55, 0x17, 0x4E, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x56, 0x2C, 0x29, 0x90, 0x00, 0x00, 0x00, 0x00, 0x56, 0xF7, 0x30, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x58, 0x15, 0x46, 0x10, 0x00, 0x00, 0x00, 0x00, 0x58, 0xD7, 0x12, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x59, 0xF5, 0x28, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xB6, 0xF4, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x5B, 0xD5, 0x0A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5C, 0xA0, 0x11, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x5D, 0xB4, 0xEC, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x7F, 0xF3, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x5F, 0x94, 0xCE, 0x10, 0x00, 0x00, 0x00, 0x00, 0x60, 0x5F, 0xD5, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x61, 0x7D, 0xEA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x62, 0x3F, 0xB7, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x63, 0x5D, 0xCC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x64, 0x1F, 0x99, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x65, 0x3D, 0xAE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x66, 0x08, 0xB5, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x67, 0x1D, 0x90, 0x90, 0x00, 0x00, 0x00, 0x00, 0x67, 0xE8, 0x97, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x68, 0xFD, 0x72, 0x90, 0x00, 0x00, 0x00, 0x00, 0x69, 0xC8, 0x79, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x6A, 0xDD, 0x54, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6B, 0xA8, 0x5B, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x6C, 0xC6, 0x71, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6D, 0x88, 0x3D, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x6E, 0xA6, 0x53, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6F, 0x68, 0x1F, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x70, 0x86, 0x35, 0x10, 0x00, 0x00, 0x00, 0x00, 0x71, 0x51, 0x3C, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x72, 0x66, 0x17, 0x10, 0x00, 0x00, 0x00, 0x00, 0x73, 0x31, 0x1E, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x74, 0x45, 0xF9, 0x10, 0x00, 0x00, 0x00, 0x00, 0x75, 0x11, 0x00, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x76, 0x2F, 0x15, 0x90, 0x00, 0x00, 0x00, 0x00, 0x76, 0xF0, 0xE2, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x78, 0x0E, 0xF7, 0x90, 0x00, 0x00, 0x00, 0x00, 0x78, 0xD0, 0xC4, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x79, 0xEE, 0xD9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7A, 0xB0, 0xA6, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x7B, 0xCE, 0xBB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x99, 0xC2, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x7D, 0xAE, 0x9D, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x79, 0xA4, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x7F, 0x8E, 0x7F, 0x90, 0x00, 0x06, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
-0x07, 0x02, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x05, 0x03, 0x04, 0x03, 0x05, 0x03, 0x04, 0x03, 0x05, 0x03, 0x04,
+0x03, 0x05, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
-0x03, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06,
-0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06,
-0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06,
-0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06,
-0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06,
-0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0xFF, 0xFF, 0xF7, 0x63,
-0x00, 0x00, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00,
-0x0E, 0x10, 0x01, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x0D,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x12, 0x00, 0x00, 0x0E, 0x10,
-0x00, 0x12, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x16, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x04, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x09, 0x4C, 0x4D, 0x54, 0x00, 0x57, 0x45, 0x53, 0x54, 0x00, 0x57, 0x45, 0x54,
-0x00, 0x57, 0x45, 0x4D, 0x54, 0x00, 0x43, 0x45, 0x54, 0x00, 0x43, 0x45, 0x53, 0x54, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x00,
-0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, 0x0C, 0x00,
-0x00, 0x00, 0x1B, 0xFF, 0xFF, 0xFF, 0xFF, 0x5E, 0x3D, 0x0C, 0x1D, 0xFF, 0xFF, 0xFF, 0xFF, 0x92,
-0xE6, 0x8E, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0x9B, 0x4B, 0x6D, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0x9B,
-0xFE, 0xC7, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0x9C, 0x9C, 0xED, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0x9D,
-0xC9, 0x83, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0x9E, 0x7F, 0x72, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0x9F,
-0xAA, 0xB6, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xA0, 0x5F, 0x54, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xA1,
-0x8B, 0xEA, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xA2, 0x41, 0xD9, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xA3,
-0x6E, 0x6F, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xA4, 0x23, 0x0C, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5,
-0x4F, 0xA2, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xAA, 0x05, 0xEF, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAA,
-0xF4, 0x8E, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xAD, 0xC9, 0xA7, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xAE,
-0xA7, 0x23, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xA0, 0x4F, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB0,
-0x87, 0x05, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB1, 0x89, 0x6B, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB2,
-0x70, 0x22, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB3, 0x72, 0x88, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB4,
-0x50, 0x04, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x32, 0x4C, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8,
-0x0F, 0xC8, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0xFF, 0xB9, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB9,
-0xEF, 0xAA, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xBC, 0xC8, 0xB7, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xBD,
-0xB8, 0xA8, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xBE, 0x9F, 0x5F, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xBF,
-0x98, 0x8A, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC0, 0x9A, 0xF0, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC1,
-0x78, 0x6C, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC2, 0x68, 0x5D, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC3,
-0x58, 0x4E, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC4, 0x3F, 0x05, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xC5,
-0x38, 0x30, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC6, 0x3A, 0x96, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC7,
-0x58, 0xAC, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xC7, 0xD9, 0xDF, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9,
-0x01, 0x2F, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0xF1, 0x20, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xCA,
-0xE2, 0x62, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0xB5, 0x52, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB,
-0xEC, 0xA3, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCC, 0x80, 0x4B, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCC,
-0xDC, 0xA2, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCD, 0x95, 0x34, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCD,
-0xC3, 0x4B, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xCE, 0x72, 0xA2, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCE,
-0xC5, 0xBF, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xCF, 0x75, 0x16, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCF,
-0xAC, 0x67, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD0, 0x52, 0x84, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD0,
-0xA5, 0xA1, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD1, 0x54, 0xF8, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD1,
-0x8C, 0x49, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x32, 0x66, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2,
-0x85, 0x83, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD3, 0x59, 0xC4, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD4,
-0x49, 0xB5, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD5, 0x39, 0xD1, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xD6,
-0x29, 0xC2, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xD7, 0x19, 0xB3, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xD8,
-0x09, 0xA4, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xD8, 0xF9, 0x95, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xD9,
-0xE9, 0x86, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xDA, 0xD9, 0x77, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xDB,
-0xC9, 0x68, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xDC, 0xB9, 0x59, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xDD,
-0xB2, 0x84, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xDE, 0xA2, 0x75, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF,
-0x92, 0x66, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE0, 0x82, 0x57, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE1,
-0x72, 0x48, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE2, 0x62, 0x39, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE3,
-0x52, 0x2A, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE4, 0x42, 0x1B, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE5,
-0x32, 0x0C, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE6, 0x21, 0xFD, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE7,
-0x1B, 0x29, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xE8, 0x0B, 0x1A, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xE8,
-0xFB, 0x0B, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xE9, 0xEA, 0xFC, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xEA,
-0xDA, 0xED, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xEB, 0xCA, 0xDE, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xEC,
-0xBA, 0xCF, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xED, 0xAA, 0xC0, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xEE,
-0x9A, 0xB1, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xEF, 0x8A, 0xA2, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF0,
-0x7A, 0x93, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF1, 0x6A, 0x84, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF2,
-0x63, 0xAF, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF3, 0x53, 0xA0, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4,
-0x43, 0x91, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x33, 0x82, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF6,
-0x23, 0x73, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x13, 0x64, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8,
-0x03, 0x55, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0xF3, 0x46, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x0C,
-0xAB, 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0D, 0x9B, 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0E,
-0x8B, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x84, 0x37, 0x80, 0x00, 0x00, 0x00, 0x00, 0x10,
-0x74, 0x28, 0x80, 0x00, 0x00, 0x00, 0x00, 0x11, 0x64, 0x19, 0x80, 0x00, 0x00, 0x00, 0x00, 0x12,
-0x54, 0x18, 0x90, 0x00, 0x00, 0x00, 0x00, 0x13, 0x43, 0xFB, 0x80, 0x00, 0x00, 0x00, 0x00, 0x14,
-0x33, 0xFA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x15, 0x23, 0xEB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x16,
-0x13, 0xDC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x17, 0x03, 0xCD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x17,
-0xF3, 0xBE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x18, 0xE3, 0xBD, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x19,
-0xD3, 0xA0, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xC3, 0x91, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1B,
-0xBC, 0xBD, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xAC, 0xAE, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1D,
-0x9C, 0x9F, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x8C, 0x90, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1F,
-0x7C, 0x81, 0x10, 0x00, 0x00, 0x00, 0x00, 0x20, 0x6C, 0x72, 0x10, 0x00, 0x00, 0x00, 0x00, 0x21,
-0x5C, 0x63, 0x10, 0x00, 0x00, 0x00, 0x00, 0x22, 0x4C, 0x54, 0x10, 0x00, 0x00, 0x00, 0x00, 0x23,
-0x3C, 0x45, 0x10, 0x00, 0x00, 0x00, 0x00, 0x24, 0x2C, 0x36, 0x10, 0x00, 0x00, 0x00, 0x00, 0x25,
-0x1C, 0x27, 0x10, 0x00, 0x00, 0x00, 0x00, 0x26, 0x0C, 0x18, 0x10, 0x00, 0x00, 0x00, 0x00, 0x27,
-0x05, 0x43, 0x90, 0x00, 0x00, 0x00, 0x00, 0x27, 0xF5, 0x34, 0x90, 0x00, 0x00, 0x00, 0x00, 0x28,
-0xE5, 0x25, 0x90, 0x00, 0x00, 0x00, 0x00, 0x29, 0xD5, 0x16, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2A,
-0xC5, 0x07, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xB4, 0xF8, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2C,
-0xA4, 0xE9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x94, 0xDA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2E,
-0x84, 0xCB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x74, 0xBC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x30,
-0x64, 0xAD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x31, 0x5D, 0xD9, 0x10, 0x00, 0x00, 0x00, 0x00, 0x32,
-0x72, 0xB4, 0x10, 0x00, 0x00, 0x00, 0x00, 0x33, 0x3D, 0xBB, 0x10, 0x00, 0x00, 0x00, 0x00, 0x34,
-0x52, 0x96, 0x10, 0x00, 0x00, 0x00, 0x00, 0x35, 0x1D, 0x9D, 0x10, 0x00, 0x00, 0x00, 0x00, 0x36,
-0x32, 0x78, 0x10, 0x00, 0x00, 0x00, 0x00, 0x36, 0xFD, 0x7F, 0x10, 0x00, 0x00, 0x00, 0x00, 0x38,
-0x1B, 0x94, 0x90, 0x00, 0x00, 0x00, 0x00, 0x38, 0xDD, 0x61, 0x10, 0x00, 0x00, 0x00, 0x00, 0x39,
-0xFB, 0x76, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xBD, 0x43, 0x10, 0x00, 0x00, 0x00, 0x00, 0x3B,
-0xDB, 0x58, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xA6, 0x5F, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3D,
-0xBB, 0x3A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x86, 0x41, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3F,
-0x9B, 0x1C, 0x90, 0x00, 0x00, 0x00, 0x00, 0x40, 0x66, 0x23, 0x90, 0x00, 0x00, 0x00, 0x00, 0x41,
-0x84, 0x39, 0x10, 0x00, 0x00, 0x00, 0x00, 0x42, 0x46, 0x05, 0x90, 0x00, 0x00, 0x00, 0x00, 0x43,
-0x64, 0x1B, 0x10, 0x00, 0x00, 0x00, 0x00, 0x44, 0x25, 0xE7, 0x90, 0x00, 0x00, 0x00, 0x00, 0x45,
-0x43, 0xFD, 0x10, 0x00, 0x00, 0x00, 0x00, 0x46, 0x05, 0xC9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x47,
-0x23, 0xDF, 0x10, 0x00, 0x00, 0x00, 0x00, 0x47, 0xEE, 0xE6, 0x10, 0x00, 0x00, 0x00, 0x00, 0x49,
-0x03, 0xC1, 0x10, 0x00, 0x00, 0x00, 0x00, 0x49, 0xCE, 0xC8, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4A,
-0xE3, 0xA3, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4B, 0xAE, 0xAA, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4C,
-0xCC, 0xBF, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x8E, 0x8C, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4E,
-0xAC, 0xA1, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x6E, 0x6E, 0x10, 0x00, 0x00, 0x00, 0x00, 0x50,
-0x8C, 0x83, 0x90, 0x00, 0x00, 0x00, 0x00, 0x51, 0x57, 0x8A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x52,
-0x6C, 0x65, 0x90, 0x00, 0x00, 0x00, 0x00, 0x53, 0x37, 0x6C, 0x90, 0x00, 0x00, 0x00, 0x00, 0x54,
-0x4C, 0x47, 0x90, 0x00, 0x00, 0x00, 0x00, 0x55, 0x17, 0x4E, 0x90, 0x00, 0x00, 0x00, 0x00, 0x56,
-0x2C, 0x29, 0x90, 0x00, 0x00, 0x00, 0x00, 0x56, 0xF7, 0x30, 0x90, 0x00, 0x00, 0x00, 0x00, 0x58,
-0x15, 0x46, 0x10, 0x00, 0x00, 0x00, 0x00, 0x58, 0xD7, 0x12, 0x90, 0x00, 0x00, 0x00, 0x00, 0x59,
-0xF5, 0x28, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xB6, 0xF4, 0x90, 0x00, 0x00, 0x00, 0x00, 0x5B,
-0xD5, 0x0A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5C, 0xA0, 0x11, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5D,
-0xB4, 0xEC, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x7F, 0xF3, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5F,
-0x94, 0xCE, 0x10, 0x00, 0x00, 0x00, 0x00, 0x60, 0x5F, 0xD5, 0x10, 0x00, 0x00, 0x00, 0x00, 0x61,
-0x7D, 0xEA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x62, 0x3F, 0xB7, 0x10, 0x00, 0x00, 0x00, 0x00, 0x63,
-0x5D, 0xCC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x64, 0x1F, 0x99, 0x10, 0x00, 0x00, 0x00, 0x00, 0x65,
-0x3D, 0xAE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x66, 0x08, 0xB5, 0x90, 0x00, 0x00, 0x00, 0x00, 0x67,
-0x1D, 0x90, 0x90, 0x00, 0x00, 0x00, 0x00, 0x67, 0xE8, 0x97, 0x90, 0x00, 0x00, 0x00, 0x00, 0x68,
-0xFD, 0x72, 0x90, 0x00, 0x00, 0x00, 0x00, 0x69, 0xC8, 0x79, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6A,
-0xDD, 0x54, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6B, 0xA8, 0x5B, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6C,
-0xC6, 0x71, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6D, 0x88, 0x3D, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6E,
-0xA6, 0x53, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6F, 0x68, 0x1F, 0x90, 0x00, 0x00, 0x00, 0x00, 0x70,
-0x86, 0x35, 0x10, 0x00, 0x00, 0x00, 0x00, 0x71, 0x51, 0x3C, 0x10, 0x00, 0x00, 0x00, 0x00, 0x72,
-0x66, 0x17, 0x10, 0x00, 0x00, 0x00, 0x00, 0x73, 0x31, 0x1E, 0x10, 0x00, 0x00, 0x00, 0x00, 0x74,
-0x45, 0xF9, 0x10, 0x00, 0x00, 0x00, 0x00, 0x75, 0x11, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x76,
-0x2F, 0x15, 0x90, 0x00, 0x00, 0x00, 0x00, 0x76, 0xF0, 0xE2, 0x10, 0x00, 0x00, 0x00, 0x00, 0x78,
-0x0E, 0xF7, 0x90, 0x00, 0x00, 0x00, 0x00, 0x78, 0xD0, 0xC4, 0x10, 0x00, 0x00, 0x00, 0x00, 0x79,
-0xEE, 0xD9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7A, 0xB0, 0xA6, 0x10, 0x00, 0x00, 0x00, 0x00, 0x7B,
-0xCE, 0xBB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x99, 0xC2, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7D,
-0xAE, 0x9D, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x79, 0xA4, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7F,
-0x8E, 0x7F, 0x90, 0x00, 0x06, 0x01, 0x02, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
-0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
-0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
-0x05, 0x03, 0x04, 0x03, 0x05, 0x03, 0x04, 0x03, 0x05, 0x03, 0x04, 0x03, 0x05, 0x03, 0x04, 0x03,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x07, 0x02, 0x03,
 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
-0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
-0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x07, 0x02, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
-0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
-0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x0A,
-0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A,
-0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A,
-0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A,
-0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A,
-0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A,
-0x06, 0x0A, 0x06, 0xFF, 0xFF, 0xF7, 0x63, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x04, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x09, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x0E,
-0x10, 0x00, 0x12, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x12, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x16, 0x00,
-0x00, 0x0E, 0x10, 0x01, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x4C, 0x4D, 0x54, 0x00, 0x57,
-0x45, 0x53, 0x54, 0x00, 0x57, 0x45, 0x54, 0x00, 0x57, 0x45, 0x4D, 0x54, 0x00, 0x43, 0x45, 0x54,
-0x00, 0x43, 0x45, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01,
-0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x0A, 0x57,
-0x45, 0x54, 0x30, 0x57, 0x45, 0x53, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x31,
-0x2C, 0x4D, 0x31, 0x30, 0x2E, 0x35, 0x2E, 0x30, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 
+0x04, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x09, 0x0A,
+0x09, 0x0A, 0x09, 0x0A, 0x09, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08,
+0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08,
+0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08,
+0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08,
+0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08,
+0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0xFF, 0xFF, 0xF7, 0x63, 0x00, 0x00, 0x00,
+0x00, 0x0E, 0x10, 0x01, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x0E, 0x10, 0x01,
+0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x0D, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x09, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x12, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x04, 0x00,
+0x00, 0x0E, 0x10, 0x00, 0x12, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x16, 0x00, 0x00, 0x0E, 0x10, 0x01,
+0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x4C, 0x4D, 0x54, 0x00, 0x57, 0x45, 0x53, 0x54, 0x00,
+0x57, 0x45, 0x54, 0x00, 0x57, 0x45, 0x4D, 0x54, 0x00, 0x43, 0x45, 0x54, 0x00, 0x43, 0x45, 0x53,
+0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x0A, 0x57, 0x45, 0x54,
+0x30, 0x57, 0x45, 0x53, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x31, 0x2C, 0x4D,
+0x31, 0x30, 0x2E, 0x35, 0x2E, 0x30, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 
 
 /* PRC */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -67881,151 +68716,185 @@
 
 /* PST8PDT */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x95, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x10, 0x9E, 0xA6, 0x48, 0xA0,
-0x9F, 0xBB, 0x15, 0x90, 0xA0, 0x86, 0x2A, 0xA0, 0xA1, 0x9A, 0xF7, 0x90, 0xCB, 0x89, 0x1A, 0xA0,
-0xD2, 0x23, 0xF4, 0x70, 0xD2, 0x61, 0x26, 0x10, 0xFA, 0xF8, 0x83, 0x20, 0xFB, 0xE8, 0x66, 0x10,
-0xFC, 0xD8, 0x65, 0x20, 0xFD, 0xC8, 0x48, 0x10, 0xFE, 0xB8, 0x47, 0x20, 0xFF, 0xA8, 0x2A, 0x10,
-0x00, 0x98, 0x29, 0x20, 0x01, 0x88, 0x0C, 0x10, 0x02, 0x78, 0x0B, 0x20, 0x03, 0x71, 0x28, 0x90,
-0x04, 0x61, 0x27, 0xA0, 0x05, 0x51, 0x0A, 0x90, 0x06, 0x41, 0x09, 0xA0, 0x07, 0x30, 0xEC, 0x90,
-0x07, 0x8D, 0x43, 0xA0, 0x09, 0x10, 0xCE, 0x90, 0x09, 0xAD, 0xBF, 0x20, 0x0A, 0xF0, 0xB0, 0x90,
-0x0B, 0xE0, 0xAF, 0xA0, 0x0C, 0xD9, 0xCD, 0x10, 0x0D, 0xC0, 0x91, 0xA0, 0x0E, 0xB9, 0xAF, 0x10,
-0x0F, 0xA9, 0xAE, 0x20, 0x10, 0x99, 0x91, 0x10, 0x11, 0x89, 0x90, 0x20, 0x12, 0x79, 0x73, 0x10,
-0x13, 0x69, 0x72, 0x20, 0x14, 0x59, 0x55, 0x10, 0x15, 0x49, 0x54, 0x20, 0x16, 0x39, 0x37, 0x10,
-0x17, 0x29, 0x36, 0x20, 0x18, 0x22, 0x53, 0x90, 0x19, 0x09, 0x18, 0x20, 0x1A, 0x02, 0x35, 0x90,
-0x1A, 0xF2, 0x34, 0xA0, 0x1B, 0xE2, 0x17, 0x90, 0x1C, 0xD2, 0x16, 0xA0, 0x1D, 0xC1, 0xF9, 0x90,
-0x1E, 0xB1, 0xF8, 0xA0, 0x1F, 0xA1, 0xDB, 0x90, 0x20, 0x76, 0x2B, 0x20, 0x21, 0x81, 0xBD, 0x90,
-0x22, 0x56, 0x0D, 0x20, 0x23, 0x6A, 0xDA, 0x10, 0x24, 0x35, 0xEF, 0x20, 0x25, 0x4A, 0xBC, 0x10,
-0x26, 0x15, 0xD1, 0x20, 0x27, 0x2A, 0x9E, 0x10, 0x27, 0xFE, 0xED, 0xA0, 0x29, 0x0A, 0x80, 0x10,
-0x29, 0xDE, 0xCF, 0xA0, 0x2A, 0xEA, 0x62, 0x10, 0x2B, 0xBE, 0xB1, 0xA0, 0x2C, 0xD3, 0x7E, 0x90,
-0x2D, 0x9E, 0x93, 0xA0, 0x2E, 0xB3, 0x60, 0x90, 0x2F, 0x7E, 0x75, 0xA0, 0x30, 0x93, 0x42, 0x90,
-0x31, 0x67, 0x92, 0x20, 0x32, 0x73, 0x24, 0x90, 0x33, 0x47, 0x74, 0x20, 0x34, 0x53, 0x06, 0x90,
-0x35, 0x27, 0x56, 0x20, 0x36, 0x32, 0xE8, 0x90, 0x37, 0x07, 0x38, 0x20, 0x38, 0x1C, 0x05, 0x10,
-0x38, 0xE7, 0x1A, 0x20, 0x39, 0xFB, 0xE7, 0x10, 0x3A, 0xC6, 0xFC, 0x20, 0x3B, 0xDB, 0xC9, 0x10,
-0x3C, 0xB0, 0x18, 0xA0, 0x3D, 0xBB, 0xAB, 0x10, 0x3E, 0x8F, 0xFA, 0xA0, 0x3F, 0x9B, 0x8D, 0x10,
-0x40, 0x6F, 0xDC, 0xA0, 0x41, 0x84, 0xA9, 0x90, 0x42, 0x4F, 0xBE, 0xA0, 0x43, 0x64, 0x8B, 0x90,
-0x44, 0x2F, 0xA0, 0xA0, 0x45, 0x44, 0x6D, 0x90, 0x45, 0xF3, 0xD3, 0x20, 0x47, 0x2D, 0x8A, 0x10,
-0x47, 0xD3, 0xB5, 0x20, 0x49, 0x0D, 0x6C, 0x10, 0x49, 0xB3, 0x97, 0x20, 0x4A, 0xED, 0x4E, 0x10,
-0x4B, 0x9C, 0xB3, 0xA0, 0x4C, 0xD6, 0x6A, 0x90, 0x4D, 0x7C, 0x95, 0xA0, 0x4E, 0xB6, 0x4C, 0x90,
-0x4F, 0x5C, 0x77, 0xA0, 0x50, 0x96, 0x2E, 0x90, 0x51, 0x3C, 0x59, 0xA0, 0x52, 0x76, 0x10, 0x90,
-0x53, 0x1C, 0x3B, 0xA0, 0x54, 0x55, 0xF2, 0x90, 0x54, 0xFC, 0x1D, 0xA0, 0x56, 0x35, 0xD4, 0x90,
-0x56, 0xE5, 0x3A, 0x20, 0x58, 0x1E, 0xF1, 0x10, 0x58, 0xC5, 0x1C, 0x20, 0x59, 0xFE, 0xD3, 0x10,
-0x5A, 0xA4, 0xFE, 0x20, 0x5B, 0xDE, 0xB5, 0x10, 0x5C, 0x84, 0xE0, 0x20, 0x5D, 0xBE, 0x97, 0x10,
-0x5E, 0x64, 0xC2, 0x20, 0x5F, 0x9E, 0x79, 0x10, 0x60, 0x4D, 0xDE, 0xA0, 0x61, 0x87, 0x95, 0x90,
-0x62, 0x2D, 0xC0, 0xA0, 0x63, 0x67, 0x77, 0x90, 0x64, 0x0D, 0xA2, 0xA0, 0x65, 0x47, 0x59, 0x90,
-0x65, 0xED, 0x84, 0xA0, 0x67, 0x27, 0x3B, 0x90, 0x67, 0xCD, 0x66, 0xA0, 0x69, 0x07, 0x1D, 0x90,
-0x69, 0xAD, 0x48, 0xA0, 0x6A, 0xE6, 0xFF, 0x90, 0x6B, 0x96, 0x65, 0x20, 0x6C, 0xD0, 0x1C, 0x10,
-0x6D, 0x76, 0x47, 0x20, 0x6E, 0xAF, 0xFE, 0x10, 0x6F, 0x56, 0x29, 0x20, 0x70, 0x8F, 0xE0, 0x10,
-0x71, 0x36, 0x0B, 0x20, 0x72, 0x6F, 0xC2, 0x10, 0x73, 0x15, 0xED, 0x20, 0x74, 0x4F, 0xA4, 0x10,
-0x74, 0xFF, 0x09, 0xA0, 0x76, 0x38, 0xC0, 0x90, 0x76, 0xDE, 0xEB, 0xA0, 0x78, 0x18, 0xA2, 0x90,
-0x78, 0xBE, 0xCD, 0xA0, 0x79, 0xF8, 0x84, 0x90, 0x7A, 0x9E, 0xAF, 0xA0, 0x7B, 0xD8, 0x66, 0x90,
-0x7C, 0x7E, 0x91, 0xA0, 0x7D, 0xB8, 0x48, 0x90, 0x7E, 0x5E, 0x73, 0xA0, 0x7F, 0x98, 0x2A, 0x90,
-0x01, 0x00, 0x01, 0x00, 0x02, 0x03, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x04, 0xFF, 0xFF, 0x9D, 0x90, 0x01,
-0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x08, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x0C, 0xFF, 0xFF, 0x8F,
-0x80, 0x00, 0x04, 0x50, 0x44, 0x54, 0x00, 0x50, 0x53, 0x54, 0x00, 0x50, 0x57, 0x54, 0x00, 0x50,
-0x50, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x54, 0x5A, 0x69,
-0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x95, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0x9E, 0xA6, 0x48,
-0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0x9F, 0xBB, 0x15, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xA0, 0x86, 0x2A,
-0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xA1, 0x9A, 0xF7, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0x89, 0x1A,
-0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x23, 0xF4, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x61, 0x26,
-0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0xF8, 0x83, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xFB, 0xE8, 0x66,
-0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0xD8, 0x65, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xFD, 0xC8, 0x48,
-0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xB8, 0x47, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xA8, 0x2A,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x98, 0x29, 0x20, 0x00, 0x00, 0x00, 0x00, 0x01, 0x88, 0x0C,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x02, 0x78, 0x0B, 0x20, 0x00, 0x00, 0x00, 0x00, 0x03, 0x71, 0x28,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x04, 0x61, 0x27, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x05, 0x51, 0x0A,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x06, 0x41, 0x09, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x07, 0x30, 0xEC,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x07, 0x8D, 0x43, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x09, 0x10, 0xCE,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x09, 0xAD, 0xBF, 0x20, 0x00, 0x00, 0x00, 0x00, 0x0A, 0xF0, 0xB0,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x0B, 0xE0, 0xAF, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x0C, 0xD9, 0xCD,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x0D, 0xC0, 0x91, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x0E, 0xB9, 0xAF,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xA9, 0xAE, 0x20, 0x00, 0x00, 0x00, 0x00, 0x10, 0x99, 0x91,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x11, 0x89, 0x90, 0x20, 0x00, 0x00, 0x00, 0x00, 0x12, 0x79, 0x73,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x13, 0x69, 0x72, 0x20, 0x00, 0x00, 0x00, 0x00, 0x14, 0x59, 0x55,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x15, 0x49, 0x54, 0x20, 0x00, 0x00, 0x00, 0x00, 0x16, 0x39, 0x37,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x17, 0x29, 0x36, 0x20, 0x00, 0x00, 0x00, 0x00, 0x18, 0x22, 0x53,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x19, 0x09, 0x18, 0x20, 0x00, 0x00, 0x00, 0x00, 0x1A, 0x02, 0x35,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xF2, 0x34, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xE2, 0x17,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xD2, 0x16, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC1, 0xF9,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x1E, 0xB1, 0xF8, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA1, 0xDB,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x20, 0x76, 0x2B, 0x20, 0x00, 0x00, 0x00, 0x00, 0x21, 0x81, 0xBD,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x22, 0x56, 0x0D, 0x20, 0x00, 0x00, 0x00, 0x00, 0x23, 0x6A, 0xDA,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x24, 0x35, 0xEF, 0x20, 0x00, 0x00, 0x00, 0x00, 0x25, 0x4A, 0xBC,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x26, 0x15, 0xD1, 0x20, 0x00, 0x00, 0x00, 0x00, 0x27, 0x2A, 0x9E,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x27, 0xFE, 0xED, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x29, 0x0A, 0x80,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x29, 0xDE, 0xCF, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xEA, 0x62,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xBE, 0xB1, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xD3, 0x7E,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x9E, 0x93, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x2E, 0xB3, 0x60,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x7E, 0x75, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x30, 0x93, 0x42,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x92, 0x20, 0x00, 0x00, 0x00, 0x00, 0x32, 0x73, 0x24,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x74, 0x20, 0x00, 0x00, 0x00, 0x00, 0x34, 0x53, 0x06,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x56, 0x20, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0xE8,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x37, 0x07, 0x38, 0x20, 0x00, 0x00, 0x00, 0x00, 0x38, 0x1C, 0x05,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x38, 0xE7, 0x1A, 0x20, 0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0xE7,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xC6, 0xFC, 0x20, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xDB, 0xC9,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xB0, 0x18, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0xAB,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x8F, 0xFA, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x8D,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x40, 0x6F, 0xDC, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0xA9,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x42, 0x4F, 0xBE, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x8B,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x44, 0x2F, 0xA0, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x45, 0x44, 0x6D,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x45, 0xF3, 0xD3, 0x20, 0x00, 0x00, 0x00, 0x00, 0x47, 0x2D, 0x8A,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x47, 0xD3, 0xB5, 0x20, 0x00, 0x00, 0x00, 0x00, 0x49, 0x0D, 0x6C,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x49, 0xB3, 0x97, 0x20, 0x00, 0x00, 0x00, 0x00, 0x4A, 0xED, 0x4E,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x4B, 0x9C, 0xB3, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x4C, 0xD6, 0x6A,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x7C, 0x95, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x4E, 0xB6, 0x4C,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x5C, 0x77, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x50, 0x96, 0x2E,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x51, 0x3C, 0x59, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x52, 0x76, 0x10,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x53, 0x1C, 0x3B, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x54, 0x55, 0xF2,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x54, 0xFC, 0x1D, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x56, 0x35, 0xD4,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x56, 0xE5, 0x3A, 0x20, 0x00, 0x00, 0x00, 0x00, 0x58, 0x1E, 0xF1,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x58, 0xC5, 0x1C, 0x20, 0x00, 0x00, 0x00, 0x00, 0x59, 0xFE, 0xD3,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xA4, 0xFE, 0x20, 0x00, 0x00, 0x00, 0x00, 0x5B, 0xDE, 0xB5,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x5C, 0x84, 0xE0, 0x20, 0x00, 0x00, 0x00, 0x00, 0x5D, 0xBE, 0x97,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x64, 0xC2, 0x20, 0x00, 0x00, 0x00, 0x00, 0x5F, 0x9E, 0x79,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x60, 0x4D, 0xDE, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x61, 0x87, 0x95,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x62, 0x2D, 0xC0, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x63, 0x67, 0x77,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x64, 0x0D, 0xA2, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x65, 0x47, 0x59,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x65, 0xED, 0x84, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x67, 0x27, 0x3B,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x67, 0xCD, 0x66, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x69, 0x07, 0x1D,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x69, 0xAD, 0x48, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x6A, 0xE6, 0xFF,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x6B, 0x96, 0x65, 0x20, 0x00, 0x00, 0x00, 0x00, 0x6C, 0xD0, 0x1C,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x6D, 0x76, 0x47, 0x20, 0x00, 0x00, 0x00, 0x00, 0x6E, 0xAF, 0xFE,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x6F, 0x56, 0x29, 0x20, 0x00, 0x00, 0x00, 0x00, 0x70, 0x8F, 0xE0,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x71, 0x36, 0x0B, 0x20, 0x00, 0x00, 0x00, 0x00, 0x72, 0x6F, 0xC2,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x73, 0x15, 0xED, 0x20, 0x00, 0x00, 0x00, 0x00, 0x74, 0x4F, 0xA4,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x74, 0xFF, 0x09, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x76, 0x38, 0xC0,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x76, 0xDE, 0xEB, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x78, 0x18, 0xA2,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x78, 0xBE, 0xCD, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x79, 0xF8, 0x84,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x7A, 0x9E, 0xAF, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x7B, 0xD8, 0x66,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x7E, 0x91, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x7D, 0xB8, 0x48,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x5E, 0x73, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x98, 0x2A,
-0x90, 0x01, 0x00, 0x01, 0x00, 0x02, 0x03, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x04, 0xFF, 0xFF, 0x9D, 0x90,
-0x01, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x08, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x0C, 0xFF, 0xFF,
-0x8F, 0x80, 0x00, 0x04, 0x50, 0x44, 0x54, 0x00, 0x50, 0x53, 0x54, 0x00, 0x50, 0x57, 0x54, 0x00,
-0x50, 0x50, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0A, 0x50,
-0x53, 0x54, 0x38, 0x50, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D, 0x31,
-0x31, 0x2E, 0x31, 0x2E, 0x30, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0xBA, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x14, 0x80, 0x00, 0x00, 0x00,
+0x9E, 0xA6, 0x48, 0xA0, 0x9F, 0xBB, 0x15, 0x90, 0xA0, 0x86, 0x2A, 0xA0, 0xA1, 0x9A, 0xF7, 0x90,
+0xCB, 0x89, 0x1A, 0xA0, 0xD2, 0x23, 0xF4, 0x70, 0xD2, 0x61, 0x26, 0x10, 0xD6, 0xFE, 0x74, 0x5C,
+0xD8, 0x80, 0xAD, 0x90, 0xDA, 0xFE, 0xC3, 0x90, 0xDB, 0xC0, 0x90, 0x10, 0xDC, 0xDE, 0xA5, 0x90,
+0xDD, 0xA9, 0xAC, 0x90, 0xDE, 0xBE, 0x87, 0x90, 0xDF, 0x89, 0x8E, 0x90, 0xE0, 0x9E, 0x69, 0x90,
+0xE1, 0x69, 0x70, 0x90, 0xE2, 0x7E, 0x4B, 0x90, 0xE3, 0x49, 0x52, 0x90, 0xE4, 0x5E, 0x2D, 0x90,
+0xE5, 0x29, 0x34, 0x90, 0xE6, 0x47, 0x4A, 0x10, 0xE7, 0x12, 0x51, 0x10, 0xE8, 0x27, 0x2C, 0x10,
+0xE8, 0xF2, 0x33, 0x10, 0xEA, 0x07, 0x0E, 0x10, 0xEA, 0xD2, 0x15, 0x10, 0xEB, 0xE6, 0xF0, 0x10,
+0xEC, 0xB1, 0xF7, 0x10, 0xED, 0xC6, 0xD2, 0x10, 0xEE, 0x91, 0xD9, 0x10, 0xEF, 0xAF, 0xEE, 0x90,
+0xF0, 0x71, 0xBB, 0x10, 0xF1, 0x8F, 0xD0, 0x90, 0xF2, 0x7F, 0xC1, 0x90, 0xF3, 0x6F, 0xB2, 0x90,
+0xF4, 0x5F, 0xA3, 0x90, 0xF5, 0x4F, 0x94, 0x90, 0xF6, 0x3F, 0x85, 0x90, 0xF7, 0x2F, 0x76, 0x90,
+0xF8, 0x28, 0xA2, 0x10, 0xF9, 0x0F, 0x58, 0x90, 0xFA, 0x08, 0x84, 0x10, 0xFA, 0xF8, 0x83, 0x20,
+0xFB, 0xE8, 0x66, 0x10, 0xFC, 0xD8, 0x65, 0x20, 0xFD, 0xC8, 0x48, 0x10, 0xFE, 0xB8, 0x47, 0x20,
+0xFF, 0xA8, 0x2A, 0x10, 0x00, 0x98, 0x29, 0x20, 0x01, 0x88, 0x0C, 0x10, 0x02, 0x78, 0x0B, 0x20,
+0x03, 0x71, 0x28, 0x90, 0x04, 0x61, 0x27, 0xA0, 0x05, 0x51, 0x0A, 0x90, 0x06, 0x41, 0x09, 0xA0,
+0x07, 0x30, 0xEC, 0x90, 0x07, 0x8D, 0x43, 0xA0, 0x09, 0x10, 0xCE, 0x90, 0x09, 0xAD, 0xBF, 0x20,
+0x0A, 0xF0, 0xB0, 0x90, 0x0B, 0xE0, 0xAF, 0xA0, 0x0C, 0xD9, 0xCD, 0x10, 0x0D, 0xC0, 0x91, 0xA0,
+0x0E, 0xB9, 0xAF, 0x10, 0x0F, 0xA9, 0xAE, 0x20, 0x10, 0x99, 0x91, 0x10, 0x11, 0x89, 0x90, 0x20,
+0x12, 0x79, 0x73, 0x10, 0x13, 0x69, 0x72, 0x20, 0x14, 0x59, 0x55, 0x10, 0x15, 0x49, 0x54, 0x20,
+0x16, 0x39, 0x37, 0x10, 0x17, 0x29, 0x36, 0x20, 0x18, 0x22, 0x53, 0x90, 0x19, 0x09, 0x18, 0x20,
+0x1A, 0x02, 0x35, 0x90, 0x1A, 0xF2, 0x34, 0xA0, 0x1B, 0xE2, 0x17, 0x90, 0x1C, 0xD2, 0x16, 0xA0,
+0x1D, 0xC1, 0xF9, 0x90, 0x1E, 0xB1, 0xF8, 0xA0, 0x1F, 0xA1, 0xDB, 0x90, 0x20, 0x76, 0x2B, 0x20,
+0x21, 0x81, 0xBD, 0x90, 0x22, 0x56, 0x0D, 0x20, 0x23, 0x6A, 0xDA, 0x10, 0x24, 0x35, 0xEF, 0x20,
+0x25, 0x4A, 0xBC, 0x10, 0x26, 0x15, 0xD1, 0x20, 0x27, 0x2A, 0x9E, 0x10, 0x27, 0xFE, 0xED, 0xA0,
+0x29, 0x0A, 0x80, 0x10, 0x29, 0xDE, 0xCF, 0xA0, 0x2A, 0xEA, 0x62, 0x10, 0x2B, 0xBE, 0xB1, 0xA0,
+0x2C, 0xD3, 0x7E, 0x90, 0x2D, 0x9E, 0x93, 0xA0, 0x2E, 0xB3, 0x60, 0x90, 0x2F, 0x7E, 0x75, 0xA0,
+0x30, 0x93, 0x42, 0x90, 0x31, 0x67, 0x92, 0x20, 0x32, 0x73, 0x24, 0x90, 0x33, 0x47, 0x74, 0x20,
+0x34, 0x53, 0x06, 0x90, 0x35, 0x27, 0x56, 0x20, 0x36, 0x32, 0xE8, 0x90, 0x37, 0x07, 0x38, 0x20,
+0x38, 0x1C, 0x05, 0x10, 0x38, 0xE7, 0x1A, 0x20, 0x39, 0xFB, 0xE7, 0x10, 0x3A, 0xC6, 0xFC, 0x20,
+0x3B, 0xDB, 0xC9, 0x10, 0x3C, 0xB0, 0x18, 0xA0, 0x3D, 0xBB, 0xAB, 0x10, 0x3E, 0x8F, 0xFA, 0xA0,
+0x3F, 0x9B, 0x8D, 0x10, 0x40, 0x6F, 0xDC, 0xA0, 0x41, 0x84, 0xA9, 0x90, 0x42, 0x4F, 0xBE, 0xA0,
+0x43, 0x64, 0x8B, 0x90, 0x44, 0x2F, 0xA0, 0xA0, 0x45, 0x44, 0x6D, 0x90, 0x45, 0xF3, 0xD3, 0x20,
+0x47, 0x2D, 0x8A, 0x10, 0x47, 0xD3, 0xB5, 0x20, 0x49, 0x0D, 0x6C, 0x10, 0x49, 0xB3, 0x97, 0x20,
+0x4A, 0xED, 0x4E, 0x10, 0x4B, 0x9C, 0xB3, 0xA0, 0x4C, 0xD6, 0x6A, 0x90, 0x4D, 0x7C, 0x95, 0xA0,
+0x4E, 0xB6, 0x4C, 0x90, 0x4F, 0x5C, 0x77, 0xA0, 0x50, 0x96, 0x2E, 0x90, 0x51, 0x3C, 0x59, 0xA0,
+0x52, 0x76, 0x10, 0x90, 0x53, 0x1C, 0x3B, 0xA0, 0x54, 0x55, 0xF2, 0x90, 0x54, 0xFC, 0x1D, 0xA0,
+0x56, 0x35, 0xD4, 0x90, 0x56, 0xE5, 0x3A, 0x20, 0x58, 0x1E, 0xF1, 0x10, 0x58, 0xC5, 0x1C, 0x20,
+0x59, 0xFE, 0xD3, 0x10, 0x5A, 0xA4, 0xFE, 0x20, 0x5B, 0xDE, 0xB5, 0x10, 0x5C, 0x84, 0xE0, 0x20,
+0x5D, 0xBE, 0x97, 0x10, 0x5E, 0x64, 0xC2, 0x20, 0x5F, 0x9E, 0x79, 0x10, 0x60, 0x4D, 0xDE, 0xA0,
+0x61, 0x87, 0x95, 0x90, 0x62, 0x2D, 0xC0, 0xA0, 0x63, 0x67, 0x77, 0x90, 0x64, 0x0D, 0xA2, 0xA0,
+0x65, 0x47, 0x59, 0x90, 0x65, 0xED, 0x84, 0xA0, 0x67, 0x27, 0x3B, 0x90, 0x67, 0xCD, 0x66, 0xA0,
+0x69, 0x07, 0x1D, 0x90, 0x69, 0xAD, 0x48, 0xA0, 0x6A, 0xE6, 0xFF, 0x90, 0x6B, 0x96, 0x65, 0x20,
+0x6C, 0xD0, 0x1C, 0x10, 0x6D, 0x76, 0x47, 0x20, 0x6E, 0xAF, 0xFE, 0x10, 0x6F, 0x56, 0x29, 0x20,
+0x70, 0x8F, 0xE0, 0x10, 0x71, 0x36, 0x0B, 0x20, 0x72, 0x6F, 0xC2, 0x10, 0x73, 0x15, 0xED, 0x20,
+0x74, 0x4F, 0xA4, 0x10, 0x74, 0xFF, 0x09, 0xA0, 0x76, 0x38, 0xC0, 0x90, 0x76, 0xDE, 0xEB, 0xA0,
+0x78, 0x18, 0xA2, 0x90, 0x78, 0xBE, 0xCD, 0xA0, 0x79, 0xF8, 0x84, 0x90, 0x7A, 0x9E, 0xAF, 0xA0,
+0x7B, 0xD8, 0x66, 0x90, 0x7C, 0x7E, 0x91, 0xA0, 0x7D, 0xB8, 0x48, 0x90, 0x7E, 0x5E, 0x73, 0xA0,
+0x7F, 0x98, 0x2A, 0x90, 0x05, 0x01, 0x02, 0x01, 0x02, 0x03, 0x04, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0xFF, 0xFF,
+0x91, 0x26, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x04, 0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x08,
+0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x0C, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x10, 0xFF, 0xFF, 0x8F, 0x80,
+0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x50, 0x44, 0x54, 0x00, 0x50, 0x53, 0x54, 0x00, 0x50, 0x57,
+0x54, 0x00, 0x50, 0x50, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00,
+0x01, 0x01, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0xBA, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x14, 0xFF, 0xFF,
+0xFF, 0xFF, 0x5E, 0x04, 0x1A, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0x9E, 0xA6, 0x48, 0xA0, 0xFF, 0xFF,
+0xFF, 0xFF, 0x9F, 0xBB, 0x15, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xA0, 0x86, 0x2A, 0xA0, 0xFF, 0xFF,
+0xFF, 0xFF, 0xA1, 0x9A, 0xF7, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0x89, 0x1A, 0xA0, 0xFF, 0xFF,
+0xFF, 0xFF, 0xD2, 0x23, 0xF4, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x61, 0x26, 0x10, 0xFF, 0xFF,
+0xFF, 0xFF, 0xD6, 0xFE, 0x74, 0x5C, 0xFF, 0xFF, 0xFF, 0xFF, 0xD8, 0x80, 0xAD, 0x90, 0xFF, 0xFF,
+0xFF, 0xFF, 0xDA, 0xFE, 0xC3, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xDB, 0xC0, 0x90, 0x10, 0xFF, 0xFF,
+0xFF, 0xFF, 0xDC, 0xDE, 0xA5, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xDD, 0xA9, 0xAC, 0x90, 0xFF, 0xFF,
+0xFF, 0xFF, 0xDE, 0xBE, 0x87, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0x89, 0x8E, 0x90, 0xFF, 0xFF,
+0xFF, 0xFF, 0xE0, 0x9E, 0x69, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE1, 0x69, 0x70, 0x90, 0xFF, 0xFF,
+0xFF, 0xFF, 0xE2, 0x7E, 0x4B, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE3, 0x49, 0x52, 0x90, 0xFF, 0xFF,
+0xFF, 0xFF, 0xE4, 0x5E, 0x2D, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE5, 0x29, 0x34, 0x90, 0xFF, 0xFF,
+0xFF, 0xFF, 0xE6, 0x47, 0x4A, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xE7, 0x12, 0x51, 0x10, 0xFF, 0xFF,
+0xFF, 0xFF, 0xE8, 0x27, 0x2C, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xE8, 0xF2, 0x33, 0x10, 0xFF, 0xFF,
+0xFF, 0xFF, 0xEA, 0x07, 0x0E, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xEA, 0xD2, 0x15, 0x10, 0xFF, 0xFF,
+0xFF, 0xFF, 0xEB, 0xE6, 0xF0, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xEC, 0xB1, 0xF7, 0x10, 0xFF, 0xFF,
+0xFF, 0xFF, 0xED, 0xC6, 0xD2, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xEE, 0x91, 0xD9, 0x10, 0xFF, 0xFF,
+0xFF, 0xFF, 0xEF, 0xAF, 0xEE, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xF0, 0x71, 0xBB, 0x10, 0xFF, 0xFF,
+0xFF, 0xFF, 0xF1, 0x8F, 0xD0, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xF2, 0x7F, 0xC1, 0x90, 0xFF, 0xFF,
+0xFF, 0xFF, 0xF3, 0x6F, 0xB2, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x5F, 0xA3, 0x90, 0xFF, 0xFF,
+0xFF, 0xFF, 0xF5, 0x4F, 0x94, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xF6, 0x3F, 0x85, 0x90, 0xFF, 0xFF,
+0xFF, 0xFF, 0xF7, 0x2F, 0x76, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x28, 0xA2, 0x10, 0xFF, 0xFF,
+0xFF, 0xFF, 0xF9, 0x0F, 0x58, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x08, 0x84, 0x10, 0xFF, 0xFF,
+0xFF, 0xFF, 0xFA, 0xF8, 0x83, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xFB, 0xE8, 0x66, 0x10, 0xFF, 0xFF,
+0xFF, 0xFF, 0xFC, 0xD8, 0x65, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xFD, 0xC8, 0x48, 0x10, 0xFF, 0xFF,
+0xFF, 0xFF, 0xFE, 0xB8, 0x47, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xA8, 0x2A, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x98, 0x29, 0x20, 0x00, 0x00, 0x00, 0x00, 0x01, 0x88, 0x0C, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x02, 0x78, 0x0B, 0x20, 0x00, 0x00, 0x00, 0x00, 0x03, 0x71, 0x28, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x04, 0x61, 0x27, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x05, 0x51, 0x0A, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x06, 0x41, 0x09, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x07, 0x30, 0xEC, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x07, 0x8D, 0x43, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x09, 0x10, 0xCE, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x09, 0xAD, 0xBF, 0x20, 0x00, 0x00, 0x00, 0x00, 0x0A, 0xF0, 0xB0, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x0B, 0xE0, 0xAF, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x0C, 0xD9, 0xCD, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x0D, 0xC0, 0x91, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x0E, 0xB9, 0xAF, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x0F, 0xA9, 0xAE, 0x20, 0x00, 0x00, 0x00, 0x00, 0x10, 0x99, 0x91, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x11, 0x89, 0x90, 0x20, 0x00, 0x00, 0x00, 0x00, 0x12, 0x79, 0x73, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x13, 0x69, 0x72, 0x20, 0x00, 0x00, 0x00, 0x00, 0x14, 0x59, 0x55, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x15, 0x49, 0x54, 0x20, 0x00, 0x00, 0x00, 0x00, 0x16, 0x39, 0x37, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x17, 0x29, 0x36, 0x20, 0x00, 0x00, 0x00, 0x00, 0x18, 0x22, 0x53, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x19, 0x09, 0x18, 0x20, 0x00, 0x00, 0x00, 0x00, 0x1A, 0x02, 0x35, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x1A, 0xF2, 0x34, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xE2, 0x17, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x1C, 0xD2, 0x16, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC1, 0xF9, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x1E, 0xB1, 0xF8, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA1, 0xDB, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x20, 0x76, 0x2B, 0x20, 0x00, 0x00, 0x00, 0x00, 0x21, 0x81, 0xBD, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x22, 0x56, 0x0D, 0x20, 0x00, 0x00, 0x00, 0x00, 0x23, 0x6A, 0xDA, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x24, 0x35, 0xEF, 0x20, 0x00, 0x00, 0x00, 0x00, 0x25, 0x4A, 0xBC, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x26, 0x15, 0xD1, 0x20, 0x00, 0x00, 0x00, 0x00, 0x27, 0x2A, 0x9E, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x27, 0xFE, 0xED, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x29, 0x0A, 0x80, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x29, 0xDE, 0xCF, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xEA, 0x62, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x2B, 0xBE, 0xB1, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xD3, 0x7E, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x2D, 0x9E, 0x93, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x2E, 0xB3, 0x60, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x2F, 0x7E, 0x75, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x30, 0x93, 0x42, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x31, 0x67, 0x92, 0x20, 0x00, 0x00, 0x00, 0x00, 0x32, 0x73, 0x24, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x33, 0x47, 0x74, 0x20, 0x00, 0x00, 0x00, 0x00, 0x34, 0x53, 0x06, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x35, 0x27, 0x56, 0x20, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0xE8, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x37, 0x07, 0x38, 0x20, 0x00, 0x00, 0x00, 0x00, 0x38, 0x1C, 0x05, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x38, 0xE7, 0x1A, 0x20, 0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0xE7, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x3A, 0xC6, 0xFC, 0x20, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xDB, 0xC9, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x3C, 0xB0, 0x18, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0xAB, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x3E, 0x8F, 0xFA, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x8D, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x40, 0x6F, 0xDC, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0xA9, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x42, 0x4F, 0xBE, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x8B, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x44, 0x2F, 0xA0, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x45, 0x44, 0x6D, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x45, 0xF3, 0xD3, 0x20, 0x00, 0x00, 0x00, 0x00, 0x47, 0x2D, 0x8A, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x47, 0xD3, 0xB5, 0x20, 0x00, 0x00, 0x00, 0x00, 0x49, 0x0D, 0x6C, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x49, 0xB3, 0x97, 0x20, 0x00, 0x00, 0x00, 0x00, 0x4A, 0xED, 0x4E, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x4B, 0x9C, 0xB3, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x4C, 0xD6, 0x6A, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x4D, 0x7C, 0x95, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x4E, 0xB6, 0x4C, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x4F, 0x5C, 0x77, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x50, 0x96, 0x2E, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x51, 0x3C, 0x59, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x52, 0x76, 0x10, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x53, 0x1C, 0x3B, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x54, 0x55, 0xF2, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x54, 0xFC, 0x1D, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x56, 0x35, 0xD4, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x56, 0xE5, 0x3A, 0x20, 0x00, 0x00, 0x00, 0x00, 0x58, 0x1E, 0xF1, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x58, 0xC5, 0x1C, 0x20, 0x00, 0x00, 0x00, 0x00, 0x59, 0xFE, 0xD3, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x5A, 0xA4, 0xFE, 0x20, 0x00, 0x00, 0x00, 0x00, 0x5B, 0xDE, 0xB5, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x5C, 0x84, 0xE0, 0x20, 0x00, 0x00, 0x00, 0x00, 0x5D, 0xBE, 0x97, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x5E, 0x64, 0xC2, 0x20, 0x00, 0x00, 0x00, 0x00, 0x5F, 0x9E, 0x79, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x60, 0x4D, 0xDE, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x61, 0x87, 0x95, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x62, 0x2D, 0xC0, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x63, 0x67, 0x77, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x64, 0x0D, 0xA2, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x65, 0x47, 0x59, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x65, 0xED, 0x84, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x67, 0x27, 0x3B, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x67, 0xCD, 0x66, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x69, 0x07, 0x1D, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x69, 0xAD, 0x48, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x6A, 0xE6, 0xFF, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x6B, 0x96, 0x65, 0x20, 0x00, 0x00, 0x00, 0x00, 0x6C, 0xD0, 0x1C, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x6D, 0x76, 0x47, 0x20, 0x00, 0x00, 0x00, 0x00, 0x6E, 0xAF, 0xFE, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x6F, 0x56, 0x29, 0x20, 0x00, 0x00, 0x00, 0x00, 0x70, 0x8F, 0xE0, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x71, 0x36, 0x0B, 0x20, 0x00, 0x00, 0x00, 0x00, 0x72, 0x6F, 0xC2, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x73, 0x15, 0xED, 0x20, 0x00, 0x00, 0x00, 0x00, 0x74, 0x4F, 0xA4, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x74, 0xFF, 0x09, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x76, 0x38, 0xC0, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x76, 0xDE, 0xEB, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x78, 0x18, 0xA2, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x78, 0xBE, 0xCD, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x79, 0xF8, 0x84, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x7A, 0x9E, 0xAF, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x7B, 0xD8, 0x66, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x7C, 0x7E, 0x91, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x7D, 0xB8, 0x48, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x7E, 0x5E, 0x73, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x98, 0x2A, 0x90, 0x05, 0x01,
+0x02, 0x01, 0x02, 0x03, 0x04, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0xFF, 0xFF, 0x91, 0x26, 0x00, 0x00, 0xFF, 0xFF,
+0x9D, 0x90, 0x01, 0x04, 0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x08, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x0C,
+0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x10, 0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00,
+0x50, 0x44, 0x54, 0x00, 0x50, 0x53, 0x54, 0x00, 0x50, 0x57, 0x54, 0x00, 0x50, 0x50, 0x54, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x0A, 0x50, 0x53, 0x54,
+0x38, 0x50, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D, 0x31, 0x31, 0x2E,
+0x31, 0x2E, 0x30, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+
 
 /* ROC */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -69968,125 +70837,227 @@
 
 /* WET */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x7A, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x09, 0x0D, 0xA4, 0x63, 0x90,
-0x0E, 0x8B, 0x1A, 0x10, 0x0F, 0x84, 0x45, 0x90, 0x10, 0x74, 0x36, 0x90, 0x11, 0x64, 0x27, 0x90,
-0x12, 0x54, 0x18, 0x90, 0x13, 0x4D, 0x44, 0x10, 0x14, 0x33, 0xFA, 0x90, 0x15, 0x23, 0xEB, 0x90,
-0x16, 0x13, 0xDC, 0x90, 0x17, 0x03, 0xCD, 0x90, 0x17, 0xF3, 0xBE, 0x90, 0x18, 0xE3, 0xAF, 0x90,
-0x19, 0xD3, 0xA0, 0x90, 0x1A, 0xC3, 0x91, 0x90, 0x1B, 0xBC, 0xBD, 0x10, 0x1C, 0xAC, 0xAE, 0x10,
-0x1D, 0x9C, 0x9F, 0x10, 0x1E, 0x8C, 0x90, 0x10, 0x1F, 0x7C, 0x81, 0x10, 0x20, 0x6C, 0x72, 0x10,
-0x21, 0x5C, 0x63, 0x10, 0x22, 0x4C, 0x54, 0x10, 0x23, 0x3C, 0x45, 0x10, 0x24, 0x2C, 0x36, 0x10,
-0x25, 0x1C, 0x27, 0x10, 0x26, 0x0C, 0x18, 0x10, 0x27, 0x05, 0x43, 0x90, 0x27, 0xF5, 0x34, 0x90,
-0x28, 0xE5, 0x25, 0x90, 0x29, 0xD5, 0x16, 0x90, 0x2A, 0xC5, 0x07, 0x90, 0x2B, 0xB4, 0xF8, 0x90,
-0x2C, 0xA4, 0xE9, 0x90, 0x2D, 0x94, 0xDA, 0x90, 0x2E, 0x84, 0xCB, 0x90, 0x2F, 0x74, 0xBC, 0x90,
-0x30, 0x64, 0xAD, 0x90, 0x31, 0x5D, 0xD9, 0x10, 0x32, 0x72, 0xB4, 0x10, 0x33, 0x3D, 0xBB, 0x10,
-0x34, 0x52, 0x96, 0x10, 0x35, 0x1D, 0x9D, 0x10, 0x36, 0x32, 0x78, 0x10, 0x36, 0xFD, 0x7F, 0x10,
-0x38, 0x1B, 0x94, 0x90, 0x38, 0xDD, 0x61, 0x10, 0x39, 0xFB, 0x76, 0x90, 0x3A, 0xBD, 0x43, 0x10,
-0x3B, 0xDB, 0x58, 0x90, 0x3C, 0xA6, 0x5F, 0x90, 0x3D, 0xBB, 0x3A, 0x90, 0x3E, 0x86, 0x41, 0x90,
-0x3F, 0x9B, 0x1C, 0x90, 0x40, 0x66, 0x23, 0x90, 0x41, 0x84, 0x39, 0x10, 0x42, 0x46, 0x05, 0x90,
-0x43, 0x64, 0x1B, 0x10, 0x44, 0x25, 0xE7, 0x90, 0x45, 0x43, 0xFD, 0x10, 0x46, 0x05, 0xC9, 0x90,
-0x47, 0x23, 0xDF, 0x10, 0x47, 0xEE, 0xE6, 0x10, 0x49, 0x03, 0xC1, 0x10, 0x49, 0xCE, 0xC8, 0x10,
-0x4A, 0xE3, 0xA3, 0x10, 0x4B, 0xAE, 0xAA, 0x10, 0x4C, 0xCC, 0xBF, 0x90, 0x4D, 0x8E, 0x8C, 0x10,
-0x4E, 0xAC, 0xA1, 0x90, 0x4F, 0x6E, 0x6E, 0x10, 0x50, 0x8C, 0x83, 0x90, 0x51, 0x57, 0x8A, 0x90,
-0x52, 0x6C, 0x65, 0x90, 0x53, 0x37, 0x6C, 0x90, 0x54, 0x4C, 0x47, 0x90, 0x55, 0x17, 0x4E, 0x90,
-0x56, 0x2C, 0x29, 0x90, 0x56, 0xF7, 0x30, 0x90, 0x58, 0x15, 0x46, 0x10, 0x58, 0xD7, 0x12, 0x90,
-0x59, 0xF5, 0x28, 0x10, 0x5A, 0xB6, 0xF4, 0x90, 0x5B, 0xD5, 0x0A, 0x10, 0x5C, 0xA0, 0x11, 0x10,
-0x5D, 0xB4, 0xEC, 0x10, 0x5E, 0x7F, 0xF3, 0x10, 0x5F, 0x94, 0xCE, 0x10, 0x60, 0x5F, 0xD5, 0x10,
-0x61, 0x7D, 0xEA, 0x90, 0x62, 0x3F, 0xB7, 0x10, 0x63, 0x5D, 0xCC, 0x90, 0x64, 0x1F, 0x99, 0x10,
-0x65, 0x3D, 0xAE, 0x90, 0x66, 0x08, 0xB5, 0x90, 0x67, 0x1D, 0x90, 0x90, 0x67, 0xE8, 0x97, 0x90,
-0x68, 0xFD, 0x72, 0x90, 0x69, 0xC8, 0x79, 0x90, 0x6A, 0xDD, 0x54, 0x90, 0x6B, 0xA8, 0x5B, 0x90,
-0x6C, 0xC6, 0x71, 0x10, 0x6D, 0x88, 0x3D, 0x90, 0x6E, 0xA6, 0x53, 0x10, 0x6F, 0x68, 0x1F, 0x90,
-0x70, 0x86, 0x35, 0x10, 0x71, 0x51, 0x3C, 0x10, 0x72, 0x66, 0x17, 0x10, 0x73, 0x31, 0x1E, 0x10,
-0x74, 0x45, 0xF9, 0x10, 0x75, 0x11, 0x00, 0x10, 0x76, 0x2F, 0x15, 0x90, 0x76, 0xF0, 0xE2, 0x10,
-0x78, 0x0E, 0xF7, 0x90, 0x78, 0xD0, 0xC4, 0x10, 0x79, 0xEE, 0xD9, 0x90, 0x7A, 0xB0, 0xA6, 0x10,
-0x7B, 0xCE, 0xBB, 0x90, 0x7C, 0x99, 0xC2, 0x90, 0x7D, 0xAE, 0x9D, 0x90, 0x7E, 0x79, 0xA4, 0x90,
-0x7F, 0x8E, 0x7F, 0x90, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x00, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x57, 0x45, 0x53, 0x54, 0x00, 0x57, 0x45, 0x54, 0x00, 0x01,
-0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00,
-0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7A, 0x00, 0x00, 0x00, 0x04, 0x00,
-0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x0D, 0xA4, 0x63, 0x90, 0x00, 0x00, 0x00, 0x00, 0x0E,
-0x8B, 0x1A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x84, 0x45, 0x90, 0x00, 0x00, 0x00, 0x00, 0x10,
-0x74, 0x36, 0x90, 0x00, 0x00, 0x00, 0x00, 0x11, 0x64, 0x27, 0x90, 0x00, 0x00, 0x00, 0x00, 0x12,
-0x54, 0x18, 0x90, 0x00, 0x00, 0x00, 0x00, 0x13, 0x4D, 0x44, 0x10, 0x00, 0x00, 0x00, 0x00, 0x14,
-0x33, 0xFA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x15, 0x23, 0xEB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x16,
-0x13, 0xDC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x17, 0x03, 0xCD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x17,
-0xF3, 0xBE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x18, 0xE3, 0xAF, 0x90, 0x00, 0x00, 0x00, 0x00, 0x19,
-0xD3, 0xA0, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xC3, 0x91, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1B,
-0xBC, 0xBD, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xAC, 0xAE, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1D,
-0x9C, 0x9F, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x8C, 0x90, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1F,
-0x7C, 0x81, 0x10, 0x00, 0x00, 0x00, 0x00, 0x20, 0x6C, 0x72, 0x10, 0x00, 0x00, 0x00, 0x00, 0x21,
-0x5C, 0x63, 0x10, 0x00, 0x00, 0x00, 0x00, 0x22, 0x4C, 0x54, 0x10, 0x00, 0x00, 0x00, 0x00, 0x23,
-0x3C, 0x45, 0x10, 0x00, 0x00, 0x00, 0x00, 0x24, 0x2C, 0x36, 0x10, 0x00, 0x00, 0x00, 0x00, 0x25,
-0x1C, 0x27, 0x10, 0x00, 0x00, 0x00, 0x00, 0x26, 0x0C, 0x18, 0x10, 0x00, 0x00, 0x00, 0x00, 0x27,
-0x05, 0x43, 0x90, 0x00, 0x00, 0x00, 0x00, 0x27, 0xF5, 0x34, 0x90, 0x00, 0x00, 0x00, 0x00, 0x28,
-0xE5, 0x25, 0x90, 0x00, 0x00, 0x00, 0x00, 0x29, 0xD5, 0x16, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2A,
-0xC5, 0x07, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xB4, 0xF8, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2C,
-0xA4, 0xE9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x94, 0xDA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2E,
-0x84, 0xCB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x74, 0xBC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x30,
-0x64, 0xAD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x31, 0x5D, 0xD9, 0x10, 0x00, 0x00, 0x00, 0x00, 0x32,
-0x72, 0xB4, 0x10, 0x00, 0x00, 0x00, 0x00, 0x33, 0x3D, 0xBB, 0x10, 0x00, 0x00, 0x00, 0x00, 0x34,
-0x52, 0x96, 0x10, 0x00, 0x00, 0x00, 0x00, 0x35, 0x1D, 0x9D, 0x10, 0x00, 0x00, 0x00, 0x00, 0x36,
-0x32, 0x78, 0x10, 0x00, 0x00, 0x00, 0x00, 0x36, 0xFD, 0x7F, 0x10, 0x00, 0x00, 0x00, 0x00, 0x38,
-0x1B, 0x94, 0x90, 0x00, 0x00, 0x00, 0x00, 0x38, 0xDD, 0x61, 0x10, 0x00, 0x00, 0x00, 0x00, 0x39,
-0xFB, 0x76, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xBD, 0x43, 0x10, 0x00, 0x00, 0x00, 0x00, 0x3B,
-0xDB, 0x58, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xA6, 0x5F, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3D,
-0xBB, 0x3A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x86, 0x41, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3F,
-0x9B, 0x1C, 0x90, 0x00, 0x00, 0x00, 0x00, 0x40, 0x66, 0x23, 0x90, 0x00, 0x00, 0x00, 0x00, 0x41,
-0x84, 0x39, 0x10, 0x00, 0x00, 0x00, 0x00, 0x42, 0x46, 0x05, 0x90, 0x00, 0x00, 0x00, 0x00, 0x43,
-0x64, 0x1B, 0x10, 0x00, 0x00, 0x00, 0x00, 0x44, 0x25, 0xE7, 0x90, 0x00, 0x00, 0x00, 0x00, 0x45,
-0x43, 0xFD, 0x10, 0x00, 0x00, 0x00, 0x00, 0x46, 0x05, 0xC9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x47,
-0x23, 0xDF, 0x10, 0x00, 0x00, 0x00, 0x00, 0x47, 0xEE, 0xE6, 0x10, 0x00, 0x00, 0x00, 0x00, 0x49,
-0x03, 0xC1, 0x10, 0x00, 0x00, 0x00, 0x00, 0x49, 0xCE, 0xC8, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4A,
-0xE3, 0xA3, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4B, 0xAE, 0xAA, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4C,
-0xCC, 0xBF, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x8E, 0x8C, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4E,
-0xAC, 0xA1, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x6E, 0x6E, 0x10, 0x00, 0x00, 0x00, 0x00, 0x50,
-0x8C, 0x83, 0x90, 0x00, 0x00, 0x00, 0x00, 0x51, 0x57, 0x8A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x52,
-0x6C, 0x65, 0x90, 0x00, 0x00, 0x00, 0x00, 0x53, 0x37, 0x6C, 0x90, 0x00, 0x00, 0x00, 0x00, 0x54,
-0x4C, 0x47, 0x90, 0x00, 0x00, 0x00, 0x00, 0x55, 0x17, 0x4E, 0x90, 0x00, 0x00, 0x00, 0x00, 0x56,
-0x2C, 0x29, 0x90, 0x00, 0x00, 0x00, 0x00, 0x56, 0xF7, 0x30, 0x90, 0x00, 0x00, 0x00, 0x00, 0x58,
-0x15, 0x46, 0x10, 0x00, 0x00, 0x00, 0x00, 0x58, 0xD7, 0x12, 0x90, 0x00, 0x00, 0x00, 0x00, 0x59,
-0xF5, 0x28, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xB6, 0xF4, 0x90, 0x00, 0x00, 0x00, 0x00, 0x5B,
-0xD5, 0x0A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5C, 0xA0, 0x11, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5D,
-0xB4, 0xEC, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x7F, 0xF3, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5F,
-0x94, 0xCE, 0x10, 0x00, 0x00, 0x00, 0x00, 0x60, 0x5F, 0xD5, 0x10, 0x00, 0x00, 0x00, 0x00, 0x61,
-0x7D, 0xEA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x62, 0x3F, 0xB7, 0x10, 0x00, 0x00, 0x00, 0x00, 0x63,
-0x5D, 0xCC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x64, 0x1F, 0x99, 0x10, 0x00, 0x00, 0x00, 0x00, 0x65,
-0x3D, 0xAE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x66, 0x08, 0xB5, 0x90, 0x00, 0x00, 0x00, 0x00, 0x67,
-0x1D, 0x90, 0x90, 0x00, 0x00, 0x00, 0x00, 0x67, 0xE8, 0x97, 0x90, 0x00, 0x00, 0x00, 0x00, 0x68,
-0xFD, 0x72, 0x90, 0x00, 0x00, 0x00, 0x00, 0x69, 0xC8, 0x79, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6A,
-0xDD, 0x54, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6B, 0xA8, 0x5B, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6C,
-0xC6, 0x71, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6D, 0x88, 0x3D, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6E,
-0xA6, 0x53, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6F, 0x68, 0x1F, 0x90, 0x00, 0x00, 0x00, 0x00, 0x70,
-0x86, 0x35, 0x10, 0x00, 0x00, 0x00, 0x00, 0x71, 0x51, 0x3C, 0x10, 0x00, 0x00, 0x00, 0x00, 0x72,
-0x66, 0x17, 0x10, 0x00, 0x00, 0x00, 0x00, 0x73, 0x31, 0x1E, 0x10, 0x00, 0x00, 0x00, 0x00, 0x74,
-0x45, 0xF9, 0x10, 0x00, 0x00, 0x00, 0x00, 0x75, 0x11, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x76,
-0x2F, 0x15, 0x90, 0x00, 0x00, 0x00, 0x00, 0x76, 0xF0, 0xE2, 0x10, 0x00, 0x00, 0x00, 0x00, 0x78,
-0x0E, 0xF7, 0x90, 0x00, 0x00, 0x00, 0x00, 0x78, 0xD0, 0xC4, 0x10, 0x00, 0x00, 0x00, 0x00, 0x79,
-0xEE, 0xD9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7A, 0xB0, 0xA6, 0x10, 0x00, 0x00, 0x00, 0x00, 0x7B,
-0xCE, 0xBB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x99, 0xC2, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7D,
-0xAE, 0x9D, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x79, 0xA4, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7F,
-0x8E, 0x7F, 0x90, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x05, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x00, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x05, 0x57, 0x45, 0x53, 0x54, 0x00, 0x57, 0x45, 0x54, 0x00, 0x01, 0x01,
-0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x0A, 0x57, 0x45, 0x54, 0x30, 0x57, 0x45, 0x53, 0x54, 0x2C,
-0x4D, 0x33, 0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x31, 0x2C, 0x4D, 0x31, 0x30, 0x2E, 0x35, 0x2E, 0x30,
-0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0xE1, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x1B, 0x80, 0x00, 0x00, 0x00,
+0x92, 0xE6, 0x8E, 0x80, 0x9B, 0x4B, 0x6D, 0x70, 0x9B, 0xFE, 0xC7, 0x80, 0x9C, 0x9C, 0xFB, 0x80,
+0x9D, 0xC9, 0x83, 0x70, 0x9E, 0x7E, 0x2F, 0x00, 0x9F, 0xAA, 0xB6, 0xF0, 0xA0, 0x5F, 0x62, 0x80,
+0xA1, 0x8B, 0xEA, 0x70, 0xA2, 0x41, 0xE7, 0x80, 0xA3, 0x6E, 0x6F, 0x70, 0xA4, 0x23, 0x1B, 0x00,
+0xA5, 0x4F, 0xA2, 0xF0, 0xAA, 0x05, 0xEF, 0x70, 0xAA, 0xE7, 0x5F, 0xF0, 0xAD, 0xC9, 0xA7, 0xF0,
+0xAE, 0xA7, 0x23, 0xF0, 0xAF, 0xA0, 0x4F, 0x70, 0xB0, 0x87, 0x05, 0xF0, 0xB1, 0x89, 0x6B, 0xF0,
+0xB2, 0x70, 0x22, 0x70, 0xB3, 0x72, 0x88, 0x70, 0xB4, 0x50, 0x04, 0x70, 0xB7, 0x32, 0x4C, 0x70,
+0xB8, 0x0F, 0xC8, 0x70, 0xB8, 0xFF, 0xB9, 0x70, 0xB9, 0xEF, 0xAA, 0x70, 0xBC, 0xC8, 0xB7, 0xF0,
+0xBD, 0xB8, 0xA8, 0xF0, 0xBE, 0x9F, 0x5F, 0x70, 0xBF, 0x98, 0x8A, 0xF0, 0xC0, 0x9A, 0xF0, 0xF0,
+0xC1, 0x78, 0x6C, 0xF0, 0xC2, 0x68, 0x5D, 0xF0, 0xC3, 0x58, 0x4E, 0xF0, 0xC4, 0x3F, 0x05, 0x70,
+0xC5, 0x38, 0x30, 0xF0, 0xC6, 0x3A, 0x96, 0xF0, 0xC7, 0x58, 0xAC, 0x70, 0xC7, 0xD9, 0xDF, 0x70,
+0xC9, 0x03, 0xD2, 0x70, 0xC9, 0xF1, 0x20, 0x70, 0xCA, 0xE2, 0x62, 0xF0, 0xCB, 0xB5, 0x52, 0xF0,
+0xCB, 0xEC, 0xA3, 0xE0, 0xCC, 0x80, 0x4B, 0xE0, 0xCC, 0xDC, 0xA2, 0xF0, 0xCD, 0x95, 0x34, 0xF0,
+0xCD, 0xC3, 0x4B, 0x60, 0xCE, 0x72, 0xA2, 0xE0, 0xCE, 0xC5, 0xBF, 0x70, 0xCF, 0x75, 0x16, 0xF0,
+0xCF, 0xAC, 0x67, 0xE0, 0xD0, 0x52, 0x84, 0xE0, 0xD0, 0xA5, 0xA1, 0x70, 0xD1, 0x54, 0xF8, 0xF0,
+0xD1, 0x8C, 0x49, 0xE0, 0xD2, 0x32, 0x66, 0xE0, 0xD2, 0x85, 0x83, 0x70, 0xD3, 0x59, 0xC4, 0xF0,
+0xD4, 0x49, 0xB5, 0xF0, 0xD5, 0x39, 0xD1, 0x20, 0xD6, 0x29, 0xC2, 0x20, 0xD7, 0x19, 0xB3, 0x20,
+0xD8, 0x09, 0xA4, 0x20, 0xD8, 0xF9, 0x95, 0x20, 0xD9, 0xE9, 0x86, 0x20, 0xDA, 0xD9, 0x77, 0x20,
+0xDB, 0xC9, 0x68, 0x20, 0xDC, 0xB9, 0x59, 0x20, 0xDD, 0xB2, 0x84, 0xA0, 0xDE, 0xA2, 0x75, 0xA0,
+0xDF, 0x92, 0x66, 0xA0, 0xE0, 0x82, 0x57, 0xA0, 0xE1, 0x72, 0x48, 0xA0, 0xE2, 0x62, 0x39, 0xA0,
+0xE3, 0x52, 0x2A, 0xA0, 0xE4, 0x42, 0x1B, 0xA0, 0xE5, 0x32, 0x0C, 0xA0, 0xE6, 0x21, 0xFD, 0xA0,
+0xE7, 0x1B, 0x29, 0x20, 0xE8, 0x0B, 0x1A, 0x20, 0xE8, 0xFB, 0x0B, 0x20, 0xE9, 0xEA, 0xFC, 0x20,
+0xEA, 0xDA, 0xED, 0x20, 0xEB, 0xCA, 0xDE, 0x20, 0xEC, 0xBA, 0xCF, 0x20, 0xED, 0xAA, 0xC0, 0x20,
+0xEE, 0x9A, 0xB1, 0x20, 0xEF, 0x8A, 0xA2, 0x20, 0xF0, 0x7A, 0x93, 0x20, 0xF1, 0x6A, 0x84, 0x20,
+0xF2, 0x63, 0xAF, 0xA0, 0xF3, 0x53, 0xA0, 0xA0, 0xF4, 0x43, 0x91, 0xA0, 0xF5, 0x33, 0x82, 0xA0,
+0xF6, 0x23, 0x73, 0xA0, 0xF7, 0x13, 0x64, 0xA0, 0xF8, 0x03, 0x55, 0xA0, 0xF8, 0xF3, 0x46, 0xA0,
+0xF9, 0xE3, 0x37, 0xA0, 0x0C, 0xAB, 0x2A, 0x00, 0x0D, 0x9B, 0x1B, 0x00, 0x0E, 0x8B, 0x0C, 0x00,
+0x0F, 0x84, 0x45, 0x90, 0x10, 0x74, 0x36, 0x90, 0x11, 0x64, 0x27, 0x90, 0x12, 0x54, 0x18, 0x90,
+0x13, 0x4D, 0x44, 0x10, 0x14, 0x33, 0xFA, 0x90, 0x15, 0x23, 0xDD, 0x80, 0x16, 0x13, 0xCE, 0x80,
+0x17, 0x03, 0xBF, 0x80, 0x17, 0xF3, 0xB0, 0x80, 0x18, 0xE3, 0xA1, 0x80, 0x19, 0xD3, 0x92, 0x80,
+0x1A, 0xC3, 0x83, 0x80, 0x1B, 0xBC, 0xAF, 0x00, 0x1C, 0xAC, 0xA0, 0x00, 0x1D, 0x9C, 0x91, 0x00,
+0x1E, 0x8C, 0x90, 0x10, 0x1F, 0x7C, 0x81, 0x10, 0x20, 0x6C, 0x72, 0x10, 0x21, 0x5C, 0x63, 0x10,
+0x22, 0x4C, 0x54, 0x10, 0x23, 0x3C, 0x45, 0x10, 0x24, 0x2C, 0x36, 0x10, 0x25, 0x1C, 0x27, 0x10,
+0x26, 0x0C, 0x18, 0x10, 0x27, 0x05, 0x43, 0x90, 0x27, 0xF5, 0x34, 0x90, 0x28, 0xE5, 0x25, 0x90,
+0x29, 0xD5, 0x16, 0x90, 0x2A, 0xC5, 0x07, 0x90, 0x2B, 0xB4, 0xF8, 0x90, 0x2C, 0xA4, 0xE9, 0x90,
+0x2D, 0x94, 0xDA, 0x90, 0x2E, 0x84, 0xCB, 0x90, 0x2F, 0x74, 0xBC, 0x90, 0x30, 0x64, 0xAD, 0x90,
+0x31, 0x5D, 0xD9, 0x10, 0x32, 0x72, 0xB4, 0x10, 0x33, 0x3D, 0xBB, 0x10, 0x34, 0x52, 0x96, 0x10,
+0x35, 0x1D, 0x9D, 0x10, 0x36, 0x32, 0x78, 0x10, 0x36, 0xFD, 0x7F, 0x10, 0x38, 0x1B, 0x94, 0x90,
+0x38, 0xDD, 0x61, 0x10, 0x39, 0xFB, 0x76, 0x90, 0x3A, 0xBD, 0x43, 0x10, 0x3B, 0xDB, 0x58, 0x90,
+0x3C, 0xA6, 0x5F, 0x90, 0x3D, 0xBB, 0x3A, 0x90, 0x3E, 0x86, 0x41, 0x90, 0x3F, 0x9B, 0x1C, 0x90,
+0x40, 0x66, 0x23, 0x90, 0x41, 0x84, 0x39, 0x10, 0x42, 0x46, 0x05, 0x90, 0x43, 0x64, 0x1B, 0x10,
+0x44, 0x25, 0xE7, 0x90, 0x45, 0x43, 0xFD, 0x10, 0x46, 0x05, 0xC9, 0x90, 0x47, 0x23, 0xDF, 0x10,
+0x47, 0xEE, 0xE6, 0x10, 0x49, 0x03, 0xC1, 0x10, 0x49, 0xCE, 0xC8, 0x10, 0x4A, 0xE3, 0xA3, 0x10,
+0x4B, 0xAE, 0xAA, 0x10, 0x4C, 0xCC, 0xBF, 0x90, 0x4D, 0x8E, 0x8C, 0x10, 0x4E, 0xAC, 0xA1, 0x90,
+0x4F, 0x6E, 0x6E, 0x10, 0x50, 0x8C, 0x83, 0x90, 0x51, 0x57, 0x8A, 0x90, 0x52, 0x6C, 0x65, 0x90,
+0x53, 0x37, 0x6C, 0x90, 0x54, 0x4C, 0x47, 0x90, 0x55, 0x17, 0x4E, 0x90, 0x56, 0x2C, 0x29, 0x90,
+0x56, 0xF7, 0x30, 0x90, 0x58, 0x15, 0x46, 0x10, 0x58, 0xD7, 0x12, 0x90, 0x59, 0xF5, 0x28, 0x10,
+0x5A, 0xB6, 0xF4, 0x90, 0x5B, 0xD5, 0x0A, 0x10, 0x5C, 0xA0, 0x11, 0x10, 0x5D, 0xB4, 0xEC, 0x10,
+0x5E, 0x7F, 0xF3, 0x10, 0x5F, 0x94, 0xCE, 0x10, 0x60, 0x5F, 0xD5, 0x10, 0x61, 0x7D, 0xEA, 0x90,
+0x62, 0x3F, 0xB7, 0x10, 0x63, 0x5D, 0xCC, 0x90, 0x64, 0x1F, 0x99, 0x10, 0x65, 0x3D, 0xAE, 0x90,
+0x66, 0x08, 0xB5, 0x90, 0x67, 0x1D, 0x90, 0x90, 0x67, 0xE8, 0x97, 0x90, 0x68, 0xFD, 0x72, 0x90,
+0x69, 0xC8, 0x79, 0x90, 0x6A, 0xDD, 0x54, 0x90, 0x6B, 0xA8, 0x5B, 0x90, 0x6C, 0xC6, 0x71, 0x10,
+0x6D, 0x88, 0x3D, 0x90, 0x6E, 0xA6, 0x53, 0x10, 0x6F, 0x68, 0x1F, 0x90, 0x70, 0x86, 0x35, 0x10,
+0x71, 0x51, 0x3C, 0x10, 0x72, 0x66, 0x17, 0x10, 0x73, 0x31, 0x1E, 0x10, 0x74, 0x45, 0xF9, 0x10,
+0x75, 0x11, 0x00, 0x10, 0x76, 0x2F, 0x15, 0x90, 0x76, 0xF0, 0xE2, 0x10, 0x78, 0x0E, 0xF7, 0x90,
+0x78, 0xD0, 0xC4, 0x10, 0x79, 0xEE, 0xD9, 0x90, 0x7A, 0xB0, 0xA6, 0x10, 0x7B, 0xCE, 0xBB, 0x90,
+0x7C, 0x99, 0xC2, 0x90, 0x7D, 0xAE, 0x9D, 0x90, 0x7E, 0x79, 0xA4, 0x90, 0x7F, 0x8E, 0x7F, 0x90,
+0x00, 0x06, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x03, 0x04,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x05, 0x03, 0x04,
+0x03, 0x05, 0x03, 0x04, 0x03, 0x05, 0x03, 0x04, 0x03, 0x05, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x07, 0x02, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
+0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08,
+0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x08, 0x06, 0x08,
+0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08,
+0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08,
+0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08,
+0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08,
+0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08,
+0x06, 0xFF, 0xFF, 0xF7, 0x63, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x04, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x09, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00,
+0x00, 0x1C, 0x20, 0x01, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x0E, 0x10, 0x00,
+0x12, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x04, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x12, 0x00, 0x00, 0x1C,
+0x20, 0x01, 0x16, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x4C,
+0x4D, 0x54, 0x00, 0x57, 0x45, 0x53, 0x54, 0x00, 0x57, 0x45, 0x54, 0x00, 0x57, 0x45, 0x4D, 0x54,
+0x00, 0x43, 0x45, 0x54, 0x00, 0x43, 0x45, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01,
+0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01,
+0x01, 0x01, 0x01, 0x01, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x0D,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE1, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x1B,
+0xFF, 0xFF, 0xFF, 0xFF, 0x5E, 0x3D, 0x0C, 0x1D, 0xFF, 0xFF, 0xFF, 0xFF, 0x92, 0xE6, 0x8E, 0x80,
+0xFF, 0xFF, 0xFF, 0xFF, 0x9B, 0x4B, 0x6D, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0x9B, 0xFE, 0xC7, 0x80,
+0xFF, 0xFF, 0xFF, 0xFF, 0x9C, 0x9C, 0xFB, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0x9D, 0xC9, 0x83, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0x9E, 0x7E, 0x2F, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x9F, 0xAA, 0xB6, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xA0, 0x5F, 0x62, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xA1, 0x8B, 0xEA, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xA2, 0x41, 0xE7, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xA3, 0x6E, 0x6F, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xA4, 0x23, 0x1B, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0x4F, 0xA2, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xAA, 0x05, 0xEF, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAA, 0xE7, 0x5F, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xAD, 0xC9, 0xA7, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xAE, 0xA7, 0x23, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xA0, 0x4F, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB0, 0x87, 0x05, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xB1, 0x89, 0x6B, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB2, 0x70, 0x22, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xB3, 0x72, 0x88, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB4, 0x50, 0x04, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x32, 0x4C, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0x0F, 0xC8, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0xFF, 0xB9, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB9, 0xEF, 0xAA, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xBC, 0xC8, 0xB7, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xBD, 0xB8, 0xA8, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xBE, 0x9F, 0x5F, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xBF, 0x98, 0x8A, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xC0, 0x9A, 0xF0, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC1, 0x78, 0x6C, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xC2, 0x68, 0x5D, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC3, 0x58, 0x4E, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xC4, 0x3F, 0x05, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xC5, 0x38, 0x30, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xC6, 0x3A, 0x96, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC7, 0x58, 0xAC, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xC7, 0xD9, 0xDF, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0x03, 0xD2, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0xF1, 0x20, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xCA, 0xE2, 0x62, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0xB5, 0x52, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0xEC, 0xA3, 0xE0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xCC, 0x80, 0x4B, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCC, 0xDC, 0xA2, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xCD, 0x95, 0x34, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCD, 0xC3, 0x4B, 0x60,
+0xFF, 0xFF, 0xFF, 0xFF, 0xCE, 0x72, 0xA2, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCE, 0xC5, 0xBF, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xCF, 0x75, 0x16, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCF, 0xAC, 0x67, 0xE0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xD0, 0x52, 0x84, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD0, 0xA5, 0xA1, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xD1, 0x54, 0xF8, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD1, 0x8C, 0x49, 0xE0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x32, 0x66, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x85, 0x83, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xD3, 0x59, 0xC4, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD4, 0x49, 0xB5, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xD5, 0x39, 0xD1, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xD6, 0x29, 0xC2, 0x20,
+0xFF, 0xFF, 0xFF, 0xFF, 0xD7, 0x19, 0xB3, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xD8, 0x09, 0xA4, 0x20,
+0xFF, 0xFF, 0xFF, 0xFF, 0xD8, 0xF9, 0x95, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xD9, 0xE9, 0x86, 0x20,
+0xFF, 0xFF, 0xFF, 0xFF, 0xDA, 0xD9, 0x77, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xDB, 0xC9, 0x68, 0x20,
+0xFF, 0xFF, 0xFF, 0xFF, 0xDC, 0xB9, 0x59, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xDD, 0xB2, 0x84, 0xA0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xDE, 0xA2, 0x75, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0x92, 0x66, 0xA0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xE0, 0x82, 0x57, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE1, 0x72, 0x48, 0xA0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xE2, 0x62, 0x39, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE3, 0x52, 0x2A, 0xA0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xE4, 0x42, 0x1B, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE5, 0x32, 0x0C, 0xA0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xE6, 0x21, 0xFD, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE7, 0x1B, 0x29, 0x20,
+0xFF, 0xFF, 0xFF, 0xFF, 0xE8, 0x0B, 0x1A, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xE8, 0xFB, 0x0B, 0x20,
+0xFF, 0xFF, 0xFF, 0xFF, 0xE9, 0xEA, 0xFC, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xEA, 0xDA, 0xED, 0x20,
+0xFF, 0xFF, 0xFF, 0xFF, 0xEB, 0xCA, 0xDE, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xEC, 0xBA, 0xCF, 0x20,
+0xFF, 0xFF, 0xFF, 0xFF, 0xED, 0xAA, 0xC0, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xEE, 0x9A, 0xB1, 0x20,
+0xFF, 0xFF, 0xFF, 0xFF, 0xEF, 0x8A, 0xA2, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF0, 0x7A, 0x93, 0x20,
+0xFF, 0xFF, 0xFF, 0xFF, 0xF1, 0x6A, 0x84, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF2, 0x63, 0xAF, 0xA0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xF3, 0x53, 0xA0, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x43, 0x91, 0xA0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x33, 0x82, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF6, 0x23, 0x73, 0xA0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x13, 0x64, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x03, 0x55, 0xA0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0xF3, 0x46, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF9, 0xE3, 0x37, 0xA0,
+0x00, 0x00, 0x00, 0x00, 0x0C, 0xAB, 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0D, 0x9B, 0x1B, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x0E, 0x8B, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x84, 0x45, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x10, 0x74, 0x36, 0x90, 0x00, 0x00, 0x00, 0x00, 0x11, 0x64, 0x27, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x12, 0x54, 0x18, 0x90, 0x00, 0x00, 0x00, 0x00, 0x13, 0x4D, 0x44, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x14, 0x33, 0xFA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x15, 0x23, 0xDD, 0x80,
+0x00, 0x00, 0x00, 0x00, 0x16, 0x13, 0xCE, 0x80, 0x00, 0x00, 0x00, 0x00, 0x17, 0x03, 0xBF, 0x80,
+0x00, 0x00, 0x00, 0x00, 0x17, 0xF3, 0xB0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x18, 0xE3, 0xA1, 0x80,
+0x00, 0x00, 0x00, 0x00, 0x19, 0xD3, 0x92, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xC3, 0x83, 0x80,
+0x00, 0x00, 0x00, 0x00, 0x1B, 0xBC, 0xAF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xAC, 0xA0, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x1D, 0x9C, 0x91, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x8C, 0x90, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x1F, 0x7C, 0x81, 0x10, 0x00, 0x00, 0x00, 0x00, 0x20, 0x6C, 0x72, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x21, 0x5C, 0x63, 0x10, 0x00, 0x00, 0x00, 0x00, 0x22, 0x4C, 0x54, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x23, 0x3C, 0x45, 0x10, 0x00, 0x00, 0x00, 0x00, 0x24, 0x2C, 0x36, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x25, 0x1C, 0x27, 0x10, 0x00, 0x00, 0x00, 0x00, 0x26, 0x0C, 0x18, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x27, 0x05, 0x43, 0x90, 0x00, 0x00, 0x00, 0x00, 0x27, 0xF5, 0x34, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x28, 0xE5, 0x25, 0x90, 0x00, 0x00, 0x00, 0x00, 0x29, 0xD5, 0x16, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x2A, 0xC5, 0x07, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xB4, 0xF8, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x2C, 0xA4, 0xE9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x94, 0xDA, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x2E, 0x84, 0xCB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x74, 0xBC, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x30, 0x64, 0xAD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x31, 0x5D, 0xD9, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x32, 0x72, 0xB4, 0x10, 0x00, 0x00, 0x00, 0x00, 0x33, 0x3D, 0xBB, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x34, 0x52, 0x96, 0x10, 0x00, 0x00, 0x00, 0x00, 0x35, 0x1D, 0x9D, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0x78, 0x10, 0x00, 0x00, 0x00, 0x00, 0x36, 0xFD, 0x7F, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x38, 0x1B, 0x94, 0x90, 0x00, 0x00, 0x00, 0x00, 0x38, 0xDD, 0x61, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0x76, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xBD, 0x43, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x3B, 0xDB, 0x58, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xA6, 0x5F, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0x3A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x86, 0x41, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x1C, 0x90, 0x00, 0x00, 0x00, 0x00, 0x40, 0x66, 0x23, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0x39, 0x10, 0x00, 0x00, 0x00, 0x00, 0x42, 0x46, 0x05, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x1B, 0x10, 0x00, 0x00, 0x00, 0x00, 0x44, 0x25, 0xE7, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x45, 0x43, 0xFD, 0x10, 0x00, 0x00, 0x00, 0x00, 0x46, 0x05, 0xC9, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x47, 0x23, 0xDF, 0x10, 0x00, 0x00, 0x00, 0x00, 0x47, 0xEE, 0xE6, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x49, 0x03, 0xC1, 0x10, 0x00, 0x00, 0x00, 0x00, 0x49, 0xCE, 0xC8, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x4A, 0xE3, 0xA3, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4B, 0xAE, 0xAA, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x4C, 0xCC, 0xBF, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x8E, 0x8C, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x4E, 0xAC, 0xA1, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x6E, 0x6E, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x50, 0x8C, 0x83, 0x90, 0x00, 0x00, 0x00, 0x00, 0x51, 0x57, 0x8A, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x52, 0x6C, 0x65, 0x90, 0x00, 0x00, 0x00, 0x00, 0x53, 0x37, 0x6C, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x54, 0x4C, 0x47, 0x90, 0x00, 0x00, 0x00, 0x00, 0x55, 0x17, 0x4E, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x56, 0x2C, 0x29, 0x90, 0x00, 0x00, 0x00, 0x00, 0x56, 0xF7, 0x30, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x58, 0x15, 0x46, 0x10, 0x00, 0x00, 0x00, 0x00, 0x58, 0xD7, 0x12, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x59, 0xF5, 0x28, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xB6, 0xF4, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x5B, 0xD5, 0x0A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5C, 0xA0, 0x11, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x5D, 0xB4, 0xEC, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x7F, 0xF3, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x5F, 0x94, 0xCE, 0x10, 0x00, 0x00, 0x00, 0x00, 0x60, 0x5F, 0xD5, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x61, 0x7D, 0xEA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x62, 0x3F, 0xB7, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x63, 0x5D, 0xCC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x64, 0x1F, 0x99, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x65, 0x3D, 0xAE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x66, 0x08, 0xB5, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x67, 0x1D, 0x90, 0x90, 0x00, 0x00, 0x00, 0x00, 0x67, 0xE8, 0x97, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x68, 0xFD, 0x72, 0x90, 0x00, 0x00, 0x00, 0x00, 0x69, 0xC8, 0x79, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x6A, 0xDD, 0x54, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6B, 0xA8, 0x5B, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x6C, 0xC6, 0x71, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6D, 0x88, 0x3D, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x6E, 0xA6, 0x53, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6F, 0x68, 0x1F, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x70, 0x86, 0x35, 0x10, 0x00, 0x00, 0x00, 0x00, 0x71, 0x51, 0x3C, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x72, 0x66, 0x17, 0x10, 0x00, 0x00, 0x00, 0x00, 0x73, 0x31, 0x1E, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x74, 0x45, 0xF9, 0x10, 0x00, 0x00, 0x00, 0x00, 0x75, 0x11, 0x00, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x76, 0x2F, 0x15, 0x90, 0x00, 0x00, 0x00, 0x00, 0x76, 0xF0, 0xE2, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x78, 0x0E, 0xF7, 0x90, 0x00, 0x00, 0x00, 0x00, 0x78, 0xD0, 0xC4, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x79, 0xEE, 0xD9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7A, 0xB0, 0xA6, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x7B, 0xCE, 0xBB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x99, 0xC2, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x7D, 0xAE, 0x9D, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x79, 0xA4, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x7F, 0x8E, 0x7F, 0x90, 0x00, 0x06, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x05, 0x03, 0x04, 0x03, 0x05, 0x03, 0x04, 0x03, 0x05, 0x03, 0x04,
+0x03, 0x05, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x07, 0x02, 0x03,
+0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
+0x04, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x09, 0x0A,
+0x09, 0x0A, 0x09, 0x0A, 0x09, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08,
+0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08,
+0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08,
+0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08,
+0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08,
+0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0xFF, 0xFF, 0xF7, 0x63, 0x00, 0x00, 0x00,
+0x00, 0x0E, 0x10, 0x01, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x0E, 0x10, 0x01,
+0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x0D, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x09, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x12, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x04, 0x00,
+0x00, 0x0E, 0x10, 0x00, 0x12, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x16, 0x00, 0x00, 0x0E, 0x10, 0x01,
+0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x4C, 0x4D, 0x54, 0x00, 0x57, 0x45, 0x53, 0x54, 0x00,
+0x57, 0x45, 0x54, 0x00, 0x57, 0x45, 0x4D, 0x54, 0x00, 0x43, 0x45, 0x54, 0x00, 0x43, 0x45, 0x53,
+0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x0A, 0x57, 0x45, 0x54,
+0x30, 0x57, 0x45, 0x53, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x31, 0x2C, 0x4D,
+0x31, 0x30, 0x2E, 0x35, 0x2E, 0x30, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 
 
 /* Zulu */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -70100,4 +71071,4 @@
 };
 #endif
 
-const timelib_tzdb timezonedb_builtin = { "2024.1", 597, timezonedb_idx_builtin, timelib_timezone_db_data_builtin };
+const timelib_tzdb timezonedb_builtin = { "2025.2", 598, timezonedb_idx_builtin, timelib_timezone_db_data_builtin };

php-8.3.7.tar.xz/ext/date/php_date.c -> php-8.3.21.tar.xz/ext/date/php_date.c Changed

@@ -320,6 +320,7 @@
 		}
 		if (ce_ptr->type != ZEND_INTERNAL_CLASS) {
 			zend_throw_error(date_ce_date_object_error, "Object of type %s not been correctly initialized by calling parent::__construct() in its constructor", ZSTR_VAL(ce->name));
+			return;
 		}
 		zend_throw_error(date_ce_date_object_error, "Object of type %s (inheriting %s) has not been correctly initialized by calling parent::__construct() in its constructor", ZSTR_VAL(ce->name), ZSTR_VAL(ce_ptr->name));
 	}
@@ -704,8 +705,11 @@
 			                          (offset->offset < 0) ? '-' : '+',
 			                          abs(offset->offset / 3600),
 			                          abs((offset->offset % 3600) / 60));
-		} else {
+		} else if (t->zone_type == TIMELIB_ZONETYPE_ID) {
 			offset = timelib_get_time_zone_info(t->sse, t->tz_info);
+		} else {
+			/* Shouldn't happen, but code defensively */
+			offset = timelib_time_offset_ctor();
 		}
 	}
 
@@ -2332,7 +2336,7 @@
 
 	common = zend_std_get_properties(zobj);
 
-	ZEND_HASH_MAP_FOREACH_STR_KEY_VAL_IND(common, name, prop) {
+	ZEND_HASH_FOREACH_STR_KEY_VAL_IND(common, name, prop) {
 		if (zend_hash_add(myht, name, prop) != NULL) {
 			Z_TRY_ADDREF_P(prop);
 		}
@@ -2446,6 +2450,9 @@
 				new_dst    = tzobj->tzi.z.dst;
 				new_abbr   = timelib_strdup(tzobj->tzi.z.abbr);
 				break;
+			default:
+				zend_throw_error(NULL, "The DateTimeZone object has not been correctly initialized by its constructor");
+				return 0;
 		}
 		type = tzobj->type;
 	} else if (dateobj->time->tz_info) {
@@ -2862,7 +2869,7 @@
 	zend_string      *prop_name;
 	zval             *prop_val;
 
-	ZEND_HASH_MAP_FOREACH_STR_KEY_VAL(myht, prop_name, prop_val) {
+	ZEND_HASH_FOREACH_STR_KEY_VAL(myht, prop_name, prop_val) {
 		if (!prop_name || (Z_TYPE_P(prop_val) == IS_REFERENCE) || date_time_is_internal_property(prop_name)) {
 			continue;
 		}
@@ -2933,6 +2940,7 @@
 
 	if (!php_date_initialize_from_hash(&dateobj, myht)) {
 		zend_throw_error(NULL, "Invalid serialization data for DateTime object");
+		RETURN_THROWS();
 	}
 }
 /* }}} */
@@ -2952,6 +2960,7 @@
 
 	if (!php_date_initialize_from_hash(&dateobj, myht)) {
 		zend_throw_error(NULL, "Invalid serialization data for DateTimeImmutable object");
+		RETURN_THROWS();
 	}
 }
 /* }}} */
@@ -3864,6 +3873,7 @@
 	if (!timezone_initialize(tzobj, ZSTR_VAL(tz), ZSTR_LEN(tz), &exception_message)) {
 		zend_throw_exception_ex(date_ce_date_invalid_timezone_exception, 0, "DateTimeZone::__construct(): %s", exception_message);
 		efree(exception_message);
+		RETURN_THROWS();
 	}
 }
 /* }}} */
@@ -3911,6 +3921,7 @@
 	tzobj = Z_PHPTIMEZONE_P(return_value);
 	if (!php_date_timezone_initialize_from_hash(&return_value, &tzobj, myht)) {
 		zend_throw_error(NULL, "Invalid serialization data for DateTimeZone object");
+		RETURN_THROWS();
 	}
 }
 /* }}} */
@@ -3930,6 +3941,7 @@
 
 	if (!php_date_timezone_initialize_from_hash(&return_value, &tzobj, myht)) {
 		zend_throw_error(NULL, "Invalid serialization data for DateTimeZone object");
+		RETURN_THROWS();
 	}
 }
 /* }}} */
@@ -3970,7 +3982,7 @@
 	zend_string      *prop_name;
 	zval             *prop_val;
 
-	ZEND_HASH_MAP_FOREACH_STR_KEY_VAL(myht, prop_name, prop_val) {
+	ZEND_HASH_FOREACH_STR_KEY_VAL(myht, prop_name, prop_val) {
 		if (!prop_name || (Z_TYPE_P(prop_val) == IS_REFERENCE) || date_timezone_is_internal_property(prop_name)) {
 			continue;
 		}
@@ -3995,6 +4007,7 @@
 
 	if (!php_date_timezone_initialize_from_hash(&object, &tzobj, myht)) {
 		zend_throw_error(NULL, "Invalid serialization data for DateTimeZone object");
+		RETURN_THROWS();
 	}
 
 	restore_custom_datetimezone_properties(object, myht);
@@ -4386,6 +4399,9 @@
 		zend_string_equals_literal(name, "days") ||
 		zend_string_equals_literal(name, "invert") ) {
 		/* Fallback to read_property. */
+		if (cache_slot) {
+			cache_slot0 = cache_slot1 = cache_slot2 = NULL;
+		}
 		ret = NULL;
 	} else {
 		ret = zend_std_get_property_ptr_ptr(object, name, type, cache_slot);
@@ -4418,11 +4434,6 @@
 
 static void php_date_interval_initialize_from_hash(zval **return_value, php_interval_obj **intobj, HashTable *myht) /* {{{ */
 {
-	/* If ->diff is already set, then we need to free it first */
-	if ((*intobj)->diff) {
-		timelib_rel_time_dtor((*intobj)->diff);
-	}
-
 	/* If we have a date_string, use that instead */
 	zval *date_str = zend_hash_str_find(myht, "date_string", strlen("date_string"));
 	if (date_str && Z_TYPE_P(date_str) == IS_STRING) {
@@ -4437,6 +4448,14 @@
 				Z_STRVAL_P(date_str),
 				err->error_messages0.position,
 				err->error_messages0.character ? err->error_messages0.character : ' ', err->error_messages0.message);
+				timelib_time_dtor(time);
+				timelib_error_container_dtor(err);
+				return;
+		}
+
+		/* If ->diff is already set, then we need to free it first */
+		if ((*intobj)->diff) {
+			timelib_rel_time_dtor((*intobj)->diff);
 		}
 
 		(*intobj)->diff = timelib_rel_time_clone(&time->relative);
@@ -4451,6 +4470,11 @@
 		return;
 	}
 
+	/* If ->diff is already set, then we need to free it first */
+	if ((*intobj)->diff) {
+		timelib_rel_time_dtor((*intobj)->diff);
+	}
+
 	/* Set new value */
 	(*intobj)->diff = timelib_rel_time_ctor();
 
@@ -4598,7 +4622,7 @@
 	zend_string      *prop_name;
 	zval             *prop_val;
 
-	ZEND_HASH_MAP_FOREACH_STR_KEY_VAL(myht, prop_name, prop_val) {
+	ZEND_HASH_FOREACH_STR_KEY_VAL(myht, prop_name, prop_val) {
 		if (!prop_name || (Z_TYPE_P(prop_val) == IS_REFERENCE) || date_interval_is_internal_property(prop_name)) {
 			continue;
 		}
@@ -4882,9 +4906,11 @@
 
 static bool date_period_init_finish(php_period_obj *dpobj, zend_long options, zend_long recurrences)
 {
-	if (dpobj->end == NULL && recurrences < 1) {
+	const zend_long max_recurrences = (INT_MAX - 8);
+
+	if (dpobj->end == NULL && (recurrences < 1 || recurrences > max_recurrences)) {
 		zend_string *func = get_active_function_or_method_name();
-		zend_throw_exception_ex(date_ce_date_malformed_period_string_exception, 0, "%s(): Recurrence count must be greater than 0", ZSTR_VAL(func));
+		zend_throw_exception_ex(date_ce_date_malformed_period_string_exception, 0, "%s(): Recurrence count must be greater or equal to 1 and lower than " ZEND_LONG_FMT, ZSTR_VAL(func), max_recurrences + 1);
 		zend_string_release(func);
 		return false;
 	}
@@ -4893,8 +4919,17 @@
 	dpobj->include_start_date = !(options & PHP_DATE_PERIOD_EXCLUDE_START_DATE);
 	dpobj->include_end_date = options & PHP_DATE_PERIOD_INCLUDE_END_DATE;
 
-	/* recurrrences */
-	dpobj->recurrences = recurrences + dpobj->include_start_date + dpobj->include_end_date;
+	/* recurrences */
+	recurrences += dpobj->include_start_date + dpobj->include_end_date;
+
+	if (UNEXPECTED(recurrences > max_recurrences)) {
+		zend_string *func = get_active_function_or_method_name();
+		zend_throw_exception_ex(date_ce_date_malformed_string_exception, 0, "%s(): Recurrence count must be greater or equal to 1 and lower than " ZEND_LONG_FMT " (including options)", ZSTR_VAL(func), max_recurrences + 1);
+		zend_string_release(func);
+		return false;
+	}
+
+	dpobj->recurrences = (int)recurrences;
 
 	dpobj->initialized = 1;
 
@@ -5278,6 +5313,10 @@
 	}
 	altitude = 90 - zenith;
 
+	if (!zend_finite(latitude) || !zend_finite(longitude)) {
+		RETURN_FALSE;
+	}
+
 	/* Initialize time struct */
 	tzi = get_timezone_info();
 	if (!tzi) {
@@ -5307,6 +5346,9 @@
 	if (N > 24 || N < 0) {
 		N -= floor(N / 24) * 24;
 	}
+	if (N > 24 || N < 0) {
+		RETURN_FALSE;
+	}
 
 	switch (retformat) {
 		case SUNFUNCS_RET_STRING:
@@ -5352,6 +5394,15 @@
 		Z_PARAM_DOUBLE(longitude)
 	ZEND_PARSE_PARAMETERS_END();
 
+	if (!zend_finite(latitude)) {
+		zend_argument_value_error(2, "must be finite");
+		RETURN_THROWS();
+	}
+	if (!zend_finite(longitude)) {
+		zend_argument_value_error(3, "must be finite");
+		RETURN_THROWS();
+	}
+
 	/* Initialize time struct */
 	tzi = get_timezone_info();
 	if (!tzi) {
@@ -5617,6 +5668,7 @@
 	period_obj = Z_PHPPERIOD_P(return_value);
 	if (!php_date_period_initialize_from_hash(period_obj, myht)) {
 		zend_throw_error(NULL, "Invalid serialization data for DatePeriod object");
+		RETURN_THROWS();
 	}
 }
 /* }}} */
@@ -5667,7 +5719,7 @@
 	zend_string      *prop_name;
 	zval             *prop_val;
 
-	ZEND_HASH_MAP_FOREACH_STR_KEY_VAL(myht, prop_name, prop_val) {
+	ZEND_HASH_FOREACH_STR_KEY_VAL(myht, prop_name, prop_val) {
 		if (!prop_name || (Z_TYPE_P(prop_val) == IS_REFERENCE) || date_period_is_internal_property(prop_name)) {
 			continue;
 		}
@@ -5692,6 +5744,7 @@
 
 	if (!php_date_period_initialize_from_hash(period_obj, myht)) {
 		zend_throw_error(NULL, "Invalid serialization data for DatePeriod object");
+		RETURN_THROWS();
 	}
 	restore_custom_dateperiod_properties(object, myht);
 }
@@ -5712,6 +5765,7 @@
 
 	if (!php_date_period_initialize_from_hash(period_obj, myht)) {
 		zend_throw_error(NULL, "Invalid serialization data for DatePeriod object");
+		RETURN_THROWS();
 	}
 }
 /* }}} */

php-8.3.7.tar.xz/ext/date/tests/DatePeriod_no_advance_on_valid.phpt -> php-8.3.21.tar.xz/ext/date/tests/DatePeriod_no_advance_on_valid.phpt Changed

php-8.3.7.tar.xz/ext/date/tests/DatePeriod_wrong_recurrence_on_constructor.phpt -> php-8.3.21.tar.xz/ext/date/tests/DatePeriod_wrong_recurrence_on_constructor.phpt Changed

php-8.3.21.tar.xz/ext/date/tests/bug-gh15582.phpt Added

php-8.3.21.tar.xz/ext/date/tests/bug-gh16037.phpt Added

php-8.3.7.tar.xz/ext/date/tests/bug40861.phpt -> php-8.3.21.tar.xz/ext/date/tests/bug40861.phpt Changed

php-8.3.21.tar.xz/ext/date/tests/date_interval_set_state_error1.phpt Added

@@ -0,0 +1,68 @@
+--TEST--
+Test that DateInterval::__unserialize() doesn't modify state in case of a date_string format error
+--FILE--
+<?php
+
+$interval = new DateInterval("P1Y1DT1H1M");
+
+var_dump($interval);
+
+try {
+    $interval->__unserialize(
+        
+            "date_string" => "wrong",
+        
+    );
+} catch (Error $e) {
+    echo $e->getMessage() . "\n";
+}
+
+var_dump($interval);
+
+?>
+--EXPECTF--
+object(DateInterval)#%d (%d) {
+  "y"=>
+  int(1)
+  "m"=>
+  int(0)
+  "d"=>
+  int(1)
+  "h"=>
+  int(1)
+  "i"=>
+  int(1)
+  "s"=>
+  int(0)
+  "f"=>
+  float(0)
+  "invert"=>
+  int(0)
+  "days"=>
+  bool(false)
+  "from_string"=>
+  bool(false)
+}
+Unknown or bad format (wrong) at position 0 (w) while unserializing: The timezone could not be found in the database
+object(DateInterval)#%d (%d) {
+  "y"=>
+  int(1)
+  "m"=>
+  int(0)
+  "d"=>
+  int(1)
+  "h"=>
+  int(1)
+  "i"=>
+  int(1)
+  "s"=>
+  int(0)
+  "f"=>
+  float(0)
+  "invert"=>
+  int(0)
+  "days"=>
+  bool(false)
+  "from_string"=>
+  bool(false)
+}

php-8.3.7.tar.xz/ext/date/tests/date_period_bad_iso_format.phpt -> php-8.3.21.tar.xz/ext/date/tests/date_period_bad_iso_format.phpt Changed

@@ -40,10 +40,10 @@
 }
 
 ?>
---EXPECT--
+--EXPECTF--
 DateMalformedPeriodStringException: DatePeriod::__construct(): ISO interval must contain a start date, "R4" given
 DateMalformedPeriodStringException: DatePeriod::createFromISO8601String(): ISO interval must contain a start date, "R4" given
 DateMalformedPeriodStringException: DatePeriod::__construct(): ISO interval must contain an interval, "R4/2012-07-01T00:00:00Z" given
 DateMalformedPeriodStringException: DatePeriod::createFromISO8601String(): ISO interval must contain an interval, "R4/2012-07-01T00:00:00Z" given
-DateMalformedPeriodStringException: DatePeriod::__construct(): Recurrence count must be greater than 0
-DateMalformedPeriodStringException: DatePeriod::createFromISO8601String(): Recurrence count must be greater than 0
+DateMalformedPeriodStringException: DatePeriod::__construct(): Recurrence count must be greater or equal to 1 and lower than %d
+DateMalformedPeriodStringException: DatePeriod::createFromISO8601String(): Recurrence count must be greater or equal to 1 and lower than %d

php-8.3.21.tar.xz/ext/date/tests/gh14709.phpt Added

php-8.3.21.tar.xz/ext/date/tests/gh14732.phpt Added

@@ -0,0 +1,38 @@
+--TEST--
+GH-14732 (date_sun_info() fails for non-finite values)
+--FILE--
+<?php
+try {
+    date_sun_info(1, NAN, 1);
+} catch (ValueError $ex) {
+    echo $ex->getMessage(), "\n";
+}
+try {
+    date_sun_info(1, -INF, 1);
+} catch (ValueError $ex) {
+    echo $ex->getMessage(), "\n";
+}
+try {
+    date_sun_info(1, 1, NAN);
+} catch (ValueError $ex) {
+    echo $ex->getMessage(), "\n";
+}
+try {
+    date_sun_info(1, 1, INF);
+} catch (ValueError $ex) {
+    echo $ex->getMessage(), "\n";
+}
+var_dump(date_sunset(1, SUNFUNCS_RET_STRING, NAN, 1));
+var_dump(date_sunrise(1, SUNFUNCS_RET_STRING, 1, NAN));
+?>
+--EXPECTF--
+date_sun_info(): Argument #2 ($latitude) must be finite
+date_sun_info(): Argument #2 ($latitude) must be finite
+date_sun_info(): Argument #3 ($longitude) must be finite
+date_sun_info(): Argument #3 ($longitude) must be finite
+
+Deprecated: Function date_sunset() is deprecated in %s on line %d
+bool(false)
+
+Deprecated: Function date_sunrise() is deprecated in %s on line %d
+bool(false)

php-8.3.21.tar.xz/ext/date/tests/gh16454.phpt Added

php-8.3.21.tar.xz/ext/date/tests/gh18304.phpt Added

php-8.3.7.tar.xz/ext/dba/dba.c -> php-8.3.21.tar.xz/ext/dba/dba.c Changed

@@ -788,10 +788,13 @@
 			info->lock.fp = php_stream_open_wrapper(lock_name, lock_file_mode, STREAM_MUST_SEEK|REPORT_ERRORS|IGNORE_PATH|persistent_flag, &opened_path);
 			if (info->lock.fp) {
 				if (is_db_lock) {
-					ZEND_ASSERT(opened_path);
-					/* replace the path info with the real path of the opened file */
-					zend_string_release(info->path);
-					info->path = php_dba_zend_string_dup_safe(opened_path, persistent);
+					if (opened_path) {
+						/* replace the path info with the real path of the opened file */
+						zend_string_release_ex(info->path, persistent);
+						info->path = php_dba_zend_string_dup_safe(opened_path, persistent);
+					} else {
+						error = "Unable to determine path for locking";
+					}
 				}
 			}
 			if (opened_path) {
@@ -807,10 +810,10 @@
 			FREE_PERSISTENT_RESOURCE_KEY();
 			RETURN_FALSE;
 		}
-		if (!php_stream_supports_lock(info->lock.fp)) {
+		if (!error && !php_stream_supports_lock(info->lock.fp)) {
 			error = "Stream does not support locking";
 		}
-		if (php_stream_lock(info->lock.fp, lock_mode)) {
+		if (!error && php_stream_lock(info->lock.fp, lock_mode)) {
 			error = "Unable to establish lock"; /* force failure exit */
 		}
 	}

php-8.3.7.tar.xz/ext/dba/tests/dba_flatfile.phpt -> php-8.3.21.tar.xz/ext/dba/tests/dba_flatfile.phpt Changed

php-8.3.7.tar.xz/ext/dba/tests/dba_gdbm.phpt -> php-8.3.21.tar.xz/ext/dba/tests/dba_gdbm.phpt Changed

php-8.3.7.tar.xz/ext/dba/tests/dba_handlers.phpt -> php-8.3.21.tar.xz/ext/dba/tests/dba_handlers.phpt Changed

php-8.3.7.tar.xz/ext/dba/tests/dba_inifile.phpt -> php-8.3.21.tar.xz/ext/dba/tests/dba_inifile.phpt Changed

php-8.3.7.tar.xz/ext/dba/tests/dba_ndbm.phpt -> php-8.3.21.tar.xz/ext/dba/tests/dba_ndbm.phpt Changed

@@ -26,22 +26,22 @@
 --EXPECT--
 === RUNNING WITH FILE LOCK ===
 
-Notice: dba_open(): Handler ndbm does locking internally in /home/girgias/Dev/php-src/ext/dba/tests/setup/setup_dba_tests.inc on line 40
+Notice: dba_open(): Handler ndbm does locking internally in %s on line %d
 
-Notice: dba_open(): Handler ndbm does locking internally in /home/girgias/Dev/php-src/ext/dba/tests/setup/setup_dba_tests.inc on line 40
+Notice: dba_open(): Handler ndbm does locking internally in %s on line %d
 
-Notice: dba_open(): Handler ndbm does locking internally in /home/girgias/Dev/php-src/ext/dba/tests/setup/setup_dba_tests.inc on line 82
+Notice: dba_open(): Handler ndbm does locking internally in %s on line %d
 Remove key 1 and 3
 bool(true)
 bool(true)
 Try to remove key 1 again
 bool(false)
-key4: Another Content String
+key10name10: Content String 10
+key30name30: Content String 30
 key2: Content String 2
+key4: Another Content String
 key5: The last content string
-key10name10: Content String 10
 name9: Content String 9
-key30name30: Content String 30
 Total keys: 6
 Key 1 exists? N
 Key 2 exists? Y
@@ -61,7 +61,7 @@
 Fetch "key2": Content 2 replaced 2nd time
 Fetch "key number 6": The 6th value
 
-Notice: dba_open(): Handler ndbm does locking internally in /home/girgias/Dev/php-src/ext/dba/tests/setup/setup_dba_tests.inc on line 149
+Notice: dba_open(): Handler ndbm does locking internally in %s on line %d
 array(6) {
   "key10name10"=>
   string(17) "Content String 10"
@@ -82,12 +82,12 @@
 bool(true)
 Try to remove key 1 again
 bool(false)
-key4: Another Content String
+key10name10: Content String 10
+key30name30: Content String 30
 key2: Content String 2
+key4: Another Content String
 key5: The last content string
-key10name10: Content String 10
 name9: Content String 9
-key30name30: Content String 30
 Total keys: 6
 Key 1 exists? N
 Key 2 exists? Y
@@ -122,5 +122,5 @@
 }
 === RUNNING WITH NO LOCK ===
 
-Warning: dba_open(): Locking cannot be disabled for handler ndbm in /home/girgias/Dev/php-src/ext/dba/tests/setup/setup_dba_tests.inc on line 40
+Warning: dba_open(): Locking cannot be disabled for handler ndbm in %s on line %d
 Failed to create DB

php-8.3.7.tar.xz/ext/dba/tests/dba_qdbm.phpt -> php-8.3.21.tar.xz/ext/dba/tests/dba_qdbm.phpt Changed

php-8.3.7.tar.xz/ext/dba/tests/dba_tcadb.phpt -> php-8.3.21.tar.xz/ext/dba/tests/dba_tcadb.phpt Changed

php-8.3.21.tar.xz/ext/dba/tests/gh16390.phpt Added

php-8.3.7.tar.xz/ext/dba/tests/setup/setup_dba_tests.inc -> php-8.3.21.tar.xz/ext/dba/tests/setup/setup_dba_tests.inc Changed

@@ -102,14 +102,29 @@
     echo 'Try to remove key 1 again', \PHP_EOL;
     var_dump(dba_delete("key1", $db_writer));
 
-    // Fetch data
+    // Fetch and sort data. We sort to guarantee that the output is
+    // consistent across invocations and architectures. When iterating
+    // with firstkey() and nextkey(), several engines (GDBM, LMDB,
+    // QDBM) make no promise about the iteration order. Others (TCADB,
+    // DBM) explicitly state that the order is arbitrary. With GDBM at
+    // least, the order appears platform-dependent -- we have a report
+    // in Github issue 14786. GDBM's own test suite sorts this output,
+    // suggesting that sorting is a reasonable workaround for the issue.
+    $output = ;
+
     $key = dba_firstkey($db_writer);
     $total_keys = 0;
     while ($key) {
-        echo $key, ': ', dba_fetch($key, $db_writer), \PHP_EOL;
+        $output = $key . ': ' . dba_fetch($key, $db_writer) . \PHP_EOL;
         $key = dba_nextkey($db_writer);
         $total_keys++;
     }
+
+    sort($output, SORT_STRING);
+    foreach ($output as $line) {
+        echo $line;
+    }
+
     echo 'Total keys: ', $total_keys, \PHP_EOL;
     for ($i = 1; $i < 6; $i++) {
         echo "Key $i exists? ", dba_exists("key$i", $db_writer) ? 'Y' : 'N', \PHP_EOL;

php-8.3.7.tar.xz/ext/dl_test/dl_test.c -> php-8.3.21.tar.xz/ext/dl_test/dl_test.c Changed

php-8.3.7.tar.xz/ext/dl_test/dl_test.stub.php -> php-8.3.21.tar.xz/ext/dl_test/dl_test.stub.php Changed

php-8.3.7.tar.xz/ext/dl_test/dl_test_arginfo.h -> php-8.3.21.tar.xz/ext/dl_test/dl_test_arginfo.h Changed

@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 547ddbc21e9aa853b491cb17e902bbbb9cc2df00 */
+ * Stub hash: 0641a8eeff00e6c8083fe4a8639f970e3ba80db9 */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_dl_test_test1, 0, 0, IS_VOID, 0)
 ZEND_END_ARG_INFO()
@@ -8,9 +8,15 @@
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, str, IS_STRING, 0, "\"\"")
 ZEND_END_ARG_INFO()
 
+#define arginfo_class_DlTest_test arginfo_dl_test_test2
+
+#define arginfo_class_DlTestSuperClass_test arginfo_dl_test_test2
+
 
 ZEND_FUNCTION(dl_test_test1);
 ZEND_FUNCTION(dl_test_test2);
+ZEND_METHOD(DlTest, test);
+ZEND_METHOD(DlTestSuperClass, test);
 
 
 static const zend_function_entry ext_functions = {
@@ -18,3 +24,72 @@
 	ZEND_FE(dl_test_test2, arginfo_dl_test_test2)
 	ZEND_FE_END
 };
+
+
+static const zend_function_entry class_DlTest_methods = {
+	ZEND_ME(DlTest, test, arginfo_class_DlTest_test, ZEND_ACC_PUBLIC)
+	ZEND_FE_END
+};
+
+
+static const zend_function_entry class_DlTestSuperClass_methods = {
+	ZEND_ME(DlTestSuperClass, test, arginfo_class_DlTestSuperClass_test, ZEND_ACC_PUBLIC)
+	ZEND_FE_END
+};
+
+
+static const zend_function_entry class_DlTestSubClass_methods = {
+	ZEND_FE_END
+};
+
+
+static const zend_function_entry class_DlTestAliasedClass_methods = {
+	ZEND_FE_END
+};
+
+static zend_class_entry *register_class_DlTest(void)
+{
+	zend_class_entry ce, *class_entry;
+
+	INIT_CLASS_ENTRY(ce, "DlTest", class_DlTest_methods);
+	class_entry = zend_register_internal_class_ex(&ce, NULL);
+
+	return class_entry;
+}
+
+static zend_class_entry *register_class_DlTestSuperClass(void)
+{
+	zend_class_entry ce, *class_entry;
+
+	INIT_CLASS_ENTRY(ce, "DlTestSuperClass", class_DlTestSuperClass_methods);
+	class_entry = zend_register_internal_class_ex(&ce, NULL);
+
+	zval property_a_default_value;
+	ZVAL_UNDEF(&property_a_default_value);
+	zend_string *property_a_name = zend_string_init("a", sizeof("a") - 1, 1);
+	zend_declare_typed_property(class_entry, property_a_name, &property_a_default_value, ZEND_ACC_PUBLIC, NULL, (zend_type) ZEND_TYPE_INIT_MASK(MAY_BE_LONG));
+	zend_string_release(property_a_name);
+
+	return class_entry;
+}
+
+static zend_class_entry *register_class_DlTestSubClass(zend_class_entry *class_entry_DlTestSuperClass)
+{
+	zend_class_entry ce, *class_entry;
+
+	INIT_CLASS_ENTRY(ce, "DlTestSubClass", class_DlTestSubClass_methods);
+	class_entry = zend_register_internal_class_ex(&ce, class_entry_DlTestSuperClass);
+
+	return class_entry;
+}
+
+static zend_class_entry *register_class_DlTestAliasedClass(void)
+{
+	zend_class_entry ce, *class_entry;
+
+	INIT_CLASS_ENTRY(ce, "DlTestAliasedClass", class_DlTestAliasedClass_methods);
+	class_entry = zend_register_internal_class_ex(&ce, NULL);
+	zend_register_class_alias("DlTestClassAlias", class_entry);
+
+	return class_entry;
+}

php-8.3.7.tar.xz/ext/dom/document.c -> php-8.3.21.tar.xz/ext/dom/document.c Changed

@@ -809,12 +809,17 @@
 			xmlNsPtr nsptr = NULL;
 			xmlNodePtr root = xmlDocGetRootElement(docp);
 
-			nsptr = xmlSearchNsByHref (nodep->doc, root, nodep->ns->href);
+			nsptr = xmlSearchNsByHref (docp, root, nodep->ns->href);
 			if (nsptr == NULL || nsptr->prefix == NULL) {
 				int errorcode;
 				nsptr = dom_get_ns(root, (char *) nodep->ns->href, &errorcode, (char *) nodep->ns->prefix);
+
+				/* If there is no root, the namespace cannot be attached to it, so we have to attach it to the old list. */
+				if (nsptr != NULL && root == NULL) {
+					php_libxml_set_old_ns(docp, nsptr);
+				}
 			}
-			xmlSetNs(retnodep, nsptr);
+			retnodep->ns = nsptr;
 		}
 	}
 
@@ -1331,11 +1336,13 @@
 	if (keep_blanks == 0 && ! (options & XML_PARSE_NOBLANKS)) {
 		options |= XML_PARSE_NOBLANKS;
 	}
+	if (recover) {
+		options |= XML_PARSE_RECOVER;
+	}
 
 	php_libxml_sanitize_parse_ctxt_options(ctxt);
 	xmlCtxtUseOptions(ctxt, options);
 
-	ctxt->recovery = recover;
 	if (recover) {
 		old_error_reporting = EG(error_reporting);
 		EG(error_reporting) = old_error_reporting | E_WARNING;
@@ -1345,7 +1352,7 @@
 
 	if (ctxt->wellFormed || recover) {
 		ret = ctxt->myDoc;
-		if (ctxt->recovery) {
+		if (recover) {
 			EG(error_reporting) = old_error_reporting;
 		}
 		/* If loading from memory, set the base reference uri for the document */
@@ -1579,53 +1586,79 @@
 }
 /* }}} end dom_document_savexml */
 
-static xmlNodePtr php_dom_free_xinclude_node(xmlNodePtr cur) /* {{{ */
+/* Backported from master branch xml_common.h */
+static zend_always_inline xmlNodePtr php_dom_next_in_tree_order(const xmlNode *nodep, const xmlNode *basep)
 {
-	xmlNodePtr xincnode;
+	if (nodep->type == XML_ELEMENT_NODE && nodep->children) {
+		return nodep->children;
+	}
 
-	xincnode = cur;
-	cur = cur->next;
-	xmlUnlinkNode(xincnode);
-	php_libxml_node_free_resource(xincnode);
+	if (nodep->next) {
+		return nodep->next;
+	} else {
+		/* Go upwards, until we find a parent node with a next sibling, or until we hit the base. */
+		do {
+			nodep = nodep->parent;
+			if (nodep == basep) {
+				return NULL;
+			}
+		} while (nodep->next == NULL);
+		return nodep->next;
+	}
+}
 
-	return cur;
+static void dom_xinclude_strip_references_for_attributes(xmlNodePtr basep)
+{
+	for (xmlAttrPtr prop = basep->properties; prop; prop = prop->next) {
+		php_libxml_node_free_resource((xmlNodePtr) prop);
+		for (xmlNodePtr child = prop->children; child; child = child->next) {
+			php_libxml_node_free_resource(child);
+		}
+	}
 }
-/* }}} */
 
-static void php_dom_remove_xinclude_nodes(xmlNodePtr cur) /* {{{ */
+static void dom_xinclude_strip_references(xmlNodePtr basep)
 {
-	while(cur) {
-		if (cur->type == XML_XINCLUDE_START) {
-			cur = php_dom_free_xinclude_node(cur);
+	php_libxml_node_free_resource(basep);
+	dom_xinclude_strip_references_for_attributes(basep);
 
-			/* XML_XINCLUDE_END node will be a sibling of XML_XINCLUDE_START */
-			while(cur && cur->type != XML_XINCLUDE_END) {
-				/* remove xinclude processing nodes from recursive xincludes */
-				if (cur->type == XML_ELEMENT_NODE) {
-					   php_dom_remove_xinclude_nodes(cur->children);
-				}
-				cur = cur->next;
-			}
+	xmlNodePtr current = basep->children;
 
-			if (cur && cur->type == XML_XINCLUDE_END) {
-				cur = php_dom_free_xinclude_node(cur);
-			}
-		} else {
-			if (cur->type == XML_ELEMENT_NODE) {
-				php_dom_remove_xinclude_nodes(cur->children);
-			}
-			cur = cur->next;
+	while (current) {
+		php_libxml_node_free_resource(current);
+		if (current->type == XML_ELEMENT_NODE) {
+			dom_xinclude_strip_references_for_attributes(current);
 		}
+		current = php_dom_next_in_tree_order(current, basep);
+	}
+}
+
+/* See GH-14702 and GH-17847.
+ * We have to remove userland references to xinclude nodes because libxml2 will make clones of these
+ * and remove the original nodes. If the originals are removed while there are still userland references
+ * this will cause memory corruption. */
+static void dom_xinclude_strip_fallback_references(const xmlNode *basep)
+{
+	xmlNodePtr current = basep->children;
+
+	/* TODO: try to improve loop search performance */
+	while (current) {
+		if (current->type == XML_ELEMENT_NODE
+			&& current->ns != NULL
+			&& xmlStrEqual(current->name, XINCLUDE_NODE)
+			&& (xmlStrEqual(current->ns->href, XINCLUDE_NS) || xmlStrEqual(current->ns->href, XINCLUDE_OLD_NS))) {
+			dom_xinclude_strip_references(current);
+		}
+
+		current = php_dom_next_in_tree_order(current, basep);
 	}
 }
-/* }}} */
 
 /* {{{ Substitutues xincludes in a DomDocument */
 PHP_METHOD(DOMDocument, xinclude)
 {
 	zval *id;
 	xmlDoc *docp;
-	xmlNodePtr root;
 	zend_long flags = 0;
 	int err;
 	dom_object *intern;
@@ -1642,22 +1675,13 @@
 
 	DOM_GET_OBJ(docp, id, xmlDocPtr, intern);
 
+	dom_xinclude_strip_fallback_references((const xmlNode *) docp);
+
+	flags |= XML_PARSE_NOXINCNODE;
 	PHP_LIBXML_SANITIZE_GLOBALS(xinclude);
 	err = xmlXIncludeProcessFlags(docp, (int)flags);
 	PHP_LIBXML_RESTORE_GLOBALS(xinclude);
 
-	/* XML_XINCLUDE_START and XML_XINCLUDE_END nodes need to be removed as these
-	are added via xmlXIncludeProcess to mark beginning and ending of xincluded document
-	but are not wanted in resulting document - must be done even if err as it could fail after
-	having processed some xincludes */
-	root = (xmlNodePtr) docp->children;
-	while(root && root->type != XML_ELEMENT_NODE && root->type != XML_XINCLUDE_START) {
-		root = root->next;
-	}
-	if (root) {
-		php_dom_remove_xinclude_nodes(root);
-	}
-
 	php_libxml_invalidate_node_list_cache(intern->document);
 
 	if (err) {

php-8.3.7.tar.xz/ext/dom/dom_iterators.c -> php-8.3.21.tar.xz/ext/dom/dom_iterators.c Changed

@@ -148,8 +148,7 @@
 zval *php_dom_iterator_current_data(zend_object_iterator *iter) /* {{{ */
 {
 	php_dom_iterator *iterator = (php_dom_iterator *)iter;
-
-	return &iterator->curobj;
+	return Z_ISUNDEF(iterator->curobj) ? NULL : &iterator->curobj;
 }
 /* }}} */
 
@@ -159,7 +158,7 @@
 	zval *object = &iterator->intern.data;
 
 	if (instanceof_function(Z_OBJCE_P(object), dom_nodelist_class_entry)) {
-		ZVAL_LONG(key, iter->index);
+		ZVAL_LONG(key, iterator->index);
 	} else {
 		dom_object *intern = Z_DOMOBJ_P(&iterator->curobj);
 
@@ -180,19 +179,23 @@
 	dom_object *intern;
 	dom_object *nnmap;
 	dom_nnodemap_object *objmap;
-	int previndex;
+	zend_long previndex;
 	HashTable *nodeht;
 	zval *entry;
 	bool do_curobj_undef = 1;
 
 	php_dom_iterator *iterator = (php_dom_iterator *)iter;
+	if (Z_ISUNDEF(iterator->curobj)) {
+		return;
+	}
 
+	iterator->index++;
+
+	intern = Z_DOMOBJ_P(&iterator->curobj);
 	object = &iterator->intern.data;
 	nnmap = Z_DOMOBJ_P(object);
 	objmap = (dom_nnodemap_object *)nnmap->ptr;
 
-	intern = Z_DOMOBJ_P(&iterator->curobj);
-
 	if (intern != NULL && intern->ptr != NULL) {
 		if (objmap->nodetype != XML_ENTITY_NODE &&
 			objmap->nodetype != XML_NOTATION_NODE) {
@@ -226,18 +229,18 @@
 							curnode = basenode->children;
 						}
 					} else {
-						previndex = iter->index - 1;
+						previndex = iterator->index - 1;
 						curnode = (xmlNodePtr)((php_libxml_node_ptr *)intern->ptr)->node;
 					}
 					curnode = dom_get_elements_by_tag_name_ns_raw(
-						basenode, curnode, (char *) objmap->ns, (char *) objmap->local, &previndex, iter->index);
+						basenode, curnode, (char *) objmap->ns, (char *) objmap->local, &previndex, iterator->index);
 				}
 			}
 		} else {
 			if (objmap->nodetype == XML_ENTITY_NODE) {
-				curnode = php_dom_libxml_hash_iter(objmap->ht, iter->index);
+				curnode = php_dom_libxml_hash_iter(objmap->ht, iterator->index);
 			} else {
-				curnode = php_dom_libxml_notation_iter(objmap->ht, iter->index);
+				curnode = php_dom_libxml_notation_iter(objmap->ht, iterator->index);
 			}
 		}
 	}
@@ -268,7 +271,7 @@
 	dom_object *intern;
 	dom_nnodemap_object *objmap;
 	xmlNodePtr curnode=NULL;
-	int curindex = 0;
+	zend_long curindex = 0;
 	HashTable *nodeht;
 	zval *entry;
 	php_dom_iterator *iterator;
@@ -277,15 +280,13 @@
 		zend_throw_error(NULL, "An iterator cannot be used with foreach by reference");
 		return NULL;
 	}
-	iterator = emalloc(sizeof(php_dom_iterator));
+	iterator = emalloc(sizeof(*iterator));
+	memset(iterator, 0, sizeof(*iterator));
 	zend_iterator_init(&iterator->intern);
-	iterator->cache_tag.modification_nr = 0;
 
 	ZVAL_OBJ_COPY(&iterator->intern.data, Z_OBJ_P(object));
 	iterator->intern.funcs = &php_dom_iterator_funcs;
 
-	ZVAL_UNDEF(&iterator->curobj);
-
 	intern = Z_DOMOBJ_P(object);
 	objmap = (dom_nnodemap_object *)intern->ptr;
 	if (objmap != NULL) {
@@ -306,7 +307,7 @@
 					if (objmap->nodetype == XML_ATTRIBUTE_NODE) {
 						curnode = (xmlNodePtr) basep->properties;
 					} else {
-						curnode = (xmlNodePtr) basep->children;
+						curnode = dom_nodelist_iter_start_first_child(basep);
 					}
 				} else {
 					xmlNodePtr nodep = basep;

php-8.3.7.tar.xz/ext/dom/dom_properties.h -> php-8.3.21.tar.xz/ext/dom/dom_properties.h Changed

php-8.3.7.tar.xz/ext/dom/element.c -> php-8.3.21.tar.xz/ext/dom/element.c Changed

php-8.3.7.tar.xz/ext/dom/entityreference.c -> php-8.3.21.tar.xz/ext/dom/entityreference.c Changed

@@ -22,6 +22,7 @@
 #include "php.h"
 #if defined(HAVE_LIBXML) && defined(HAVE_DOM)
 #include "php_dom.h"
+#include "dom_properties.h"
 
 /*
 * class DOMEntityReference extends DOMNode
@@ -65,4 +66,63 @@
 }
 /* }}} end DOMEntityReference::__construct */
 
+/* The following property handlers are necessary because of special lifetime management with entities and entity
+ * references. The issue is that entity references hold a reference to an entity declaration, but don't
+ * register that reference anywhere. When the entity declaration disappears we have no way of notifying the
+ * entity references. Override the property handlers for the declaration-accessing properties to fix this problem. */
+
+xmlEntityPtr dom_entity_reference_fetch_and_sync_declaration(xmlNodePtr reference)
+{
+	xmlEntityPtr entity = xmlGetDocEntity(reference->doc, reference->name);
+	reference->children = (xmlNodePtr) entity;
+	reference->last = (xmlNodePtr) entity;
+	reference->content = entity ? entity->content : NULL;
+	return entity;
+}
+
+int dom_entity_reference_child_read(dom_object *obj, zval *retval)
+{
+	xmlNodePtr nodep = dom_object_get_node(obj);
+
+	if (nodep == NULL) {
+		php_dom_throw_error(INVALID_STATE_ERR, true);
+		return FAILURE;
+	}
+
+	xmlEntityPtr entity = dom_entity_reference_fetch_and_sync_declaration(nodep);
+	if (entity == NULL) {
+		ZVAL_NULL(retval);
+		return SUCCESS;
+	}
+
+	php_dom_create_object((xmlNodePtr) entity, retval, obj);
+	return SUCCESS;
+}
+
+int dom_entity_reference_text_content_read(dom_object *obj, zval *retval)
+{
+	xmlNodePtr nodep = dom_object_get_node(obj);
+
+	if (nodep == NULL) {
+		php_dom_throw_error(INVALID_STATE_ERR, true);
+		return FAILURE;
+	}
+
+	dom_entity_reference_fetch_and_sync_declaration(nodep);
+	return dom_node_text_content_read(obj, retval);
+}
+
+int dom_entity_reference_child_nodes_read(dom_object *obj, zval *retval)
+{
+	xmlNodePtr nodep = dom_object_get_node(obj);
+
+	if (nodep == NULL) {
+		php_dom_throw_error(INVALID_STATE_ERR, true);
+		return FAILURE;
+	}
+
+	dom_entity_reference_fetch_and_sync_declaration(nodep);
+	return dom_node_child_nodes_read(obj, retval);
+}
+
 #endif

php-8.3.7.tar.xz/ext/dom/node.c -> php-8.3.21.tar.xz/ext/dom/node.c Changed

@@ -98,11 +98,17 @@
 		}
 		case XML_DOCUMENT_TYPE_NODE:
 		case XML_DTD_NODE:
+			if (nodep->name) {
+				ZVAL_STRING(retval, (const char *) nodep->name);
+			} else {
+				ZVAL_EMPTY_STRING(retval);
+			}
+			break;
 		case XML_PI_NODE:
 		case XML_ENTITY_DECL:
 		case XML_ENTITY_REF_NODE:
 		case XML_NOTATION_NODE:
-			ZVAL_STRING(retval, (char *) nodep->name);
+			ZVAL_STRING(retval, (const char *) nodep->name);
 			break;
 		case XML_CDATA_SECTION_NODE:
 			ZVAL_STRING(retval, "#cdata-section");
@@ -820,11 +826,93 @@
 
 /* }}} */
 
-static xmlNodePtr _php_dom_insert_fragment(xmlNodePtr nodep, xmlNodePtr prevsib, xmlNodePtr nextsib, xmlNodePtr fragment, dom_object *intern, dom_object *childobj) /* {{{ */
+/* Returns true if the node had the same document reference, false otherwise. */
+static bool dom_set_document_ref_obj_single(xmlNodePtr node, php_libxml_ref_obj *document)
+{
+	dom_object *childobj = php_dom_object_get_data(node);
+	if (!childobj) {
+		return true;
+	}
+	if (!childobj->document) {
+		childobj->document = document;
+		document->refcount++;
+		return true;
+	}
+	return false;
+}
+
+void dom_set_document_ref_pointers_attr(xmlAttrPtr attr, php_libxml_ref_obj *document)
 {
-	xmlNodePtr newchild, node;
+	ZEND_ASSERT(document != NULL);
+
+	dom_set_document_ref_obj_single((xmlNodePtr) attr, document);
+	for (xmlNodePtr attr_child = attr->children; attr_child; attr_child = attr_child->next) {
+		dom_set_document_ref_obj_single(attr_child, document);
+	}
+}
+
+static bool dom_set_document_ref_pointers_node(xmlNodePtr node, php_libxml_ref_obj *document)
+{
+	ZEND_ASSERT(document != NULL);
+
+	if (!dom_set_document_ref_obj_single(node, document)) {
+		return false;
+	}
+
+	if (node->type == XML_ELEMENT_NODE) {
+		for (xmlAttrPtr attr = node->properties; attr; attr = attr->next) {
+			dom_set_document_ref_pointers_attr(attr, document);
+		}
+	}
+
+	return true;
+}
+
+/* TODO: on 8.4 replace the loop with the tree walk helper function. */
+void dom_set_document_ref_pointers(xmlNodePtr node, php_libxml_ref_obj *document)
+{
+	if (!document) {
+		return;
+	}
+
+	if (!dom_set_document_ref_pointers_node(node, document)) {
+		return;
+	}
+
+	xmlNodePtr base = node;
+	node = node->children;
+	while (node != NULL) {
+		ZEND_ASSERT(node != base);
+
+		if (!dom_set_document_ref_pointers_node(node, document)) {
+			break;
+		}
+
+		if (node->type == XML_ELEMENT_NODE) {
+			if (node->children) {
+				node = node->children;
+				continue;
+			}
+		}
+
+		if (node->next) {
+			node = node->next;
+		} else {
+			/* Go upwards, until we find a parent node with a next sibling, or until we hit the base. */
+			do {
+				node = node->parent;
+				if (node == base) {
+					return;
+				}
+			} while (node->next == NULL);
+			node = node->next;
+		}
+	}
+}
 
-	newchild = fragment->children;
+static xmlNodePtr _php_dom_insert_fragment(xmlNodePtr nodep, xmlNodePtr prevsib, xmlNodePtr nextsib, xmlNodePtr fragment, dom_object *intern, dom_object *childobj) /* {{{ */
+{
+	xmlNodePtr newchild = fragment->children;
 
 	if (newchild) {
 		if (prevsib == NULL) {
@@ -840,17 +928,10 @@
 			nextsib->prev = fragment->last;
 		}
 
-		node = newchild;
+		/* Assign parent node pointer */
+		xmlNodePtr node = newchild;
 		while (node != NULL) {
 			node->parent = nodep;
-			if (node->doc != nodep->doc) {
-				xmlSetTreeDoc(node, nodep->doc);
-				if (node->_private != NULL) {
-					childobj = node->_private;
-					childobj->document = intern->document;
-					php_libxml_increment_doc_ref((php_libxml_node_object *)childobj, NULL);
-				}
-			}
 			if (node == fragment->last) {
 				break;
 			}
@@ -865,13 +946,57 @@
 }
 /* }}} */
 
+static bool dom_node_check_legacy_insertion_validity(xmlNodePtr parentp, xmlNodePtr child, bool stricterror, bool warn_empty_fragment)
+{
+	if (dom_node_is_read_only(parentp) == SUCCESS ||
+		(child->parent != NULL && dom_node_is_read_only(child->parent) == SUCCESS)) {
+		php_dom_throw_error(NO_MODIFICATION_ALLOWED_ERR, stricterror);
+		return false;
+	}
+
+	if (dom_hierarchy(parentp, child) == FAILURE) {
+		php_dom_throw_error(HIERARCHY_REQUEST_ERR, stricterror);
+		return false;
+	}
+
+	if (child->doc != parentp->doc && child->doc != NULL) {
+		php_dom_throw_error(WRONG_DOCUMENT_ERR, stricterror);
+		return false;
+	}
+
+	if (warn_empty_fragment && child->type == XML_DOCUMENT_FRAG_NODE && child->children == NULL) {
+		/* TODO Drop Warning? */
+		php_error_docref(NULL, E_WARNING, "Document Fragment is empty");
+		return false;
+	}
+
+	/* In old DOM only text nodes and entity nodes can be added as children to attributes. */
+	if (parentp->type == XML_ATTRIBUTE_NODE && child->type != XML_TEXT_NODE && child->type != XML_ENTITY_REF_NODE) {
+		php_dom_throw_error(HIERARCHY_REQUEST_ERR, stricterror);
+		return false;
+	}
+	/* Attributes must be in elements. */
+	if (child->type == XML_ATTRIBUTE_NODE && parentp->type != XML_ELEMENT_NODE) {
+		php_dom_throw_error(HIERARCHY_REQUEST_ERR, stricterror);
+		return false;
+	}
+
+	/* Documents can never be a child. */
+	if (child->type == XML_DOCUMENT_NODE || child->type == XML_HTML_DOCUMENT_NODE) {
+		php_dom_throw_error(HIERARCHY_REQUEST_ERR, stricterror);
+		return false;
+	}
+
+	return true;
+}
+
 /* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-952280727
 Since:
 */
 PHP_METHOD(DOMNode, insertBefore)
 {
 	zval *id, *node, *ref = NULL;
-	xmlNodePtr child, new_child, parentp, refp;
+	xmlNodePtr child, new_child, parentp, refp = NULL;
 	dom_object *intern, *childobj, *refpobj;
 	int ret, stricterror;
 
@@ -892,51 +1017,32 @@
 
 	stricterror = dom_get_strict_error(intern->document);
 
-	if (dom_node_is_read_only(parentp) == SUCCESS ||
-		(child->parent != NULL && dom_node_is_read_only(child->parent) == SUCCESS)) {
-		php_dom_throw_error(NO_MODIFICATION_ALLOWED_ERR, stricterror);
+	if (!dom_node_check_legacy_insertion_validity(parentp, child, stricterror, true)) {
 		RETURN_FALSE;
 	}
 
-	if (dom_hierarchy(parentp, child) == FAILURE) {
-		php_dom_throw_error(HIERARCHY_REQUEST_ERR, stricterror);
-		RETURN_FALSE;
-	}
-
-	if (child->doc != parentp->doc && child->doc != NULL) {
-		php_dom_throw_error(WRONG_DOCUMENT_ERR, stricterror);
-		RETURN_FALSE;
-	}
-
-	if (child->type == XML_DOCUMENT_FRAG_NODE && child->children == NULL) {
-		/* TODO Drop Warning? */
-		php_error_docref(NULL, E_WARNING, "Document Fragment is empty");
-		RETURN_FALSE;
+	if (ref != NULL) {
+		DOM_GET_OBJ(refp, ref, xmlNodePtr, refpobj);
+		if (refp->parent != parentp) {
+			php_dom_throw_error(NOT_FOUND_ERR, stricterror);
+			RETURN_FALSE;
+		}
 	}
 
 	if (child->doc == NULL && parentp->doc != NULL) {
-		childobj->document = intern->document;
-		php_libxml_increment_doc_ref((php_libxml_node_object *)childobj, NULL);
+		xmlSetTreeDoc(child, parentp->doc);
+		dom_set_document_ref_pointers(child, intern->document);
 	}
 
 	php_libxml_invalidate_node_list_cache(intern->document);
 
 	if (ref != NULL) {
-		DOM_GET_OBJ(refp, ref, xmlNodePtr, refpobj);
-		if (refp->parent != parentp) {
-			php_dom_throw_error(NOT_FOUND_ERR, stricterror);
-			RETURN_FALSE;
-		}
-
 		if (child->parent != NULL) {
 			xmlUnlinkNode(child);
 		}
 
 		if (child->type == XML_TEXT_NODE && (refp->type == XML_TEXT_NODE ||
 			(refp->prev != NULL && refp->prev->type == XML_TEXT_NODE))) {
-			if (child->doc == NULL) {
-				xmlSetTreeDoc(child, parentp->doc);
-			}
 			new_child = child;
 			new_child->parent = refp->parent;
 			new_child->next = refp;
@@ -988,9 +1094,6 @@
 		}
 		if (child->type == XML_TEXT_NODE && parentp->last != NULL && parentp->last->type == XML_TEXT_NODE) {
 			child->parent = parentp;
-			if (child->doc == NULL) {
-				xmlSetTreeDoc(child, parentp->doc);
-			}
 			new_child = child;
 			if (parentp->children == NULL) {
 				parentp->children = child;
@@ -1075,18 +1178,13 @@
 
 	stricterror = dom_get_strict_error(intern->document);
 
-	if (dom_node_is_read_only(nodep) == SUCCESS ||
-		(newchild->parent != NULL && dom_node_is_read_only(newchild->parent) == SUCCESS)) {
-		php_dom_throw_error(NO_MODIFICATION_ALLOWED_ERR, stricterror);
+	if (!dom_node_check_legacy_insertion_validity(nodep, newchild, stricterror, false)) {
 		RETURN_FALSE;
 	}
 
-	if (newchild->doc != nodep->doc && newchild->doc != NULL) {
-		php_dom_throw_error(WRONG_DOCUMENT_ERR, stricterror);
-		RETURN_FALSE;
-	}
-
-	if (dom_hierarchy(nodep, newchild) == FAILURE) {
+	/* This is already disallowed by libxml, but we should check it here to avoid
+	 * breaking assumptions and assertions. */
+	if ((oldchild->type == XML_ATTRIBUTE_NODE) != (newchild->type == XML_ATTRIBUTE_NODE)) {
 		php_dom_throw_error(HIERARCHY_REQUEST_ERR, stricterror);
 		RETURN_FALSE;
 	}
@@ -1096,6 +1194,11 @@
 		RETURN_FALSE;
 	}
 
+	if (newchild->doc == NULL && nodep->doc != NULL) {
+		xmlSetTreeDoc(newchild, nodep->doc);
+		dom_set_document_ref_pointers(newchild, intern->document);
+	}
+
 	if (newchild->type == XML_DOCUMENT_FRAG_NODE) {
 		xmlNodePtr prevsib, nextsib;
 		prevsib = oldchild->prev;
@@ -1112,11 +1215,6 @@
 		xmlDtdPtr intSubset = xmlGetIntSubset(nodep->doc);
 		replacedoctype = (intSubset == (xmlDtd *) oldchild);
 
-		if (newchild->doc == NULL && nodep->doc != NULL) {
-			xmlSetTreeDoc(newchild, nodep->doc);
-			newchildobj->document = intern->document;
-			php_libxml_increment_doc_ref((php_libxml_node_object *)newchildobj, NULL);
-		}
 		xmlReplaceNode(oldchild, newchild);
 		dom_reconcile_ns(nodep->doc, newchild);
 
@@ -1196,31 +1294,13 @@
 
 	stricterror = dom_get_strict_error(intern->document);
 
-	if (dom_node_is_read_only(nodep) == SUCCESS ||
-		(child->parent != NULL && dom_node_is_read_only(child->parent) == SUCCESS)) {
-		php_dom_throw_error(NO_MODIFICATION_ALLOWED_ERR, stricterror);
-		RETURN_FALSE;
-	}
-
-	if (dom_hierarchy(nodep, child) == FAILURE) {
-		php_dom_throw_error(HIERARCHY_REQUEST_ERR, stricterror);
-		RETURN_FALSE;
-	}
-
-	if (!(child->doc == NULL || child->doc == nodep->doc)) {
-		php_dom_throw_error(WRONG_DOCUMENT_ERR, stricterror);
-		RETURN_FALSE;
-	}
-
-	if (child->type == XML_DOCUMENT_FRAG_NODE && child->children == NULL) {
-		/* TODO Drop Warning? */
-		php_error_docref(NULL, E_WARNING, "Document Fragment is empty");
+	if (!dom_node_check_legacy_insertion_validity(nodep, child, stricterror, true)) {
 		RETURN_FALSE;
 	}
 
 	if (child->doc == NULL && nodep->doc != NULL) {
-		childobj->document = intern->document;
-		php_libxml_increment_doc_ref((php_libxml_node_object *)childobj, NULL);
+		xmlSetTreeDoc(child, nodep->doc);
+		dom_set_document_ref_pointers(child, intern->document);
 	}
 
 	if (child->parent != NULL){
@@ -1229,9 +1309,6 @@
 
 	if (child->type == XML_TEXT_NODE && nodep->last != NULL && nodep->last->type == XML_TEXT_NODE) {
 		child->parent = nodep;
-		if (child->doc == NULL) {
-			xmlSetTreeDoc(child, nodep->doc);
-		}
 		new_child = child;
 		if (nodep->children == NULL) {
 			nodep->children = child;
@@ -1821,7 +1898,7 @@
 		char *xquery;
 
 		/* Find "query" key */
-		tmp = zend_hash_find(ht, ZSTR_KNOWN(ZEND_STR_QUERY));
+		tmp = zend_hash_find_deref(ht, ZSTR_KNOWN(ZEND_STR_QUERY));
 		if (!tmp) {
 			/* if mode == 0 then $xpath arg is 3, if mode == 1 then $xpath is 4 */
 			zend_argument_value_error(3 + mode, "must have a \"query\" key");
@@ -1837,12 +1914,13 @@
 		ctxp = xmlXPathNewContext(docp);
 		ctxp->node = nodep;
 
-		tmp = zend_hash_str_find(ht, "namespaces", sizeof("namespaces")-1);
+		tmp = zend_hash_str_find_deref(ht, "namespaces", sizeof("namespaces")-1);
 		if (tmp && Z_TYPE_P(tmp) == IS_ARRAY && !HT_IS_PACKED(Z_ARRVAL_P(tmp))) {
 			zval *tmpns;
 			zend_string *prefix;
 
 			ZEND_HASH_MAP_FOREACH_STR_KEY_VAL(Z_ARRVAL_P(tmp), prefix, tmpns) {
+				ZVAL_DEREF(tmpns);
 				if (Z_TYPE_P(tmpns) == IS_STRING) {
 					if (prefix) {
 						xmlXPathRegisterNs(ctxp, (xmlChar *) ZSTR_VAL(prefix), (xmlChar *) Z_STRVAL_P(tmpns));
@@ -1873,6 +1951,7 @@
 			inclusive_ns_prefixes = safe_emalloc(zend_hash_num_elements(Z_ARRVAL_P(ns_prefixes)) + 1,
 				sizeof(xmlChar *), 0);
 			ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(ns_prefixes), tmpns) {
+				ZVAL_DEREF(tmpns);
 				if (Z_TYPE_P(tmpns) == IS_STRING) {
 					inclusive_ns_prefixesnscount++ = (xmlChar *) Z_STRVAL_P(tmpns);
 				}

php-8.3.7.tar.xz/ext/dom/nodelist.c -> php-8.3.21.tar.xz/ext/dom/nodelist.c Changed

@@ -49,6 +49,16 @@
 	objmap->cached_length = -1;
 }
 
+xmlNodePtr dom_nodelist_iter_start_first_child(xmlNodePtr nodep)
+{
+	if (nodep->type == XML_ENTITY_REF_NODE) {
+		/* See entityreference.c */
+		dom_entity_reference_fetch_and_sync_declaration(nodep);
+	}
+
+	return nodep->children;
+}
+
 int php_dom_get_nodelist_length(dom_object *obj)
 {
 	dom_nnodemap_object *objmap = (dom_nnodemap_object *) obj->ptr;
@@ -81,9 +91,9 @@
 		reset_objmap_cache(objmap);
 	}
 
-	int count = 0;
+	zend_long count = 0;
 	if (objmap->nodetype == XML_ATTRIBUTE_NODE || objmap->nodetype == XML_ELEMENT_NODE) {
-		xmlNodePtr curnode = nodep->children;
+		xmlNodePtr curnode = dom_nodelist_iter_start_first_child(nodep);
 		if (curnode) {
 			count++;
 			while (curnode->next != NULL) {
@@ -99,7 +109,7 @@
 			nodep = nodep->children;
 		}
 		dom_get_elements_by_tag_name_ns_raw(
-			basep, nodep, (char *) objmap->ns, (char *) objmap->local, &count, INT_MAX - 1 /* because of <= */);
+			basep, nodep, (char *) objmap->ns, (char *) objmap->local, &count, ZEND_LONG_MAX - 1 /* because of <= */);
 	}
 
 	objmap->cached_length = count;
@@ -164,7 +174,7 @@
 						 * TODO: in the future we could extend the logic of the node list such that backwards searches
 						 *       are also possible. */
 						bool restart = true;
-						int relative_index = index;
+						zend_long relative_index = index;
 						if (index >= objmap->cached_obj_index && objmap->cached_obj && !php_dom_is_cache_tag_stale_from_node(&objmap->cache_tag, nodep)) {
 							xmlNodePtr cached_obj_xml_node = dom_object_get_node(objmap->cached_obj);
 
@@ -182,10 +192,10 @@
 								nodep = cached_obj_xml_node;
 							}
 						}
-						int count = 0;
+						zend_long count = 0;
 						if (objmap->nodetype == XML_ATTRIBUTE_NODE || objmap->nodetype == XML_ELEMENT_NODE) {
 							if (restart) {
-								nodep = nodep->children;
+								nodep = dom_nodelist_iter_start_first_child(nodep);
 							}
 							while (count < relative_index && nodep != NULL) {
 								count++;

php-8.3.7.tar.xz/ext/dom/parentnode.c -> php-8.3.21.tar.xz/ext/dom/parentnode.c Changed

@@ -146,6 +146,22 @@
 	}
 }
 
+/* Citing from the docs (https://gnome.pages.gitlab.gnome.org/libxml2/devhelp/libxml2-tree.html#xmlAddChild):
+ * "Add a new node to @parent, at the end of the child (or property) list merging adjacent TEXT nodes (in which case @cur is freed)".
+ * So we must use a custom way of adding that does not merge. */
+static void dom_add_child_without_merging(xmlNodePtr parent, xmlNodePtr child)
+{
+	if (parent->children == NULL) {
+		parent->children = child;
+	} else {
+		xmlNodePtr last = parent->last;
+		last->next = child;
+		child->prev = last;
+	}
+	parent->last = child;
+	child->parent = parent;
+}
+
 xmlNode* dom_zvals_to_fragment(php_libxml_ref_obj *document, xmlNode *contextNode, zval *nodes, int nodesc)
 {
 	xmlDoc *documentNode;
@@ -178,7 +194,7 @@
 			 * So we must take a copy if this situation arises to prevent a use-after-free. */
 			bool will_free = newNode->type == XML_TEXT_NODE && fragment->last && fragment->last->type == XML_TEXT_NODE;
 			if (will_free) {
-				newNode = xmlCopyNode(newNode, 1);
+				newNode = xmlCopyNode(newNode, 0);
 			}
 
 			if (newNode->type == XML_DOCUMENT_FRAG_NODE) {
@@ -187,9 +203,7 @@
 				while (newNode) {
 					xmlNodePtr next = newNode->next;
 					xmlUnlinkNode(newNode);
-					if (!xmlAddChild(fragment, newNode)) {
-						goto err;
-					}
+					dom_add_child_without_merging(fragment, newNode);
 					newNode = next;
 				}
 			} else if (!xmlAddChild(fragment, newNode)) {
@@ -251,6 +265,11 @@
 			if (instanceof_function(ce, dom_node_class_entry)) {
 				xmlNodePtr node = dom_object_get_node(Z_DOMOBJ_P(nodes + i));
 
+				if (!node) {
+					php_dom_throw_error(INVALID_STATE_ERR, /* strict */ true);
+					return FAILURE;
+				}
+
 				if (node->doc != documentNode) {
 					php_dom_throw_error(WRONG_DOCUMENT_ERR, dom_get_strict_error(document));
 					return FAILURE;

php-8.3.7.tar.xz/ext/dom/php_dom.c -> php-8.3.21.tar.xz/ext/dom/php_dom.c Changed

@@ -72,6 +72,7 @@
 static HashTable dom_document_prop_handlers;
 static HashTable dom_documentfragment_prop_handlers;
 static HashTable dom_node_prop_handlers;
+static HashTable dom_entity_reference_prop_handlers;
 static HashTable dom_nodelist_prop_handlers;
 static HashTable dom_namednodemap_prop_handlers;
 static HashTable dom_characterdata_prop_handlers;
@@ -286,6 +287,14 @@
 	zend_string_release_ex(str, 1);
 }
 
+static void dom_override_prop_handler(HashTable *prop_handler, char *name, size_t name_len, dom_read_t read_func, dom_write_t write_func)
+{
+	dom_prop_handler hnd;
+	hnd.read_func = read_func;
+	hnd.write_func = write_func;
+	zend_hash_str_update_mem(prop_handler, name, name_len, &hnd, sizeof(dom_prop_handler));
+}
+
 static zval *dom_get_property_ptr_ptr(zend_object *object, zend_string *name, int type, void **cache_slot)
 {
 	dom_object *obj = php_dom_obj_from_obj(object);
@@ -294,6 +303,9 @@
 		return zend_std_get_property_ptr_ptr(object, name, type, cache_slot);
 	}
 
+	if (cache_slot) {
+		cache_slot0 = cache_slot1 = cache_slot2 = NULL;
+	}
 	return NULL;
 }
 
@@ -815,7 +827,14 @@
 
 	dom_entityreference_class_entry = register_class_DOMEntityReference(dom_node_class_entry);
 	dom_entityreference_class_entry->create_object = dom_objects_new;
-	zend_hash_add_ptr(&classes, dom_entityreference_class_entry->name, &dom_node_prop_handlers);
+
+	zend_hash_init(&dom_entity_reference_prop_handlers, 0, NULL, dom_dtor_prop_handler, true);
+	zend_hash_merge(&dom_entity_reference_prop_handlers, &dom_node_prop_handlers, dom_copy_prop_handler, false);
+	dom_override_prop_handler(&dom_entity_reference_prop_handlers, "firstChild", sizeof("firstChild")-1, dom_entity_reference_child_read, NULL);
+	dom_override_prop_handler(&dom_entity_reference_prop_handlers, "lastChild", sizeof("lastChild")-1, dom_entity_reference_child_read, NULL);
+	dom_override_prop_handler(&dom_entity_reference_prop_handlers, "textContent", sizeof("textContent")-1, dom_entity_reference_text_content_read, NULL);
+	dom_override_prop_handler(&dom_entity_reference_prop_handlers, "childNodes", sizeof("childNodes")-1, dom_entity_reference_child_nodes_read, NULL);
+	zend_hash_add_ptr(&classes, dom_entityreference_class_entry->name, &dom_entity_reference_prop_handlers);
 
 	dom_processinginstruction_class_entry = register_class_DOMProcessingInstruction(dom_node_class_entry);
 	dom_processinginstruction_class_entry->create_object = dom_objects_new;
@@ -878,6 +897,7 @@
 	zend_hash_destroy(&dom_document_prop_handlers);
 	zend_hash_destroy(&dom_documentfragment_prop_handlers);
 	zend_hash_destroy(&dom_node_prop_handlers);
+	zend_hash_destroy(&dom_entity_reference_prop_handlers);
 	zend_hash_destroy(&dom_namespace_node_prop_handlers);
 	zend_hash_destroy(&dom_nodelist_prop_handlers);
 	zend_hash_destroy(&dom_namednodemap_prop_handlers);
@@ -1001,6 +1021,10 @@
 	mapptr->baseobj = basenode;
 	mapptr->nodetype = ntype;
 	mapptr->ht = ht;
+	if (EXPECTED(doc != NULL)) {
+		mapptr->dict = doc->dict;
+		xmlDictReference(doc->dict);
+	}
 
 	const xmlChar* tmp;
 
@@ -1111,6 +1135,7 @@
 		if (!Z_ISUNDEF(objmap->baseobj_zv)) {
 			zval_ptr_dtor(&objmap->baseobj_zv);
 		}
+		xmlDictFree(objmap->dict);
 		efree(objmap);
 		intern->ptr = NULL;
 	}
@@ -1141,6 +1166,7 @@
 	objmap->cached_length = -1;
 	objmap->cached_obj = NULL;
 	objmap->cached_obj_index = 0;
+	objmap->dict = NULL;
 
 	return &intern->std;
 }
@@ -1317,7 +1343,7 @@
 }
 /* }}} end dom_has_feature */
 
-xmlNode *dom_get_elements_by_tag_name_ns_raw(xmlNodePtr basep, xmlNodePtr nodep, char *ns, char *local, int *cur, int index) /* {{{ */
+xmlNode *dom_get_elements_by_tag_name_ns_raw(xmlNodePtr basep, xmlNodePtr nodep, char *ns, char *local, zend_long *cur, zend_long index) /* {{{ */
 {
 	/* Can happen with detached document */
 	if (UNEXPECTED(nodep == NULL)) {

php-8.3.7.tar.xz/ext/dom/php_dom.h -> php-8.3.21.tar.xz/ext/dom/php_dom.h Changed

@@ -88,7 +88,8 @@
 	xmlChar *ns;
 	php_libxml_cache_tag cache_tag;
 	dom_object *cached_obj;
-	int cached_obj_index;
+	zend_long cached_obj_index;
+	xmlDictPtr dict;
 	bool free_local : 1;
 	bool free_ns : 1;
 } dom_nnodemap_object;
@@ -97,6 +98,9 @@
 	zend_object_iterator intern;
 	zval curobj;
 	HashPosition pos;
+	/* intern->index is only updated for FE_* opcodes, not for e.g. unpacking,
+	 * yet we need to track the position of the node relative to the start. */
+	zend_ulong index;
 	php_libxml_cache_tag cache_tag;
 } php_dom_iterator;
 
@@ -133,7 +137,7 @@
 void dom_reconcile_ns_list(xmlDocPtr doc, xmlNodePtr nodep, xmlNodePtr last);
 xmlNsPtr dom_get_nsdecl(xmlNode *node, xmlChar *localName);
 void dom_normalize (xmlNodePtr nodep);
-xmlNode *dom_get_elements_by_tag_name_ns_raw(xmlNodePtr basep, xmlNodePtr nodep, char *ns, char *local, int *cur, int index);
+xmlNode *dom_get_elements_by_tag_name_ns_raw(xmlNodePtr basep, xmlNodePtr nodep, char *ns, char *local, zend_long *cur, zend_long index);
 void php_dom_create_implementation(zval *retval);
 int dom_hierarchy(xmlNodePtr parent, xmlNodePtr child);
 bool dom_has_feature(zend_string *feature, zend_string *version);
@@ -153,6 +157,9 @@
 bool php_dom_is_node_connected(const xmlNode *node);
 bool php_dom_adopt_node(xmlNodePtr nodep, dom_object *dom_object_new_document, xmlDocPtr new_document);
 xmlNsPtr dom_get_ns_resolve_prefix_conflict(xmlNodePtr tree, const char *uri);
+xmlEntityPtr dom_entity_reference_fetch_and_sync_declaration(xmlNodePtr reference);
+void dom_set_document_ref_pointers(xmlNodePtr node, php_libxml_ref_obj *document);
+void dom_set_document_ref_pointers_attr(xmlAttrPtr attr, php_libxml_ref_obj *document);
 
 /* parentnode */
 void dom_parent_node_prepend(dom_object *context, zval *nodes, uint32_t nodesc);
@@ -173,6 +180,7 @@
 void php_dom_nodelist_get_item_into_zval(dom_nnodemap_object *objmap, zend_long index, zval *return_value);
 int php_dom_get_namednodemap_length(dom_object *obj);
 int php_dom_get_nodelist_length(dom_object *obj);
+xmlNodePtr dom_nodelist_iter_start_first_child(xmlNodePtr nodep);
 
 #define DOM_GET_INTERN(__id, __intern) { \
 	__intern = Z_DOMOBJ_P(__id); \

php-8.3.7.tar.xz/ext/dom/php_dom.stub.php -> php-8.3.21.tar.xz/ext/dom/php_dom.stub.php Changed

php-8.3.7.tar.xz/ext/dom/php_dom_arginfo.h -> php-8.3.21.tar.xz/ext/dom/php_dom_arginfo.h Changed

php-8.3.7.tar.xz/ext/dom/tests/DOMDocument_loadHTMLfile_error1.phpt -> php-8.3.21.tar.xz/ext/dom/tests/DOMDocument_loadHTMLfile_error1.phpt Changed

php-8.3.7.tar.xz/ext/dom/tests/DOMDocument_loadHTMLfile_variation1.phpt -> php-8.3.21.tar.xz/ext/dom/tests/DOMDocument_loadHTMLfile_variation1.phpt Changed

php-8.3.7.tar.xz/ext/dom/tests/DOMDocument_loadXML_error2_gte2_12.phpt -> php-8.3.21.tar.xz/ext/dom/tests/DOMDocument_loadXML_error2_gte2_12.phpt Changed

php-8.3.7.tar.xz/ext/dom/tests/DOMDocument_load_error2_gte2_12.phpt -> php-8.3.21.tar.xz/ext/dom/tests/DOMDocument_load_error2_gte2_12.phpt Changed

php-8.3.7.tar.xz/ext/dom/tests/DOMDocument_relaxNGValidate_error2.phpt -> php-8.3.21.tar.xz/ext/dom/tests/DOMDocument_relaxNGValidate_error2.phpt Changed

php-8.3.7.tar.xz/ext/dom/tests/DOMDocument_saveHTMLFile_basic.phpt -> php-8.3.21.tar.xz/ext/dom/tests/DOMDocument_saveHTMLFile_basic.phpt Changed

php-8.3.7.tar.xz/ext/dom/tests/DOMDocument_saveHTMLFile_formatOutput.phpt -> php-8.3.21.tar.xz/ext/dom/tests/DOMDocument_saveHTMLFile_formatOutput.phpt Changed

php-8.3.21.tar.xz/ext/dom/tests/DOMDocument_saveHTMLFile_formatOutput_gte_2_13.phpt Added

php-8.3.21.tar.xz/ext/dom/tests/DOMDocument_saveHTML_basic_gte_2_13.phpt Added

php-8.3.7.tar.xz/ext/dom/tests/DOMDocument_schemaValidate_error5.phpt -> php-8.3.21.tar.xz/ext/dom/tests/DOMDocument_schemaValidate_error5.phpt Changed

php-8.3.7.tar.xz/ext/dom/tests/DOMElement_insertAdjacentText.phpt -> php-8.3.21.tar.xz/ext/dom/tests/DOMElement_insertAdjacentText.phpt Changed

php-8.3.7.tar.xz/ext/dom/tests/DOMEntityReference_predefined_free.phpt -> php-8.3.21.tar.xz/ext/dom/tests/DOMEntityReference_predefined_free.phpt Changed

php-8.3.21.tar.xz/ext/dom/tests/DOMNode_C14N_references.phpt Added

@@ -0,0 +1,41 @@
+--TEST--
+Test: Canonicalization - C14N() with references
+--EXTENSIONS--
+dom
+--FILE--
+<?php
+// Adapted from canonicalization.phpt
+
+$xml = <<<EOXML
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<foo xmlns="http://www.example.com/ns/foo"
+     xmlns:fubar="http://www.example.com/ns/fubar" xmlns:test="urn::test"><contain>
+  <bar><test1 /></bar>
+  <bar><test2 /></bar>
+  <fubar:bar xmlns:fubar="http://www.example.com/ns/fubar"><test3 /></fubar:bar>
+  <fubar:bar><test4 /></fubar:bar>
+</contain>
+</foo>
+EOXML;
+
+$dom = new DOMDocument();
+$dom->loadXML($xml);
+$doc = $dom->documentElement->firstChild;
+
+$xpath = 
+    'query' => '(//a:contain | //a:bar | .//namespace::*)',
+    'namespaces' => 'a' => 'http://www.example.com/ns/foo',
+;
+$prefixes = 'test';
+
+foreach ($xpath'namespaces' as $k => &$v);
+unset($v);
+foreach ($xpath as $k => &$v);
+unset($v);
+foreach ($prefixes as $k => &$v);
+unset($v);
+
+echo $doc->C14N(true, false, $xpath, $prefixes);
+?>
+--EXPECT--
+<contain xmlns="http://www.example.com/ns/foo" xmlns:test="urn::test"><bar></bar><bar></bar></contain>

php-8.3.21.tar.xz/ext/dom/tests/ParentNode_append_fragment_text_coalesce.phpt Added

php-8.3.7.tar.xz/ext/dom/tests/bug69679.phpt -> php-8.3.21.tar.xz/ext/dom/tests/bug69679.phpt Changed

php-8.3.7.tar.xz/ext/dom/tests/bug78025.phpt -> php-8.3.21.tar.xz/ext/dom/tests/bug78025.phpt Changed

php-8.3.7.tar.xz/ext/dom/tests/bug80268_2.phpt -> php-8.3.21.tar.xz/ext/dom/tests/bug80268_2.phpt Changed

php-8.3.21.tar.xz/ext/dom/tests/childNodes_current_crash.phpt Added

php-8.3.7.tar.xz/ext/dom/tests/dom_create_element.phpt -> php-8.3.21.tar.xz/ext/dom/tests/dom_create_element.phpt Changed

@@ -251,14 +251,10 @@
     print $e->getMessage() . "\n";
 }
 
-/* This isn't because the xml namespace isn't there and we can't create it */
-print "29 DOMElement::__construct('xml:valid', '', 'http://www.w3.org/XML/1998/namespace')\n";
-try {
-    $element = new DomElement('xml:valid', '', 'http://www.w3.org/XML/1998/namespace');
-    print "valid\n";
-} catch (Exception $e) {
-    print $e->getMessage() . "\n";
-}
+/* There used to be a 29 here that tested DOMElement::__construct('xml:valid', '', 'http://www.w3.org/XML/1998/namespace').
+ * In libxml2 version 2.12 or prior this didn't work because the xml namespace isn't there and you can't create it without
+ * a document. Starting from libxml2 version 2.13 it does actually work because the XML namespace is statically defined.
+ * The behaviour from version 2.13 is actually the desired behaviour anyway. */
 
 
 /* the qualifiedName or its prefix is "xmlns" and the  namespaceURI is
@@ -378,8 +374,6 @@
 Namespace Error
 28 DOMDocument::createElementNS('http://www.w3.org/XML/1998/namespace', 'xml:valid')
 valid
-29 DOMElement::__construct('xml:valid', '', 'http://www.w3.org/XML/1998/namespace')
-Namespace Error
 30 DOMDocument::createElementNS('http://wrong.namespaceURI.com', 'xmlns:valid')
 Namespace Error
 31 DOMElement::__construct('xmlns:valid', '', 'http://wrong.namespaceURI.com')

php-8.3.21.tar.xz/ext/dom/tests/entity_reference_stale_01.phpt Added

php-8.3.21.tar.xz/ext/dom/tests/entity_reference_stale_02.phpt Added

php-8.3.21.tar.xz/ext/dom/tests/gh14343.phpt Added

php-8.3.21.tar.xz/ext/dom/tests/gh14702.phpt Added

@@ -0,0 +1,66 @@
+--TEST--
+GH-14702 (DOMDocument::xinclude() crash)
+--EXTENSIONS--
+dom
+--FILE--
+<?php
+$doc = new DOMDocument();
+$doc->loadXML(<<<XML
+<?xml version="1.0"?>
+<root>
+  <child/>
+  <include href="foo" xmlns="http://www.w3.org/2001/XInclude">
+    <fallback/>
+  </include>
+  <keep/>
+</root>
+XML);
+$xi = $doc->createElementNS('http://www.w3.org/2001/XInclude', 'xi:include');
+$xi->setAttribute('href', 'nonexistent');
+
+$fallback = $doc->createElementNS('http://www.w3.org/2001/XInclude', 'xi:fallback');
+$xi->appendChild($fallback);
+$child1 = $fallback->appendChild($doc->createElement('fallback-child1'));
+$child2 = $fallback->appendChild($doc->createElement('fallback-child2'));
+
+$xpath = new DOMXPath($doc);
+$toReplace = $xpath->query('//child')->item(0);
+$toReplace->parentNode->replaceChild($xi, $toReplace);
+
+$keep = $doc->documentElement->lastElementChild;
+
+var_dump(@$doc->xinclude());
+echo $doc->saveXML();
+
+var_dump($child1, $child2, $fallback, $keep->nodeName);
+
+$keep->textContent = 'still works';
+echo $doc->saveXML();
+?>
+--EXPECT--
+int(2)
+<?xml version="1.0"?>
+<root>
+  <fallback-child1/><fallback-child2/>
+  
+  <keep/>
+</root>
+object(DOMElement)#4 (1) {
+  "schemaTypeInfo"=>
+  NULL
+}
+object(DOMElement)#5 (1) {
+  "schemaTypeInfo"=>
+  NULL
+}
+object(DOMElement)#3 (1) {
+  "schemaTypeInfo"=>
+  NULL
+}
+string(4) "keep"
+<?xml version="1.0"?>
+<root>
+  <fallback-child1/><fallback-child2/>
+  
+  <keep>still works</keep>
+</root>

php-8.3.21.tar.xz/ext/dom/tests/gh15551.phpt Added

php-8.3.21.tar.xz/ext/dom/tests/gh15654.phpt Added

php-8.3.21.tar.xz/ext/dom/tests/gh16039.phpt Added

php-8.3.21.tar.xz/ext/dom/tests/gh16149.phpt Added

php-8.3.21.tar.xz/ext/dom/tests/gh16150.phpt Added

php-8.3.21.tar.xz/ext/dom/tests/gh16151.phpt Added

php-8.3.21.tar.xz/ext/dom/tests/gh16152.phpt Added

php-8.3.21.tar.xz/ext/dom/tests/gh16316.phpt Added

php-8.3.21.tar.xz/ext/dom/tests/gh16336_1.phpt Added

php-8.3.21.tar.xz/ext/dom/tests/gh16336_2.phpt Added

php-8.3.21.tar.xz/ext/dom/tests/gh16338.phpt Added

php-8.3.21.tar.xz/ext/dom/tests/gh16473.phpt Added

php-8.3.21.tar.xz/ext/dom/tests/gh16533.phpt Added

php-8.3.21.tar.xz/ext/dom/tests/gh16535.phpt Added

php-8.3.21.tar.xz/ext/dom/tests/gh16593.phpt Added

php-8.3.21.tar.xz/ext/dom/tests/gh16777_1.phpt Added

php-8.3.21.tar.xz/ext/dom/tests/gh16777_2.phpt Added

php-8.3.21.tar.xz/ext/dom/tests/gh16906.phpt Added

php-8.3.21.tar.xz/ext/dom/tests/gh17223.phpt Added

php-8.3.21.tar.xz/ext/dom/tests/gh17224.phpt Added

@@ -0,0 +1,67 @@
+--TEST--
+GH-17224 (UAF in importNode)
+--EXTENSIONS--
+dom
+--CREDITS--
+YuanchengJiang
+--FILE--
+<?php
+$aDOM = new DOMDocument();
+$fromdom = new DOMDocument();
+$fromdom->loadXML('<data xmlns:ai="http://test.org" ai:attr="namespaced" />');
+$attr = $fromdom->firstChild->attributes->item(0);
+$att = $aDOM->importNode($attr);
+$doc = new DOMDocument;
+$fromdom->load(__DIR__."/book.xml");
+unset($attr);
+var_dump($att);
+?>
+--EXPECTF--
+object(DOMAttr)#%d (%d) {
+  "specified"=>
+  bool(true)
+  "schemaTypeInfo"=>
+  NULL
+  "name"=>
+  string(4) "attr"
+  "value"=>
+  string(10) "namespaced"
+  "ownerElement"=>
+  NULL
+  "nodeName"=>
+  string(7) "ai:attr"
+  "nodeValue"=>
+  string(10) "namespaced"
+  "nodeType"=>
+  int(2)
+  "parentNode"=>
+  NULL
+  "parentElement"=>
+  NULL
+  "childNodes"=>
+  string(22) "(object value omitted)"
+  "firstChild"=>
+  string(22) "(object value omitted)"
+  "lastChild"=>
+  string(22) "(object value omitted)"
+  "previousSibling"=>
+  NULL
+  "nextSibling"=>
+  NULL
+  "attributes"=>
+  NULL
+  "isConnected"=>
+  bool(false)
+  "ownerDocument"=>
+  string(22) "(object value omitted)"
+  "namespaceURI"=>
+  string(15) "http://test.org"
+  "prefix"=>
+  string(2) "ai"
+  "localName"=>
+  string(4) "attr"
+  "baseURI"=>
+  NULL
+  "textContent"=>
+  string(10) "namespaced"
+}

php-8.3.21.tar.xz/ext/dom/tests/gh17500.phpt Added

php-8.3.21.tar.xz/ext/dom/tests/gh17847.phpt Added

@@ -0,0 +1,76 @@
+--TEST--
+GH-17847 (xinclude destroys live node)
+--EXTENSIONS--
+dom
+--FILE--
+<?php
+$doc = new DOMDocument();
+$doc->loadXML(<<<XML
+<root>
+    <xi:include href="thisisnonexistent" xmlns:xi="http://www.w3.org/2001/XInclude">
+        <xi:fallback>fallback<p>garbage</p></xi:fallback>
+        <p>garbage</p>
+    </xi:include>
+    <xi:test xmlns:xi="http://www.w3.org/2001/XInclude">
+      <xi:include href="thisisnonexistent">
+        <p attr="foo" attr2="bar">garbage</p>
+      </xi:include>
+    </xi:test>
+</root>
+XML);
+
+$xpath = new DOMXPath($doc);
+
+$garbage = ;
+foreach ($xpath->query('//p') as $entry) {
+    $garbage = $entry;
+    foreach ($entry->attributes as $attr) {
+        $garbage = $attr;
+        foreach ($attr->childNodes as $child) {
+            $garbage = $child;
+        }
+    }
+}
+
+@$doc->xinclude();
+
+var_dump($garbage);
+?>
+--EXPECT--
+array(7) {
+  0=>
+  object(DOMElement)#3 (1) {
+    "schemaTypeInfo"=>
+    NULL
+  }
+  1=>
+  object(DOMElement)#4 (1) {
+    "schemaTypeInfo"=>
+    NULL
+  }
+  2=>
+  object(DOMElement)#5 (1) {
+    "schemaTypeInfo"=>
+    NULL
+  }
+  3=>
+  object(DOMAttr)#10 (2) {
+    "specified"=>
+    bool(true)
+    "schemaTypeInfo"=>
+    NULL
+  }
+  4=>
+  object(DOMText)#13 (0) {
+  }
+  5=>
+  object(DOMAttr)#12 (2) {
+    "specified"=>
+    bool(true)
+    "schemaTypeInfo"=>
+    NULL
+  }
+  6=>
+  object(DOMText)#15 (0) {
+  }
+}

php-8.3.21.tar.xz/ext/dom/tests/gh18304.phpt Added

php-8.3.21.tar.xz/ext/dom/tests/ghsa-p3x9-6h7p-cgfc_001.phpt Added

@@ -0,0 +1,60 @@
+--TEST--
+GHSA-p3x9-6h7p-cgfc: libxml streams use wrong `content-type` header when requesting a redirected resource (Basic)
+--EXTENSIONS--
+dom
+--SKIPIF--
+<?php
+if (@!include "./ext/standard/tests/http/server.inc") die('skip server.inc not available');
+http_server_skipif();
+?>
+--FILE--
+<?php
+require "./ext/standard/tests/http/server.inc";
+
+function genResponses($server) {
+    $uri = 'http://' . stream_socket_get_name($server, false);
+    yield "data://text/plain,HTTP/1.1 302 Moved Temporarily\r\nLocation: $uri/document.xml\r\nContent-Type: text/html;charset=utf-16\r\n\r\n";
+    $xml = <<<'EOT'
+        <!doctype html>
+        <html>
+            <head>
+                <title>GHSA-p3x9-6h7p-cgfc</title>
+
+                <meta charset="utf-8" />
+                <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
+            </head>
+
+            <body>
+                <h1>GHSA-p3x9-6h7p-cgfc</h1>
+            </body>
+        </html>
+        EOT;
+    // Intentionally using non-standard casing for content-type to verify it is matched not case sensitively.
+    yield "data://text/plain,HTTP/1.1 200 OK\r\nconteNt-tyPe: text/html; charset=utf-8\r\n\r\n{$xml}";
+}
+
+'pid' => $pid, 'uri' => $uri = http_server('genResponses', $output);
+$document = new \DOMDocument();
+$document->loadHTMLFile($uri);
+
+$h1 = $document->getElementsByTagName('h1');
+var_dump($h1->length);
+var_dump($document->saveHTML());
+http_server_kill($pid);
+?>
+--EXPECT--
+int(1)
+string(266) "<!DOCTYPE html>
+<html>
+    <head>
+        <title>GHSA-p3x9-6h7p-cgfc</title>
+
+        <meta charset="utf-8">
+        <meta http-equiv="Content-type" content="text/html; charset=utf-8">
+    </head>
+
+    <body>
+        <h1>GHSA-p3x9-6h7p-cgfc</h1>
+    </body>
+</html>
+"

php-8.3.21.tar.xz/ext/dom/tests/ghsa-p3x9-6h7p-cgfc_002.phpt Added

@@ -0,0 +1,60 @@
+--TEST--
+GHSA-p3x9-6h7p-cgfc: libxml streams use wrong `content-type` header when requesting a redirected resource (Missing content-type)
+--EXTENSIONS--
+dom
+--SKIPIF--
+<?php
+if (@!include "./ext/standard/tests/http/server.inc") die('skip server.inc not available');
+http_server_skipif();
+?>
+--FILE--
+<?php
+require "./ext/standard/tests/http/server.inc";
+
+function genResponses($server) {
+    $uri = 'http://' . stream_socket_get_name($server, false);
+    yield "data://text/plain,HTTP/1.1 302 Moved Temporarily\r\nLocation: $uri/document.xml\r\nContent-Type: text/html;charset=utf-16\r\n\r\n";
+    $xml = <<<'EOT'
+        <!doctype html>
+        <html>
+            <head>
+                <title>GHSA-p3x9-6h7p-cgfc</title>
+
+                <meta charset="utf-8" />
+                <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
+            </head>
+
+            <body>
+                <h1>GHSA-p3x9-6h7p-cgfc</h1>
+            </body>
+        </html>
+        EOT;
+    // Missing content-type in actual response.
+    yield "data://text/plain,HTTP/1.1 200 OK\r\n\r\n{$xml}";
+}
+
+'pid' => $pid, 'uri' => $uri = http_server('genResponses', $output);
+$document = new \DOMDocument();
+$document->loadHTMLFile($uri);
+
+$h1 = $document->getElementsByTagName('h1');
+var_dump($h1->length);
+var_dump($document->saveHTML());
+http_server_kill($pid);
+?>
+--EXPECT--
+int(1)
+string(266) "<!DOCTYPE html>
+<html>
+    <head>
+        <title>GHSA-p3x9-6h7p-cgfc</title>
+
+        <meta charset="utf-8">
+        <meta http-equiv="Content-type" content="text/html; charset=utf-8">
+    </head>
+
+    <body>
+        <h1>GHSA-p3x9-6h7p-cgfc</h1>
+    </body>
+</html>
+"

php-8.3.21.tar.xz/ext/dom/tests/ghsa-p3x9-6h7p-cgfc_003.phpt Added

@@ -0,0 +1,60 @@
+--TEST--
+GHSA-p3x9-6h7p-cgfc: libxml streams use wrong `content-type` header when requesting a redirected resource (Reason with colon)
+--EXTENSIONS--
+dom
+--SKIPIF--
+<?php
+if (@!include "./ext/standard/tests/http/server.inc") die('skip server.inc not available');
+http_server_skipif();
+?>
+--FILE--
+<?php
+require "./ext/standard/tests/http/server.inc";
+
+function genResponses($server) {
+    $uri = 'http://' . stream_socket_get_name($server, false);
+    yield "data://text/plain,HTTP/1.1 302 Moved Temporarily\r\nLocation: $uri/document.xml\r\nContent-Type: text/html;charset=utf-16\r\n\r\n";
+    $xml = <<<'EOT'
+        <!doctype html>
+        <html>
+            <head>
+                <title>GHSA-p3x9-6h7p-cgfc</title>
+
+                <meta charset="utf-8" />
+                <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
+            </head>
+
+            <body>
+                <h1>GHSA-p3x9-6h7p-cgfc</h1>
+            </body>
+        </html>
+        EOT;
+    // Missing content-type in actual response.
+    yield "data://text/plain,HTTP/1.1 200 OK: This is fine\r\n\r\n{$xml}";
+}
+
+'pid' => $pid, 'uri' => $uri = http_server('genResponses', $output);
+$document = new \DOMDocument();
+$document->loadHTMLFile($uri);
+
+$h1 = $document->getElementsByTagName('h1');
+var_dump($h1->length);
+var_dump($document->saveHTML());
+http_server_kill($pid);
+?>
+--EXPECT--
+int(1)
+string(266) "<!DOCTYPE html>
+<html>
+    <head>
+        <title>GHSA-p3x9-6h7p-cgfc</title>
+
+        <meta charset="utf-8">
+        <meta http-equiv="Content-type" content="text/html; charset=utf-8">
+    </head>
+
+    <body>
+        <h1>GHSA-p3x9-6h7p-cgfc</h1>
+    </body>
+</html>
+"

php-8.3.21.tar.xz/ext/dom/tests/replaceChild_attribute_validation.phpt Added

php-8.3.21.tar.xz/ext/dom/tests/uaf_doctype_iterator.phpt Added

php-8.3.21.tar.xz/ext/dom/tests/unpack_foreach_behaviour.phpt Added

php-8.3.7.tar.xz/ext/dom/xml_common.h -> php-8.3.21.tar.xz/ext/dom/xml_common.h Changed

php-8.3.7.tar.xz/ext/dom/xpath.c -> php-8.3.21.tar.xz/ext/dom/xpath.c Changed

php-8.3.7.tar.xz/ext/enchant/enchant.c -> php-8.3.21.tar.xz/ext/enchant/enchant.c Changed

@@ -339,7 +339,7 @@
 	char *value;
 	size_t value_len;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "Ols", &broker, enchant_broker_ce, &dict_type, &value, &value_len) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "Olp", &broker, enchant_broker_ce, &dict_type, &value, &value_len) == FAILURE) {
 		RETURN_THROWS();
 	}
 
@@ -440,7 +440,7 @@
 	char *tag;
 	size_t taglen;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "Os", &broker, enchant_broker_ce, &tag, &taglen) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "Op", &broker, enchant_broker_ce, &tag, &taglen) == FAILURE) {
 		RETURN_THROWS();
 	}
 
@@ -534,7 +534,7 @@
 	size_t taglen;
 	enchant_broker * pbroker;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "Os", &broker, enchant_broker_ce,  &tag, &taglen) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "Op", &broker, enchant_broker_ce,  &tag, &taglen) == FAILURE) {
 		RETURN_THROWS();
 	}
 
@@ -559,7 +559,7 @@
 	size_t ptaglen;
 	enchant_broker * pbroker;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "Oss", &broker, enchant_broker_ce, &ptag, &ptaglen, &pordering, &porderinglen) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "Opp", &broker, enchant_broker_ce, &ptag, &ptaglen, &pordering, &porderinglen) == FAILURE) {
 		RETURN_THROWS();
 	}
 
@@ -597,7 +597,7 @@
 	size_t wordlen;
 	enchant_dict *pdict;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "Os|z", &dict, enchant_dict_ce, &word, &wordlen, &sugg) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "Op|z", &dict, enchant_dict_ce, &word, &wordlen, &sugg) == FAILURE) {
 		RETURN_THROWS();
 	}
 
@@ -642,7 +642,7 @@
 	size_t wordlen;
 	enchant_dict *pdict;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "Os", &dict, enchant_dict_ce, &word, &wordlen) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "Op", &dict, enchant_dict_ce, &word, &wordlen) == FAILURE) {
 		RETURN_THROWS();
 	}
 
@@ -662,7 +662,7 @@
 	enchant_dict *pdict;
 	size_t n_sugg;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "Os", &dict, enchant_dict_ce, &word, &wordlen) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "Op", &dict, enchant_dict_ce, &word, &wordlen) == FAILURE) {
 		RETURN_THROWS();
 	}
 
@@ -690,7 +690,7 @@
 	size_t wordlen;
 	enchant_dict *pdict;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "Os", &dict, enchant_dict_ce, &word, &wordlen) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "Op", &dict, enchant_dict_ce, &word, &wordlen) == FAILURE) {
 		RETURN_THROWS();
 	}
 
@@ -708,7 +708,7 @@
 	size_t wordlen;
 	enchant_dict *pdict;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "Os", &dict, enchant_dict_ce, &word, &wordlen) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "Op", &dict, enchant_dict_ce, &word, &wordlen) == FAILURE) {
 		RETURN_THROWS();
 	}
 
@@ -726,7 +726,7 @@
 	size_t wordlen;
 	enchant_dict *pdict;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "Os", &dict, enchant_dict_ce, &word, &wordlen) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "Op", &dict, enchant_dict_ce, &word, &wordlen) == FAILURE) {
 		RETURN_THROWS();
 	}
 
@@ -748,7 +748,7 @@
 
 	enchant_dict *pdict;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "Oss", &dict, enchant_dict_ce, &mis, &mislen, &cor, &corlen) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "Opp", &dict, enchant_dict_ce, &mis, &mislen, &cor, &corlen) == FAILURE) {
 		RETURN_THROWS();
 	}

php-8.3.21.tar.xz/ext/enchant/tests/null_bytes.phpt Added

@@ -0,0 +1,70 @@
+--TEST--
+null bytes
+--EXTENSIONS--
+enchant
+--SKIPIF--
+<?php
+$broker = enchant_broker_init();
+if (!enchant_broker_list_dicts($broker)) die("skip No broker dicts installed");
+?>
+--FILE--
+<?php
+
+$broker = enchant_broker_init();
+$dicts = enchant_broker_list_dicts($broker);
+$requestDict = enchant_broker_request_dict($broker, $dicts0'lang_tag');
+
+$two_params_broker = 
+    "enchant_broker_request_dict",
+    "enchant_broker_dict_exists",
+;
+
+$two_params_dict = 
+    "enchant_dict_quick_check",
+    "enchant_dict_check",
+    "enchant_dict_suggest",
+    "enchant_dict_add",
+    "enchant_dict_add_to_session",
+    "enchant_dict_is_added",
+;
+
+foreach ($two_params_broker as $func) {
+    try {
+        $func($broker, "foo\0bar");
+    } catch (ValueError $e) {
+        echo $e->getMessage(), "\n";
+    }
+}
+
+foreach ($two_params_dict as $func) {
+    try {
+        $func($requestDict, "foo\0bar");
+    } catch (ValueError $e) {
+        echo $e->getMessage(), "\n";
+    }
+}
+
+try {
+    var_dump(enchant_broker_set_ordering($broker, "foo\0bar", "foo\0bar"));
+} catch (ValueError $e) {
+    echo $e->getMessage(), "\n";
+}
+
+try {
+    var_dump(enchant_dict_store_replacement($requestDict, "foo\0bar", "foo\0bar"));
+} catch (ValueError $e) {
+    echo $e->getMessage(), "\n";
+}
+
+?>
+--EXPECT--
+enchant_broker_request_dict(): Argument #2 ($tag) must not contain any null bytes
+enchant_broker_dict_exists(): Argument #2 ($tag) must not contain any null bytes
+enchant_dict_quick_check(): Argument #2 ($word) must not contain any null bytes
+enchant_dict_check(): Argument #2 ($word) must not contain any null bytes
+enchant_dict_suggest(): Argument #2 ($word) must not contain any null bytes
+enchant_dict_add(): Argument #2 ($word) must not contain any null bytes
+enchant_dict_add_to_session(): Argument #2 ($word) must not contain any null bytes
+enchant_dict_is_added(): Argument #2 ($word) must not contain any null bytes
+enchant_broker_set_ordering(): Argument #2 ($tag) must not contain any null bytes
+enchant_dict_store_replacement(): Argument #2 ($misspelled) must not contain any null bytes

php-8.3.7.tar.xz/ext/exif/exif.c -> php-8.3.21.tar.xz/ext/exif/exif.c Changed

php-8.3.21.tar.xz/ext/exif/tests/gh16409.phpt Added

php-8.3.7.tar.xz/ext/ffi/ffi.c -> php-8.3.21.tar.xz/ext/ffi/ffi.c Changed

@@ -807,6 +807,7 @@
 			if (ZSTR_LEN(str) == 1) {
 				*(char*)ptr = ZSTR_VAL(str)0;
 			} else {
+				zend_tmp_string_release(tmp_str);
 				zend_ffi_assign_incompatible(value, type);
 				return FAILURE;
 			}
@@ -984,6 +985,27 @@
 	ret_type = ZEND_FFI_TYPE(callback_data->type->func.ret_type);
 	if (ret_type->kind != ZEND_FFI_TYPE_VOID) {
 		zend_ffi_zval_to_cdata(ret, ret_type, &retval);
+
+#ifdef WORDS_BIGENDIAN
+		if (ret_type->size < sizeof(ffi_arg)
+		 && ret_type->kind >= ZEND_FFI_TYPE_UINT8
+		 && ret_type->kind < ZEND_FFI_TYPE_POINTER) {
+			/* We need to widen the value (zero extend) */
+			switch (ret_type->size) {
+				case 1:
+					*(ffi_arg*)ret = *(uint8_t*)ret;
+					break;
+				case 2:
+					*(ffi_arg*)ret = *(uint16_t*)ret;
+					break;
+				case 4:
+					*(ffi_arg*)ret = *(uint32_t*)ret;
+					break;
+				default:
+					break;
+			}
+		}
+#endif
 	}
 
 	zval_ptr_dtor(&retval);
@@ -2854,7 +2876,31 @@
 	}
 
 	if (ZEND_FFI_TYPE(type->func.ret_type)->kind != ZEND_FFI_TYPE_VOID) {
-		zend_ffi_cdata_to_zval(NULL, ret, ZEND_FFI_TYPE(type->func.ret_type), BP_VAR_R, return_value, 0, 1, 0);
+		zend_ffi_type *func_ret_type = ZEND_FFI_TYPE(type->func.ret_type);
+
+#ifdef WORDS_BIGENDIAN
+		if (func_ret_type->size < sizeof(ffi_arg)
+		 && func_ret_type->kind >= ZEND_FFI_TYPE_UINT8
+		 && func_ret_type->kind < ZEND_FFI_TYPE_POINTER) {
+
+			/* We need to narrow the value (truncate) */
+			switch (func_ret_type->size) {
+				case 1:
+					*(uint8_t*)ret = *(ffi_arg*)ret;
+					break;
+				case 2:
+					*(uint16_t*)ret = *(ffi_arg*)ret;
+					break;
+				case 4:
+					*(uint32_t*)ret = *(ffi_arg*)ret;
+					break;
+				default:
+					break;
+			}
+		}
+#endif
+
+		zend_ffi_cdata_to_zval(NULL, ret, func_ret_type, BP_VAR_R, return_value, 0, 1, 0);
 	} else {
 		ZVAL_NULL(return_value);
 	}
@@ -2936,6 +2982,12 @@
 }
 /* }}} */
 
+static int zend_fake_compare_objects(zval *o1, zval *o2)
+{
+	zend_throw_error(zend_ffi_exception_ce, "Cannot compare FFI objects");
+	return ZEND_UNCOMPARABLE;
+}
+
 static zend_never_inline int zend_ffi_disabled(void) /* {{{ */
 {
 	zend_throw_error(zend_ffi_exception_ce, "FFI API is restricted by \"ffi.enable\" configuration directive");
@@ -3282,7 +3334,11 @@
 
 	code_size = buf.st_size;
 	code = emalloc(code_size + 1);
-	fd = open(filename, O_RDONLY, 0);
+	int open_flags = O_RDONLY;
+#ifdef PHP_WIN32
+	open_flags |= _O_BINARY;
+#endif
+	fd = open(filename, open_flags, 0);
 	if (fd < 0 || read(fd, code, code_size) != code_size) {
 		if (preload) {
 			zend_error(E_WARNING, "FFI: Failed pre-loading '%s', cannot read_file", filename);
@@ -3578,7 +3634,7 @@
 }
 /* }}} */
 
-static void zend_ffi_cleanup_dcl(zend_ffi_dcl *dcl) /* {{{ */
+void zend_ffi_cleanup_dcl(zend_ffi_dcl *dcl) /* {{{ */
 {
 	if (dcl) {
 		zend_ffi_type_dtor(dcl->type);
@@ -4948,85 +5004,85 @@
 }
 /* }}} */
 
+static char *zend_ffi_skip_ws_and_comments(char *p, bool allow_standalone_newline)
+{
+	while (true) {
+		if (*p == ' ' || *p == '\t') {
+			p++;
+		} else if (allow_standalone_newline && (*p == '\r' || *p == '\n' || *p == '\f' || *p == '\v')) {
+			p++;
+		} else if (allow_standalone_newline && *p == '/' && p1 == '/') {
+			p += 2;
+			while (*p && *p != '\r' && *p != '\n') {
+				p++;
+			}
+		} else if (*p == '/' && p1 == '*') {
+			p += 2;
+			while (*p && (*p != '*' || p1 != '/')) {
+				p++;
+			}
+			if (*p == '*') {
+				p++;
+				if (*p == '/') {
+					p++;
+				}
+			}
+		} else {
+			break;
+		}
+	}
+
+	return p;
+}
+
 static char *zend_ffi_parse_directives(const char *filename, char *code_pos, char **scope_name, char **lib, bool preload) /* {{{ */
 {
 	char *p;
 
+	code_pos = zend_ffi_skip_ws_and_comments(code_pos, true);
+
 	*scope_name = NULL;
 	*lib = NULL;
 	while (*code_pos == '#') {
-		if (strncmp(code_pos, "#define FFI_SCOPE", sizeof("#define FFI_SCOPE") - 1) == 0
-		 && (code_possizeof("#define FFI_SCOPE") - 1 == ' '
-		  || code_possizeof("#define FFI_SCOPE") - 1 == '\t')) {
-			p = code_pos + sizeof("#define FFI_SCOPE");
-			while (*p == ' ' || *p == '\t') {
-				p++;
-			}
-			if (*p != '"') {
-				if (preload) {
-					zend_error(E_WARNING, "FFI: failed pre-loading '%s', bad FFI_SCOPE define", filename);
-				} else {
-					zend_throw_error(zend_ffi_exception_ce, "Failed loading '%s', bad FFI_SCOPE define", filename);
-				}
-				return NULL;
-			}
-			p++;
-			if (*scope_name) {
-				if (preload) {
-					zend_error(E_WARNING, "FFI: failed pre-loading '%s', FFI_SCOPE defined twice", filename);
-				} else {
-					zend_throw_error(zend_ffi_exception_ce, "Failed loading '%s', FFI_SCOPE defined twice", filename);
-				}
-				return NULL;
-			}
-			*scope_name = p;
-			while (1) {
-				if (*p == '\"') {
-					*p = 0;
+		if (strncmp(code_pos, ZEND_STRL("#define")) == 0) {
+			p = zend_ffi_skip_ws_and_comments(code_pos + sizeof("#define") - 1, false);
+
+			char **target = NULL;
+			const char *target_name = NULL;
+			if (strncmp(p, ZEND_STRL("FFI_SCOPE")) == 0) {
+				p = zend_ffi_skip_ws_and_comments(p + sizeof("FFI_SCOPE") - 1, false);
+				target = scope_name;
+				target_name = "FFI_SCOPE";
+			} else if (strncmp(p, ZEND_STRL("FFI_LIB")) == 0) {
+				p = zend_ffi_skip_ws_and_comments(p + sizeof("FFI_LIB") - 1, false);
+				target = lib;
+				target_name = "FFI_LIB";
+			} else {
+				while (*p && *p != '\n' && *p != '\r') {
 					p++;
-					break;
-				} else if (*p <= ' ') {
-					if (preload) {
-						zend_error(E_WARNING, "FFI: failed pre-loading '%s', bad FFI_SCOPE define", filename);
-					} else {
-						zend_throw_error(zend_ffi_exception_ce, "Failed loading '%s', bad FFI_SCOPE define", filename);
-					}
-					return NULL;
 				}
-				p++;
-			}
-			while (*p == ' ' || *p == '\t') {
-				p++;
-			}
-			while (*p == '\r' || *p == '\n') {
-				p++;
-			}
-			code_pos = p;
-		} else if (strncmp(code_pos, "#define FFI_LIB", sizeof("#define FFI_LIB") - 1) == 0
-		 && (code_possizeof("#define FFI_LIB") - 1 == ' '
-		  || code_possizeof("#define FFI_LIB") - 1 == '\t')) {
-			p = code_pos + sizeof("#define FFI_LIB");
-			while (*p == ' ' || *p == '\t') {
-				p++;
+				code_pos = zend_ffi_skip_ws_and_comments(p, true);
+				continue;
 			}
+
 			if (*p != '"') {
 				if (preload) {
-					zend_error(E_WARNING, "FFI: failed pre-loading '%s', bad FFI_LIB define", filename);
+					zend_error(E_WARNING, "FFI: failed pre-loading '%s', bad %s define", filename, target_name);
 				} else {
-					zend_throw_error(zend_ffi_exception_ce, "Failed loading '%s', bad FFI_LIB define", filename);
+					zend_throw_error(zend_ffi_exception_ce, "Failed loading '%s', bad %s define", filename, target_name);
 				}
 				return NULL;
 			}
 			p++;
-			if (*lib) {
+			if (*target) {
 				if (preload) {
-					zend_error(E_WARNING, "FFI: failed pre-loading '%s', FFI_LIB defined twice", filename);
+					zend_error(E_WARNING, "FFI: failed pre-loading '%s', %s defined twice", filename, target_name);
 				} else {
-					zend_throw_error(zend_ffi_exception_ce, "Failed loading '%s', FFI_LIB defined twice", filename);
+					zend_throw_error(zend_ffi_exception_ce, "Failed loading '%s', %s defined twice", filename, target_name);
 				}
 				return NULL;
 			}
-			*lib = p;
+			*target = p;
 			while (1) {
 				if (*p == '\"') {
 					*p = 0;
@@ -5034,21 +5090,16 @@
 					break;
 				} else if (*p <= ' ') {
 					if (preload) {
-						zend_error(E_WARNING, "FFI: failed pre-loading '%s', bad FFI_LIB define", filename);
+						zend_error(E_WARNING, "FFI: failed pre-loading '%s', bad %s define", filename, target_name);
 					} else {
-						zend_throw_error(zend_ffi_exception_ce, "Failed loading '%s', bad FFI_LIB define", filename);
+						zend_throw_error(zend_ffi_exception_ce, "Failed loading '%s', bad %s define", filename, target_name);
 					}
 					return NULL;
 				}
 				p++;
 			}
-			while (*p == ' ' || *p == '\t') {
-				p++;
-			}
-			while (*p == '\r' || *p == '\n') {
-				p++;
-			}
-			code_pos = p;
+
+			code_pos = zend_ffi_skip_ws_and_comments(p, true);
 		} else {
 			break;
 		}
@@ -5432,7 +5483,7 @@
 	zend_ffi_handlers.has_dimension        = zend_fake_has_dimension;
 	zend_ffi_handlers.unset_dimension      = zend_fake_unset_dimension;
 	zend_ffi_handlers.get_method           = zend_ffi_get_func;
-	zend_ffi_handlers.compare              = NULL;
+	zend_ffi_handlers.compare              = zend_fake_compare_objects;
 	zend_ffi_handlers.cast_object          = zend_fake_cast_object;
 	zend_ffi_handlers.get_debug_info       = NULL;
 	zend_ffi_handlers.get_closure          = NULL;

php-8.3.7.tar.xz/ext/ffi/ffi.g -> php-8.3.21.tar.xz/ext/ffi/ffi.g Changed

@@ -64,6 +64,7 @@
 /* forward declarations */
 static void yy_error(const char *msg);
 static void yy_error_sym(const char *msg, int sym);
+static void yy_error_str(const char *msg, const char *str);
 
 %}
 
@@ -96,7 +97,10 @@
 				initializer?
 				{zend_ffi_declare(name, name_len, &dcl);}
 			)*
-		)?
+		|
+			/* empty */
+			{if (common_dcl.flags & (ZEND_FFI_DCL_ENUM | ZEND_FFI_DCL_STRUCT | ZEND_FFI_DCL_UNION)) zend_ffi_cleanup_dcl(&common_dcl);}
+		)
 		";"
 	)*
 ;
@@ -260,12 +264,14 @@
 
 struct_declaration(zend_ffi_dcl *struct_dcl):
 	{zend_ffi_dcl common_field_dcl = ZEND_FFI_ATTR_INIT;}
+	{zend_ffi_dcl base_field_dcl = ZEND_FFI_ATTR_INIT;}
 	specifier_qualifier_list(&common_field_dcl)
+	{base_field_dcl = common_field_dcl;}
 	(	/* empty */
 		{zend_ffi_add_anonymous_field(struct_dcl, &common_field_dcl);}
 	|	struct_declarator(struct_dcl, &common_field_dcl)
 		(	","
-			{zend_ffi_dcl field_dcl = common_field_dcl;}
+			{zend_ffi_dcl field_dcl = base_field_dcl;}
 			attributes(&field_dcl)?
 			struct_declarator(struct_dcl, &field_dcl)
 		)*
@@ -918,3 +924,7 @@
 static void yy_error_sym(const char *msg, int sym) {
 	zend_ffi_parser_error("%s '%s' at line %d", msg, sym_namesym, yy_line);
 }
+
+static void yy_error_str(const char *msg, const char *str) {
+	zend_ffi_parser_error("%s '%s' at line %d\n", msg, str, yy_line);
+}

php-8.3.7.tar.xz/ext/ffi/ffi_parser.c -> php-8.3.21.tar.xz/ext/ffi/ffi_parser.c Changed

@@ -34,6 +34,7 @@
 /* forward declarations */
 static void yy_error(const char *msg);
 static void yy_error_sym(const char *msg, int sym);
+static void yy_error_str(const char *msg, const char *str);
 
 #define YYPOS cpos
 #define YYEND cend
@@ -246,6 +247,63 @@
 #define YY_IN_SET(sym, set, bitset) \
 	(bitsetsym>>3 & (1 << (sym & 0x7)))
 
+size_t yy_escape(char *buf, unsigned char ch)
+{
+	switch (ch) {
+		case '\\': buf0 = '\\'; buf1 = '\\'; return 2;
+		case '\'': buf0 = '\\'; buf1 = '\''; return 2;
+		case '\"': buf0 = '\\'; buf1 = '\"'; return 2;
+		case '\a': buf0 = '\\'; buf1 = '\a'; return 2;
+		case '\b': buf0 = '\\'; buf1 = '\b'; return 2;
+		case 27:   buf0 = '\\'; buf1 = 27; return 2;
+		case '\f': buf0 = '\\'; buf1 = '\f'; return 2;
+		case '\n': buf0 = '\\'; buf1 = '\n'; return 2;
+		case '\r': buf0 = '\\'; buf1 = '\r'; return 2;
+		case '\t': buf0 = '\\'; buf1 = '\t'; return 2;
+		case '\v': buf0 = '\\'; buf1 = '\v'; return 2;
+		case '\?': buf0 = '\\'; buf1 = 0x3f; return 2;
+		default: break;
+	}
+	if (ch < 32 || ch >= 127) {
+		buf0 = '\\';
+		buf1 = '0' + ((ch >> 6) % 8);
+		buf2 = '0' + ((ch >> 3) % 8);
+		buf3 = '0' + (ch % 8);
+		return 4;
+	} else {
+		buf0 = ch;
+		return 1;
+	}
+}
+
+const char *yy_escape_char(char *buf, unsigned char ch)
+{
+	size_t len = yy_escape(buf, ch);
+	buflen = 0;
+	return buf;
+}
+
+const char *yy_escape_string(char *buf, size_t size, const unsigned char *str, size_t n)
+{
+	size_t i = 0;
+	size_t pos = 0;
+	size_t len;
+
+	while (i < n) {
+		if (pos + 8 > size) {
+			bufpos++ = '.';
+			bufpos++ = '.';
+			bufpos++ = '.';
+			break;
+		}
+		len = yy_escape(buf + pos, stri);
+		i++;
+		pos += len;
+	}
+	bufpos = 0;
+	return buf;
+}
+
 static int skip_EOL(int sym);
 static int skip_WS(int sym);
 static int skip_ONE_LINE_COMMENT(int sym);
@@ -310,6 +368,7 @@
 static int synpred_6(int sym);
 
 static int get_skip_sym(void) {
+	char buf64;
 	int ch;
 	int ret;
 	int accept = -1;
@@ -1667,9 +1726,9 @@
 	if (YYPOS >= YYEND) {
 		yy_error("unexpected <EOF>");
 	} else if (YYPOS == yy_text) {
-		yy_error("unexpected character 'escape_char(ch)'");
+		yy_error_str("unexpected character",  yy_escape_char(buf, ch));
 	} else {
-		yy_error("unexpected sequence 'escape_string(yy_text, 1 + YYPOS - yy_text))'");
+		yy_error_str("unexpected sequence", yy_escape_string(buf, sizeof(buf), yy_text, 1 + YYPOS - yy_text));
 	}
 	YYPOS++;
 	goto _yy_state_start;
@@ -2056,6 +2115,10 @@
 				}
 				zend_ffi_declare(name, name_len, &dcl);
 			}
+		} else if (sym == YY__SEMICOLON) {
+			if (common_dcl.flags & (ZEND_FFI_DCL_ENUM | ZEND_FFI_DCL_STRUCT | ZEND_FFI_DCL_UNION)) zend_ffi_cleanup_dcl(&common_dcl);
+		} else {
+			yy_error_sym("unexpected", sym);
 		}
 		if (sym != YY__SEMICOLON) {
 			yy_error_sym("';' expected, got", sym);
@@ -2409,14 +2472,16 @@
 
 static int parse_struct_declaration(int sym, zend_ffi_dcl *struct_dcl) {
 	zend_ffi_dcl common_field_dcl = ZEND_FFI_ATTR_INIT;
+	zend_ffi_dcl base_field_dcl = ZEND_FFI_ATTR_INIT;
 	sym = parse_specifier_qualifier_list(sym, &common_field_dcl);
+	base_field_dcl = common_field_dcl;
 	if (sym == YY__SEMICOLON || sym == YY__RBRACE) {
 		zend_ffi_add_anonymous_field(struct_dcl, &common_field_dcl);
 	} else if (sym == YY__STAR || sym == YY_ID || sym == YY__LPAREN || sym == YY__COLON) {
 		sym = parse_struct_declarator(sym, struct_dcl, &common_field_dcl);
 		while (sym == YY__COMMA) {
 			sym = get_sym();
-			zend_ffi_dcl field_dcl = common_field_dcl;
+			zend_ffi_dcl field_dcl = base_field_dcl;
 			if (YY_IN_SET(sym, (YY___ATTRIBUTE,YY___ATTRIBUTE__,YY___DECLSPEC,YY___CDECL,YY___STDCALL,YY___FASTCALL,YY___THISCALL,YY___VECTORCALL), "\000\000\000\000\000\000\360\017\000\000\000\000\000")) {
 				sym = parse_attributes(sym, &field_dcl);
 			}
@@ -3592,3 +3657,7 @@
 static void yy_error_sym(const char *msg, int sym) {
 	zend_ffi_parser_error("%s '%s' at line %d", msg, sym_namesym, yy_line);
 }
+
+static void yy_error_str(const char *msg, const char *str) {
+	zend_ffi_parser_error("%s '%s' at line %d\n", msg, str, yy_line);
+}

php-8.3.7.tar.xz/ext/ffi/php_ffi.h -> php-8.3.21.tar.xz/ext/ffi/php_ffi.h Changed

php-8.3.21.tar.xz/ext/ffi/tests/bug79075.h Added

php-8.3.21.tar.xz/ext/ffi/tests/bug79075.inc Added

php-8.3.21.tar.xz/ext/ffi/tests/bug79075.phpt Added

php-8.3.21.tar.xz/ext/ffi/tests/gh14215.h Added

php-8.3.21.tar.xz/ext/ffi/tests/gh14215.phpt Added

php-8.3.21.tar.xz/ext/ffi/tests/gh14286_1.phpt Added

php-8.3.21.tar.xz/ext/ffi/tests/gh14286_2.phpt Added

php-8.3.21.tar.xz/ext/ffi/tests/gh14626.phpt Added

php-8.3.21.tar.xz/ext/ffi/tests/gh16013.phpt Added

@@ -0,0 +1,137 @@
+--TEST--
+GH-16013 (endianness issue with FFI)
+--EXTENSIONS--
+ffi
+zend_test
+--FILE--
+<?php
+require_once('utils.inc');
+
+$header = <<<HEADER
+enum bug_gh16013_enum {
+	BUG_GH16013_A = 1,
+	BUG_GH16013_B = 2,
+};
+struct bug_gh16013_int_struct {
+	int field;
+};
+struct bug_gh16013_callback_struct {
+	int8_t (*return_int8)(int8_t);
+	uint8_t (*return_uint8)(uint8_t);
+	int16_t (*return_int16)(int16_t);
+	uint16_t (*return_uint16)(uint16_t);
+	int32_t (*return_int32)(int32_t);
+	uint32_t (*return_uint32)(uint32_t);
+	float (*return_float)(float);
+	struct bug_gh16013_int_struct (*return_struct)(struct bug_gh16013_int_struct);
+	enum bug_gh16013_enum (*return_enum)(enum bug_gh16013_enum);
+};
+
+char bug_gh16013_return_char();
+bool bug_gh16013_return_bool();
+short bug_gh16013_return_short();
+int bug_gh16013_return_int();
+enum bug_gh16013_enum bug_gh16013_return_enum();
+struct bug_gh16013_int_struct bug_gh16013_return_struct();
+HEADER;
+
+if (PHP_OS_FAMILY !== 'Windows') {
+    $ffi = FFI::cdef($header);
+} else {
+    try {
+        $ffi = FFI::cdef($header, 'php_zend_test.dll');
+    } catch (FFI\Exception $ex) {
+        $ffi = FFI::cdef($header, ffi_get_php_dll_name());
+    }
+}
+
+echo "--- Return values ---\n";
+var_dump($ffi->bug_gh16013_return_char());
+var_dump($ffi->bug_gh16013_return_bool());
+var_dump($ffi->bug_gh16013_return_short());
+var_dump($ffi->bug_gh16013_return_int());
+var_dump($ffi->bug_gh16013_return_enum());
+var_dump($ffi->bug_gh16013_return_struct());
+
+echo "--- Callback values ---\n";
+$bug_gh16013_callback_struct = $ffi->new('struct bug_gh16013_callback_struct');
+$bug_gh16013_callback_struct->return_int8 = function($val) use($ffi) {
+    $cdata = $ffi->new('int8_t');
+    $cdata->cdata = $val;
+    return $cdata;
+};
+$bug_gh16013_callback_struct->return_uint8 = function($val) use($ffi) {
+    $cdata = $ffi->new('uint8_t');
+    $cdata->cdata = $val;
+    return $cdata;
+};
+$bug_gh16013_callback_struct->return_int16 = function($val) use($ffi) {
+    $cdata = $ffi->new('int16_t');
+    $cdata->cdata = $val;
+    return $cdata;
+};
+$bug_gh16013_callback_struct->return_uint16 = function($val) use($ffi) {
+    $cdata = $ffi->new('uint16_t');
+    $cdata->cdata = $val;
+    return $cdata;
+};
+$bug_gh16013_callback_struct->return_int32 = function($val) use($ffi) {
+    $cdata = $ffi->new('int32_t');
+    $cdata->cdata = $val;
+    return $cdata;
+};
+$bug_gh16013_callback_struct->return_uint32 = function($val) use($ffi) {
+    $cdata = $ffi->new('uint32_t');
+    $cdata->cdata = $val;
+    return $cdata;
+};
+$bug_gh16013_callback_struct->return_float = function($val) use($ffi) {
+    $cdata = $ffi->new('float');
+    $cdata->cdata = $val;
+    return $cdata;
+};
+$bug_gh16013_callback_struct->return_struct = function($val) use($ffi) {
+    return $val;
+};
+$bug_gh16013_callback_struct->return_enum = function($val) use($ffi) {
+    $cdata = $ffi->new('enum bug_gh16013_enum');
+    $cdata->cdata = $val;
+    return $cdata;
+};
+
+var_dump(($bug_gh16013_callback_struct->return_int8)(-4));
+var_dump(($bug_gh16013_callback_struct->return_uint8)(4));
+var_dump(($bug_gh16013_callback_struct->return_int16)(-10000));
+var_dump(($bug_gh16013_callback_struct->return_uint16)(10000));
+var_dump(($bug_gh16013_callback_struct->return_int32)(-100000));
+var_dump(($bug_gh16013_callback_struct->return_uint32)(100000));
+var_dump(($bug_gh16013_callback_struct->return_float)(12.34));
+$struct = $ffi->new('struct bug_gh16013_int_struct');
+$struct->field = 10;
+var_dump(($bug_gh16013_callback_struct->return_struct)($struct));
+var_dump(($bug_gh16013_callback_struct->return_enum)($ffi->BUG_GH16013_B));
+?>
+--EXPECT--
+--- Return values ---
+string(1) "A"
+bool(true)
+int(12345)
+int(123456789)
+int(2)
+object(FFI\CData:struct bug_gh16013_int_struct)#2 (1) {
+  "field"=>
+  int(123456789)
+}
+--- Callback values ---
+int(-4)
+int(4)
+int(-10000)
+int(10000)
+int(-100000)
+int(100000)
+float(12.34000015258789)
+object(FFI\CData:struct bug_gh16013_int_struct)#13 (1) {
+  "field"=>
+  int(10)
+}
+int(2)

php-8.3.21.tar.xz/ext/ffi/tests/gh16397.phpt Added

php-8.3.21.tar.xz/ext/ffi/tests/ptr_declaration_list.phpt Added

php-8.3.7.tar.xz/ext/fileinfo/fileinfo.c -> php-8.3.21.tar.xz/ext/fileinfo/fileinfo.c Changed

php-8.3.21.tar.xz/ext/fileinfo/libmagic/LICENSE Added

@@ -0,0 +1,29 @@
+$File: COPYING,v 1.2 2018/09/09 20:33:28 christos Exp $
+Copyright (c) Ian F. Darwin 1986, 1987, 1989, 1990, 1991, 1992, 1994, 1995.
+Software written by Ian F. Darwin and others;
+maintained 1994- Christos Zoulas.
+
+This software is not subject to any export provision of the United States
+Department of Commerce, and may be exported to any country or planet.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice immediately at the beginning of the file, without modification,
+   this list of conditions, and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER 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.

php-8.3.7.tar.xz/ext/fileinfo/tests/cve-2014-3538-mb.phpt -> php-8.3.21.tar.xz/ext/fileinfo/tests/cve-2014-3538-mb.phpt Changed

php-8.3.7.tar.xz/ext/fileinfo/tests/cve-2014-3538-nojit.phpt -> php-8.3.21.tar.xz/ext/fileinfo/tests/cve-2014-3538-nojit.phpt Changed

php-8.3.7.tar.xz/ext/fileinfo/tests/finfo_file_001.phpt -> php-8.3.21.tar.xz/ext/fileinfo/tests/finfo_file_001.phpt Changed

php-8.3.7.tar.xz/ext/fileinfo/tests/finfo_file_basic.phpt -> php-8.3.21.tar.xz/ext/fileinfo/tests/finfo_file_basic.phpt Changed

php-8.3.7.tar.xz/ext/filter/logical_filters.c -> php-8.3.21.tar.xz/ext/filter/logical_filters.c Changed

@@ -89,7 +89,7 @@
 #define FORMAT_IPV4    4
 #define FORMAT_IPV6    6
 
-static int _php_filter_validate_ipv6(char *str, size_t str_len, int ip8);
+static int _php_filter_validate_ipv6(const char *str, size_t str_len, int ip8);
 
 static int php_filter_parse_int(const char *str, size_t str_len, zend_long *ret) { /* {{{ */
 	zend_long ctx_value;
@@ -542,7 +542,7 @@
 			/* Reset label length counter */
 			i = 1;
 		} else {
-			if (i > 63 || (hostname && *s != '-' && !isalnum((int)*(unsigned char *)s))) {
+			if (i > 63 || (hostname && (*s != '-' || *(s + 1) == '\0') && !isalnum((int)*(unsigned char *)s))) {
 				return 0;
 			}
 
@@ -580,6 +580,14 @@
 	return 1;
 }
 
+static bool php_filter_is_valid_ipv6_hostname(const char *s, size_t l)
+{
+	const char *e = s + l;
+	const char *t = e - 1;
+
+	return *s == '' && *t == '' && _php_filter_validate_ipv6(s + 1, l - 2, NULL);
+}
+
 void php_filter_validate_url(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */
 {
 	php_url *url;
@@ -600,7 +608,7 @@
 
 	if (url->scheme != NULL &&
 		(zend_string_equals_literal_ci(url->scheme, "http") || zend_string_equals_literal_ci(url->scheme, "https"))) {
-		char *e, *s, *t;
+		const char *s;
 		size_t l;
 
 		if (url->host == NULL) {
@@ -609,17 +617,14 @@
 
 		s = ZSTR_VAL(url->host);
 		l = ZSTR_LEN(url->host);
-		e = s + l;
-		t = e - 1;
-
-		/* An IPv6 enclosed by square brackets is a valid hostname */
-		if (*s == '' && *t == '' && _php_filter_validate_ipv6((s + 1), l - 2, NULL)) {
-			php_url_free(url);
-			return;
-		}
 
-		// Validate domain
-		if (!_php_filter_validate_domain(ZSTR_VAL(url->host), l, FILTER_FLAG_HOSTNAME)) {
+		if (
+			/* An IPv6 enclosed by square brackets is a valid hostname.*/
+			!php_filter_is_valid_ipv6_hostname(s, l) &&
+			/* Validate domain.
+			 * This includes a loose check for an IPv4 address. */
+			!_php_filter_validate_domain(ZSTR_VAL(url->host), l, FILTER_FLAG_HOSTNAME)
+		) {
 			php_url_free(url);
 			RETURN_VALIDATION_FAILED
 		}
@@ -753,15 +758,16 @@
 }
 /* }}} */
 
-static int _php_filter_validate_ipv6(char *str, size_t str_len, int ip8) /* {{{ */
+static int _php_filter_validate_ipv6(const char *str, size_t str_len, int ip8) /* {{{ */
 {
 	int compressed_pos = -1;
 	int blocks = 0;
-	int num, n, i;
+	unsigned int num, n;
+	int i;
 	char *ipv4;
-	char *end;
+	const char *end;
 	int ip4elm4;
-	char *s = str;
+	const char *s = str;
 
 	if (!memchr(str, ':', str_len)) {
 		return 0;
@@ -864,15 +870,120 @@
 }
 /* }}} */
 
-void php_filter_validate_ip(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */
+/* From the tables in RFC 6890 - Special-Purpose IP Address Registriesi
+ * Including errata: https://www.rfc-editor.org/errata_search.php?rfc=6890&rec_status=1 */
+static bool ipv4_get_status_flags(const int ip8, bool *global, bool *reserved, bool *private)
+{
+	*global = false;
+	*reserved = false;
+	*private = false;
+
+	if (ip0 == 0) {
+		/* RFC 0791 - This network */
+		*reserved = true;
+	} else if (ip0 == 0 && ip1 == 0 && ip2 == 0 && ip3 == 0) {
+		/* RFC 1122 - This host on this network */
+		*reserved = true;
+	} else if (ip0 == 10) {
+		/* RFC 1918 - Private Use */
+		*private = true;
+	} else if (ip0 == 100 && ip1 >= 64 && ip1 <= 127) {
+		/* RFC 6598 - Shared Address Space */
+	} else if (ip0 == 127) {
+		/* RFC 1122 - Loopback */
+		*reserved = true;
+	} else if (ip0 == 169 && ip1 == 254) {
+		/* RFC 3927 - Link Local */
+		*reserved = true;
+	} else if (ip0 == 172 && ip1 >= 16 && ip1 <= 31) {
+		/* RFC 1918 - Private Use */
+		*private = true;
+	} else if (ip0 == 192 && ip1 == 0 && ip2 == 0) {
+		/* RFC 6890 - IETF Protocol Assignments */
+	} else if (ip0 == 192 && ip1 == 0 && ip2 == 0 && ip3 >= 0 && ip3 <= 7) {
+		/* RFC 6333 - DS-Lite */
+	} else if (ip0 == 192 && ip1 == 0 && ip2 == 2) {
+		/* RFC 5737 - Documentation */
+	} else if (ip0 == 192 && ip1 == 88 && ip2 == 99) {
+		/* RFC 3068 - 6to4 Relay Anycast */
+		*global = true;
+	} else if (ip0 == 192 && ip1 == 168) {
+		/* RFC 1918 - Private Use */
+		*private = true;
+	} else if (ip0 == 198 && ip1 >= 18 && ip1 <= 19) {
+		/* RFC 2544 - Benchmarking */
+	} else if (ip0 == 198 && ip1 == 51 && ip2 == 100) {
+		/* RFC 5737 - Documentation */
+	} else if (ip0 == 203 && ip1 == 0 && ip2 == 113) {
+		/* RFC 5737 - Documentation */
+	} else if (ip0 >= 240 && ip1 <= 255) {
+		/* RFC 1122 - Reserved */
+		*reserved = true;
+	} else if (ip0 == 255 && ip1 == 255 && ip2 == 255 && ip3 == 255) {
+		/* RFC 0919 - Limited Broadcast, Updated by RFC 8190, 2.2. */
+		*reserved = true;
+	} else {
+		return false;
+	}
+
+	return true;
+}
+
+/* From the tables in RFC 6890 - Special-Purpose IP Address Registries */
+static bool ipv6_get_status_flags(const int ip8, bool *global, bool *reserved, bool *private)
 {
-	/* validates an ipv4 or ipv6 IP, based on the flag (4, 6, or both) add a
-	 * flag to throw out reserved ranges; multicast ranges... etc. If both
-	 * allow_ipv4 and allow_ipv6 flags flag are used, then the first dot or
-	 * colon determine the format */
+	*global = false;
+	*reserved = false;
+	*private = false;
+
+	if (ip0 == 0 && ip1 == 0 && ip2 == 0 && ip3 == 0 && ip4 == 0 && ip5 == 0 && ip6 == 0 && ip7 == 0) {
+		/* RFC 4291 - Unspecified Address */
+		*reserved = true;
+	} else if (ip0 == 0 && ip1 == 0 && ip2 == 0 && ip3 == 0 && ip4 == 0 && ip5 == 0 && ip6 == 0 && ip7 == 1) {
+		/* RFC 4291 - Loopback Address */
+		*reserved = true;
+	} else if (ip0 == 0x0064 && ip1 == 0xff9b) {
+		/* RFC 6052 - IPv4-IPv6 Translation */
+		*global = true;
+	} else if (ip0 == 0 && ip1 == 0 && ip2 == 0 && ip3 == 0 && ip4 == 0 && ip5 == 0xffff) {
+		/* RFC 4291 - IPv4-mapped Address */
+		*reserved = true;
+	} else if (ip0 == 0x0100 && ip1 == 0 && ip2 == 0 && ip3 == 0) {
+		/* RFC 6666 - Discard-Only Address Block */
+	} else if (ip0 == 0x2001 && ip1 == 0x0000) {
+		/* RFC 4380 - TEREDO */
+	} else if (ip0 == 0x2001 && ip1 <= 0x01ff) {
+		/* RFC 2928 - IETF Protocol Assignments */
+	} else if (ip0 == 0x2001 && ip1 == 0x0002 && ip2 == 0) {
+		/* RFC 5180 - Benchmarking */
+	} else if (ip0 == 0x2001 && ip1 == 0x0db8) {
+		/* RFC 3849 - Documentation */
+	} else if (ip0 == 0x2001 && ip1 >= 0x0010 && ip1 <= 0x001f) {
+		/* RFC 4843 - ORCHID */
+	} else if (ip0 == 0x2002) {
+		/* RFC 3056 - 6to4 */
+	} else if (ip0 >= 0xfc00 && ip0 <= 0xfdff) {
+		/* RFC 4193 - Unique-Local */
+		*private = true;
+	} else if (ip0 >= 0xfe80 && ip0 <= 0xfebf) {
+		/* RFC 4291 - Linked-Scoped Unicast */
+		*reserved = true;
+	} else {
+		return false;
+	}
 
-	int            ip8;
-	int            mode;
+	return true;
+}
+
+/* Validates an ipv4 or ipv6 IP, based on the flag (4, 6, or both) add a flag
+ * to throw out reserved ranges; multicast ranges... etc. If both allow_ipv4
+ * and allow_ipv6 flags flag are used, then the first dot or colon determine
+ * the format */
+void php_filter_validate_ip(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */
+{
+	int  ip8;
+	int  mode;
+	bool flag_global, flag_reserved, flag_private; /* flags for ranges as determined by RFC 6890 */
 
 	if (memchr(Z_STRVAL_P(value), ':', Z_STRLEN_P(value))) {
 		mode = FORMAT_IPV6;
@@ -890,85 +1001,35 @@
 		RETURN_VALIDATION_FAILED
 	}
 
-	switch (mode) {
-		case FORMAT_IPV4:
-			if (!_php_filter_validate_ipv4(Z_STRVAL_P(value), Z_STRLEN_P(value), ip)) {
-				RETURN_VALIDATION_FAILED
-			}
+	if (mode == FORMAT_IPV4) {
+		if (!_php_filter_validate_ipv4(Z_STRVAL_P(value), Z_STRLEN_P(value), ip)) {
+			RETURN_VALIDATION_FAILED
+		}
 
-			/* Check flags */
-			if (flags & FILTER_FLAG_NO_PRIV_RANGE  || flags & FILTER_FLAG_GLOBAL_RANGE) {
-				if (
-					(ip0 == 10) ||
-					(ip0 == 172 && ip1 >= 16 && ip1 <= 31) ||
-					(ip0 == 192 && ip1 == 168)
-				) {
-					RETURN_VALIDATION_FAILED
-				}
-			}
+		if (!ipv4_get_status_flags(ip, &flag_global, &flag_reserved, &flag_private)) {
+			return; /* no special block */
+		}
+	}
+	else if (mode == FORMAT_IPV6) {
+		if (_php_filter_validate_ipv6(Z_STRVAL_P(value), Z_STRLEN_P(value), ip) < 1) {
+			RETURN_VALIDATION_FAILED
+		}
 
-			if (flags & FILTER_FLAG_NO_RES_RANGE || flags & FILTER_FLAG_GLOBAL_RANGE) {
-				if (
-					(ip0 == 0) ||
-					(ip0 >= 240) ||
-					(ip0 == 127) ||
-					(ip0 == 169 && ip1 == 254)
-				) {
-					RETURN_VALIDATION_FAILED
-				}
-			}
+		if (!ipv6_get_status_flags(ip, &flag_global, &flag_reserved, &flag_private)) {
+			return; /* no special block */
+		}
+	}
 
-			if (flags & FILTER_FLAG_GLOBAL_RANGE) {
-				if (
-						(ip0 == 100 && ip1 >= 64 && ip1 <= 127 ) ||
-						(ip0 == 192 && ip1 == 0 && ip2 == 0 ) ||
-						(ip0 == 192 && ip1 == 0 && ip2 == 2 ) ||
-						(ip0 == 198 && ip1 >= 18 && ip1 <= 19 ) ||
-						(ip0 == 198 && ip1 == 51 && ip2 == 100 ) ||
-						(ip0 == 203 && ip1 == 0 && ip2 == 113 )
-		   ) {
-					RETURN_VALIDATION_FAILED
-				}
-			}
+	if ((flags & FILTER_FLAG_GLOBAL_RANGE) && flag_global != true) {
+		RETURN_VALIDATION_FAILED
+	}
 
-			break;
+	if ((flags & FILTER_FLAG_NO_PRIV_RANGE) && flag_private == true) {
+		RETURN_VALIDATION_FAILED
+	}
 
-		case FORMAT_IPV6:
-			{
-				int res = 0;
-				res = _php_filter_validate_ipv6(Z_STRVAL_P(value), Z_STRLEN_P(value), ip);
-				if (res < 1) {
-					RETURN_VALIDATION_FAILED
-				}
-				/* Check flags */
-				if (flags & FILTER_FLAG_NO_PRIV_RANGE || flags & FILTER_FLAG_GLOBAL_RANGE) {
-					if (ip0 >= 0xfc00 && ip0 <= 0xfdff) {
-						RETURN_VALIDATION_FAILED
-					}
-				}
-				if (flags & FILTER_FLAG_NO_RES_RANGE || flags & FILTER_FLAG_GLOBAL_RANGE) {
-					if ((ip0 == 0 && ip1 == 0 && ip2 == 0 && ip3 == 0
-							&& ip4 == 0 && ip5 == 0 && ip6 == 0 && (ip7 == 0 || ip7 == 1))
-						|| (ip0 == 0x5f)
-						|| (ip0 >= 0xfe80 && ip0 <= 0xfebf)
-						|| (ip0 == 0x2001 && (ip1 == 0x0db8 || (ip1 >= 0x0010 && ip1 <= 0x001f)))
-						|| (ip0 == 0x3ff3)
-								) {
-									RETURN_VALIDATION_FAILED
-								}
-				}
-				if (flags & FILTER_FLAG_GLOBAL_RANGE) {
-					if ((ip0 == 0 && ip1 == 0 && ip2 == 0 && ip3 == 0 && ip4 == 0 && ip5 == 0xffff) ||
-							(ip0 == 0x0100 && ip1 == 0 && ip2 == 0 && ip3 == 0) ||
-							(ip0 == 0x2001 && ip1 <= 0x01ff) ||
-							(ip0 == 0x2001 && ip1 == 0x0002 && ip2 == 0) ||
-							(ip0 >= 0xfc00 && ip0 <= 0xfdff)
-					   ) {
-						RETURN_VALIDATION_FAILED
-					}
-				}
-			}
-			break;
+	if ((flags & FILTER_FLAG_NO_RES_RANGE) && flag_reserved == true) {
+		RETURN_VALIDATION_FAILED
 	}
 }
 /* }}} */

php-8.3.21.tar.xz/ext/filter/tests/CVE-2007-1900.phpt Added

php-8.3.7.tar.xz/ext/filter/tests/bug42718-2.phpt -> php-8.3.21.tar.xz/ext/filter/tests/bug42718-2.phpt Changed

php-8.3.7.tar.xz/ext/filter/tests/bug47435.phpt -> php-8.3.21.tar.xz/ext/filter/tests/bug47435.phpt Changed

php-8.3.7.tar.xz/ext/filter/tests/bug49274.phpt -> php-8.3.21.tar.xz/ext/filter/tests/bug49274.phpt Changed

php-8.3.7.tar.xz/ext/filter/tests/bug49510.phpt -> php-8.3.21.tar.xz/ext/filter/tests/bug49510.phpt Changed

php-8.3.7.tar.xz/ext/filter/tests/bug50632.phpt -> php-8.3.21.tar.xz/ext/filter/tests/bug50632.phpt Changed

php-8.3.7.tar.xz/ext/filter/tests/bug51192.phpt -> php-8.3.21.tar.xz/ext/filter/tests/bug51192.phpt Changed

php-8.3.7.tar.xz/ext/filter/tests/bug51368.phpt -> php-8.3.21.tar.xz/ext/filter/tests/bug51368.phpt Changed

php-8.3.7.tar.xz/ext/filter/tests/bug64441.phpt -> php-8.3.21.tar.xz/ext/filter/tests/bug64441.phpt Changed

php-8.3.7.tar.xz/ext/filter/tests/bug67167.01.phpt -> php-8.3.21.tar.xz/ext/filter/tests/bug67167.01.phpt Changed

php-8.3.7.tar.xz/ext/filter/tests/bug67167.02.phpt -> php-8.3.21.tar.xz/ext/filter/tests/bug67167.02.phpt Changed

php-8.3.7.tar.xz/ext/filter/tests/bug7715.phpt -> php-8.3.21.tar.xz/ext/filter/tests/bug7715.phpt Changed

php-8.3.7.tar.xz/ext/filter/tests/bug7733.phpt -> php-8.3.21.tar.xz/ext/filter/tests/bug7733.phpt Changed

php-8.3.7.tar.xz/ext/filter/tests/bug80584.phpt -> php-8.3.21.tar.xz/ext/filter/tests/bug80584.phpt Changed

php-8.3.7.tar.xz/ext/filter/tests/bug8315.phpt -> php-8.3.21.tar.xz/ext/filter/tests/bug8315.phpt Changed

php-8.3.21.tar.xz/ext/filter/tests/gh16523.phpt Added

php-8.3.21.tar.xz/ext/filter/tests/gh16944.phpt Added

php-8.3.21.tar.xz/ext/filter/tests/gh18309.phpt Added

php-8.3.21.tar.xz/ext/filter/tests/ghsa-w8qr-v226-r27w.phpt Added

@@ -0,0 +1,41 @@
+--TEST--
+GHSA-w8qr-v226-r27w
+--EXTENSIONS--
+filter
+--FILE--
+<?php
+
+function test(string $input) {
+    var_dump(filter_var($input, FILTER_VALIDATE_URL));
+}
+
+echo "--- These ones should fail ---\n";
+test("http://test@127.0.0.1");
+test("http://test@::1");
+test("http://test@::1");
+test("http://test@::1");
+test("http://php.net\\@aliyun.com/aaa.do");
+test("http://test@2001:db8:3333:4444:5555:6666:1.2.3.4");
+test("http://test@2001:db8:3333:4444:5555:6666:1.2.3.4");
+test("http://test@2001:db8:3333:4444:5555:6666:1.2.3.4");
+
+echo "--- These ones should work ---\n";
+test("http://test@127.0.0.1");
+test("http://test@2001:db8:3333:4444:5555:6666:1.2.3.4");
+test("http://test@::1");
+
+?>
+--EXPECT--
+--- These ones should fail ---
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+--- These ones should work ---
+string(21) "http://test@127.0.0.1"
+string(50) "http://test@2001:db8:3333:4444:5555:6666:1.2.3.4"
+string(17) "http://test@::1"

php-8.3.7.tar.xz/ext/ftp/ftp.c -> php-8.3.21.tar.xz/ext/ftp/ftp.c Changed

@@ -1387,6 +1387,22 @@
 }
 /* }}} */
 
+static ssize_t my_send_wrapper_with_restart(php_socket_t fd, const void *buf, size_t size, int flags) {
+	ssize_t n;
+	do {
+		n = send(fd, buf, size, flags);
+	} while (n == -1 && php_socket_errno() == EINTR);
+	return n;
+}
+
+static ssize_t my_recv_wrapper_with_restart(php_socket_t fd, void *buf, size_t size, int flags) {
+	ssize_t n;
+	do {
+		n = recv(fd, buf, size, flags);
+	} while (n == -1 && php_socket_errno() == EINTR);
+	return n;
+}
+
 int single_send(ftpbuf_t *ftp, php_socket_t s, void *buf, size_t size) {
 #ifdef HAVE_FTP_SSL
 	int err;
@@ -1402,7 +1418,7 @@
 		handle = ftp->data->ssl_handle;
 		fd = ftp->data->fd;
 	} else {
-		return send(s, buf, size, 0);
+		return my_send_wrapper_with_restart(s, buf, size, 0);
 	}
 
 	do {
@@ -1441,8 +1457,33 @@
 	} while (retry);
 	return sent;
 #else
-	return send(s, buf, size, 0);
+	return my_send_wrapper_with_restart(s, buf, size, 0);
+#endif
+}
+
+static int my_poll(php_socket_t fd, int events, int timeout) {
+	int n;
+	zend_hrtime_t timeout_hr = (zend_hrtime_t) timeout * 1000000;
+
+	while (true) {
+		zend_hrtime_t start_ns = zend_hrtime();
+		n = php_pollfd_for_ms(fd, events, (int) (timeout_hr / 1000000));
+
+		if (n == -1 && php_socket_errno() == EINTR) {
+			zend_hrtime_t delta_ns = zend_hrtime() - start_ns;
+			if (delta_ns > timeout_hr) {
+#ifndef PHP_WIN32
+				errno = ETIMEDOUT;
 #endif
+				break;
+			}
+			timeout_hr -= delta_ns;
+		} else {
+			break;
+		}
+	}
+
+	return n;
 }
 
 /* {{{ my_send */
@@ -1454,7 +1495,7 @@
 
 	size = len;
 	while (size) {
-		n = php_pollfd_for_ms(s, POLLOUT, ftp->timeout_sec * 1000);
+		n = my_poll(s, POLLOUT, ftp->timeout_sec * 1000);
 
 		if (n < 1) {
 			char buf256;
@@ -1493,7 +1534,7 @@
 	SSL *handle = NULL;
 	php_socket_t fd;
 #endif
-	n = php_pollfd_for_ms(s, PHP_POLLREADABLE, ftp->timeout_sec * 1000);
+	n = my_poll(s, PHP_POLLREADABLE, ftp->timeout_sec * 1000);
 	if (n < 1) {
 		char buf256;
 		if (n == 0) {
@@ -1553,7 +1594,7 @@
 		} while (retry);
 	} else {
 #endif
-		nr_bytes = recv(s, buf, len, 0);
+		nr_bytes = my_recv_wrapper_with_restart(s, buf, len, 0);
 #ifdef HAVE_FTP_SSL
 	}
 #endif
@@ -1567,7 +1608,7 @@
 {
 	int		n;
 
-	n = php_pollfd_for_ms(s, PHP_POLLREADABLE, 1000);
+	n = my_poll(s, PHP_POLLREADABLE, 1000);
 	if (n < 1) {
 		char buf256;
 		if (n == 0) {
@@ -1590,7 +1631,7 @@
 {
 	int		n;
 
-	n = php_pollfd_for_ms(s, POLLOUT, 1000);
+	n = my_poll(s, POLLOUT, 1000);
 	if (n < 1) {
 		char buf256;
 		if (n == 0) {
@@ -1614,7 +1655,7 @@
 {
 	int		n;
 
-	n = php_pollfd_for_ms(s, PHP_POLLREADABLE, ftp->timeout_sec * 1000);
+	n = my_poll(s, PHP_POLLREADABLE, ftp->timeout_sec * 1000);
 	if (n < 1) {
 		char buf256;
 		if (n == 0) {

php-8.3.7.tar.xz/ext/gd/gd.c -> php-8.3.21.tar.xz/ext/gd/gd.c Changed

@@ -1194,6 +1194,11 @@
 		RETURN_THROWS();
 	}
 
+	if (degrees < (double)(INT_MIN / 100) || degrees > (double)(INT_MAX / 100)) {
+		zend_argument_value_error(2, "must be between %d and %d", (INT_MIN / 100), (INT_MAX / 100));
+		RETURN_THROWS();
+	}
+
 	im_src = php_gd_libgdimageptr_from_zval_p(SIM);
 	im_dst = gdImageRotateInterpolated(im_src, (const float)degrees, color);
 
@@ -1317,7 +1322,7 @@
 
 	do {
 		i = (ctx->getC)(ctx);
-		if (i < 0) {
+		if (i < 0 || mbi > (INT_MAX >> 7)) {
 			return -1;
 		}
 		mbi = (mbi << 7) | (i & 0x7f);
@@ -2212,9 +2217,9 @@
 
 	im = php_gd_libgdimageptr_from_zval_p(IM);
 
-	CHECK_RGBA_RANGE(red, Red, 2);
-	CHECK_RGBA_RANGE(green, Green, 3);
-	CHECK_RGBA_RANGE(blue, Blue, 4);
+	CHECK_RGBA_RANGE(red, Red, 3);
+	CHECK_RGBA_RANGE(green, Green, 4);
+	CHECK_RGBA_RANGE(blue, Blue, 5);
 
 	col = color;
 
@@ -3077,6 +3082,17 @@
 		im = php_gd_libgdimageptr_from_zval_p(IM);
 	}
 
+	// FT_F26Dot6 is a signed long alias
+	if (ptsize < (double)LONG_MIN / 64 || ptsize > (double)LONG_MAX / 64) {
+		zend_argument_value_error(2, "must be between " ZEND_LONG_FMT " and " ZEND_LONG_FMT, (zend_long)((double)LONG_MIN / 64), (zend_long)((double)LONG_MAX / 64));
+		RETURN_THROWS();
+	}
+
+	if (UNEXPECTED(!zend_finite(ptsize))) {
+		zend_argument_value_error(2, "must be finite");
+		RETURN_THROWS();
+	}
+
 	/* convert angle to radians */
 	angle = angle * (M_PI/180);
 
@@ -3412,7 +3428,7 @@
 	}
 
 	for (i=0; i<3; i++) {
-		if ((var = zend_hash_index_find(Z_ARRVAL_P(hash_matrix), (i))) != NULL && Z_TYPE_P(var) == IS_ARRAY) {
+		if ((var = zend_hash_index_find_deref(Z_ARRVAL_P(hash_matrix), (i))) != NULL && Z_TYPE_P(var) == IS_ARRAY) {
 			if (zend_hash_num_elements(Z_ARRVAL_P(var)) != 3 ) {
 				zend_argument_value_error(2, "must be a 3x3 array, matrix%d only has %d elements", i, zend_hash_num_elements(Z_ARRVAL_P(var)));
 				RETURN_THROWS();
@@ -3428,7 +3444,24 @@
 			}
 		}
 	}
-	res = gdImageConvolution(im_src, matrix, (float)div, (float)offset);
+
+	if (UNEXPECTED(!zend_finite(div))) {
+		zend_argument_value_error(3, "must be finite");
+		RETURN_THROWS();
+	}
+
+	float div_float = (float) div;
+	if (UNEXPECTED(div_float == 0.0f)) {
+		zend_argument_value_error(3, "must not be 0");
+		RETURN_THROWS();
+	}
+
+	if (UNEXPECTED(!zend_finite(offset))) {
+		zend_argument_value_error(4, "must be finite");
+		RETURN_THROWS();
+	}
+
+	res = gdImageConvolution(im_src, matrix, div_float, (float) offset);
 
 	if (res) {
 		RETURN_TRUE;
@@ -3538,6 +3571,26 @@
 		RETURN_THROWS();
 	}
 
+	if ((rect.width > 0 && rect.x > INT_MAX - rect.width)) {
+		zend_argument_value_error(2, "overflow with \"x\" and \"width\" keys");
+		RETURN_THROWS();
+	}
+
+	if ((rect.width < 0 && rect.x < INT_MIN - rect.width)) {
+		zend_argument_value_error(2, "underflow with \"x\" and \"width\" keys");
+		RETURN_THROWS();
+	}
+
+	if ((rect.height > 0 && rect.y > INT_MAX - rect.height)) {
+		zend_argument_value_error(2, "overflow with \"y\" and \"height\" keys");
+		RETURN_THROWS();
+	}
+
+	if ((rect.height < 0 && rect.y < INT_MIN - rect.height)) {
+		zend_argument_value_error(2, "underflow with \"y\" and \"height\" keys");
+		RETURN_THROWS();
+	}
+
 	im_crop = gdImageCrop(im, &rect);
 
 	if (im_crop == NULL) {
@@ -3675,16 +3728,28 @@
 	}
 
 	for (i = 0; i < nelems; i++) {
-		if ((zval_affine_elem = zend_hash_index_find(Z_ARRVAL_P(z_affine), i)) != NULL) {
+		if ((zval_affine_elem = zend_hash_index_find_deref(Z_ARRVAL_P(z_affine), i)) != NULL) {
 			switch (Z_TYPE_P(zval_affine_elem)) {
 				case IS_LONG:
-					affinei  = Z_LVAL_P(zval_affine_elem);
+					affinei = Z_LVAL_P(zval_affine_elem);
+					if (affinei < INT_MIN || affinei > INT_MAX) {
+						zend_argument_value_error(2, "element %i must be between %d and %d", i, INT_MIN, INT_MAX);
+						RETURN_THROWS();
+					}
 					break;
 				case IS_DOUBLE:
 					affinei = Z_DVAL_P(zval_affine_elem);
+					if (affinei < INT_MIN || affinei > INT_MAX) {
+						zend_argument_value_error(2, "element %i must be between %d and %d", i, INT_MIN, INT_MAX);
+						RETURN_THROWS();
+					}
 					break;
 				case IS_STRING:
 					affinei = zval_get_double(zval_affine_elem);
+					if (affinei < INT_MIN || affinei > INT_MAX) {
+						zend_argument_value_error(2, "element %i must be between %d and %d", i, INT_MIN, INT_MAX);
+						RETURN_THROWS();
+					}
 					break;
 				default:
 					zend_argument_type_error(3, "contains invalid type for element %i", i);
@@ -3839,7 +3904,7 @@
 	}
 
 	for (i = 0; i < 6; i++) {
-		if ((tmp = zend_hash_index_find(Z_ARRVAL_P(z_m1), i)) != NULL) {
+		if ((tmp = zend_hash_index_find_deref(Z_ARRVAL_P(z_m1), i)) != NULL) {
 			switch (Z_TYPE_P(tmp)) {
 				case IS_LONG:
 					m1i  = Z_LVAL_P(tmp);
@@ -3856,7 +3921,7 @@
 			}
 		}
 
-		if ((tmp = zend_hash_index_find(Z_ARRVAL_P(z_m2), i)) != NULL) {
+		if ((tmp = zend_hash_index_find_deref(Z_ARRVAL_P(z_m2), i)) != NULL) {
 			switch (Z_TYPE_P(tmp)) {
 				case IS_LONG:
 					m2i  = Z_LVAL_P(tmp);

php-8.3.7.tar.xz/ext/gd/libgd/gd.c -> php-8.3.21.tar.xz/ext/gd/libgd/gd.c Changed

php-8.3.7.tar.xz/ext/gd/libgd/gd_avif.c -> php-8.3.21.tar.xz/ext/gd/libgd/gd_avif.c Changed

@@ -393,7 +393,13 @@
 	// (While AVIF image pixel depth can be 8, 10, or 12 bits, GD truecolor images are 8-bit.)
 	avifRGBImageSetDefaults(&rgb, decoder->image);
 	rgb.depth = 8;
+#if AVIF_VERSION >= 1000000
+	result = avifRGBImageAllocatePixels(&rgb);
+	if (isAvifError(result, "Allocating RGB pixels failed"))
+		goto cleanup;
+#else
 	avifRGBImageAllocatePixels(&rgb);
+#endif
 
 	result = avifImageYUVToRGB(decoder->image, &rgb);
 	if (isAvifError(result, "Conversion from YUV to RGB failed"))
@@ -522,14 +528,25 @@
 	// Note that MATRIX_COEFFICIENTS_IDENTITY enables lossless conversion from RGB to YUV.
 
 	avifImage *avifIm = avifImageCreate(gdImageSX(im), gdImageSY(im), 8, subsampling);
-
+#if AVIF_VERSION >= 1000000
+	if (avifIm == NULL) {
+		gd_error("avif error - Creating image failed\n");
+		goto cleanup;
+	}
+#endif
 	avifIm->colorPrimaries = AVIF_COLOR_PRIMARIES_BT709;
 	avifIm->transferCharacteristics = AVIF_TRANSFER_CHARACTERISTICS_SRGB;
 	avifIm->matrixCoefficients = lossless ? AVIF_MATRIX_COEFFICIENTS_IDENTITY : AVIF_MATRIX_COEFFICIENTS_BT709;
 
 	avifRGBImageSetDefaults(&rgb, avifIm);
 	// this allocates memory, and sets rgb.rowBytes and rgb.pixels.
+#if AVIF_VERSION >= 1000000
+	result = avifRGBImageAllocatePixels(&rgb);
+	if (isAvifError(result, "Allocating RGB pixels failed"))
+		goto cleanup;
+#else
 	avifRGBImageAllocatePixels(&rgb);
+#endif
 
 	// Parse RGB data from the GD image, and copy it into the AVIF RGB image.
 	// Convert 7-bit GD alpha channel values to 8-bit AVIF values.
@@ -555,6 +572,12 @@
 	// Encode the image in AVIF format.
 
 	encoder = avifEncoderCreate();
+#if AVIF_VERSION >= 1000000
+	if (encoder == NULL) {
+		gd_error("avif error - Creating encoder failed\n");
+		goto cleanup;
+	}
+#endif
 	int quantizerQuality = quality == QUALITY_DEFAULT ?
 		QUANTIZER_DEFAULT : quality2Quantizer(quality);

php-8.3.7.tar.xz/ext/gd/libgd/gd_bmp.c -> php-8.3.21.tar.xz/ext/gd/libgd/gd_bmp.c Changed

php-8.3.7.tar.xz/ext/gd/libgd/gd_interpolation.c -> php-8.3.21.tar.xz/ext/gd/libgd/gd_interpolation.c Changed

@@ -748,8 +748,8 @@
  */
 int getPixelInterpolated(gdImagePtr im, const double x, const double y, const int bgColor)
 {
-	const int xi=(int)((x) < 0 ? x - 1: x);
-	const int yi=(int)((y) < 0 ? y - 1: y);
+	const int xi=(int)(x);
+	const int yi=(int)(y);
 	int yii;
 	int i;
 	double kernel, kernel_cache_y;
@@ -929,6 +929,32 @@
 	return res;
 }
 
+/* Convert a double to an unsigned char, rounding to the nearest
+ * integer and clamping the result between 0 and max.  The absolute
+ * value of clr must be less than the maximum value of an unsigned
+ * short. */
+static inline unsigned char
+uchar_clamp(double clr, unsigned char max) {
+	unsigned short result;
+
+	//assert(fabs(clr) <= SHRT_MAX);
+
+	/* Casting a negative float to an unsigned short is undefined.
+	 * However, casting a float to a signed truncates toward zero and
+	 * casting a negative signed value to an unsigned of the same size
+	 * results in a bit-identical value (assuming twos-complement
+	 * arithmetic).	 This is what we want: all legal negative values
+	 * for clr will be greater than 255. */
+
+	/* Convert and clamp. */
+	result = (unsigned short)(short)(clr + 0.5);
+	if (result > max) {
+		result = (clr < 0) ? 0 : max;
+	}/* if */
+
+	return result;
+}/* uchar_clamp*/
+
 static inline void _gdScaleRow(gdImagePtr pSrc,  unsigned int src_width, gdImagePtr dst, unsigned int dst_width, unsigned int row, LineContribType *contrib)
 {
     int *p_src_row = pSrc->tpixelsrow;
@@ -936,20 +962,22 @@
 	unsigned int x;
 
     for (x = 0; x < dst_width; x++) {
-		register unsigned char r = 0, g = 0, b = 0, a = 0;
+	    double r = 0, g = 0, b = 0, a = 0;
         const int left = contrib->ContribRowx.Left;
         const int right = contrib->ContribRowx.Right;
-		int i;
+	int i;
 
-		/* Accumulate each channel */
-        for (i = left; i <= right; i++) {
-			const int left_channel = i - left;
-            r += (unsigned char)(contrib->ContribRowx.Weightsleft_channel * (double)(gdTrueColorGetRed(p_src_rowi)));
-            g += (unsigned char)(contrib->ContribRowx.Weightsleft_channel * (double)(gdTrueColorGetGreen(p_src_rowi)));
-            b += (unsigned char)(contrib->ContribRowx.Weightsleft_channel * (double)(gdTrueColorGetBlue(p_src_rowi)));
-			a += (unsigned char)(contrib->ContribRowx.Weightsleft_channel * (double)(gdTrueColorGetAlpha(p_src_rowi)));
-        }
-        p_dst_rowx = gdTrueColorAlpha(r, g, b, a);
+	/* Accumulate each channel */
+	for (i = left; i <= right; i++) {
+		const int left_channel = i - left;
+		r += contrib->ContribRowx.Weightsleft_channel * (double)(gdTrueColorGetRed(p_src_rowi));
+		g += contrib->ContribRowx.Weightsleft_channel * (double)(gdTrueColorGetGreen(p_src_rowi));
+		b += contrib->ContribRowx.Weightsleft_channel * (double)(gdTrueColorGetBlue(p_src_rowi));
+		a += contrib->ContribRowx.Weightsleft_channel * (double)(gdTrueColorGetAlpha(p_src_rowi));
+	}
+	p_dst_rowx = gdTrueColorAlpha(uchar_clamp(r, 0xFF), uchar_clamp(g, 0xFF),
+									uchar_clamp(b, 0xFF),
+									uchar_clamp(a, 0x7F)); /* alpha is 0..127 */
     }
 }
 
@@ -982,7 +1010,7 @@
 {
 	unsigned int y;
 	for (y = 0; y < dst_height; y++) {
-		register unsigned char r = 0, g = 0, b = 0, a = 0;
+		double r = 0, g = 0, b = 0, a = 0;
 		const int iLeft = contrib->ContribRowy.Left;
 		const int iRight = contrib->ContribRowy.Right;
 		int i;
@@ -991,12 +1019,14 @@
 		for (i = iLeft; i <= iRight; i++) {
 			const int pCurSrc = pSrc->tpixelsiuCol;
 			const int i_iLeft = i - iLeft;
-			r += (unsigned char)(contrib->ContribRowy.Weightsi_iLeft * (double)(gdTrueColorGetRed(pCurSrc)));
-			g += (unsigned char)(contrib->ContribRowy.Weightsi_iLeft * (double)(gdTrueColorGetGreen(pCurSrc)));
-			b += (unsigned char)(contrib->ContribRowy.Weightsi_iLeft * (double)(gdTrueColorGetBlue(pCurSrc)));
-			a += (unsigned char)(contrib->ContribRowy.Weightsi_iLeft * (double)(gdTrueColorGetAlpha(pCurSrc)));
+			r += contrib->ContribRowy.Weightsi_iLeft * (double)(gdTrueColorGetRed(pCurSrc));
+			g += contrib->ContribRowy.Weightsi_iLeft * (double)(gdTrueColorGetGreen(pCurSrc));
+			b += contrib->ContribRowy.Weightsi_iLeft * (double)(gdTrueColorGetBlue(pCurSrc));
+			a += contrib->ContribRowy.Weightsi_iLeft * (double)(gdTrueColorGetAlpha(pCurSrc));
 		}
-		pRes->tpixelsyuCol = gdTrueColorAlpha(r, g, b, a);
+		pRes->tpixelsyuCol = gdTrueColorAlpha(uchar_clamp(r, 0xFF), uchar_clamp(g, 0xFF),
+												  uchar_clamp(b, 0xFF),
+												  uchar_clamp(a, 0x7F)); /* alpha is 0..127 */
 	}
 }
 
@@ -1683,13 +1713,6 @@
 	int new_width, new_height;
 	gdRect bbox;
 
-	const gdFixed f_slop_y = f_sin;
-	const gdFixed f_slop_x = f_cos;
-	const gdFixed f_slop = f_slop_x > 0 && f_slop_y > 0 ?
-							(f_slop_x > f_slop_y ? gd_divfx(f_slop_y, f_slop_x) : gd_divfx(f_slop_x, f_slop_y))
-						: 0;
-
-
 	if (bgColor < 0) {
 		return NULL;
 	}
@@ -1715,15 +1738,10 @@
 			long m = gd_fxtoi(f_m);
 			long n = gd_fxtoi(f_n);
 
-			if ((n <= 0) || (m <= 0) || (m >= src_h) || (n >= src_w)) {
+			if (m < -1 || n < -1 || m >= src_h || n >= src_w ) {
 				dst->tpixelsdst_offset_ydst_offset_x++ = bgColor;
-			} else if ((n <= 1) || (m <= 1) || (m >= src_h - 1) || (n >= src_w - 1)) {
-				register int c = getPixelInterpolated(src, n, m, bgColor);
-				c = c | (( gdTrueColorGetAlpha(c) + ((int)(127* gd_fxtof(f_slop)))) << 24);
-
-				dst->tpixelsdst_offset_ydst_offset_x++ = _color_blend(bgColor, c);
 			} else {
-				dst->tpixelsdst_offset_ydst_offset_x++ = getPixelInterpolated(src, n, m, bgColor);
+				dst->tpixelsdst_offset_ydst_offset_x++ = getPixelInterpolated(src, gd_fxtod(f_n), gd_fxtod(f_m), bgColor);
 			}
 		}
 		dst_offset_y++;

php-8.3.7.tar.xz/ext/gd/libgd/gd_topal.c -> php-8.3.21.tar.xz/ext/gd/libgd/gd_topal.c Changed

php-8.3.7.tar.xz/ext/gd/libgd/gd_webp.c -> php-8.3.21.tar.xz/ext/gd/libgd/gd_webp.c Changed

@@ -3,6 +3,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include "gd.h"
+#include "gd_errors.h"
 #include "gdhelpers.h"
 
 #ifdef HAVE_LIBWEBP
@@ -56,7 +57,7 @@
 			if (filedata) {
 				gdFree(filedata);
 			}
-			zend_error(E_ERROR, "WebP decode: realloc failed");
+			gd_error("WebP decode: realloc failed");
 			return NULL;
 		}
 
@@ -67,7 +68,7 @@
 	} while (n>0 && n!=EOF);
 
 	if (WebPGetInfo(filedata,size, &width, &height) == 0) {
-		zend_error(E_ERROR, "gd-webp cannot get webp info");
+		gd_error("gd-webp cannot get webp info");
 		gdFree(filedata);
 		return NULL;
 	}
@@ -79,7 +80,7 @@
 	}
 	argb = WebPDecodeARGB(filedata, size, &width, &height);
 	if (!argb) {
-		zend_error(E_ERROR, "gd-webp cannot allocate temporary buffer");
+		gd_error("gd-webp cannot allocate temporary buffer");
 		gdFree(filedata);
 		gdImageDestroy(im);
 		return NULL;
@@ -113,7 +114,7 @@
 	}
 
 	if (!gdImageTrueColor(im)) {
-		zend_error(E_ERROR, "Palette image not supported by webp");
+		gd_error("Palette image not supported by webp");
 		return;
 	}
 
@@ -159,7 +160,7 @@
 	}
 
 	if (out_size == 0) {
-		zend_error(E_ERROR, "gd-webp encoding failed");
+		gd_error("gd-webp encoding failed");
 		goto freeargb;
 	}
 	gdPutBuf(out, out_size, outfile);

php-8.3.7.tar.xz/ext/gd/libgd/gdft.c -> php-8.3.21.tar.xz/ext/gd/libgd/gdft.c Changed

php-8.3.7.tar.xz/ext/gd/libgd/wbmp.c -> php-8.3.21.tar.xz/ext/gd/libgd/wbmp.c Changed

php-8.3.7.tar.xz/ext/gd/tests/bug22544-mb.phpt -> php-8.3.21.tar.xz/ext/gd/tests/bug22544-mb.phpt Changed

php-8.3.7.tar.xz/ext/gd/tests/bug22544.phpt -> php-8.3.21.tar.xz/ext/gd/tests/bug22544.phpt Changed

php-8.3.7.tar.xz/ext/gd/tests/bug24155.phpt -> php-8.3.21.tar.xz/ext/gd/tests/bug24155.phpt Changed

php-8.3.7.tar.xz/ext/gd/tests/bug27582_1.phpt -> php-8.3.21.tar.xz/ext/gd/tests/bug27582_1.phpt Changed

php-8.3.7.tar.xz/ext/gd/tests/bug39366.phpt -> php-8.3.21.tar.xz/ext/gd/tests/bug39366.phpt Changed

php-8.3.7.tar.xz/ext/gd/tests/bug39780_extern.phpt -> php-8.3.21.tar.xz/ext/gd/tests/bug39780_extern.phpt Changed

php-8.3.7.tar.xz/ext/gd/tests/bug43073.phpt -> php-8.3.21.tar.xz/ext/gd/tests/bug43073.phpt Changed

php-8.3.7.tar.xz/ext/gd/tests/bug43475.phpt -> php-8.3.21.tar.xz/ext/gd/tests/bug43475.phpt Changed

php-8.3.7.tar.xz/ext/gd/tests/bug43828.phpt -> php-8.3.21.tar.xz/ext/gd/tests/bug43828.phpt Changed

php-8.3.7.tar.xz/ext/gd/tests/bug45799.phpt -> php-8.3.21.tar.xz/ext/gd/tests/bug45799.phpt Changed

php-8.3.7.tar.xz/ext/gd/tests/bug47946.phpt -> php-8.3.21.tar.xz/ext/gd/tests/bug47946.phpt Changed

php-8.3.7.tar.xz/ext/gd/tests/bug48732-mb.phpt -> php-8.3.21.tar.xz/ext/gd/tests/bug48732-mb.phpt Changed

php-8.3.7.tar.xz/ext/gd/tests/bug48732.phpt -> php-8.3.21.tar.xz/ext/gd/tests/bug48732.phpt Changed

php-8.3.7.tar.xz/ext/gd/tests/bug50194.phpt -> php-8.3.21.tar.xz/ext/gd/tests/bug50194.phpt Changed

php-8.3.7.tar.xz/ext/gd/tests/bug51498.phpt -> php-8.3.21.tar.xz/ext/gd/tests/bug51498.phpt Changed

php-8.3.7.tar.xz/ext/gd/tests/bug52070.phpt -> php-8.3.21.tar.xz/ext/gd/tests/bug52070.phpt Changed

php-8.3.7.tar.xz/ext/gd/tests/bug53504.phpt -> php-8.3.21.tar.xz/ext/gd/tests/bug53504.phpt Changed

php-8.3.7.tar.xz/ext/gd/tests/bug64641.phpt -> php-8.3.21.tar.xz/ext/gd/tests/bug64641.phpt Changed

php-8.3.7.tar.xz/ext/gd/tests/bug66005.phpt -> php-8.3.21.tar.xz/ext/gd/tests/bug66005.phpt Changed

php-8.3.7.tar.xz/ext/gd/tests/bug72482_2.phpt -> php-8.3.21.tar.xz/ext/gd/tests/bug72482_2.phpt Changed

php-8.3.7.tar.xz/ext/gd/tests/bug72604.phpt -> php-8.3.21.tar.xz/ext/gd/tests/bug72604.phpt Changed

php-8.3.7.tar.xz/ext/gd/tests/bug72913.phpt -> php-8.3.21.tar.xz/ext/gd/tests/bug72913.phpt Changed

php-8.3.7.tar.xz/ext/gd/tests/bug73213.phpt -> php-8.3.21.tar.xz/ext/gd/tests/bug73213.phpt Changed

php-8.3.7.tar.xz/ext/gd/tests/bug73272.phpt -> php-8.3.21.tar.xz/ext/gd/tests/bug73272.phpt Changed

php-8.3.7.tar.xz/ext/gd/tests/bug73549.phpt -> php-8.3.21.tar.xz/ext/gd/tests/bug73549.phpt Changed

php-8.3.7.tar.xz/ext/gd/tests/bug73614.phpt -> php-8.3.21.tar.xz/ext/gd/tests/bug73614.phpt Changed

php-8.3.7.tar.xz/ext/gd/tests/bug74031.phpt -> php-8.3.21.tar.xz/ext/gd/tests/bug74031.phpt Changed

php-8.3.7.tar.xz/ext/gd/tests/bug75124.phpt -> php-8.3.21.tar.xz/ext/gd/tests/bug75124.phpt Changed

php-8.3.7.tar.xz/ext/gd/tests/bug77943.phpt -> php-8.3.21.tar.xz/ext/gd/tests/bug77943.phpt Changed

php-8.3.7.tar.xz/ext/gd/tests/bug79945.phpt -> php-8.3.21.tar.xz/ext/gd/tests/bug79945.phpt Changed

php-8.3.7.tar.xz/ext/gd/tests/func.inc -> php-8.3.21.tar.xz/ext/gd/tests/func.inc Changed

@@ -70,12 +70,8 @@
  * message is printed, and the actual file is stored right beside the temporary
  * .php test file with the extension .out.png, to be able to manually inspect
  * the result.
- *
- * @param string $filename
- * @param resource $actual
- * @return void
  */
-function test_image_equals_file($filename, $actual)
+function test_image_equals_file(string $filename, GdImage $actual): void
 {
     if (!file_exists($filename)) {
         echo "The expected image does not exist.\n";
@@ -85,13 +81,29 @@
     $actual = test_to_truecolor($actual);
     $expected = imagecreatefrompng($filename);
     $expected = test_to_truecolor($expected);
+    test_image_equals_image($expected, $actual, true);
+}
+
+/**
+ * Tests that an in-memory image equals another in-memory image.
+ *
+ * It checks for equal image sizes, and whether any pixels are different.
+ * The textual result is printed, so the EXPECT section should contain the line
+ * "The images are equal."
+ *
+ * If the images are not equal, a diagnostic message is printed.
+ */
+function test_image_equals_image(GdImage $expected, GdImage $actual, bool $save_actual = false): void
+{
     $exp_x = imagesx($expected);
     $exp_y = imagesy($expected);
     $act_x = imagesx($actual);
     $act_y = imagesy($actual);
     if ($exp_x != $act_x || $exp_y != $act_y) {
         echo "The image size differs: expected {$exp_x}x{$exp_y}, got {$act_x}x{$act_y}.\n";
-        save_actual_image($actual);
+        if ($save_actual) {
+            save_actual_image($actual);
+        }
         return;
     }
     $pixels_changed = 0;
@@ -108,7 +120,9 @@
         echo "The images are equal.\n";
     } else {
         echo "The images differ in {$pixels_changed} pixels.\n";
-        save_actual_image($actual);
+        if ($save_actual) {
+            save_actual_image($actual);
+        }
     }
 }

php-8.3.21.tar.xz/ext/gd/tests/gd223.phpt Added

php-8.3.21.tar.xz/ext/gd/tests/gd223.png Added

php-8.3.21.tar.xz/ext/gd/tests/gd276.phpt Added

php-8.3.7.tar.xz/ext/gd/tests/gh10614.phpt -> php-8.3.21.tar.xz/ext/gd/tests/gh10614.phpt Changed

php-8.3.7.tar.xz/ext/gd/tests/gh13082.phpt -> php-8.3.21.tar.xz/ext/gd/tests/gh13082.phpt Changed

php-8.3.21.tar.xz/ext/gd/tests/gh13774.phpt Added

php-8.3.21.tar.xz/ext/gd/tests/gh16232.phpt Added

php-8.3.21.tar.xz/ext/gd/tests/gh16255.phpt Added

php-8.3.21.tar.xz/ext/gd/tests/gh16257.phpt Added

php-8.3.21.tar.xz/ext/gd/tests/gh16260.phpt Added

php-8.3.21.tar.xz/ext/gd/tests/gh16322.phpt Added

php-8.3.21.tar.xz/ext/gd/tests/gh16559.phpt Added

php-8.3.21.tar.xz/ext/gd/tests/gh16771.phpt Added

php-8.3.21.tar.xz/ext/gd/tests/gh17349.phpt Added

php-8.3.21.tar.xz/ext/gd/tests/gh17349.png Added

php-8.3.21.tar.xz/ext/gd/tests/gh17373.phpt Added

php-8.3.21.tar.xz/ext/gd/tests/gh17772.phpt Added

php-8.3.21.tar.xz/ext/gd/tests/gh17984.phpt Added

php-8.3.21.tar.xz/ext/gd/tests/gh18243.phpt Added

@@ -0,0 +1,42 @@
+--TEST--
+GH-18243: imagefttext underflow/overflow on $size
+--EXTENSIONS--
+gd
+--SKIPIF--
+<?php
+if(!function_exists('imagettftext')) die('skip imagettftext() not available');
+?>
+--FILE--
+<?php
+$font = __DIR__.'/Rochester-Regular.otf';
+$im = imagecreatetruecolor(100, 80);
+
+try {
+	imagettftext($im, PHP_INT_MAX, 0, 15, 60, 0, $font, "");
+} catch (\ValueError $e) {
+	echo $e->getMessage(), PHP_EOL;
+}
+
+try {
+	imagettftext($im, PHP_INT_MIN, 0, 15, 60, 0, $font, "");
+} catch (\ValueError $e) {
+	echo $e->getMessage(), PHP_EOL;
+}
+
+try {
+	imagettftext($im, NAN, 0, 15, 60, 0, $font, "");
+} catch (\ValueError $e) {
+	echo $e->getMessage(), PHP_EOL;
+}
+
+try {
+	imagettftext($im, INF, 0, 15, 60, 0, $font, "");
+} catch (\ValueError $e) {
+	echo $e->getMessage();
+}
+?>
+--EXPECTF--
+imagettftext(): Argument #2 ($size) must be between %i and %d
+imagettftext(): Argument #2 ($size) must be between %i and %d
+imagettftext(): Argument #2 ($size) must be finite
+imagettftext(): Argument #2 ($size) must be between %i and %d

php-8.3.7.tar.xz/ext/gd/tests/imagearc_basic.phpt -> php-8.3.21.tar.xz/ext/gd/tests/imagearc_basic.phpt Changed

php-8.3.7.tar.xz/ext/gd/tests/imagearc_variation1.phpt -> php-8.3.21.tar.xz/ext/gd/tests/imagearc_variation1.phpt Changed

php-8.3.7.tar.xz/ext/gd/tests/imagearc_variation2.phpt -> php-8.3.21.tar.xz/ext/gd/tests/imagearc_variation2.phpt Changed

php-8.3.7.tar.xz/ext/gd/tests/imagechar_basic.phpt -> php-8.3.21.tar.xz/ext/gd/tests/imagechar_basic.phpt Changed

php-8.3.7.tar.xz/ext/gd/tests/imagecharup_basic.phpt -> php-8.3.21.tar.xz/ext/gd/tests/imagecharup_basic.phpt Changed

php-8.3.7.tar.xz/ext/gd/tests/imagecolorallocatealpha_basic.phpt -> php-8.3.21.tar.xz/ext/gd/tests/imagecolorallocatealpha_basic.phpt Changed

php-8.3.7.tar.xz/ext/gd/tests/imagecolorset_basic.phpt -> php-8.3.21.tar.xz/ext/gd/tests/imagecolorset_basic.phpt Changed

php-8.3.21.tar.xz/ext/gd/tests/imagecolorset_error1.phpt Added

php-8.3.7.tar.xz/ext/gd/tests/imageconvolution_basic.phpt -> php-8.3.21.tar.xz/ext/gd/tests/imageconvolution_basic.phpt Changed

php-8.3.7.tar.xz/ext/gd/tests/imagecopyresampled_basic.phpt -> php-8.3.21.tar.xz/ext/gd/tests/imagecopyresampled_basic.phpt Changed

php-8.3.7.tar.xz/ext/gd/tests/imagecreatefrombmp_basic.phpt -> php-8.3.21.tar.xz/ext/gd/tests/imagecreatefrombmp_basic.phpt Changed

php-8.3.7.tar.xz/ext/gd/tests/imagecreatefromstring_bmp.phpt -> php-8.3.21.tar.xz/ext/gd/tests/imagecreatefromstring_bmp.phpt Changed

php-8.3.7.tar.xz/ext/gd/tests/imagecreatefromtga_basic.phpt -> php-8.3.21.tar.xz/ext/gd/tests/imagecreatefromtga_basic.phpt Changed

php-8.3.7.tar.xz/ext/gd/tests/imagecreatefromtga_variation.phpt -> php-8.3.21.tar.xz/ext/gd/tests/imagecreatefromtga_variation.phpt Changed

php-8.3.7.tar.xz/ext/gd/tests/imagecreatetruecolor_basic.phpt -> php-8.3.21.tar.xz/ext/gd/tests/imagecreatetruecolor_basic.phpt Changed

php-8.3.7.tar.xz/ext/gd/tests/imagecrop_auto.phpt -> php-8.3.21.tar.xz/ext/gd/tests/imagecrop_auto.phpt Changed

php-8.3.21.tar.xz/ext/gd/tests/imagecrop_overflow.phpt Added

@@ -0,0 +1,45 @@
+--TEST--
+imagecrop() overflows when the combo  x/width or y/height is over INT_MAX or under INT_MIN.
+--EXTENSIONS--
+gd
+--FILE--
+<?php
+$img = imagecreatetruecolor(10, 10);
+
+$arr = "x" => 2147483647, "y" => 2147483647, "width" => 10, "height" => 10;
+
+try {
+	imagecrop($img, $arr);
+} catch (\ValueError $e) {
+	echo $e->getMessage() . PHP_EOL;
+}
+
+$arr = "x" => -2147483648, "y" => 0, "width" => -10, "height" => 10;
+
+try {
+	imagecrop($img, $arr);
+} catch (\ValueError $e) {
+	echo $e->getMessage() . PHP_EOL;
+}
+
+$arr = "x" => 1, "y" => 2147483647, "width" => 10, "height" => 10;
+
+try {
+	imagecrop($img, $arr);
+} catch (\ValueError $e) {
+	echo $e->getMessage() . PHP_EOL;
+}
+
+$arr = "x" => 1, "y" => -2147483648, "width" => 10, "height" => -10;
+
+try {
+	imagecrop($img, $arr);
+} catch (\ValueError $e) {
+	echo $e->getMessage();
+}
+?>
+--EXPECT--
+imagecrop(): Argument #2 ($rectangle) overflow with "x" and "width" keys
+imagecrop(): Argument #2 ($rectangle) underflow with "x" and "width" keys
+imagecrop(): Argument #2 ($rectangle) overflow with "y" and "height" keys
+imagecrop(): Argument #2 ($rectangle) underflow with "y" and "height" keys

php-8.3.7.tar.xz/ext/gd/tests/imagedashedline_basic.phpt -> php-8.3.21.tar.xz/ext/gd/tests/imagedashedline_basic.phpt Changed

php-8.3.7.tar.xz/ext/gd/tests/imageellipse_basic.phpt -> php-8.3.21.tar.xz/ext/gd/tests/imageellipse_basic.phpt Changed

php-8.3.7.tar.xz/ext/gd/tests/imagefilledarc_basic.phpt -> php-8.3.21.tar.xz/ext/gd/tests/imagefilledarc_basic.phpt Changed

php-8.3.7.tar.xz/ext/gd/tests/imagefilledarc_variation1.phpt -> php-8.3.21.tar.xz/ext/gd/tests/imagefilledarc_variation1.phpt Changed

php-8.3.7.tar.xz/ext/gd/tests/imagefilledarc_variation2.phpt -> php-8.3.21.tar.xz/ext/gd/tests/imagefilledarc_variation2.phpt Changed

php-8.3.7.tar.xz/ext/gd/tests/imagefilledellipse_basic.phpt -> php-8.3.21.tar.xz/ext/gd/tests/imagefilledellipse_basic.phpt Changed

php-8.3.7.tar.xz/ext/gd/tests/imagefilledpolygon_basic.phpt -> php-8.3.21.tar.xz/ext/gd/tests/imagefilledpolygon_basic.phpt Changed

php-8.3.7.tar.xz/ext/gd/tests/imagefilltoborder_basic.phpt -> php-8.3.21.tar.xz/ext/gd/tests/imagefilltoborder_basic.phpt Changed

php-8.3.7.tar.xz/ext/gd/tests/imagefilter.phpt -> php-8.3.21.tar.xz/ext/gd/tests/imagefilter.phpt Changed

php-8.3.7.tar.xz/ext/gd/tests/imagegammacorrect_basic.phpt -> php-8.3.21.tar.xz/ext/gd/tests/imagegammacorrect_basic.phpt Changed

php-8.3.7.tar.xz/ext/gd/tests/imagegammacorrect_variation1.phpt -> php-8.3.21.tar.xz/ext/gd/tests/imagegammacorrect_variation1.phpt Changed

php-8.3.7.tar.xz/ext/gd/tests/imagegammacorrect_variation2.phpt -> php-8.3.21.tar.xz/ext/gd/tests/imagegammacorrect_variation2.phpt Changed

php-8.3.7.tar.xz/ext/gd/tests/imageopenpolygon_basic.phpt -> php-8.3.21.tar.xz/ext/gd/tests/imageopenpolygon_basic.phpt Changed

php-8.3.7.tar.xz/ext/gd/tests/imagepolygon_aa.phpt -> php-8.3.21.tar.xz/ext/gd/tests/imagepolygon_aa.phpt Changed

php-8.3.7.tar.xz/ext/gd/tests/imagepolygon_basic.phpt -> php-8.3.21.tar.xz/ext/gd/tests/imagepolygon_basic.phpt Changed

php-8.3.7.tar.xz/ext/gd/tests/imagerectangle_basic.phpt -> php-8.3.21.tar.xz/ext/gd/tests/imagerectangle_basic.phpt Changed

php-8.3.7.tar.xz/ext/gd/tests/imageresolution_png.phpt -> php-8.3.21.tar.xz/ext/gd/tests/imageresolution_png.phpt Changed

php-8.3.7.tar.xz/ext/gd/tests/imagerotate_overflow.phpt -> php-8.3.21.tar.xz/ext/gd/tests/imagerotate_overflow.phpt Changed

php-8.3.7.tar.xz/ext/gd/tests/imagesetbrush_basic.phpt -> php-8.3.21.tar.xz/ext/gd/tests/imagesetbrush_basic.phpt Changed

php-8.3.7.tar.xz/ext/gd/tests/imagesetthickness_basic.phpt -> php-8.3.21.tar.xz/ext/gd/tests/imagesetthickness_basic.phpt Changed

php-8.3.7.tar.xz/ext/gd/tests/imagestring_basic.phpt -> php-8.3.21.tar.xz/ext/gd/tests/imagestring_basic.phpt Changed

php-8.3.7.tar.xz/ext/gd/tests/imagestringup_basic.phpt -> php-8.3.21.tar.xz/ext/gd/tests/imagestringup_basic.phpt Changed

php-8.3.7.tar.xz/ext/gd/tests/imagetruecolortopalette_basic.phpt -> php-8.3.21.tar.xz/ext/gd/tests/imagetruecolortopalette_basic.phpt Changed

php-8.3.7.tar.xz/ext/gd/tests/libgd00086_extern.phpt -> php-8.3.21.tar.xz/ext/gd/tests/libgd00086_extern.phpt Changed

php-8.3.7.tar.xz/ext/gd/tests/test_image_equals_file_palette.phpt -> php-8.3.21.tar.xz/ext/gd/tests/test_image_equals_file_palette.phpt Changed

php-8.3.7.tar.xz/ext/gettext/config.m4 -> php-8.3.21.tar.xz/ext/gettext/config.m4 Changed

php-8.3.7.tar.xz/ext/gettext/gettext.c -> php-8.3.21.tar.xz/ext/gettext/gettext.c Changed

php-8.3.7.tar.xz/ext/gettext/tests/bug53251.phpt -> php-8.3.21.tar.xz/ext/gettext/tests/bug53251.phpt Changed

@@ -8,18 +8,28 @@
 ?>
 --FILE--
 <?php
-var_dump(is_string(bindtextdomain('foo', null)));
+$results = is_string(bindtextdomain('foo', null));
 $dir = bindtextdomain('foo', '.');
-var_dump(bindtextdomain('foo', null) === $dir);
+$results = bindtextdomain('foo', null) === $dir;
+$results = bind_textdomain_codeset('foo', null);
+$results = bind_textdomain_codeset('foo', 'UTF-8');
+$results = bind_textdomain_codeset('foo', null);
 
-var_dump(bind_textdomain_codeset('foo', null));
-var_dump(bind_textdomain_codeset('foo', 'UTF-8'));
-var_dump(bind_textdomain_codeset('foo', null));
+$expected = true, true, false, "UTF-8", "UTF-8";
 
+// musl's bindtextdomain() has no default directory to return when
+// "foo" is unbound, so in the first call, you will get false instead
+// of a string.
+//
+// bind_textdomain_codeset() always returns false on musl
+// because musl only supports UTF-8. For more information:
+//
+//   * https://github.com/php/doc-en/issues/4311,
+//   * https://github.com/php/php-src/issues/17163
+//
+$expected_musl = false, true, false, false, false;
+
+var_dump($results === $expected || $results === $expected_musl);
 ?>
 --EXPECT--
 bool(true)
-bool(true)
-bool(false)
-string(5) "UTF-8"
-string(5) "UTF-8"

php-8.3.7.tar.xz/ext/gettext/tests/gettext_bind_textdomain_codeset-retval.phpt -> php-8.3.21.tar.xz/ext/gettext/tests/gettext_bind_textdomain_codeset-retval.phpt Changed

php-8.3.7.tar.xz/ext/gmp/gmp.c -> php-8.3.21.tar.xz/ext/gmp/gmp.c Changed

@@ -32,6 +32,10 @@
 /* Needed for gmp_random() */
 #include "ext/random/php_random.h"
 
+#ifndef mpz_fits_si_p
+# define mpz_fits_si_p mpz_fits_slong_p
+#endif
+
 #define GMP_ROUND_ZERO      0
 #define GMP_ROUND_PLUSINF   1
 #define GMP_ROUND_MINUSINF  2
@@ -292,7 +296,7 @@
 		return SUCCESS;
 	case _IS_NUMBER:
 		gmpnum = GET_GMP_OBJECT_FROM_OBJ(readobj)->num;
-		if (mpz_fits_slong_p(gmpnum)) {
+		if (mpz_fits_si_p(gmpnum)) {
 			ZVAL_LONG(writeobj, mpz_get_si(gmpnum));
 		} else {
 			ZVAL_DOUBLE(writeobj, mpz_get_d(gmpnum));
@@ -333,8 +337,34 @@
 }
 /* }}} */
 
-static void shift_operator_helper(gmp_binary_ui_op_t op, zval *return_value, zval *op1, zval *op2, uint8_t opcode) {
-	zend_long shift = zval_get_long(op2);
+static zend_result shift_operator_helper(gmp_binary_ui_op_t op, zval *return_value, zval *op1, zval *op2, uint8_t opcode) {
+	zend_long shift = 0;
+
+	if (UNEXPECTED(Z_TYPE_P(op2) != IS_LONG)) {
+		if (UNEXPECTED(!IS_GMP(op2))) {
+			// For PHP 8.3 and up use zend_try_get_long()
+			switch (Z_TYPE_P(op2)) {
+				case IS_DOUBLE:
+					shift = zval_get_long(op2);
+					if (UNEXPECTED(EG(exception))) {
+						return FAILURE;
+					}
+					break;
+				case IS_STRING:
+					if (is_numeric_str_function(Z_STR_P(op2), &shift, NULL) != IS_LONG) {
+						goto valueof_op_failure;
+					}
+					break;
+				default:
+					goto typeof_op_failure;
+			}
+		} else {
+			// TODO We shouldn't cast the GMP object to int here
+			shift = zval_get_long(op2);
+		}
+	} else {
+		shift = Z_LVAL_P(op2);
+	}
 
 	if (shift < 0) {
 		zend_throw_error(
@@ -342,16 +372,54 @@
 			opcode == ZEND_POW ? "Exponent" : "Shift"
 		);
 		ZVAL_UNDEF(return_value);
-		return;
+		return FAILURE;
 	} else {
 		mpz_ptr gmpnum_op, gmpnum_result;
 		gmp_temp_t temp;
 
-		FETCH_GMP_ZVAL(gmpnum_op, op1, temp, 1);
+		/* We do not use FETCH_GMP_ZVAL(...); here as we don't use convert_to_gmp()
+		 * as we want to handle the emitted exception ourself.  */
+		if (UNEXPECTED(!IS_GMP(op1))) {
+			if (UNEXPECTED(Z_TYPE_P(op1) != IS_LONG)) {
+				goto typeof_op_failure;
+			}
+			mpz_init(temp.num);
+			mpz_set_si(temp.num, Z_LVAL_P(op1));
+			temp.is_used = 1;
+			gmpnum_op = temp.num;
+		} else {
+			gmpnum_op = GET_GMP_FROM_ZVAL(op1);
+			temp.is_used = 0;
+		}
 		INIT_GMP_RETVAL(gmpnum_result);
 		op(gmpnum_result, gmpnum_op, (gmp_ulong) shift);
 		FREE_GMP_TEMP(temp);
+		return SUCCESS;
 	}
+
+typeof_op_failure: ;
+	/* Returning FAILURE without throwing an exception would emit the
+	 * Unsupported operand types: GMP OP TypeOfOp2
+	 * However, this leads to the engine trying to interpret the GMP object as an integer
+	 * and doing the operation that way, which is not something we want. */
+	const char *op_sigil;
+	switch (opcode) {
+		case ZEND_POW:
+			op_sigil = "**";
+			break;
+		case ZEND_SL:
+			op_sigil = "<<";
+			break;
+		case ZEND_SR:
+			op_sigil = ">>";
+			break;
+		EMPTY_SWITCH_DEFAULT_CASE();
+	}
+	zend_type_error("Unsupported operand types: %s %s %s", zend_zval_type_name(op1), op_sigil, zend_zval_type_name(op2));
+	return FAILURE;
+valueof_op_failure:
+	zend_value_error("Number is not an integer string");
+	return FAILURE;
 }
 
 #define DO_BINARY_UI_OP_EX(op, uop, check_b_zero) \
@@ -380,18 +448,15 @@
 	case ZEND_MUL:
 		DO_BINARY_UI_OP(mpz_mul);
 	case ZEND_POW:
-		shift_operator_helper(mpz_pow_ui, result, op1, op2, opcode);
-		return SUCCESS;
+		return shift_operator_helper(mpz_pow_ui, result, op1, op2, opcode);
 	case ZEND_DIV:
 		DO_BINARY_UI_OP_EX(mpz_tdiv_q, gmp_mpz_tdiv_q_ui, 1);
 	case ZEND_MOD:
 		DO_BINARY_UI_OP_EX(mpz_mod, gmp_mpz_mod_ui, 1);
 	case ZEND_SL:
-		shift_operator_helper(mpz_mul_2exp, result, op1, op2, opcode);
-		return SUCCESS;
+		return shift_operator_helper(mpz_mul_2exp, result, op1, op2, opcode);
 	case ZEND_SR:
-		shift_operator_helper(mpz_fdiv_q_2exp, result, op1, op2, opcode);
-		return SUCCESS;
+		return shift_operator_helper(mpz_fdiv_q_2exp, result, op1, op2, opcode);
 	case ZEND_BW_OR:
 		DO_BINARY_OP(mpz_ior);
 	case ZEND_BW_AND:
@@ -619,6 +684,13 @@
 	case IS_STRING: {
 		return convert_zstr_to_gmp(gmpnumber, Z_STR_P(val), base, arg_pos);
 	}
+	case IS_NULL:
+		/* Just reject null for operator overloading */
+		if (arg_pos == 0) {
+			zend_type_error("Number must be of type GMP|string|int, %s given", zend_zval_type_name(val));
+			return FAILURE;
+		}
+		ZEND_FALLTHROUGH;
 	default: {
 		zend_long lval;
 		if (!zend_parse_arg_long_slow(val, &lval, arg_pos)) {
@@ -1002,8 +1074,14 @@
 	if (mpz_sgn(gmpnumber) == 0) {
 		RETVAL_EMPTY_STRING();
 	} else {
-		size_t bits_per_word = size * 8;
-		size_t count = (mpz_sizeinbase(gmpnumber, 2) + bits_per_word - 1) / bits_per_word;
+		ZEND_ASSERT(size > 0);
+		size_t size_in_base_2 = mpz_sizeinbase(gmpnumber, 2);
+		if (size > ZEND_LONG_MAX / 4 || size_in_base_2 > SIZE_MAX - (size_t) size * 8 + 1) {
+			zend_argument_value_error(2, "is too large for argument #1 ($num)");
+			RETURN_THROWS();
+		}
+		size_t bits_per_word = (size_t) size * 8;
+		size_t count = (size_in_base_2 + bits_per_word - 1) / bits_per_word;
 
 		zend_string *out_string = zend_string_safe_alloc(count, size, 0, 0);
 		mpz_export(ZSTR_VAL(out_string), NULL, order, size, endian, 0, gmpnumber);
@@ -1776,15 +1854,21 @@
 		RETURN_THROWS();
 	}
 
-	if (bits <= 0) {
-		zend_argument_value_error(1, "must be greater than or equal to 1");
+#if SIZEOF_SIZE_T == 4
+	const zend_long maxbits = ULONG_MAX / GMP_NUMB_BITS;
+#else
+	const zend_long maxbits = INT_MAX;
+#endif
+
+	if (bits <= 0 || bits > maxbits) {
+		zend_argument_value_error(1, "must be between 1 and " ZEND_LONG_FMT, maxbits);
 		RETURN_THROWS();
 	}
 
 	INIT_GMP_RETVAL(gmpnum_result);
 	gmp_init_random();
 
-	mpz_urandomb(gmpnum_result, GMPG(rand_state), bits);
+	mpz_urandomb(gmpnum_result, GMPG(rand_state), (mp_bitcnt_t)bits);
 }
 /* }}} */

php-8.3.21.tar.xz/ext/gmp/tests/gh16411.phpt Added

php-8.3.21.tar.xz/ext/gmp/tests/gh16501.phpt Added

php-8.3.21.tar.xz/ext/gmp/tests/gh16890.phpt Added

php-8.3.7.tar.xz/ext/gmp/tests/gmp_random_bits.phpt -> php-8.3.21.tar.xz/ext/gmp/tests/gmp_random_bits.phpt Changed

php-8.3.21.tar.xz/ext/gmp/tests/overloading_cmp_op_with_null.phpt Added

php-8.3.21.tar.xz/ext/gmp/tests/overloading_with_array.phpt Added

@@ -0,0 +1,84 @@
+--TEST--
+GMP operator overloading does not support 
+--EXTENSIONS--
+gmp
+--FILE--
+<?php
+
+$num = gmp_init(42);
+
+try {
+    var_dump($num + );
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num - );
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num * );
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num / );
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num % );
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num ** );
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num | );
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num & );
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num ^ );
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num << );
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num >> );
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+?>
+--EXPECT--
+TypeError: Number must be of type GMP|string|int, array given
+TypeError: Number must be of type GMP|string|int, array given
+TypeError: Number must be of type GMP|string|int, array given
+TypeError: Number must be of type GMP|string|int, array given
+TypeError: Number must be of type GMP|string|int, array given
+TypeError: Unsupported operand types: GMP ** array
+TypeError: Number must be of type GMP|string|int, array given
+TypeError: Number must be of type GMP|string|int, array given
+TypeError: Number must be of type GMP|string|int, array given
+TypeError: Unsupported operand types: GMP << array
+TypeError: Unsupported operand types: GMP >> array

php-8.3.21.tar.xz/ext/gmp/tests/overloading_with_float.phpt Added

@@ -0,0 +1,117 @@
+--TEST--
+GMP operator overloading does support float with no fractional
+--EXTENSIONS--
+gmp
+--FILE--
+<?php
+
+$num = gmp_init(42);
+
+try {
+    var_dump($num + 42.0);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num - 42.0);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num * 42.0);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num / 42.0);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num % 42.0);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num ** 42.0);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num | 42.0);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num & 42.0);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num ^ 42.0);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num << 42.0);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num >> 42.0);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+?>
+--EXPECT--
+object(GMP)#2 (1) {
+  "num"=>
+  string(2) "84"
+}
+object(GMP)#2 (1) {
+  "num"=>
+  string(1) "0"
+}
+object(GMP)#2 (1) {
+  "num"=>
+  string(4) "1764"
+}
+object(GMP)#2 (1) {
+  "num"=>
+  string(1) "1"
+}
+object(GMP)#2 (1) {
+  "num"=>
+  string(1) "0"
+}
+object(GMP)#2 (1) {
+  "num"=>
+  string(69) "150130937545296572356771972164254457814047970568738777235893533016064"
+}
+object(GMP)#2 (1) {
+  "num"=>
+  string(2) "42"
+}
+object(GMP)#2 (1) {
+  "num"=>
+  string(2) "42"
+}
+object(GMP)#2 (1) {
+  "num"=>
+  string(1) "0"
+}
+object(GMP)#2 (1) {
+  "num"=>
+  string(15) "184717953466368"
+}
+object(GMP)#2 (1) {
+  "num"=>
+  string(1) "0"
+}

php-8.3.21.tar.xz/ext/gmp/tests/overloading_with_float_fractional.phpt Added

@@ -0,0 +1,132 @@
+--TEST--
+GMP operator overloading support for float with fractional is deprecated
+--EXTENSIONS--
+gmp
+--FILE--
+<?php
+
+$num = gmp_init(42);
+
+try {
+    var_dump($num + 42.5);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num - 42.5);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num * 42.5);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num / 42.5);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num % 42.5);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num ** 42.5);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num | 42.5);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num & 42.5);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num ^ 42.5);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num << 42.5);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num >> 42.5);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+?>
+--EXPECTF--
+Deprecated: Implicit conversion from float 42.5 to int loses precision in %s on line %d
+object(GMP)#2 (1) {
+  "num"=>
+  string(2) "84"
+}
+
+Deprecated: Implicit conversion from float 42.5 to int loses precision in %s on line %d
+object(GMP)#2 (1) {
+  "num"=>
+  string(1) "0"
+}
+
+Deprecated: Implicit conversion from float 42.5 to int loses precision in %s on line %d
+object(GMP)#2 (1) {
+  "num"=>
+  string(4) "1764"
+}
+
+Deprecated: Implicit conversion from float 42.5 to int loses precision in %s on line %d
+object(GMP)#2 (1) {
+  "num"=>
+  string(1) "1"
+}
+
+Deprecated: Implicit conversion from float 42.5 to int loses precision in %s on line %d
+object(GMP)#2 (1) {
+  "num"=>
+  string(1) "0"
+}
+object(GMP)#2 (1) {
+  "num"=>
+  string(69) "150130937545296572356771972164254457814047970568738777235893533016064"
+}
+
+Deprecated: Implicit conversion from float 42.5 to int loses precision in %s on line %d
+object(GMP)#2 (1) {
+  "num"=>
+  string(2) "42"
+}
+
+Deprecated: Implicit conversion from float 42.5 to int loses precision in %s on line %d
+object(GMP)#2 (1) {
+  "num"=>
+  string(2) "42"
+}
+
+Deprecated: Implicit conversion from float 42.5 to int loses precision in %s on line %d
+object(GMP)#2 (1) {
+  "num"=>
+  string(1) "0"
+}
+object(GMP)#2 (1) {
+  "num"=>
+  string(15) "184717953466368"
+}
+object(GMP)#2 (1) {
+  "num"=>
+  string(1) "0"
+}

php-8.3.21.tar.xz/ext/gmp/tests/overloading_with_float_string.phpt Added

@@ -0,0 +1,84 @@
+--TEST--
+GMP operator overloading does not support float strings
+--EXTENSIONS--
+gmp
+--FILE--
+<?php
+
+$num = gmp_init(42);
+
+try {
+    var_dump($num + "2.0");
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num - "2.0");
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num * "2.0");
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num / "2.0");
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num % "2.0");
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num ** "2.0");
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num | "2.0");
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num & "2.0");
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num ^ "2.0");
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num << "2.0");
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num >> "2.0");
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+?>
+--EXPECT--
+ValueError: Number is not an integer string
+ValueError: Number is not an integer string
+ValueError: Number is not an integer string
+ValueError: Number is not an integer string
+ValueError: Number is not an integer string
+ValueError: Number is not an integer string
+ValueError: Number is not an integer string
+ValueError: Number is not an integer string
+ValueError: Number is not an integer string
+ValueError: Number is not an integer string
+ValueError: Number is not an integer string

php-8.3.21.tar.xz/ext/gmp/tests/overloading_with_int_string.phpt Added

@@ -0,0 +1,117 @@
+--TEST--
+GMP operator overloading does support int strings
+--EXTENSIONS--
+gmp
+--FILE--
+<?php
+
+$num = gmp_init(42);
+
+try {
+    var_dump($num + "2");
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num - "2");
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num * "2");
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num / "2");
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num % "2");
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num ** "2");
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num | "2");
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num & "2");
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num ^ "2");
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num << "2");
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num >> "2");
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+?>
+--EXPECT--
+object(GMP)#2 (1) {
+  "num"=>
+  string(2) "44"
+}
+object(GMP)#2 (1) {
+  "num"=>
+  string(2) "40"
+}
+object(GMP)#2 (1) {
+  "num"=>
+  string(2) "84"
+}
+object(GMP)#2 (1) {
+  "num"=>
+  string(2) "21"
+}
+object(GMP)#2 (1) {
+  "num"=>
+  string(1) "0"
+}
+object(GMP)#2 (1) {
+  "num"=>
+  string(4) "1764"
+}
+object(GMP)#2 (1) {
+  "num"=>
+  string(2) "42"
+}
+object(GMP)#2 (1) {
+  "num"=>
+  string(1) "2"
+}
+object(GMP)#2 (1) {
+  "num"=>
+  string(2) "40"
+}
+object(GMP)#2 (1) {
+  "num"=>
+  string(3) "168"
+}
+object(GMP)#2 (1) {
+  "num"=>
+  string(2) "10"
+}

php-8.3.21.tar.xz/ext/gmp/tests/overloading_with_non_numeric_string.phpt Added

@@ -0,0 +1,84 @@
+--TEST--
+GMP operator overloading does not support non-numeric strings
+--EXTENSIONS--
+gmp
+--FILE--
+<?php
+
+$num = gmp_init(42);
+
+try {
+    var_dump($num + "string");
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num - "string");
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num * "string");
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num / "string");
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num % "string");
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num ** "string");
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num | "string");
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num & "string");
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num ^ "string");
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num << "string");
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num >> "string");
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+?>
+--EXPECT--
+ValueError: Number is not an integer string
+ValueError: Number is not an integer string
+ValueError: Number is not an integer string
+ValueError: Number is not an integer string
+ValueError: Number is not an integer string
+ValueError: Number is not an integer string
+ValueError: Number is not an integer string
+ValueError: Number is not an integer string
+ValueError: Number is not an integer string
+ValueError: Number is not an integer string
+ValueError: Number is not an integer string

php-8.3.21.tar.xz/ext/gmp/tests/overloading_with_null.phpt Added

@@ -0,0 +1,84 @@
+--TEST--
+GMP operator overloading does not support null
+--EXTENSIONS--
+gmp
+--FILE--
+<?php
+
+$num = gmp_init(42);
+
+try {
+    var_dump($num + null);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num - null);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num * null);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num / null);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num % null);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num ** null);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num | null);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num & null);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num ^ null);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num << null);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num >> null);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+?>
+--EXPECT--
+TypeError: Number must be of type GMP|string|int, null given
+TypeError: Number must be of type GMP|string|int, null given
+TypeError: Number must be of type GMP|string|int, null given
+TypeError: Number must be of type GMP|string|int, null given
+TypeError: Number must be of type GMP|string|int, null given
+TypeError: Unsupported operand types: GMP ** null
+TypeError: Number must be of type GMP|string|int, null given
+TypeError: Number must be of type GMP|string|int, null given
+TypeError: Number must be of type GMP|string|int, null given
+TypeError: Unsupported operand types: GMP << null
+TypeError: Unsupported operand types: GMP >> null

php-8.3.21.tar.xz/ext/gmp/tests/overloading_with_object_not_stringable.phpt Added

@@ -0,0 +1,85 @@
+--TEST--
+GMP operator overloading does not support non-stringable objects
+--EXTENSIONS--
+gmp
+--FILE--
+<?php
+
+$num = gmp_init(42);
+$o = new stdClass();
+
+try {
+    var_dump($num + $o);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num - $o);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num * $o);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num / $o);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num % $o);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num ** $o);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num | $o);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num & $o);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num ^ $o);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num << $o);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num >> $o);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+?>
+--EXPECT--
+TypeError: Number must be of type GMP|string|int, stdClass given
+TypeError: Number must be of type GMP|string|int, stdClass given
+TypeError: Number must be of type GMP|string|int, stdClass given
+TypeError: Number must be of type GMP|string|int, stdClass given
+TypeError: Number must be of type GMP|string|int, stdClass given
+TypeError: Unsupported operand types: GMP ** stdClass
+TypeError: Number must be of type GMP|string|int, stdClass given
+TypeError: Number must be of type GMP|string|int, stdClass given
+TypeError: Number must be of type GMP|string|int, stdClass given
+TypeError: Unsupported operand types: GMP << stdClass
+TypeError: Unsupported operand types: GMP >> stdClass

php-8.3.21.tar.xz/ext/gmp/tests/overloading_with_object_stringable.phpt Added

@@ -0,0 +1,91 @@
+--TEST--
+GMP operator overloading does not support stringable objects
+--EXTENSIONS--
+gmp
+--FILE--
+<?php
+
+class T {
+    public function __toString() {
+        return "42";
+    }
+}
+
+$num = gmp_init(42);
+$o = new T();
+
+try {
+    var_dump($num + $o);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num - $o);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num * $o);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num / $o);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num % $o);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num ** $o);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num | $o);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num & $o);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num ^ $o);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num << $o);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num >> $o);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+?>
+--EXPECTF--
+TypeError: Number must be of type GMP|string|int, T given
+TypeError: Number must be of type GMP|string|int, T given
+TypeError: Number must be of type GMP|string|int, T given
+TypeError: Number must be of type GMP|string|int, T given
+TypeError: Number must be of type GMP|string|int, T given
+TypeError: Unsupported operand types: GMP ** T
+TypeError: Number must be of type GMP|string|int, T given
+TypeError: Number must be of type GMP|string|int, T given
+TypeError: Number must be of type GMP|string|int, T given
+TypeError: Unsupported operand types: GMP << T
+TypeError: Unsupported operand types: GMP >> T

php-8.3.21.tar.xz/ext/gmp/tests/overloading_with_resource.phpt Added

@@ -0,0 +1,84 @@
+--TEST--
+GMP operator overloading does not support resources
+--EXTENSIONS--
+gmp
+--FILE--
+<?php
+
+$num = gmp_init(42);
+
+try {
+    var_dump($num + STDERR);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num - STDERR);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num * STDERR);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num / STDERR);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num % STDERR);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num ** STDERR);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num | STDERR);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num & STDERR);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num ^ STDERR);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num << STDERR);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num >> STDERR);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+?>
+--EXPECT--
+TypeError: Number must be of type GMP|string|int, resource given
+TypeError: Number must be of type GMP|string|int, resource given
+TypeError: Number must be of type GMP|string|int, resource given
+TypeError: Number must be of type GMP|string|int, resource given
+TypeError: Number must be of type GMP|string|int, resource given
+TypeError: Unsupported operand types: GMP ** resource
+TypeError: Number must be of type GMP|string|int, resource given
+TypeError: Number must be of type GMP|string|int, resource given
+TypeError: Number must be of type GMP|string|int, resource given
+TypeError: Unsupported operand types: GMP << resource
+TypeError: Unsupported operand types: GMP >> resource

php-8.3.7.tar.xz/ext/hash/config.m4 -> php-8.3.21.tar.xz/ext/hash/config.m4 Changed

php-8.3.7.tar.xz/ext/hash/hash.c -> php-8.3.21.tar.xz/ext/hash/hash.c Changed

php-8.3.7.tar.xz/ext/hash/hash_xxhash.c -> php-8.3.21.tar.xz/ext/hash/hash_xxhash.c Changed

@@ -174,11 +174,14 @@
 			func_init_seed(&ctx->s, (XXH64_hash_t)Z_LVAL_P(_seed));
 			return;
 		} else if (_secret) {
-			if (!try_convert_to_string(_secret)) {
+			zend_string *secret_string = zval_try_get_string(_secret);
+			if (UNEXPECTED(!secret_string)) {
+				ZEND_ASSERT(EG(exception));
 				return;
 			}
-			size_t len = Z_STRLEN_P(_secret);
+			size_t len = ZSTR_LEN(secret_string);
 			if (len < PHP_XXH3_SECRET_SIZE_MIN) {
+				zend_string_release(secret_string);
 				zend_throw_error(NULL, "%s: Secret length must be >= %u bytes, %zu bytes passed", algo_name, XXH3_SECRET_SIZE_MIN, len);
 				return;
 			}
@@ -186,7 +189,8 @@
 				len = sizeof(ctx->secret);
 				php_error_docref(NULL, E_WARNING, "%s: Secret content exceeding %zu bytes discarded", algo_name, sizeof(ctx->secret));
 			}
-			memcpy((unsigned char *)ctx->secret, Z_STRVAL_P(_secret), len);
+			memcpy((unsigned char *)ctx->secret, ZSTR_VAL(secret_string), len);
+			zend_string_release(secret_string);
 			func_init_secret(&ctx->s, ctx->secret, len);
 			return;
 		}

php-8.3.7.tar.xz/ext/hash/murmur/endianness.h -> php-8.3.21.tar.xz/ext/hash/murmur/endianness.h Changed

@@ -13,14 +13,7 @@
 #  define BSWAP32(u) _byteswap_ulong(u)
 #  define BSWAP64(u) _byteswap_uint64(u)
 #else
-#  ifdef __has_builtin
-#    if __has_builtin(__builtin_bswap32)
-#      define BSWAP32(u) __builtin_bswap32(u)
-#    endif // __has_builtin(__builtin_bswap32)
-#    if __has_builtin(__builtin_bswap64)
-#      define BSWAP64(u) __builtin_bswap64(u)
-#    endif // __has_builtin(__builtin_bswap64)
-#  elif defined(__GNUC__) && ( \
+#  if defined(__GNUC__) && ( \
                     __GNUC__ > 4 || ( \
                       __GNUC__ == 4 && ( \
                         __GNUC_MINOR__ >= 3 \
@@ -29,6 +22,13 @@
                   )
 #    define BSWAP32(u) __builtin_bswap32(u)
 #    define BSWAP64(u) __builtin_bswap64(u)
+#  elif defined(__has_builtin)
+#    if __has_builtin(__builtin_bswap32)
+#      define BSWAP32(u) __builtin_bswap32(u)
+#    endif // __has_builtin(__builtin_bswap32)
+#    if __has_builtin(__builtin_bswap64)
+#      define BSWAP64(u) __builtin_bswap64(u)
+#    endif // __has_builtin(__builtin_bswap64)
 #  endif // __has_builtin
 #endif // defined(_MSC_VER)

php-8.3.21.tar.xz/ext/hash/tests/gh16711_1.phpt Added

@@ -0,0 +1,98 @@
+--TEST--
+GH-16711: Segmentation fault in mhash()
+--SKIPIF--
+<?php if(!function_exists('mhash')) { die('skip mhash compatibility layer not available'); } ?>
+--FILE--
+<?php
+
+$re = new ReflectionExtension("hash");
+var_dump($re->getConstants());
+
+var_dump(mhash(133, 1086849124, 133));
+?>
+--EXPECTF--
+array(40) {
+  "HASH_HMAC"=>
+  int(1)
+  "MHASH_CRC32"=>
+  int(0)
+  "MHASH_MD5"=>
+  int(1)
+  "MHASH_SHA1"=>
+  int(2)
+  "MHASH_HAVAL256"=>
+  int(3)
+  "MHASH_RIPEMD160"=>
+  int(5)
+  "MHASH_TIGER"=>
+  int(7)
+  "MHASH_GOST"=>
+  int(8)
+  "MHASH_CRC32B"=>
+  int(9)
+  "MHASH_HAVAL224"=>
+  int(10)
+  "MHASH_HAVAL192"=>
+  int(11)
+  "MHASH_HAVAL160"=>
+  int(12)
+  "MHASH_HAVAL128"=>
+  int(13)
+  "MHASH_TIGER128"=>
+  int(14)
+  "MHASH_TIGER160"=>
+  int(15)
+  "MHASH_MD4"=>
+  int(16)
+  "MHASH_SHA256"=>
+  int(17)
+  "MHASH_ADLER32"=>
+  int(18)
+  "MHASH_SHA224"=>
+  int(19)
+  "MHASH_SHA512"=>
+  int(20)
+  "MHASH_SHA384"=>
+  int(21)
+  "MHASH_WHIRLPOOL"=>
+  int(22)
+  "MHASH_RIPEMD128"=>
+  int(23)
+  "MHASH_RIPEMD256"=>
+  int(24)
+  "MHASH_RIPEMD320"=>
+  int(25)
+  "MHASH_SNEFRU256"=>
+  int(27)
+  "MHASH_MD2"=>
+  int(28)
+  "MHASH_FNV132"=>
+  int(29)
+  "MHASH_FNV1A32"=>
+  int(30)
+  "MHASH_FNV164"=>
+  int(31)
+  "MHASH_FNV1A64"=>
+  int(32)
+  "MHASH_JOAAT"=>
+  int(33)
+  "MHASH_CRC32C"=>
+  int(34)
+  "MHASH_MURMUR3A"=>
+  int(35)
+  "MHASH_MURMUR3C"=>
+  int(36)
+  "MHASH_MURMUR3F"=>
+  int(37)
+  "MHASH_XXH32"=>
+  int(38)
+  "MHASH_XXH64"=>
+  int(39)
+  "MHASH_XXH3"=>
+  int(40)
+  "MHASH_XXH128"=>
+  int(41)
+}
+
+Deprecated: Function mhash() is deprecated in %s on line %d
+bool(false)

php-8.3.21.tar.xz/ext/hash/tests/gh16711_2.phpt Added

@@ -0,0 +1,98 @@
+--TEST--
+GH-16711: Segmentation fault in mhash()
+--SKIPIF--
+<?php if(!function_exists('mhash')) { die('skip mhash compatibility layer not available'); } ?>
+--FILE--
+<?php
+
+$re = new ReflectionExtension("hash");
+var_dump($re->getConstants());
+
+var_dump(mhash(4, 1086849124, 133));
+?>
+--EXPECTF--
+array(40) {
+  "HASH_HMAC"=>
+  int(1)
+  "MHASH_CRC32"=>
+  int(0)
+  "MHASH_MD5"=>
+  int(1)
+  "MHASH_SHA1"=>
+  int(2)
+  "MHASH_HAVAL256"=>
+  int(3)
+  "MHASH_RIPEMD160"=>
+  int(5)
+  "MHASH_TIGER"=>
+  int(7)
+  "MHASH_GOST"=>
+  int(8)
+  "MHASH_CRC32B"=>
+  int(9)
+  "MHASH_HAVAL224"=>
+  int(10)
+  "MHASH_HAVAL192"=>
+  int(11)
+  "MHASH_HAVAL160"=>
+  int(12)
+  "MHASH_HAVAL128"=>
+  int(13)
+  "MHASH_TIGER128"=>
+  int(14)
+  "MHASH_TIGER160"=>
+  int(15)
+  "MHASH_MD4"=>
+  int(16)
+  "MHASH_SHA256"=>
+  int(17)
+  "MHASH_ADLER32"=>
+  int(18)
+  "MHASH_SHA224"=>
+  int(19)
+  "MHASH_SHA512"=>
+  int(20)
+  "MHASH_SHA384"=>
+  int(21)
+  "MHASH_WHIRLPOOL"=>
+  int(22)
+  "MHASH_RIPEMD128"=>
+  int(23)
+  "MHASH_RIPEMD256"=>
+  int(24)
+  "MHASH_RIPEMD320"=>
+  int(25)
+  "MHASH_SNEFRU256"=>
+  int(27)
+  "MHASH_MD2"=>
+  int(28)
+  "MHASH_FNV132"=>
+  int(29)
+  "MHASH_FNV1A32"=>
+  int(30)
+  "MHASH_FNV164"=>
+  int(31)
+  "MHASH_FNV1A64"=>
+  int(32)
+  "MHASH_JOAAT"=>
+  int(33)
+  "MHASH_CRC32C"=>
+  int(34)
+  "MHASH_MURMUR3A"=>
+  int(35)
+  "MHASH_MURMUR3C"=>
+  int(36)
+  "MHASH_MURMUR3F"=>
+  int(37)
+  "MHASH_XXH32"=>
+  int(38)
+  "MHASH_XXH64"=>
+  int(39)
+  "MHASH_XXH3"=>
+  int(40)
+  "MHASH_XXH128"=>
+  int(41)
+}
+
+Deprecated: Function mhash() is deprecated in %s on line %d
+bool(false)

php-8.3.21.tar.xz/ext/hash/tests/xxh3_convert_secret_to_string.phpt Added

php-8.3.7.tar.xz/ext/iconv/iconv.c -> php-8.3.21.tar.xz/ext/iconv/iconv.c Changed

php-8.3.21.tar.xz/ext/iconv/tests/gh17047.phpt Added

php-8.3.7.tar.xz/ext/iconv/tests/iconv_basic_001.phpt -> php-8.3.21.tar.xz/ext/iconv/tests/iconv_basic_001.phpt Changed

php-8.3.7.tar.xz/ext/intl/breakiterator/breakiterator_iterators.cpp -> php-8.3.21.tar.xz/ext/intl/breakiterator/breakiterator_iterators.cpp Changed

@@ -51,6 +51,7 @@
 static void _breakiterator_destroy_it(zend_object_iterator *iter)
 {
 	zval_ptr_dtor(&iter->data);
+	/* Don't free iter here because it is allocated as an object on its own, not embedded. */
 }
 
 static void _breakiterator_move_forward(zend_object_iterator *iter)
@@ -79,8 +80,18 @@
 	ZVAL_LONG(&zoi_iter->current, (zend_long)pos);
 }
 
+static void zoi_with_current_dtor_self(zend_object_iterator *iter)
+{
+	// Note: wrapping_obj is unused, call to zoi_with_current_dtor() not necessary
+	zoi_with_current *zoi_iter = (zoi_with_current*)iter;
+	ZEND_ASSERT(Z_ISUNDEF(zoi_iter->wrapping_obj));
+
+	// Unlike the other iterators, this iterator is a new, standalone instance
+	zoi_iter->destroy_it(iter);
+}
+
 static const zend_object_iterator_funcs breakiterator_iterator_funcs = {
-	zoi_with_current_dtor,
+	zoi_with_current_dtor_self,
 	zoi_with_current_valid,
 	zoi_with_current_get_current_data,
 	NULL,
@@ -211,7 +222,7 @@
 	_breakiterator_parts_move_forward,
 	_breakiterator_parts_rewind,
 	zoi_with_current_invalidate_current,
-	NULL, /* get_gc */
+	zoi_with_current_get_gc,
 };
 
 void IntlIterator_from_BreakIterator_parts(zval *break_iter_zv,
@@ -231,7 +242,7 @@
 	ii->iterator->index = 0;
 
 	((zoi_with_current*)ii->iterator)->destroy_it = _breakiterator_parts_destroy_it;
-	ZVAL_OBJ(&((zoi_with_current*)ii->iterator)->wrapping_obj, Z_OBJ_P(object));
+	ZVAL_OBJ_COPY(&((zoi_with_current*)ii->iterator)->wrapping_obj, Z_OBJ_P(object));
 	ZVAL_UNDEF(&((zoi_with_current*)ii->iterator)->current);
 
 	((zoi_break_iter_parts*)ii->iterator)->bio = Z_INTL_BREAKITERATOR_P(break_iter_zv);

php-8.3.7.tar.xz/ext/intl/common/common_enum.cpp -> php-8.3.21.tar.xz/ext/intl/common/common_enum.cpp Changed

@@ -35,25 +35,8 @@
 void zoi_with_current_dtor(zend_object_iterator *iter)
 {
 	zoi_with_current *zoiwc = (zoi_with_current*)iter;
-
-	if (!Z_ISUNDEF(zoiwc->wrapping_obj)) {
-		/* we have to copy the pointer because zoiwc->wrapping_obj may be
-		 * changed midway the execution of zval_ptr_dtor() */
-		zval *zwo = &zoiwc->wrapping_obj;
-
-		/* object is still here, we can rely on it to call this again and
-		 * destroy this object */
-		zval_ptr_dtor(zwo);
-	} else {
-		/* Object not here anymore (we've been called by the object free handler)
-		 * Note that the iterator wrapper objects (that also depend on this
-		 * structure) call this function earlier, in the destruction phase, which
-		 * precedes the object free phase. Therefore there's no risk on this
-		 * function being called by the iterator wrapper destructor function and
-		 * not finding the memory of this iterator allocated anymore. */
-		iter->funcs->invalidate_current(iter);
-		zoiwc->destroy_it(iter);
-	}
+	zval_ptr_dtor(&zoiwc->wrapping_obj);
+	ZVAL_UNDEF(&zoiwc->wrapping_obj);
 }
 
 U_CFUNC int zoi_with_current_valid(zend_object_iterator *iter)
@@ -98,6 +81,14 @@
 	} //else we've reached the end of the enum, nothing more is required
 }
 
+HashTable *zoi_with_current_get_gc(zend_object_iterator *iter, zval **table, int *n)
+{
+	zoi_with_current *zoiwc = reinterpret_cast<zoi_with_current*>(iter);
+	*table = &zoiwc->wrapping_obj;
+	*n = 1;
+	return nullptr;
+}
+
 static void string_enum_rewind(zend_object_iterator *iter)
 {
 	zoi_with_current *zoi_iter = (zoi_with_current*)iter;
@@ -134,7 +125,7 @@
 	string_enum_current_move_forward,
 	string_enum_rewind,
 	zoi_with_current_invalidate_current,
-	NULL, /* get_gc */
+	zoi_with_current_get_gc,
 };
 
 U_CFUNC void IntlIterator_from_StringEnumeration(StringEnumeration *se, zval *object)
@@ -148,24 +139,47 @@
 	ii->iterator->funcs = &string_enum_object_iterator_funcs;
 	ii->iterator->index = 0;
 	((zoi_with_current*)ii->iterator)->destroy_it = string_enum_destroy_it;
-	ZVAL_OBJ(&((zoi_with_current*)ii->iterator)->wrapping_obj, Z_OBJ_P(object));
+	ZVAL_OBJ_COPY(&((zoi_with_current*)ii->iterator)->wrapping_obj, Z_OBJ_P(object));
 	ZVAL_UNDEF(&((zoi_with_current*)ii->iterator)->current);
 }
 
-static void IntlIterator_objects_free(zend_object *object)
+static void IntlIterator_objects_dtor(zend_object *object)
 {
 	IntlIterator_object	*ii = php_intl_iterator_fetch_object(object);
-
 	if (ii->iterator) {
-		zval *wrapping_objp = &((zoi_with_current*)ii->iterator)->wrapping_obj;
-		ZVAL_UNDEF(wrapping_objp);
-		zend_iterator_dtor(ii->iterator);
+		((zoi_with_current*)ii->iterator)->destroy_it(ii->iterator);
+		OBJ_RELEASE(&ii->iterator->std);
+		ii->iterator = NULL;
 	}
+}
+
+static void IntlIterator_objects_free(zend_object *object)
+{
+	IntlIterator_object	*ii = php_intl_iterator_fetch_object(object);
+
 	intl_error_reset(INTLITERATOR_ERROR_P(ii));
 
 	zend_object_std_dtor(&ii->zo);
 }
 
+static HashTable *IntlIterator_object_get_gc(zend_object *obj, zval **table, int *n)
+{
+	IntlIterator_object *ii = php_intl_iterator_fetch_object(obj);
+	if (ii->iterator) {
+		zend_get_gc_buffer *gc_buffer = zend_get_gc_buffer_create();
+		zend_get_gc_buffer_add_obj(gc_buffer, &ii->iterator->std);
+		zend_get_gc_buffer_use(gc_buffer, table, n);
+	} else {
+		*table = nullptr;
+		*n = 0;
+	}
+	if (obj->properties == nullptr && obj->ce->default_properties_count == 0) {
+		return nullptr;
+	} else {
+		return zend_std_get_properties(obj);
+	}
+}
+
 static zend_object_iterator *IntlIterator_get_iterator(
 	zend_class_entry *ce, zval *object, int by_ref)
 {
@@ -292,7 +306,9 @@
 		sizeof IntlIterator_handlers);
 	IntlIterator_handlers.offset = XtOffsetOf(IntlIterator_object, zo);
 	IntlIterator_handlers.clone_obj = NULL;
+	IntlIterator_handlers.dtor_obj = IntlIterator_objects_dtor;
 	IntlIterator_handlers.free_obj = IntlIterator_objects_free;
+	IntlIterator_handlers.get_gc = IntlIterator_object_get_gc;
 
 	register_common_symbols(module_number);
 }

php-8.3.7.tar.xz/ext/intl/common/common_enum.h -> php-8.3.21.tar.xz/ext/intl/common/common_enum.h Changed

php-8.3.7.tar.xz/ext/intl/config.m4 -> php-8.3.21.tar.xz/ext/intl/config.m4 Changed

php-8.3.7.tar.xz/ext/intl/config.w32 -> php-8.3.21.tar.xz/ext/intl/config.w32 Changed

@@ -3,7 +3,10 @@
 ARG_ENABLE("intl", "Enable internationalization support", "no");
 
 if (PHP_INTL != "no") {
-	if (CHECK_LIB("icuuc.lib", "intl", PHP_INTL) &&
+	if (CHECK_LIB("icudt.lib", "intl", PHP_INTL) &&
+		CHECK_LIB("icuin.lib", "intl", PHP_INTL) &&
+		CHECK_LIB("icuio.lib", "intl", PHP_INTL) &&
+		CHECK_LIB("icuuc.lib", "intl", PHP_INTL) &&
 					CHECK_HEADER_ADD_INCLUDE("unicode/utf.h", "CFLAGS_INTL")) {
 		// always build as shared - zend_strtod.c/ICU type conflict
 		EXTENSION("intl", "php_intl.c intl_convert.c intl_convertcpp.cpp intl_error.c ", true,
@@ -115,16 +118,9 @@
 				codepointiterator_methods.cpp ",
 				"intl");
 
-		ADD_FLAG("LIBS_INTL", "icudt.lib icuin.lib icuio.lib");
-
 		/* Compat for ICU before 58.1.*/
-		if (CHECK_LIB("icule.lib", "intl", PHP_INTL)) {
-			ADD_FLAG("LIBS_INTL", "icule.lib");
-		}
-		if (CHECK_LIB("iculx.lib", "intl", PHP_INTL)) {
-			ADD_FLAG("LIBS_INTL", "iculx.lib");
-		}
-
+		CHECK_LIB("icule.lib", "intl", PHP_INTL);
+		CHECK_LIB("iculx.lib", "intl", PHP_INTL);
 		ADD_FLAG("CFLAGS_INTL", "/EHsc /DUNISTR_FROM_CHAR_EXPLICIT=explicit /DUNISTR_FROM_STRING_EXPLICIT=explicit /DU_NO_DEFAULT_INCLUDE_UTF_HEADERS=1 /DU_HIDE_OBSOLETE_UTF_OLD_H=1");
 		AC_DEFINE("HAVE_INTL", 1, "Internationalization support enabled");
 	} else {

php-8.3.7.tar.xz/ext/intl/converter/converter.c -> php-8.3.21.tar.xz/ext/intl/converter/converter.c Changed

@@ -381,20 +381,23 @@
 		if (objval) {
 			THROW_UFAILURE(objval, "ucnv_open", error);
 		} else {
-			php_error_docref(NULL, E_WARNING, "Error setting encoding: %d - %s", (int)error, u_errorName(error));
+			char *msg;
+			spprintf(&msg, 0, "Error setting encoding: %d - %s", (int)error, u_errorName(error));
+			intl_error_set(NULL, error, msg, 1);
+			efree(msg);
 		}
-		return 0;
+		return false;
 	}
 
 	if (objval && !php_converter_set_callbacks(objval, cnv)) {
-		return 0;
+		return false;
 	}
 
 	if (*pcnv) {
 		ucnv_close(*pcnv);
 	}
 	*pcnv = cnv;
-	return 1;
+	return true;
 }
 /* }}} */
 
@@ -746,13 +749,13 @@
 			zval *tmpzval;
 
 			if (U_SUCCESS(error) &&
-				(tmpzval = zend_hash_str_find(Z_ARRVAL_P(options), "from_subst", sizeof("from_subst") - 1)) != NULL &&
+				(tmpzval = zend_hash_str_find_deref(Z_ARRVAL_P(options), "from_subst", sizeof("from_subst") - 1)) != NULL &&
 				Z_TYPE_P(tmpzval) == IS_STRING) {
 				error = U_ZERO_ERROR;
 				ucnv_setSubstChars(src_cnv, Z_STRVAL_P(tmpzval), Z_STRLEN_P(tmpzval) & 0x7F, &error);
 			}
 			if (U_SUCCESS(error) &&
-				(tmpzval = zend_hash_str_find(Z_ARRVAL_P(options), "to_subst", sizeof("to_subst") - 1)) != NULL &&
+				(tmpzval = zend_hash_str_find_deref(Z_ARRVAL_P(options), "to_subst", sizeof("to_subst") - 1)) != NULL &&
 				Z_TYPE_P(tmpzval) == IS_STRING) {
 				error = U_ZERO_ERROR;
 				ucnv_setSubstChars(dest_cnv, Z_STRVAL_P(tmpzval), Z_STRLEN_P(tmpzval) & 0x7F, &error);

php-8.3.7.tar.xz/ext/intl/dateformat/dateformat_format.c -> php-8.3.21.tar.xz/ext/intl/dateformat/dateformat_format.c Changed

php-8.3.7.tar.xz/ext/intl/locale/locale_methods.c -> php-8.3.21.tar.xz/ext/intl/locale/locale_methods.c Changed

@@ -814,7 +814,7 @@
 {
 	zval *ele_value;
 
-	if ((ele_value = zend_hash_str_find(hash_arr , key_name, strlen(key_name))) != NULL ) {
+	if ((ele_value = zend_hash_str_find_deref(hash_arr , key_name, strlen(key_name))) != NULL ) {
 		if(Z_TYPE_P(ele_value)!= IS_STRING ){
 			/* element value is not a string */
 			return FAILURE;
@@ -857,7 +857,7 @@
 	int 	isFirstSubtag 	= 0;
 
 	/* Variant/ Extlang/Private etc. */
-	if ((ele_value = zend_hash_str_find( hash_arr , key_name , strlen(key_name))) != NULL) {
+	if ((ele_value = zend_hash_str_find_deref( hash_arr , key_name , strlen(key_name))) != NULL) {
 		if( Z_TYPE_P(ele_value) == IS_STRING ){
 			add_prefix( loc_name , key_name);
 
@@ -869,6 +869,7 @@
 			zval *data;
 
 			ZEND_HASH_FOREACH_VAL(arr, data) {
+				ZVAL_DEREF(data);
 				if(Z_TYPE_P(data) != IS_STRING) {
 					return FAILURE;
 				}
@@ -900,7 +901,7 @@
 		isFirstSubtag = 0;
 		for( i=0 ; i< max_value; i++ ){
 			snprintf( cur_key_name , 30, "%s%d", key_name , i);
-			if ((ele_value = zend_hash_str_find( hash_arr , cur_key_name , strlen(cur_key_name))) != NULL) {
+			if ((ele_value = zend_hash_str_find_deref( hash_arr , cur_key_name , strlen(cur_key_name))) != NULL) {
 				if( Z_TYPE_P(ele_value)!= IS_STRING ){
 					/* variant is not a string */
 					return FAILURE;
@@ -1437,6 +1438,7 @@
 
 	char **cur_arr = ecalloc(zend_hash_num_elements(hash_arr)*2, sizeof(char *));
 	ZEND_HASH_FOREACH_VAL(hash_arr, ele_value) {
+		ZVAL_DEREF(ele_value);
 	/* convert the array to lowercase , also replace hyphens with the underscore and store it in cur_arr */
 		if(Z_TYPE_P(ele_value)!= IS_STRING) {
 			/* element value is not a string */

php-8.3.7.tar.xz/ext/intl/spoofchecker/spoofchecker_main.c -> php-8.3.21.tar.xz/ext/intl/spoofchecker/spoofchecker_main.c Changed

php-8.3.21.tar.xz/ext/intl/tests/IntlIterator_cycle_management.phpt Added

php-8.3.7.tar.xz/ext/intl/tests/bug62070_3.phpt -> php-8.3.21.tar.xz/ext/intl/tests/bug62070_3.phpt Changed

php-8.3.21.tar.xz/ext/intl/tests/bug62070_icu76_1.phpt Added

php-8.3.7.tar.xz/ext/intl/tests/collator_get_sort_key_variant7.phpt -> php-8.3.21.tar.xz/ext/intl/tests/collator_get_sort_key_variant7.phpt Changed

php-8.3.21.tar.xz/ext/intl/tests/collator_get_sort_key_variant_icu76_1.phpt Added

@@ -0,0 +1,97 @@
+--TEST--
+collator_get_sort_key() icu >= 62.1
+--EXTENSIONS--
+intl
+--SKIPIF--
+<?php if (version_compare(INTL_ICU_VERSION, '76.1') < 0) die('skip for ICU >= 76.1'); ?>
+--FILE--
+<?php
+
+/*
+ * Get sort keys using various locales
+ */
+function sort_arrays( $locale, $data )
+{
+    $res_str = '';
+
+    $coll = ut_coll_create( $locale );
+
+    foreach($data as $value) {
+        $res_val = ut_coll_get_sort_key( $coll, $value );
+        $res_str .= "source: ".$value."\n".
+                    "key: ".bin2hex($res_val)."\n";
+    }
+
+    return $res_str;
+}
+
+
+function ut_main()
+{
+    $res_str = '';
+
+    // Regular strings keys
+    $test_params = array(
+        'abc', 'abd', 'aaa',
+        'аа', 'а', 'z',
+        '', '3',
+        'y'  , 'i'  , 'k'
+    );
+
+    $res_str .= sort_arrays( 'en_US', $test_params );
+
+    // Sort a non-ASCII array using ru_RU locale.
+    $test_params = array(
+        'абг', 'абв', 'жжж', 'эюя'
+    );
+
+    $res_str .= sort_arrays( 'ru_RU', $test_params );
+
+    // Sort an array using Lithuanian locale.
+    $res_str .= sort_arrays( 'lt_LT', $test_params );
+
+    return $res_str . "\n";
+}
+
+include_once( 'ut_common.inc' );
+ut_run();
+?>
+--EXPECT--
+source: abc
+key: 2b2d2f01070107
+source: abd
+key: 2b2d3101070107
+source: aaa
+key: 2b2b2b01070107
+source: аа
+key: 62060601060106
+source: а
+key: 620601050105
+source: z
+key: 5d01050105
+source: 
+key: 0101
+source: 3
+key: 1801050105
+source: y
+key: 5b01050105
+source: i
+key: 3b01050105
+source: k
+key: 3f01050105
+source: абг
+key: 28060c1001070107
+source: абв
+key: 28060c0e01070107
+source: жжж
+key: 282c2c2c01070107
+source: эюя
+key: 28eef0f401070107
+source: абг
+key: 62060c1001070107
+source: абв
+key: 62060c0e01070107
+source: жжж
+key: 622c2c2c01070107
+source: эюя
+key: 62eef0f401070107

php-8.3.21.tar.xz/ext/intl/tests/dateformat_format_references.phpt Added

php-8.3.21.tar.xz/ext/intl/tests/gh11874.phpt Added

php-8.3.21.tar.xz/ext/intl/tests/gh17469.phpt Added

@@ -0,0 +1,34 @@
+--TEST--
+GH-17469: UConverter::transcode() raises always E_WARNING regardless of INI settings
+--SKIPIF--
+<?php
+if (PHP_OS_FAMILY === "Windows") die("skip currently unsupported on Windows");
+?>
+--FILE--
+<?php
+ini_set("intl.error_level", E_WARNING);
+ini_set("intl.use_exceptions", 0);
+UConverter::transcode("\x0a", 'nein!!', 'UTF-8');
+UConverter::transcode("\x0a", 'UTF-16BE', 'da!');
+
+ini_set("intl.error_level", 0);
+ini_set("intl.use_exceptions", 1);
+
+try {
+	UConverter::transcode("\x0a", 'nein!!', 'UTF-8');
+} catch (IntlException $e) {
+	echo $e->getMessage(), PHP_EOL;
+}
+try {
+	UConverter::transcode("\x0a", 'UTF-16BE', 'da!');
+} catch (IntlException $e) {
+	echo $e->getMessage(), PHP_EOL;
+}
+?>
+--EXPECTF--
+
+Warning: UConverter::transcode(): Error setting encoding: 4 - U_FILE_ACCESS_ERROR in %s on line %d
+
+Warning: UConverter::transcode(): Error setting encoding: 4 - U_FILE_ACCESS_ERROR in %s on line 5
+Error setting encoding: 4 - U_FILE_ACCESS_ERROR
+Error setting encoding: 4 - U_FILE_ACCESS_ERROR

php-8.3.21.tar.xz/ext/intl/tests/intltz_get_offset_references.phpt Added

php-8.3.21.tar.xz/ext/intl/tests/locale_compose_lookup_references.phpt Added

php-8.3.7.tar.xz/ext/intl/tests/locale_get_display_name8.phpt -> php-8.3.21.tar.xz/ext/intl/tests/locale_get_display_name8.phpt Changed

@@ -112,9 +112,9 @@
 disp_locale=de :  display_name=Slowenisch #Italien, NEDIS_KIRTI#
 -----------------
 locale='sl_IT_nedis-a-kirti-x-xyz'
-disp_locale=en :  display_name=Slovenian #Italy, NEDIS_A_KIRTI_X_XYZ#
-disp_locale=fr :  display_name=slovène #Italie, NEDIS_A_KIRTI_X_XYZ#
-disp_locale=de :  display_name=Slowenisch #Italien, NEDIS_A_KIRTI_X_XYZ#
+disp_locale=en :  display_name=Slovenian #Italy, NEDIS_A_KIRTI(_X_XYZ)?#
+disp_locale=fr :  display_name=slovène #Italie, NEDIS_A_KIRTI(_X_XYZ)?#
+disp_locale=de :  display_name=Slowenisch #Italien, NEDIS_A_KIRTI(_X_XYZ)?#
 -----------------
 locale='sl_IT_rozaj'
 disp_locale=en :  display_name=Slovenian #Italy, Resian#
@@ -317,14 +317,14 @@
 disp_locale=de :  display_name=Englisch #Vereinigte Staaten, attribute=islamcal#
 -----------------
 locale='zh-CN-a-myExt-x-private'
-disp_locale=en :  display_name=Chinese #China, a=myext, Private-Use=private#
-disp_locale=fr :  display_name=chinois #Chine, a=myext, usage privé=private#
-disp_locale=de :  display_name=Chinesisch #China, a=myext, Privatnutzung=private#
+disp_locale=en :  display_name=Chinese #China(, A_MYEXT(_X_PRIVATE)?)?, a=myext, Private-Use=private#
+disp_locale=fr :  display_name=chinois #Chine(, A_MYEXT(_X_PRIVATE)?)?, a=myext, usage privé=private#
+disp_locale=de :  display_name=Chinesisch #China(, A_MYEXT(_X_PRIVATE)?)?, a=myext, Privatnutzung=private#
 -----------------
 locale='en-a-myExt-b-another'
-disp_locale=en :  display_name=English #a=myext, b=another#
-disp_locale=fr :  display_name=anglais #a=myext, b=another#
-disp_locale=de :  display_name=Englisch #a=myext, b=another#
+disp_locale=en :  display_name=English #(A_MYEXT_B_ANOTHER, )?a=myext, b=another#
+disp_locale=fr :  display_name=anglais #(A_MYEXT_B_ANOTHER, )?a=myext, b=another#
+disp_locale=de :  display_name=Englisch #(A_MYEXT_B_ANOTHER, )?a=myext, b=another#
 -----------------
 locale='de-419-DE'
 disp_locale=en :  display_name=German #Latin America, DE#
@@ -337,7 +337,7 @@
 disp_locale=de :  display_name=a #Deutschland#
 -----------------
 locale='ar-a-aaa-b-bbb-a-ccc'
-disp_locale=en :  display_name=Arabic #a=aaa, b=bbb#
-disp_locale=fr :  display_name=arabe #a=aaa, b=bbb#
-disp_locale=de :  display_name=Arabisch #a=aaa, b=bbb#
+disp_locale=en :  display_name=Arabic #(A_AAA_B_BBB_A_CCC, )?a=aaa, b=bbb#
+disp_locale=fr :  display_name=arabe #(A_AAA_B_BBB_A_CCC, )?a=aaa, b=bbb#
+disp_locale=de :  display_name=Arabisch #(A_AAA_B_BBB_A_CCC, )?a=aaa, b=bbb#
 -----------------

php-8.3.7.tar.xz/ext/intl/tests/locale_get_display_variant2.phpt -> php-8.3.21.tar.xz/ext/intl/tests/locale_get_display_variant2.phpt Changed

@@ -248,14 +248,14 @@
 disp_locale=de :  display_variant=
 -----------------
 locale='zh-CN-a-myExt-x-private'
-disp_locale=en :  display_variant=
-disp_locale=fr :  display_variant=
-disp_locale=de :  display_variant=
+disp_locale=en :  display_variant=(A_MYEXT(_X_PRIVATE)?)?
+disp_locale=fr :  display_variant=(A_MYEXT(_X_PRIVATE)?)?
+disp_locale=de :  display_variant=(A_MYEXT(_X_PRIVATE)?)?
 -----------------
 locale='en-a-myExt-b-another'
-disp_locale=en :  display_variant=(MYEXT_B_ANOTHER)?
-disp_locale=fr :  display_variant=(MYEXT_B_ANOTHER)?
-disp_locale=de :  display_variant=(MYEXT_B_ANOTHER)?
+disp_locale=en :  display_variant=((A_)?MYEXT_B_ANOTHER)?
+disp_locale=fr :  display_variant=((A_)?MYEXT_B_ANOTHER)?
+disp_locale=de :  display_variant=((A_)?MYEXT_B_ANOTHER)?
 -----------------
 locale='de-419-DE'
 disp_locale=en :  display_variant=DE
@@ -268,7 +268,7 @@
 disp_locale=de :  display_variant=
 -----------------
 locale='ar-a-aaa-b-bbb-a-ccc'
-disp_locale=en :  display_variant=(AAA_B_BBB_A_CCC)?
-disp_locale=fr :  display_variant=(AAA_B_BBB_A_CCC)?
-disp_locale=de :  display_variant=(AAA_B_BBB_A_CCC)?
+disp_locale=en :  display_variant=((A_)?AAA_B_BBB_A_CCC)?
+disp_locale=fr :  display_variant=((A_)?AAA_B_BBB_A_CCC)?
+disp_locale=de :  display_variant=((A_)?AAA_B_BBB_A_CCC)?
 -----------------

php-8.3.21.tar.xz/ext/intl/tests/spoofchecker_self_references.phpt Added

php-8.3.21.tar.xz/ext/intl/tests/spoofchecker_typed_references.phpt Added

php-8.3.7.tar.xz/ext/intl/tests/timezone_IDforWindowsID_basic2.phpt -> php-8.3.21.tar.xz/ext/intl/tests/timezone_IDforWindowsID_basic2.phpt Changed

php-8.3.21.tar.xz/ext/intl/tests/timezone_IDforWindowsID_basic_icu76_1.phpt Added

@@ -0,0 +1,44 @@
+--TEST--
+IntlTimeZone::getIDForWindowsID basic test
+--EXTENSIONS--
+intl
+--SKIPIF--
+<?php if (version_compare(INTL_ICU_VERSION, '76.1') < 0) die('skip for ICU >= 76.1'); ?>
+--FILE--
+<?php
+
+$tzs = array(
+  'Gnomeregan' => array(NULL),
+  'India Standard Time' => array(NULL),
+  'Pacific Standard Time' => array('001', 'CA', 'MX', 'US', 'ZZ'),
+  'Romance Standard Time' => array('001', 'BE', 'DK', 'ES', 'FR'),
+);
+
+foreach ($tzs as $tz => $regions) {
+  echo "** $tz\n";
+  foreach ($regions as $region) {
+    var_dump(IntlTimeZone::getIDForWindowsID($tz, $region));
+    if (intl_get_error_code() != U_ZERO_ERROR) {
+      echo "Error: ", intl_get_error_message(), "\n";
+    }
+  }
+}
+?>
+--EXPECTF--
+** Gnomeregan
+bool(false)
+Error: %snknown windows timezone: U_ILLEGAL_ARGUMENT_ERROR
+** India Standard Time
+string(13) "Asia/Calcutta"
+** Pacific Standard Time
+string(19) "America/Los_Angeles"
+string(17) "America/Vancouver"
+string(19) "America/Los_Angeles"
+string(19) "America/Los_Angeles"
+string(19) "America/Los_Angeles"
+** Romance Standard Time
+string(12) "Europe/Paris"
+string(15) "Europe/Brussels"
+string(17) "Europe/Copenhagen"
+string(13) "Europe/Madrid"
+string(12) "Europe/Paris"

php-8.3.21.tar.xz/ext/intl/tests/uconverter_transcode_references.phpt Added

php-8.3.7.tar.xz/ext/intl/timezone/timezone_methods.cpp -> php-8.3.21.tar.xz/ext/intl/timezone/timezone_methods.cpp Changed

php-8.3.21.tar.xz/ext/intl/uchar/tests/gh15087.phpt Added

php-8.3.7.tar.xz/ext/intl/uchar/uchar.c -> php-8.3.21.tar.xz/ext/intl/uchar/uchar.c Changed

php-8.3.7.tar.xz/ext/json/json_encoder.c -> php-8.3.21.tar.xz/ext/json/json_encoder.c Changed

php-8.3.7.tar.xz/ext/json/json_parser.tab.c -> php-8.3.21.tar.xz/ext/json/json_parser.tab.c Changed

php-8.3.7.tar.xz/ext/json/json_parser.tab.h -> php-8.3.21.tar.xz/ext/json/json_parser.tab.h Changed

php-8.3.7.tar.xz/ext/json/json_scanner.c -> php-8.3.21.tar.xz/ext/json/json_scanner.c Changed

@@ -1,4 +1,4 @@
-/* Generated by re2c 1.3 */
+/* Generated by re2c 3.0 */
 /*
   +----------------------------------------------------------------------+
   | Copyright (c) The PHP Group                                          |
@@ -166,41 +166,41 @@
 				if (yych <= '"') {
 					if (yych <= '\f') {
 						if (yych <= 0x08) {
-							if (yych >= 0x01) goto yy4;
+							if (yych >= 0x01) goto yy1;
 						} else {
-							if (yych <= '\t') goto yy6;
-							if (yych <= '\n') goto yy9;
-							goto yy4;
+							if (yych <= '\t') goto yy2;
+							if (yych <= '\n') goto yy5;
+							goto yy1;
 						}
 					} else {
 						if (yych <= 0x1F) {
-							if (yych <= '\r') goto yy10;
-							goto yy4;
+							if (yych <= '\r') goto yy6;
+							goto yy1;
 						} else {
-							if (yych <= ' ') goto yy6;
-							if (yych <= '!') goto yy11;
-							goto yy13;
+							if (yych <= ' ') goto yy2;
+							if (yych <= '!') goto yy7;
+							goto yy9;
 						}
 					}
 				} else {
 					if (yych <= '0') {
 						if (yych <= ',') {
-							if (yych <= '+') goto yy11;
-							goto yy15;
+							if (yych <= '+') goto yy7;
+							goto yy10;
 						} else {
-							if (yych <= '-') goto yy17;
-							if (yych <= '/') goto yy11;
-							goto yy18;
+							if (yych <= '-') goto yy11;
+							if (yych <= '/') goto yy7;
+							goto yy12;
 						}
 					} else {
 						if (yych <= 'Z') {
-							if (yych <= '9') goto yy20;
-							if (yych <= ':') goto yy22;
-							goto yy11;
+							if (yych <= '9') goto yy14;
+							if (yych <= ':') goto yy15;
+							goto yy7;
 						} else {
-							if (yych <= '') goto yy24;
-							if (yych <= '\\') goto yy11;
-							goto yy26;
+							if (yych <= '') goto yy16;
+							if (yych <= '\\') goto yy7;
+							goto yy17;
 						}
 					}
 				}
@@ -208,41 +208,41 @@
 				if (yych <= '}') {
 					if (yych <= 's') {
 						if (yych <= 'f') {
-							if (yych <= 'e') goto yy11;
-							goto yy28;
+							if (yych <= 'e') goto yy7;
+							goto yy18;
 						} else {
-							if (yych == 'n') goto yy29;
-							goto yy11;
+							if (yych == 'n') goto yy19;
+							goto yy7;
 						}
 					} else {
 						if (yych <= 'z') {
-							if (yych <= 't') goto yy30;
-							goto yy11;
+							if (yych <= 't') goto yy20;
+							goto yy7;
 						} else {
-							if (yych <= '{') goto yy31;
-							if (yych <= '|') goto yy11;
-							goto yy33;
+							if (yych <= '{') goto yy21;
+							if (yych <= '|') goto yy7;
+							goto yy22;
 						}
 					}
 				} else {
 					if (yych <= 0xEC) {
 						if (yych <= 0xC1) {
-							if (yych <= 0x7F) goto yy11;
-							goto yy35;
+							if (yych <= 0x7F) goto yy7;
+							goto yy23;
 						} else {
-							if (yych <= 0xDF) goto yy37;
-							if (yych <= 0xE0) goto yy38;
-							goto yy39;
+							if (yych <= 0xDF) goto yy25;
+							if (yych <= 0xE0) goto yy26;
+							goto yy27;
 						}
 					} else {
 						if (yych <= 0xF0) {
-							if (yych <= 0xED) goto yy40;
-							if (yych <= 0xEF) goto yy39;
-							goto yy41;
+							if (yych <= 0xED) goto yy28;
+							if (yych <= 0xEF) goto yy27;
+							goto yy29;
 						} else {
-							if (yych <= 0xF3) goto yy42;
-							if (yych <= 0xF4) goto yy43;
-							goto yy35;
+							if (yych <= 0xF3) goto yy30;
+							if (yych <= 0xF4) goto yy31;
+							goto yy23;
 						}
 					}
 				}
@@ -256,35 +256,35 @@
 			return PHP_JSON_T_ERROR;
 		}
 	}
-yy4:
+yy1:
 			++YYCURSOR;
 			{
 		s->errcode = PHP_JSON_ERROR_CTRL_CHAR;
 		return PHP_JSON_T_ERROR;
 	}
-yy6:
+yy2:
 			yych = *++YYCURSOR;
-yy7:
+yy3:
 			if (yybm0+yych & 64) {
-				goto yy6;
+				goto yy2;
 			}
-yy8:
+yy4:
 			{ goto std; }
-yy9:
+yy5:
 			++YYCURSOR;
-			goto yy8;
-yy10:
+			goto yy4;
+yy6:
 			yych = *++YYCURSOR;
-			if (yych == '\n') goto yy9;
-			goto yy7;
-yy11:
+			if (yych == '\n') goto yy5;
+			goto yy3;
+yy7:
 			++YYCURSOR;
-yy12:
+yy8:
 			{
 		s->errcode = PHP_JSON_ERROR_SYNTAX;
 		return PHP_JSON_T_ERROR;
 	}
-yy13:
+yy9:
 			++YYCURSOR;
 			{
 		s->str_start = s->cursor;
@@ -293,25 +293,25 @@
 		s->utf8_invalid_count = 0;
 		PHP_JSON_CONDITION_SET_AND_GOTO(STR_P1);
 	}
-yy15:
+yy10:
 			++YYCURSOR;
 			{ return ','; }
-yy17:
+yy11:
 			yych = *++YYCURSOR;
-			if (yych <= '/') goto yy12;
-			if (yych <= '0') goto yy18;
-			if (yych <= '9') goto yy20;
-			goto yy12;
-yy18:
+			if (yych <= '/') goto yy8;
+			if (yych <= '0') goto yy12;
+			if (yych <= '9') goto yy14;
+			goto yy8;
+yy12:
 			yyaccept = 0;
 			yych = *(YYMARKER = ++YYCURSOR);
 			if (yych <= 'D') {
-				if (yych == '.') goto yy44;
+				if (yych == '.') goto yy32;
 			} else {
-				if (yych <= 'E') goto yy46;
-				if (yych == 'e') goto yy46;
+				if (yych <= 'E') goto yy34;
+				if (yych == 'e') goto yy34;
 			}
-yy19:
+yy13:
 			{
 		bool bigint = 0, negative = s->token0 == '-';
 		size_t digits = (size_t) (s->cursor - s->token - negative);
@@ -336,203 +336,203 @@
 			return PHP_JSON_T_DOUBLE;
 		}
 	}
-yy20:
+yy14:
 			yyaccept = 0;
 			yych = *(YYMARKER = ++YYCURSOR);
 			if (yybm0+yych & 128) {
-				goto yy20;
+				goto yy14;
 			}
 			if (yych <= 'D') {
-				if (yych == '.') goto yy44;
-				goto yy19;
+				if (yych == '.') goto yy32;
+				goto yy13;
 			} else {
-				if (yych <= 'E') goto yy46;
-				if (yych == 'e') goto yy46;
-				goto yy19;
+				if (yych <= 'E') goto yy34;
+				if (yych == 'e') goto yy34;
+				goto yy13;
 			}
-yy22:
+yy15:
 			++YYCURSOR;
 			{ return ':'; }
-yy24:
+yy16:
 			++YYCURSOR;
 			{ return ''; }
-yy26:
+yy17:
 			++YYCURSOR;
 			{ return ''; }
-yy28:
+yy18:
 			yyaccept = 1;
 			yych = *(YYMARKER = ++YYCURSOR);
-			if (yych == 'a') goto yy47;
-			goto yy12;
-yy29:
+			if (yych == 'a') goto yy35;
+			goto yy8;
+yy19:
 			yyaccept = 1;
 			yych = *(YYMARKER = ++YYCURSOR);
-			if (yych == 'u') goto yy48;
-			goto yy12;
-yy30:
+			if (yych == 'u') goto yy36;
+			goto yy8;
+yy20:
 			yyaccept = 1;
 			yych = *(YYMARKER = ++YYCURSOR);
-			if (yych == 'r') goto yy49;
-			goto yy12;
-yy31:
+			if (yych == 'r') goto yy37;
+			goto yy8;
+yy21:
 			++YYCURSOR;
 			{ return '{'; }
-yy33:
+yy22:
 			++YYCURSOR;
 			{ return '}'; }
-yy35:
+yy23:
 			++YYCURSOR;
-yy36:
+yy24:
 			{
 		s->errcode = PHP_JSON_ERROR_UTF8;
 		return PHP_JSON_T_ERROR;
 	}
-yy37:
+yy25:
 			yych = *++YYCURSOR;
-			if (yych <= 0x7F) goto yy36;
-			if (yych <= 0xBF) goto yy11;
-			goto yy36;
-yy38:
+			if (yych <= 0x7F) goto yy24;
+			if (yych <= 0xBF) goto yy7;
+			goto yy24;
+yy26:
 			yyaccept = 2;
 			yych = *(YYMARKER = ++YYCURSOR);
-			if (yych <= 0x9F) goto yy36;
-			if (yych <= 0xBF) goto yy50;
-			goto yy36;
-yy39:
+			if (yych <= 0x9F) goto yy24;
+			if (yych <= 0xBF) goto yy38;
+			goto yy24;
+yy27:
 			yyaccept = 2;
 			yych = *(YYMARKER = ++YYCURSOR);
-			if (yych <= 0x7F) goto yy36;
-			if (yych <= 0xBF) goto yy50;
-			goto yy36;
-yy40:
+			if (yych <= 0x7F) goto yy24;
+			if (yych <= 0xBF) goto yy38;
+			goto yy24;
+yy28:
 			yyaccept = 2;
 			yych = *(YYMARKER = ++YYCURSOR);
-			if (yych <= 0x7F) goto yy36;
-			if (yych <= 0x9F) goto yy50;
-			goto yy36;
-yy41:
+			if (yych <= 0x7F) goto yy24;
+			if (yych <= 0x9F) goto yy38;
+			goto yy24;
+yy29:
 			yyaccept = 2;
 			yych = *(YYMARKER = ++YYCURSOR);
-			if (yych <= 0x8F) goto yy36;
-			if (yych <= 0xBF) goto yy51;
-			goto yy36;
-yy42:
+			if (yych <= 0x8F) goto yy24;
+			if (yych <= 0xBF) goto yy39;
+			goto yy24;
+yy30:
 			yyaccept = 2;
 			yych = *(YYMARKER = ++YYCURSOR);
-			if (yych <= 0x7F) goto yy36;
-			if (yych <= 0xBF) goto yy51;
-			goto yy36;
-yy43:
+			if (yych <= 0x7F) goto yy24;
+			if (yych <= 0xBF) goto yy39;
+			goto yy24;
+yy31:
 			yyaccept = 2;
 			yych = *(YYMARKER = ++YYCURSOR);
-			if (yych <= 0x7F) goto yy36;
-			if (yych <= 0x8F) goto yy51;
-			goto yy36;
-yy44:
+			if (yych <= 0x7F) goto yy24;
+			if (yych <= 0x8F) goto yy39;
+			goto yy24;
+yy32:
 			yych = *++YYCURSOR;
-			if (yych <= '/') goto yy45;
-			if (yych <= '9') goto yy52;
-yy45:
+			if (yych <= '/') goto yy33;
+			if (yych <= '9') goto yy40;
+yy33:
 			YYCURSOR = YYMARKER;
 			if (yyaccept <= 1) {
 				if (yyaccept == 0) {
-					goto yy19;
+					goto yy13;
 				} else {
-					goto yy12;
+					goto yy8;
 				}
 			} else {
 				if (yyaccept == 2) {
-					goto yy36;
+					goto yy24;
 				} else {
-					goto yy54;
+					goto yy41;
 				}
 			}
-yy46:
+yy34:
 			yych = *++YYCURSOR;
 			if (yych <= ',') {
-				if (yych == '+') goto yy55;
-				goto yy45;
+				if (yych == '+') goto yy42;
+				goto yy33;
 			} else {
-				if (yych <= '-') goto yy55;
-				if (yych <= '/') goto yy45;
-				if (yych <= '9') goto yy56;
-				goto yy45;
+				if (yych <= '-') goto yy42;
+				if (yych <= '/') goto yy33;
+				if (yych <= '9') goto yy43;
+				goto yy33;
 			}
-yy47:
+yy35:
 			yych = *++YYCURSOR;
-			if (yych == 'l') goto yy58;
-			goto yy45;
-yy48:
+			if (yych == 'l') goto yy44;
+			goto yy33;
+yy36:
 			yych = *++YYCURSOR;
-			if (yych == 'l') goto yy59;
-			goto yy45;
-yy49:
+			if (yych == 'l') goto yy45;
+			goto yy33;
+yy37:
 			yych = *++YYCURSOR;
-			if (yych == 'u') goto yy60;
-			goto yy45;
-yy50:
+			if (yych == 'u') goto yy46;
+			goto yy33;
+yy38:
 			yych = *++YYCURSOR;
-			if (yych <= 0x7F) goto yy45;
-			if (yych <= 0xBF) goto yy11;
-			goto yy45;
-yy51:
+			if (yych <= 0x7F) goto yy33;
+			if (yych <= 0xBF) goto yy7;
+			goto yy33;
+yy39:
 			yych = *++YYCURSOR;
-			if (yych <= 0x7F) goto yy45;
-			if (yych <= 0xBF) goto yy50;
-			goto yy45;
-yy52:
+			if (yych <= 0x7F) goto yy33;
+			if (yych <= 0xBF) goto yy38;
+			goto yy33;
+yy40:
 			yyaccept = 3;
 			yych = *(YYMARKER = ++YYCURSOR);
 			if (yych <= 'D') {
-				if (yych <= '/') goto yy54;
-				if (yych <= '9') goto yy52;
+				if (yych <= '/') goto yy41;
+				if (yych <= '9') goto yy40;
 			} else {
-				if (yych <= 'E') goto yy46;
-				if (yych == 'e') goto yy46;
+				if (yych <= 'E') goto yy34;
+				if (yych == 'e') goto yy34;
 			}
-yy54:
+yy41:
 			{
 		ZVAL_DOUBLE(&s->value, zend_strtod((char *) s->token, NULL));
 		return PHP_JSON_T_DOUBLE;
 	}
-yy55:
+yy42:
 			yych = *++YYCURSOR;
-			if (yych <= '/') goto yy45;
-			if (yych >= ':') goto yy45;
-yy56:
+			if (yych <= '/') goto yy33;
+			if (yych >= ':') goto yy33;
+yy43:
 			yych = *++YYCURSOR;
-			if (yych <= '/') goto yy54;
-			if (yych <= '9') goto yy56;
-			goto yy54;
-yy58:
+			if (yych <= '/') goto yy41;
+			if (yych <= '9') goto yy43;
+			goto yy41;
+yy44:
 			yych = *++YYCURSOR;
-			if (yych == 's') goto yy61;
-			goto yy45;
-yy59:
+			if (yych == 's') goto yy47;
+			goto yy33;
+yy45:
 			yych = *++YYCURSOR;
-			if (yych == 'l') goto yy62;
-			goto yy45;
-yy60:
+			if (yych == 'l') goto yy48;
+			goto yy33;
+yy46:
 			yych = *++YYCURSOR;
-			if (yych == 'e') goto yy64;
-			goto yy45;
-yy61:
+			if (yych == 'e') goto yy49;
+			goto yy33;
+yy47:
 			yych = *++YYCURSOR;
-			if (yych == 'e') goto yy66;
-			goto yy45;
-yy62:
+			if (yych == 'e') goto yy50;
+			goto yy33;
+yy48:
 			++YYCURSOR;
 			{
 		ZVAL_NULL(&s->value);
 		return PHP_JSON_T_NUL;
 	}
-yy64:
+yy49:
 			++YYCURSOR;
 			{
 		ZVAL_TRUE(&s->value);
 		return PHP_JSON_T_TRUE;
 	}
-yy66:
+yy50:
 			++YYCURSOR;
 			{
 		ZVAL_FALSE(&s->value);
@@ -544,37 +544,37 @@
 		yych = *YYCURSOR;
 		if (yych <= 0xDF) {
 			if (yych <= '') {
-				if (yych <= 0x1F) goto yy70;
-				if (yych == '"') goto yy74;
-				goto yy72;
+				if (yych <= 0x1F) goto yy52;
+				if (yych == '"') goto yy54;
+				goto yy53;
 			} else {
-				if (yych <= '\\') goto yy76;
-				if (yych <= 0x7F) goto yy72;
-				if (yych <= 0xC1) goto yy78;
-				goto yy80;
+				if (yych <= '\\') goto yy55;
+				if (yych <= 0x7F) goto yy53;
+				if (yych <= 0xC1) goto yy57;
+				goto yy59;
 			}
 		} else {
 			if (yych <= 0xEF) {
-				if (yych <= 0xE0) goto yy81;
-				if (yych == 0xED) goto yy83;
-				goto yy82;
+				if (yych <= 0xE0) goto yy60;
+				if (yych == 0xED) goto yy62;
+				goto yy61;
 			} else {
-				if (yych <= 0xF0) goto yy84;
-				if (yych <= 0xF3) goto yy85;
-				if (yych <= 0xF4) goto yy86;
-				goto yy78;
+				if (yych <= 0xF0) goto yy63;
+				if (yych <= 0xF3) goto yy64;
+				if (yych <= 0xF4) goto yy65;
+				goto yy57;
 			}
 		}
-yy70:
+yy52:
 		++YYCURSOR;
 		{
 		s->errcode = PHP_JSON_ERROR_CTRL_CHAR;
 		return PHP_JSON_T_ERROR;
 	}
-yy72:
+yy53:
 		++YYCURSOR;
 		{ PHP_JSON_CONDITION_GOTO(STR_P1); }
-yy74:
+yy54:
 		++YYCURSOR;
 		{
 		zend_string *str;
@@ -597,41 +597,41 @@
 			return PHP_JSON_T_STRING;
 		}
 	}
-yy76:
+yy55:
 		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yych <= 'e') {
 			if (yych <= '/') {
-				if (yych == '"') goto yy87;
-				if (yych >= '/') goto yy87;
+				if (yych == '"') goto yy66;
+				if (yych >= '/') goto yy66;
 			} else {
 				if (yych <= '\\') {
-					if (yych >= '\\') goto yy87;
+					if (yych >= '\\') goto yy66;
 				} else {
-					if (yych == 'b') goto yy87;
+					if (yych == 'b') goto yy66;
 				}
 			}
 		} else {
 			if (yych <= 'q') {
-				if (yych <= 'f') goto yy87;
-				if (yych == 'n') goto yy87;
+				if (yych <= 'f') goto yy66;
+				if (yych == 'n') goto yy66;
 			} else {
 				if (yych <= 's') {
-					if (yych <= 'r') goto yy87;
+					if (yych <= 'r') goto yy66;
 				} else {
-					if (yych <= 't') goto yy87;
-					if (yych <= 'u') goto yy89;
+					if (yych <= 't') goto yy66;
+					if (yych <= 'u') goto yy67;
 				}
 			}
 		}
-yy77:
+yy56:
 		{
 		s->errcode = PHP_JSON_ERROR_SYNTAX;
 		return PHP_JSON_T_ERROR;
 	}
-yy78:
+yy57:
 		++YYCURSOR;
-yy79:
+yy58:
 		{
 		if (s->options & (PHP_JSON_INVALID_UTF8_IGNORE | PHP_JSON_INVALID_UTF8_SUBSTITUTE)) {
 			if (s->options & PHP_JSON_INVALID_UTF8_SUBSTITUTE) {
@@ -649,329 +649,329 @@
 		s->errcode = PHP_JSON_ERROR_UTF8;
 		return PHP_JSON_T_ERROR;
 	}
-yy80:
+yy59:
 		yych = *++YYCURSOR;
-		if (yych <= 0x7F) goto yy79;
-		if (yych <= 0xBF) goto yy72;
-		goto yy79;
-yy81:
+		if (yych <= 0x7F) goto yy58;
+		if (yych <= 0xBF) goto yy53;
+		goto yy58;
+yy60:
 		yyaccept = 1;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych <= 0x9F) goto yy79;
-		if (yych <= 0xBF) goto yy91;
-		goto yy79;
-yy82:
+		if (yych <= 0x9F) goto yy58;
+		if (yych <= 0xBF) goto yy69;
+		goto yy58;
+yy61:
 		yyaccept = 1;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych <= 0x7F) goto yy79;
-		if (yych <= 0xBF) goto yy91;
-		goto yy79;
-yy83:
+		if (yych <= 0x7F) goto yy58;
+		if (yych <= 0xBF) goto yy69;
+		goto yy58;
+yy62:
 		yyaccept = 1;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych <= 0x7F) goto yy79;
-		if (yych <= 0x9F) goto yy91;
-		goto yy79;
-yy84:
+		if (yych <= 0x7F) goto yy58;
+		if (yych <= 0x9F) goto yy69;
+		goto yy58;
+yy63:
 		yyaccept = 1;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych <= 0x8F) goto yy79;
-		if (yych <= 0xBF) goto yy92;
-		goto yy79;
-yy85:
+		if (yych <= 0x8F) goto yy58;
+		if (yych <= 0xBF) goto yy70;
+		goto yy58;
+yy64:
 		yyaccept = 1;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych <= 0x7F) goto yy79;
-		if (yych <= 0xBF) goto yy92;
-		goto yy79;
-yy86:
+		if (yych <= 0x7F) goto yy58;
+		if (yych <= 0xBF) goto yy70;
+		goto yy58;
+yy65:
 		yyaccept = 1;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych <= 0x7F) goto yy79;
-		if (yych <= 0x8F) goto yy92;
-		goto yy79;
-yy87:
+		if (yych <= 0x7F) goto yy58;
+		if (yych <= 0x8F) goto yy70;
+		goto yy58;
+yy66:
 		++YYCURSOR;
 		{
 		s->str_esc++;
 		PHP_JSON_CONDITION_GOTO(STR_P1);
 	}
-yy89:
+yy67:
 		yych = *++YYCURSOR;
 		if (yych <= 'D') {
 			if (yych <= '9') {
-				if (yych <= '/') goto yy90;
-				if (yych <= '0') goto yy93;
-				goto yy94;
+				if (yych <= '/') goto yy68;
+				if (yych <= '0') goto yy71;
+				goto yy72;
 			} else {
-				if (yych <= '@') goto yy90;
-				if (yych <= 'C') goto yy94;
-				goto yy95;
+				if (yych <= '@') goto yy68;
+				if (yych <= 'C') goto yy72;
+				goto yy73;
 			}
 		} else {
 			if (yych <= 'c') {
-				if (yych <= 'F') goto yy94;
-				if (yych >= 'a') goto yy94;
+				if (yych <= 'F') goto yy72;
+				if (yych >= 'a') goto yy72;
 			} else {
-				if (yych <= 'd') goto yy95;
-				if (yych <= 'f') goto yy94;
+				if (yych <= 'd') goto yy73;
+				if (yych <= 'f') goto yy72;
 			}
 		}
-yy90:
+yy68:
 		YYCURSOR = YYMARKER;
 		if (yyaccept <= 1) {
 			if (yyaccept == 0) {
-				goto yy77;
+				goto yy56;
 			} else {
-				goto yy79;
+				goto yy58;
 			}
 		} else {
-			goto yy113;
+			goto yy88;
 		}
-yy91:
+yy69:
 		yych = *++YYCURSOR;
-		if (yych <= 0x7F) goto yy90;
-		if (yych <= 0xBF) goto yy72;
-		goto yy90;
-yy92:
+		if (yych <= 0x7F) goto yy68;
+		if (yych <= 0xBF) goto yy53;
+		goto yy68;
+yy70:
 		yych = *++YYCURSOR;
-		if (yych <= 0x7F) goto yy90;
-		if (yych <= 0xBF) goto yy91;
-		goto yy90;
-yy93:
+		if (yych <= 0x7F) goto yy68;
+		if (yych <= 0xBF) goto yy69;
+		goto yy68;
+yy71:
 		yych = *++YYCURSOR;
 		if (yych <= '9') {
-			if (yych <= '/') goto yy90;
-			if (yych <= '0') goto yy96;
-			if (yych <= '7') goto yy97;
-			goto yy98;
+			if (yych <= '/') goto yy68;
+			if (yych <= '0') goto yy74;
+			if (yych <= '7') goto yy75;
+			goto yy76;
 		} else {
 			if (yych <= 'F') {
-				if (yych <= '@') goto yy90;
-				goto yy98;
+				if (yych <= '@') goto yy68;
+				goto yy76;
 			} else {
-				if (yych <= '`') goto yy90;
-				if (yych <= 'f') goto yy98;
-				goto yy90;
+				if (yych <= '`') goto yy68;
+				if (yych <= 'f') goto yy76;
+				goto yy68;
 			}
 		}
-yy94:
+yy72:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy90;
-			if (yych <= '9') goto yy98;
-			goto yy90;
+			if (yych <= '/') goto yy68;
+			if (yych <= '9') goto yy76;
+			goto yy68;
 		} else {
-			if (yych <= 'F') goto yy98;
-			if (yych <= '`') goto yy90;
-			if (yych <= 'f') goto yy98;
-			goto yy90;
+			if (yych <= 'F') goto yy76;
+			if (yych <= '`') goto yy68;
+			if (yych <= 'f') goto yy76;
+			goto yy68;
 		}
-yy95:
+yy73:
 		yych = *++YYCURSOR;
 		if (yych <= 'B') {
 			if (yych <= '7') {
-				if (yych <= '/') goto yy90;
-				goto yy98;
+				if (yych <= '/') goto yy68;
+				goto yy76;
 			} else {
-				if (yych <= '9') goto yy99;
-				if (yych <= '@') goto yy90;
-				goto yy99;
+				if (yych <= '9') goto yy77;
+				if (yych <= '@') goto yy68;
+				goto yy77;
 			}
 		} else {
 			if (yych <= '`') {
-				if (yych <= 'F') goto yy100;
-				goto yy90;
+				if (yych <= 'F') goto yy78;
+				goto yy68;
 			} else {
-				if (yych <= 'b') goto yy99;
-				if (yych <= 'f') goto yy100;
-				goto yy90;
+				if (yych <= 'b') goto yy77;
+				if (yych <= 'f') goto yy78;
+				goto yy68;
 			}
 		}
-yy96:
+yy74:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy90;
-			if (yych <= '7') goto yy101;
-			if (yych <= '9') goto yy102;
-			goto yy90;
+			if (yych <= '/') goto yy68;
+			if (yych <= '7') goto yy79;
+			if (yych <= '9') goto yy80;
+			goto yy68;
 		} else {
-			if (yych <= 'F') goto yy102;
-			if (yych <= '`') goto yy90;
-			if (yych <= 'f') goto yy102;
-			goto yy90;
+			if (yych <= 'F') goto yy80;
+			if (yych <= '`') goto yy68;
+			if (yych <= 'f') goto yy80;
+			goto yy68;
 		}
-yy97:
+yy75:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy90;
-			if (yych <= '9') goto yy102;
-			goto yy90;
+			if (yych <= '/') goto yy68;
+			if (yych <= '9') goto yy80;
+			goto yy68;
 		} else {
-			if (yych <= 'F') goto yy102;
-			if (yych <= '`') goto yy90;
-			if (yych <= 'f') goto yy102;
-			goto yy90;
+			if (yych <= 'F') goto yy80;
+			if (yych <= '`') goto yy68;
+			if (yych <= 'f') goto yy80;
+			goto yy68;
 		}
-yy98:
+yy76:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy90;
-			if (yych <= '9') goto yy103;
-			goto yy90;
+			if (yych <= '/') goto yy68;
+			if (yych <= '9') goto yy81;
+			goto yy68;
 		} else {
-			if (yych <= 'F') goto yy103;
-			if (yych <= '`') goto yy90;
-			if (yych <= 'f') goto yy103;
-			goto yy90;
+			if (yych <= 'F') goto yy81;
+			if (yych <= '`') goto yy68;
+			if (yych <= 'f') goto yy81;
+			goto yy68;
 		}
-yy99:
+yy77:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy90;
-			if (yych <= '9') goto yy104;
-			goto yy90;
+			if (yych <= '/') goto yy68;
+			if (yych <= '9') goto yy82;
+			goto yy68;
 		} else {
-			if (yych <= 'F') goto yy104;
-			if (yych <= '`') goto yy90;
-			if (yych <= 'f') goto yy104;
-			goto yy90;
+			if (yych <= 'F') goto yy82;
+			if (yych <= '`') goto yy68;
+			if (yych <= 'f') goto yy82;
+			goto yy68;
 		}
-yy100:
+yy78:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy90;
-			if (yych <= '9') goto yy105;
-			goto yy90;
+			if (yych <= '/') goto yy68;
+			if (yych <= '9') goto yy83;
+			goto yy68;
 		} else {
-			if (yych <= 'F') goto yy105;
-			if (yych <= '`') goto yy90;
-			if (yych <= 'f') goto yy105;
-			goto yy90;
+			if (yych <= 'F') goto yy83;
+			if (yych <= '`') goto yy68;
+			if (yych <= 'f') goto yy83;
+			goto yy68;
 		}
-yy101:
+yy79:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy90;
-			if (yych <= '9') goto yy106;
-			goto yy90;
+			if (yych <= '/') goto yy68;
+			if (yych <= '9') goto yy84;
+			goto yy68;
 		} else {
-			if (yych <= 'F') goto yy106;
-			if (yych <= '`') goto yy90;
-			if (yych <= 'f') goto yy106;
-			goto yy90;
+			if (yych <= 'F') goto yy84;
+			if (yych <= '`') goto yy68;
+			if (yych <= 'f') goto yy84;
+			goto yy68;
 		}
-yy102:
+yy80:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy90;
-			if (yych <= '9') goto yy108;
-			goto yy90;
+			if (yych <= '/') goto yy68;
+			if (yych <= '9') goto yy85;
+			goto yy68;
 		} else {
-			if (yych <= 'F') goto yy108;
-			if (yych <= '`') goto yy90;
-			if (yych <= 'f') goto yy108;
-			goto yy90;
+			if (yych <= 'F') goto yy85;
+			if (yych <= '`') goto yy68;
+			if (yych <= 'f') goto yy85;
+			goto yy68;
 		}
-yy103:
+yy81:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy90;
-			if (yych <= '9') goto yy110;
-			goto yy90;
+			if (yych <= '/') goto yy68;
+			if (yych <= '9') goto yy86;
+			goto yy68;
 		} else {
-			if (yych <= 'F') goto yy110;
-			if (yych <= '`') goto yy90;
-			if (yych <= 'f') goto yy110;
-			goto yy90;
+			if (yych <= 'F') goto yy86;
+			if (yych <= '`') goto yy68;
+			if (yych <= 'f') goto yy86;
+			goto yy68;
 		}
-yy104:
+yy82:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy90;
-			if (yych <= '9') goto yy112;
-			goto yy90;
+			if (yych <= '/') goto yy68;
+			if (yych <= '9') goto yy87;
+			goto yy68;
 		} else {
-			if (yych <= 'F') goto yy112;
-			if (yych <= '`') goto yy90;
-			if (yych <= 'f') goto yy112;
-			goto yy90;
+			if (yych <= 'F') goto yy87;
+			if (yych <= '`') goto yy68;
+			if (yych <= 'f') goto yy87;
+			goto yy68;
 		}
-yy105:
+yy83:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy90;
-			if (yych <= '9') goto yy114;
-			goto yy90;
+			if (yych <= '/') goto yy68;
+			if (yych <= '9') goto yy89;
+			goto yy68;
 		} else {
-			if (yych <= 'F') goto yy114;
-			if (yych <= '`') goto yy90;
-			if (yych <= 'f') goto yy114;
-			goto yy90;
+			if (yych <= 'F') goto yy89;
+			if (yych <= '`') goto yy68;
+			if (yych <= 'f') goto yy89;
+			goto yy68;
 		}
-yy106:
+yy84:
 		++YYCURSOR;
 		{
 		s->str_esc += 5;
 		PHP_JSON_CONDITION_GOTO(STR_P1);
 	}
-yy108:
+yy85:
 		++YYCURSOR;
 		{
 		s->str_esc += 4;
 		PHP_JSON_CONDITION_GOTO(STR_P1);
 	}
-yy110:
+yy86:
 		++YYCURSOR;
 		{
 		s->str_esc += 3;
 		PHP_JSON_CONDITION_GOTO(STR_P1);
 	}
-yy112:
+yy87:
 		yyaccept = 2;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == '\\') goto yy115;
-yy113:
+		if (yych == '\\') goto yy90;
+yy88:
 		{
 		s->errcode = PHP_JSON_ERROR_UTF16;
 		return PHP_JSON_T_ERROR;
 	}
-yy114:
+yy89:
 		++YYCURSOR;
-		goto yy113;
-yy115:
+		goto yy88;
+yy90:
 		yych = *++YYCURSOR;
-		if (yych != 'u') goto yy90;
+		if (yych != 'u') goto yy68;
 		yych = *++YYCURSOR;
-		if (yych == 'D') goto yy117;
-		if (yych != 'd') goto yy90;
-yy117:
+		if (yych == 'D') goto yy91;
+		if (yych != 'd') goto yy68;
+yy91:
 		yych = *++YYCURSOR;
-		if (yych <= 'B') goto yy90;
-		if (yych <= 'F') goto yy118;
-		if (yych <= 'b') goto yy90;
-		if (yych >= 'g') goto yy90;
-yy118:
+		if (yych <= 'B') goto yy68;
+		if (yych <= 'F') goto yy92;
+		if (yych <= 'b') goto yy68;
+		if (yych >= 'g') goto yy68;
+yy92:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy90;
-			if (yych >= ':') goto yy90;
+			if (yych <= '/') goto yy68;
+			if (yych >= ':') goto yy68;
 		} else {
-			if (yych <= 'F') goto yy119;
-			if (yych <= '`') goto yy90;
-			if (yych >= 'g') goto yy90;
+			if (yych <= 'F') goto yy93;
+			if (yych <= '`') goto yy68;
+			if (yych >= 'g') goto yy68;
 		}
-yy119:
+yy93:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy90;
-			if (yych >= ':') goto yy90;
+			if (yych <= '/') goto yy68;
+			if (yych >= ':') goto yy68;
 		} else {
-			if (yych <= 'F') goto yy120;
-			if (yych <= '`') goto yy90;
-			if (yych >= 'g') goto yy90;
+			if (yych <= 'F') goto yy94;
+			if (yych <= '`') goto yy68;
+			if (yych >= 'g') goto yy68;
 		}
-yy120:
+yy94:
 		++YYCURSOR;
 		{
 		s->str_esc += 8;
@@ -982,40 +982,40 @@
 		yych = *YYCURSOR;
 		if (yych <= 0xDF) {
 			if (yych <= '') {
-				if (yych == '"') goto yy126;
+				if (yych == '"') goto yy97;
 			} else {
-				if (yych <= '\\') goto yy128;
-				if (yych <= 0x7F) goto yy124;
-				if (yych <= 0xC1) goto yy130;
-				goto yy132;
+				if (yych <= '\\') goto yy98;
+				if (yych <= 0x7F) goto yy96;
+				if (yych <= 0xC1) goto yy100;
+				goto yy102;
 			}
 		} else {
 			if (yych <= 0xEF) {
-				if (yych <= 0xE0) goto yy133;
-				if (yych == 0xED) goto yy135;
-				goto yy134;
+				if (yych <= 0xE0) goto yy103;
+				if (yych == 0xED) goto yy105;
+				goto yy104;
 			} else {
-				if (yych <= 0xF0) goto yy136;
-				if (yych <= 0xF3) goto yy137;
-				if (yych <= 0xF4) goto yy138;
-				goto yy130;
+				if (yych <= 0xF0) goto yy106;
+				if (yych <= 0xF3) goto yy107;
+				if (yych <= 0xF4) goto yy108;
+				goto yy100;
 			}
 		}
-yy124:
+yy96:
 		++YYCURSOR;
 		{ PHP_JSON_CONDITION_GOTO(STR_P2_BIN); }
-yy126:
+yy97:
 		++YYCURSOR;
 		YYSETCONDITION(yycJS);
 		{
 		PHP_JSON_SCANNER_COPY_ESC();
 		return PHP_JSON_T_STRING;
 	}
-yy128:
+yy98:
 		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'u') goto yy139;
-yy129:
+		if (yych == 'u') goto yy109;
+yy99:
 		{
 		char esc;
 		PHP_JSON_SCANNER_COPY_ESC();
@@ -1048,9 +1048,9 @@
 		s->str_start = s->cursor;
 		PHP_JSON_CONDITION_GOTO_STR_P2();
 	}
-yy130:
+yy100:
 		++YYCURSOR;
-yy131:
+yy101:
 		{
 		if (s->utf8_invalid) {
 			PHP_JSON_SCANNER_COPY_ESC();
@@ -1063,225 +1063,225 @@
 		}
 		PHP_JSON_CONDITION_GOTO(STR_P2_BIN);
 	}
-yy132:
+yy102:
 		yych = *++YYCURSOR;
-		if (yych <= 0x7F) goto yy131;
-		if (yych <= 0xBF) goto yy124;
-		goto yy131;
-yy133:
+		if (yych <= 0x7F) goto yy101;
+		if (yych <= 0xBF) goto yy96;
+		goto yy101;
+yy103:
 		yyaccept = 1;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych <= 0x9F) goto yy131;
-		if (yych <= 0xBF) goto yy141;
-		goto yy131;
-yy134:
+		if (yych <= 0x9F) goto yy101;
+		if (yych <= 0xBF) goto yy111;
+		goto yy101;
+yy104:
 		yyaccept = 1;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych <= 0x7F) goto yy131;
-		if (yych <= 0xBF) goto yy141;
-		goto yy131;
-yy135:
+		if (yych <= 0x7F) goto yy101;
+		if (yych <= 0xBF) goto yy111;
+		goto yy101;
+yy105:
 		yyaccept = 1;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych <= 0x7F) goto yy131;
-		if (yych <= 0x9F) goto yy141;
-		goto yy131;
-yy136:
+		if (yych <= 0x7F) goto yy101;
+		if (yych <= 0x9F) goto yy111;
+		goto yy101;
+yy106:
 		yyaccept = 1;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych <= 0x8F) goto yy131;
-		if (yych <= 0xBF) goto yy142;
-		goto yy131;
-yy137:
+		if (yych <= 0x8F) goto yy101;
+		if (yych <= 0xBF) goto yy112;
+		goto yy101;
+yy107:
 		yyaccept = 1;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych <= 0x7F) goto yy131;
-		if (yych <= 0xBF) goto yy142;
-		goto yy131;
-yy138:
+		if (yych <= 0x7F) goto yy101;
+		if (yych <= 0xBF) goto yy112;
+		goto yy101;
+yy108:
 		yyaccept = 1;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych <= 0x7F) goto yy131;
-		if (yych <= 0x8F) goto yy142;
-		goto yy131;
-yy139:
+		if (yych <= 0x7F) goto yy101;
+		if (yych <= 0x8F) goto yy112;
+		goto yy101;
+yy109:
 		yych = *++YYCURSOR;
 		if (yych <= 'D') {
 			if (yych <= '9') {
-				if (yych <= '/') goto yy140;
-				if (yych <= '0') goto yy143;
-				goto yy144;
+				if (yych <= '/') goto yy110;
+				if (yych <= '0') goto yy113;
+				goto yy114;
 			} else {
-				if (yych <= '@') goto yy140;
-				if (yych <= 'C') goto yy144;
-				goto yy145;
+				if (yych <= '@') goto yy110;
+				if (yych <= 'C') goto yy114;
+				goto yy115;
 			}
 		} else {
 			if (yych <= 'c') {
-				if (yych <= 'F') goto yy144;
-				if (yych >= 'a') goto yy144;
+				if (yych <= 'F') goto yy114;
+				if (yych >= 'a') goto yy114;
 			} else {
-				if (yych <= 'd') goto yy145;
-				if (yych <= 'f') goto yy144;
+				if (yych <= 'd') goto yy115;
+				if (yych <= 'f') goto yy114;
 			}
 		}
-yy140:
+yy110:
 		YYCURSOR = YYMARKER;
 		if (yyaccept == 0) {
-			goto yy129;
+			goto yy99;
 		} else {
-			goto yy131;
+			goto yy101;
 		}
-yy141:
+yy111:
 		yych = *++YYCURSOR;
-		if (yych <= 0x7F) goto yy140;
-		if (yych <= 0xBF) goto yy124;
-		goto yy140;
-yy142:
+		if (yych <= 0x7F) goto yy110;
+		if (yych <= 0xBF) goto yy96;
+		goto yy110;
+yy112:
 		yych = *++YYCURSOR;
-		if (yych <= 0x7F) goto yy140;
-		if (yych <= 0xBF) goto yy141;
-		goto yy140;
-yy143:
+		if (yych <= 0x7F) goto yy110;
+		if (yych <= 0xBF) goto yy111;
+		goto yy110;
+yy113:
 		yych = *++YYCURSOR;
 		if (yych <= '9') {
-			if (yych <= '/') goto yy140;
-			if (yych <= '0') goto yy146;
-			if (yych <= '7') goto yy147;
-			goto yy148;
+			if (yych <= '/') goto yy110;
+			if (yych <= '0') goto yy116;
+			if (yych <= '7') goto yy117;
+			goto yy118;
 		} else {
 			if (yych <= 'F') {
-				if (yych <= '@') goto yy140;
-				goto yy148;
+				if (yych <= '@') goto yy110;
+				goto yy118;
 			} else {
-				if (yych <= '`') goto yy140;
-				if (yych <= 'f') goto yy148;
-				goto yy140;
+				if (yych <= '`') goto yy110;
+				if (yych <= 'f') goto yy118;
+				goto yy110;
 			}
 		}
-yy144:
+yy114:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy140;
-			if (yych <= '9') goto yy148;
-			goto yy140;
+			if (yych <= '/') goto yy110;
+			if (yych <= '9') goto yy118;
+			goto yy110;
 		} else {
-			if (yych <= 'F') goto yy148;
-			if (yych <= '`') goto yy140;
-			if (yych <= 'f') goto yy148;
-			goto yy140;
+			if (yych <= 'F') goto yy118;
+			if (yych <= '`') goto yy110;
+			if (yych <= 'f') goto yy118;
+			goto yy110;
 		}
-yy145:
+yy115:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy140;
-			if (yych <= '7') goto yy148;
-			if (yych <= '9') goto yy149;
-			goto yy140;
+			if (yych <= '/') goto yy110;
+			if (yych <= '7') goto yy118;
+			if (yych <= '9') goto yy119;
+			goto yy110;
 		} else {
-			if (yych <= 'B') goto yy149;
-			if (yych <= '`') goto yy140;
-			if (yych <= 'b') goto yy149;
-			goto yy140;
+			if (yych <= 'B') goto yy119;
+			if (yych <= '`') goto yy110;
+			if (yych <= 'b') goto yy119;
+			goto yy110;
 		}
-yy146:
+yy116:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy140;
-			if (yych <= '7') goto yy150;
-			if (yych <= '9') goto yy151;
-			goto yy140;
+			if (yych <= '/') goto yy110;
+			if (yych <= '7') goto yy120;
+			if (yych <= '9') goto yy121;
+			goto yy110;
 		} else {
-			if (yych <= 'F') goto yy151;
-			if (yych <= '`') goto yy140;
-			if (yych <= 'f') goto yy151;
-			goto yy140;
+			if (yych <= 'F') goto yy121;
+			if (yych <= '`') goto yy110;
+			if (yych <= 'f') goto yy121;
+			goto yy110;
 		}
-yy147:
+yy117:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy140;
-			if (yych <= '9') goto yy151;
-			goto yy140;
+			if (yych <= '/') goto yy110;
+			if (yych <= '9') goto yy121;
+			goto yy110;
 		} else {
-			if (yych <= 'F') goto yy151;
-			if (yych <= '`') goto yy140;
-			if (yych <= 'f') goto yy151;
-			goto yy140;
+			if (yych <= 'F') goto yy121;
+			if (yych <= '`') goto yy110;
+			if (yych <= 'f') goto yy121;
+			goto yy110;
 		}
-yy148:
+yy118:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy140;
-			if (yych <= '9') goto yy152;
-			goto yy140;
+			if (yych <= '/') goto yy110;
+			if (yych <= '9') goto yy122;
+			goto yy110;
 		} else {
-			if (yych <= 'F') goto yy152;
-			if (yych <= '`') goto yy140;
-			if (yych <= 'f') goto yy152;
-			goto yy140;
+			if (yych <= 'F') goto yy122;
+			if (yych <= '`') goto yy110;
+			if (yych <= 'f') goto yy122;
+			goto yy110;
 		}
-yy149:
+yy119:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy140;
-			if (yych <= '9') goto yy153;
-			goto yy140;
+			if (yych <= '/') goto yy110;
+			if (yych <= '9') goto yy123;
+			goto yy110;
 		} else {
-			if (yych <= 'F') goto yy153;
-			if (yych <= '`') goto yy140;
-			if (yych <= 'f') goto yy153;
-			goto yy140;
+			if (yych <= 'F') goto yy123;
+			if (yych <= '`') goto yy110;
+			if (yych <= 'f') goto yy123;
+			goto yy110;
 		}
-yy150:
+yy120:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy140;
-			if (yych <= '9') goto yy154;
-			goto yy140;
+			if (yych <= '/') goto yy110;
+			if (yych <= '9') goto yy124;
+			goto yy110;
 		} else {
-			if (yych <= 'F') goto yy154;
-			if (yych <= '`') goto yy140;
-			if (yych <= 'f') goto yy154;
-			goto yy140;
+			if (yych <= 'F') goto yy124;
+			if (yych <= '`') goto yy110;
+			if (yych <= 'f') goto yy124;
+			goto yy110;
 		}
-yy151:
+yy121:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy140;
-			if (yych <= '9') goto yy156;
-			goto yy140;
+			if (yych <= '/') goto yy110;
+			if (yych <= '9') goto yy125;
+			goto yy110;
 		} else {
-			if (yych <= 'F') goto yy156;
-			if (yych <= '`') goto yy140;
-			if (yych <= 'f') goto yy156;
-			goto yy140;
+			if (yych <= 'F') goto yy125;
+			if (yych <= '`') goto yy110;
+			if (yych <= 'f') goto yy125;
+			goto yy110;
 		}
-yy152:
+yy122:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy140;
-			if (yych <= '9') goto yy158;
-			goto yy140;
+			if (yych <= '/') goto yy110;
+			if (yych <= '9') goto yy126;
+			goto yy110;
 		} else {
-			if (yych <= 'F') goto yy158;
-			if (yych <= '`') goto yy140;
-			if (yych <= 'f') goto yy158;
-			goto yy140;
+			if (yych <= 'F') goto yy126;
+			if (yych <= '`') goto yy110;
+			if (yych <= 'f') goto yy126;
+			goto yy110;
 		}
-yy153:
+yy123:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy140;
-			if (yych <= '9') goto yy160;
-			goto yy140;
+			if (yych <= '/') goto yy110;
+			if (yych <= '9') goto yy127;
+			goto yy110;
 		} else {
-			if (yych <= 'F') goto yy160;
-			if (yych <= '`') goto yy140;
-			if (yych <= 'f') goto yy160;
-			goto yy140;
+			if (yych <= 'F') goto yy127;
+			if (yych <= '`') goto yy110;
+			if (yych <= 'f') goto yy127;
+			goto yy110;
 		}
-yy154:
+yy124:
 		++YYCURSOR;
 		{
 		int utf16 = php_json_ucs2_to_int(s, 2);
@@ -1290,7 +1290,7 @@
 		s->str_start = s->cursor;
 		PHP_JSON_CONDITION_GOTO_STR_P2();
 	}
-yy156:
+yy125:
 		++YYCURSOR;
 		{
 		int utf16 = php_json_ucs2_to_int(s, 3);
@@ -1300,7 +1300,7 @@
 		s->str_start = s->cursor;
 		PHP_JSON_CONDITION_GOTO_STR_P2();
 	}
-yy158:
+yy126:
 		++YYCURSOR;
 		{
 		int utf16 = php_json_ucs2_to_int(s, 4);
@@ -1311,41 +1311,41 @@
 		s->str_start = s->cursor;
 		PHP_JSON_CONDITION_GOTO_STR_P2();
 	}
-yy160:
+yy127:
 		yych = *++YYCURSOR;
-		if (yych != '\\') goto yy140;
+		if (yych != '\\') goto yy110;
 		yych = *++YYCURSOR;
-		if (yych != 'u') goto yy140;
+		if (yych != 'u') goto yy110;
 		yych = *++YYCURSOR;
-		if (yych == 'D') goto yy163;
-		if (yych != 'd') goto yy140;
-yy163:
+		if (yych == 'D') goto yy128;
+		if (yych != 'd') goto yy110;
+yy128:
 		yych = *++YYCURSOR;
-		if (yych <= 'B') goto yy140;
-		if (yych <= 'F') goto yy164;
-		if (yych <= 'b') goto yy140;
-		if (yych >= 'g') goto yy140;
-yy164:
+		if (yych <= 'B') goto yy110;
+		if (yych <= 'F') goto yy129;
+		if (yych <= 'b') goto yy110;
+		if (yych >= 'g') goto yy110;
+yy129:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy140;
-			if (yych >= ':') goto yy140;
+			if (yych <= '/') goto yy110;
+			if (yych >= ':') goto yy110;
 		} else {
-			if (yych <= 'F') goto yy165;
-			if (yych <= '`') goto yy140;
-			if (yych >= 'g') goto yy140;
+			if (yych <= 'F') goto yy130;
+			if (yych <= '`') goto yy110;
+			if (yych >= 'g') goto yy110;
 		}
-yy165:
+yy130:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy140;
-			if (yych >= ':') goto yy140;
+			if (yych <= '/') goto yy110;
+			if (yych >= ':') goto yy110;
 		} else {
-			if (yych <= 'F') goto yy166;
-			if (yych <= '`') goto yy140;
-			if (yych >= 'g') goto yy140;
+			if (yych <= 'F') goto yy131;
+			if (yych <= '`') goto yy110;
+			if (yych >= 'g') goto yy110;
 		}
-yy166:
+yy131:
 		++YYCURSOR;
 		{
 		int utf32, utf16_hi, utf16_lo;
@@ -1363,21 +1363,21 @@
 /* *********************************** */
 yyc_STR_P2_UTF:
 		yych = *YYCURSOR;
-		if (yych == '"') goto yy172;
-		if (yych == '\\') goto yy174;
+		if (yych == '"') goto yy133;
+		if (yych == '\\') goto yy134;
 		++YYCURSOR;
 		{ PHP_JSON_CONDITION_GOTO(STR_P2_UTF); }
-yy172:
+yy133:
 		++YYCURSOR;
 		YYSETCONDITION(yycJS);
 		{
 		PHP_JSON_SCANNER_COPY_ESC();
 		return PHP_JSON_T_STRING;
 	}
-yy174:
+yy134:
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'u') goto yy176;
-yy175:
+		if (yych == 'u') goto yy136;
+yy135:
 		{
 		char esc;
 		PHP_JSON_SCANNER_COPY_ESC();
@@ -1410,170 +1410,170 @@
 		s->str_start = s->cursor;
 		PHP_JSON_CONDITION_GOTO_STR_P2();
 	}
-yy176:
+yy136:
 		yych = *++YYCURSOR;
 		if (yych <= 'D') {
 			if (yych <= '9') {
-				if (yych <= '/') goto yy177;
-				if (yych <= '0') goto yy178;
-				goto yy179;
+				if (yych <= '/') goto yy137;
+				if (yych <= '0') goto yy138;
+				goto yy139;
 			} else {
-				if (yych <= '@') goto yy177;
-				if (yych <= 'C') goto yy179;
-				goto yy180;
+				if (yych <= '@') goto yy137;
+				if (yych <= 'C') goto yy139;
+				goto yy140;
 			}
 		} else {
 			if (yych <= 'c') {
-				if (yych <= 'F') goto yy179;
-				if (yych >= 'a') goto yy179;
+				if (yych <= 'F') goto yy139;
+				if (yych >= 'a') goto yy139;
 			} else {
-				if (yych <= 'd') goto yy180;
-				if (yych <= 'f') goto yy179;
+				if (yych <= 'd') goto yy140;
+				if (yych <= 'f') goto yy139;
 			}
 		}
-yy177:
+yy137:
 		YYCURSOR = YYMARKER;
-		goto yy175;
-yy178:
+		goto yy135;
+yy138:
 		yych = *++YYCURSOR;
 		if (yych <= '9') {
-			if (yych <= '/') goto yy177;
-			if (yych <= '0') goto yy181;
-			if (yych <= '7') goto yy182;
-			goto yy183;
+			if (yych <= '/') goto yy137;
+			if (yych <= '0') goto yy141;
+			if (yych <= '7') goto yy142;
+			goto yy143;
 		} else {
 			if (yych <= 'F') {
-				if (yych <= '@') goto yy177;
-				goto yy183;
+				if (yych <= '@') goto yy137;
+				goto yy143;
 			} else {
-				if (yych <= '`') goto yy177;
-				if (yych <= 'f') goto yy183;
-				goto yy177;
+				if (yych <= '`') goto yy137;
+				if (yych <= 'f') goto yy143;
+				goto yy137;
 			}
 		}
-yy179:
+yy139:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy177;
-			if (yych <= '9') goto yy183;
-			goto yy177;
+			if (yych <= '/') goto yy137;
+			if (yych <= '9') goto yy143;
+			goto yy137;
 		} else {
-			if (yych <= 'F') goto yy183;
-			if (yych <= '`') goto yy177;
-			if (yych <= 'f') goto yy183;
-			goto yy177;
+			if (yych <= 'F') goto yy143;
+			if (yych <= '`') goto yy137;
+			if (yych <= 'f') goto yy143;
+			goto yy137;
 		}
-yy180:
+yy140:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy177;
-			if (yych <= '7') goto yy183;
-			if (yych <= '9') goto yy184;
-			goto yy177;
+			if (yych <= '/') goto yy137;
+			if (yych <= '7') goto yy143;
+			if (yych <= '9') goto yy144;
+			goto yy137;
 		} else {
-			if (yych <= 'B') goto yy184;
-			if (yych <= '`') goto yy177;
-			if (yych <= 'b') goto yy184;
-			goto yy177;
+			if (yych <= 'B') goto yy144;
+			if (yych <= '`') goto yy137;
+			if (yych <= 'b') goto yy144;
+			goto yy137;
 		}
-yy181:
+yy141:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy177;
-			if (yych <= '7') goto yy185;
-			if (yych <= '9') goto yy186;
-			goto yy177;
+			if (yych <= '/') goto yy137;
+			if (yych <= '7') goto yy145;
+			if (yych <= '9') goto yy146;
+			goto yy137;
 		} else {
-			if (yych <= 'F') goto yy186;
-			if (yych <= '`') goto yy177;
-			if (yych <= 'f') goto yy186;
-			goto yy177;
+			if (yych <= 'F') goto yy146;
+			if (yych <= '`') goto yy137;
+			if (yych <= 'f') goto yy146;
+			goto yy137;
 		}
-yy182:
+yy142:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy177;
-			if (yych <= '9') goto yy186;
-			goto yy177;
+			if (yych <= '/') goto yy137;
+			if (yych <= '9') goto yy146;
+			goto yy137;
 		} else {
-			if (yych <= 'F') goto yy186;
-			if (yych <= '`') goto yy177;
-			if (yych <= 'f') goto yy186;
-			goto yy177;
+			if (yych <= 'F') goto yy146;
+			if (yych <= '`') goto yy137;
+			if (yych <= 'f') goto yy146;
+			goto yy137;
 		}
-yy183:
+yy143:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy177;
-			if (yych <= '9') goto yy187;
-			goto yy177;
+			if (yych <= '/') goto yy137;
+			if (yych <= '9') goto yy147;
+			goto yy137;
 		} else {
-			if (yych <= 'F') goto yy187;
-			if (yych <= '`') goto yy177;
-			if (yych <= 'f') goto yy187;
-			goto yy177;
+			if (yych <= 'F') goto yy147;
+			if (yych <= '`') goto yy137;
+			if (yych <= 'f') goto yy147;
+			goto yy137;
 		}
-yy184:
+yy144:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy177;
-			if (yych <= '9') goto yy188;
-			goto yy177;
+			if (yych <= '/') goto yy137;
+			if (yych <= '9') goto yy148;
+			goto yy137;
 		} else {
-			if (yych <= 'F') goto yy188;
-			if (yych <= '`') goto yy177;
-			if (yych <= 'f') goto yy188;
-			goto yy177;
+			if (yych <= 'F') goto yy148;
+			if (yych <= '`') goto yy137;
+			if (yych <= 'f') goto yy148;
+			goto yy137;
 		}
-yy185:
+yy145:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy177;
-			if (yych <= '9') goto yy189;
-			goto yy177;
+			if (yych <= '/') goto yy137;
+			if (yych <= '9') goto yy149;
+			goto yy137;
 		} else {
-			if (yych <= 'F') goto yy189;
-			if (yych <= '`') goto yy177;
-			if (yych <= 'f') goto yy189;
-			goto yy177;
+			if (yych <= 'F') goto yy149;
+			if (yych <= '`') goto yy137;
+			if (yych <= 'f') goto yy149;
+			goto yy137;
 		}
-yy186:
+yy146:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy177;
-			if (yych <= '9') goto yy191;
-			goto yy177;
+			if (yych <= '/') goto yy137;
+			if (yych <= '9') goto yy150;
+			goto yy137;
 		} else {
-			if (yych <= 'F') goto yy191;
-			if (yych <= '`') goto yy177;
-			if (yych <= 'f') goto yy191;
-			goto yy177;
+			if (yych <= 'F') goto yy150;
+			if (yych <= '`') goto yy137;
+			if (yych <= 'f') goto yy150;
+			goto yy137;
 		}
-yy187:
+yy147:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy177;
-			if (yych <= '9') goto yy193;
-			goto yy177;
+			if (yych <= '/') goto yy137;
+			if (yych <= '9') goto yy151;
+			goto yy137;
 		} else {
-			if (yych <= 'F') goto yy193;
-			if (yych <= '`') goto yy177;
-			if (yych <= 'f') goto yy193;
-			goto yy177;
+			if (yych <= 'F') goto yy151;
+			if (yych <= '`') goto yy137;
+			if (yych <= 'f') goto yy151;
+			goto yy137;
 		}
-yy188:
+yy148:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy177;
-			if (yych <= '9') goto yy195;
-			goto yy177;
+			if (yych <= '/') goto yy137;
+			if (yych <= '9') goto yy152;
+			goto yy137;
 		} else {
-			if (yych <= 'F') goto yy195;
-			if (yych <= '`') goto yy177;
-			if (yych <= 'f') goto yy195;
-			goto yy177;
+			if (yych <= 'F') goto yy152;
+			if (yych <= '`') goto yy137;
+			if (yych <= 'f') goto yy152;
+			goto yy137;
 		}
-yy189:
+yy149:
 		++YYCURSOR;
 		{
 		int utf16 = php_json_ucs2_to_int(s, 2);
@@ -1582,7 +1582,7 @@
 		s->str_start = s->cursor;
 		PHP_JSON_CONDITION_GOTO_STR_P2();
 	}
-yy191:
+yy150:
 		++YYCURSOR;
 		{
 		int utf16 = php_json_ucs2_to_int(s, 3);
@@ -1592,7 +1592,7 @@
 		s->str_start = s->cursor;
 		PHP_JSON_CONDITION_GOTO_STR_P2();
 	}
-yy193:
+yy151:
 		++YYCURSOR;
 		{
 		int utf16 = php_json_ucs2_to_int(s, 4);
@@ -1603,41 +1603,41 @@
 		s->str_start = s->cursor;
 		PHP_JSON_CONDITION_GOTO_STR_P2();
 	}
-yy195:
+yy152:
 		yych = *++YYCURSOR;
-		if (yych != '\\') goto yy177;
+		if (yych != '\\') goto yy137;
 		yych = *++YYCURSOR;
-		if (yych != 'u') goto yy177;
+		if (yych != 'u') goto yy137;
 		yych = *++YYCURSOR;
-		if (yych == 'D') goto yy198;
-		if (yych != 'd') goto yy177;
-yy198:
+		if (yych == 'D') goto yy153;
+		if (yych != 'd') goto yy137;
+yy153:
 		yych = *++YYCURSOR;
-		if (yych <= 'B') goto yy177;
-		if (yych <= 'F') goto yy199;
-		if (yych <= 'b') goto yy177;
-		if (yych >= 'g') goto yy177;
-yy199:
+		if (yych <= 'B') goto yy137;
+		if (yych <= 'F') goto yy154;
+		if (yych <= 'b') goto yy137;
+		if (yych >= 'g') goto yy137;
+yy154:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy177;
-			if (yych >= ':') goto yy177;
+			if (yych <= '/') goto yy137;
+			if (yych >= ':') goto yy137;
 		} else {
-			if (yych <= 'F') goto yy200;
-			if (yych <= '`') goto yy177;
-			if (yych >= 'g') goto yy177;
+			if (yych <= 'F') goto yy155;
+			if (yych <= '`') goto yy137;
+			if (yych >= 'g') goto yy137;
 		}
-yy200:
+yy155:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy177;
-			if (yych >= ':') goto yy177;
+			if (yych <= '/') goto yy137;
+			if (yych >= ':') goto yy137;
 		} else {
-			if (yych <= 'F') goto yy201;
-			if (yych <= '`') goto yy177;
-			if (yych >= 'g') goto yy177;
+			if (yych <= 'F') goto yy156;
+			if (yych <= '`') goto yy137;
+			if (yych >= 'g') goto yy137;
 		}
-yy201:
+yy156:
 		++YYCURSOR;
 		{
 		int utf32, utf16_hi, utf16_lo;

php-8.3.7.tar.xz/ext/json/php_json_scanner_defs.h -> php-8.3.21.tar.xz/ext/json/php_json_scanner_defs.h Changed

php-8.3.21.tar.xz/ext/json/tests/gh15168.phpt Added

php-8.3.7.tar.xz/ext/ldap/ldap.c -> php-8.3.21.tar.xz/ext/ldap/ldap.c Changed

@@ -235,6 +235,22 @@
 	} \
 }
 
+static bool php_ldap_is_numerically_indexed_array(zend_array *arr)
+{
+	if (zend_hash_num_elements(arr) == 0 || HT_IS_PACKED(arr)) {
+		return true;
+	}
+
+	zend_string *str_key;
+	ZEND_HASH_MAP_FOREACH_STR_KEY(arr, str_key) {
+		if (str_key) {
+			return false;
+		}
+	} ZEND_HASH_FOREACH_END();
+
+	return true;
+}
+
 /* {{{ Parse controls from and to arrays */
 static void _php_ldap_control_to_array(LDAP *ld, LDAPControl* ctrl, zval* array, int request)
 {
@@ -819,6 +835,21 @@
 }
 /* }}} */
 
+/* {{{ PHP_RINIT_FUNCTION */
+static PHP_RINIT_FUNCTION(ldap)
+{
+#if defined(COMPILE_DL_LDAP) && defined(ZTS)
+	ZEND_TSRMLS_CACHE_UPDATE();
+#endif
+
+	/* needed before first connect and after TLS option changes */
+	LDAPG(tls_newctx) = true;
+
+	return SUCCESS;
+}
+/* }}} */
+
+
 /* {{{ PHP_MINIT_FUNCTION */
 PHP_MINIT_FUNCTION(ldap)
 {
@@ -971,6 +1002,20 @@
 			snprintf( url, urllen, "ldap://%s:" ZEND_LONG_FMT, host, port );
 		}
 
+#ifdef LDAP_OPT_X_TLS_NEWCTX
+		if (LDAPG(tls_newctx) && url && !strncmp(url, "ldaps:", 6)) {
+			int val = 0;
+
+			/* ensure all pending TLS options are applied in a new context */
+			if (ldap_set_option(NULL, LDAP_OPT_X_TLS_NEWCTX, &val) != LDAP_OPT_SUCCESS) {
+				zval_ptr_dtor(return_value);
+				php_error_docref(NULL, E_WARNING, "Could not create new security context");
+				RETURN_FALSE;
+			}
+			LDAPG(tls_newctx) = false;
+		}
+#endif
+
 #ifdef LDAP_API_FEATURE_X_OPENLDAP
 		/* ldap_init() is deprecated, use ldap_initialize() instead.
 		 */
@@ -1471,20 +1516,22 @@
 			num_attribs = zend_hash_num_elements(Z_ARRVAL_P(attrs));
 			ldap_attrs = safe_emalloc((num_attribs+1), sizeof(char *), 0);
 
-			for (i = 0; i<num_attribs; i++) {
-				if ((attr = zend_hash_index_find(Z_ARRVAL_P(attrs), i)) == NULL) {
-					php_error_docref(NULL, E_WARNING, "Array initialization wrong");
-					ret = 0;
-					goto cleanup;
-				}
+			if (!php_ldap_is_numerically_indexed_array(Z_ARRVAL_P(attrs))) {
+				php_error_docref(NULL, E_WARNING, "Argument #4 ($attributes) must be an array with numeric keys");
+				ret = 0;
+				goto cleanup;
+			}
 
+			i = 0;
+			ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(attrs), attr) {
 				convert_to_string(attr);
 				if (EG(exception)) {
 					ret = 0;
 					goto cleanup;
 				}
-				ldap_attrsi = Z_STRVAL_P(attr);
-			}
+				ldap_attrsi++ = Z_STRVAL_P(attr);
+			} ZEND_HASH_FOREACH_END();
+
 			ldap_attrsnum_attribs = NULL;
 			ZEND_FALLTHROUGH;
 		default:
@@ -1503,6 +1550,11 @@
 			ret = 0;
 			goto cleanup;
 		}
+		if (!zend_array_is_list(Z_ARRVAL_P(link))) {
+			zend_argument_value_error(1, "must be a list");
+			ret = 0;
+			goto cleanup;
+		}
 
 		if (base_dn_ht) {
 			nbases = zend_hash_num_elements(base_dn_ht);
@@ -2219,17 +2271,11 @@
 			ldap_modsi->mod_type = estrndup(ZSTR_VAL(attribute), ZSTR_LEN(attribute));
 		} else {
 			php_error_docref(NULL, E_WARNING, "Unknown attribute in the data");
-			/* Free allocated memory */
-			while (i >= 0) {
-				if (ldap_modsi->mod_type) {
-					efree(ldap_modsi->mod_type);
-				}
-				efree(ldap_modsi);
-				i--;
-			}
-			efree(num_berval);
-			efree(ldap_mods);
-			RETURN_FALSE;
+			RETVAL_FALSE;
+			num_bervali = 0;
+			num_attribs = i + 1;
+			ldap_modsi->mod_bvalues = NULL;
+			goto cleanup;
 		}
 
 		value = zend_hash_get_current_data(Z_ARRVAL_P(entry));
@@ -2250,29 +2296,36 @@
 			convert_to_string(value);
 			if (EG(exception)) {
 				RETVAL_FALSE;
+				num_bervali = 0;
+				num_attribs = i + 1;
 				goto cleanup;
 			}
 			ldap_modsi->mod_bvalues0 = (struct berval *) emalloc (sizeof(struct berval));
 			ldap_modsi->mod_bvalues0->bv_val = Z_STRVAL_P(value);
 			ldap_modsi->mod_bvalues0->bv_len = Z_STRLEN_P(value);
 		} else {
-			for (j = 0; j < num_values; j++) {
-				if ((ivalue = zend_hash_index_find(Z_ARRVAL_P(value), j)) == NULL) {
-					zend_argument_value_error(3, "must contain arrays with consecutive integer indices starting from 0");
-					num_bervali = j;
-					num_attribs = i + 1;
-					RETVAL_FALSE;
-					goto cleanup;
-				}
+			if (!php_ldap_is_numerically_indexed_array(Z_ARRVAL_P(value))) {
+				zend_argument_value_error(3, "must be an array with numeric keys");
+				RETVAL_FALSE;
+				num_bervali = 0;
+				num_attribs = i + 1;
+				goto cleanup;
+			}
+
+			j = 0;
+			ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(value), ivalue) {
 				convert_to_string(ivalue);
 				if (EG(exception)) {
+					num_bervali = j;
+					num_attribs = i + 1;
 					RETVAL_FALSE;
 					goto cleanup;
 				}
 				ldap_modsi->mod_bvaluesj = (struct berval *) emalloc (sizeof(struct berval));
 				ldap_modsi->mod_bvaluesj->bv_val = Z_STRVAL_P(ivalue);
 				ldap_modsi->mod_bvaluesj->bv_len = Z_STRLEN_P(ivalue);
-			}
+				j++;
+			} ZEND_HASH_FOREACH_END();
 		}
 		ldap_modsi->mod_bvaluesnum_values = NULL;
 		zend_hash_move_forward(Z_ARRVAL_P(entry));
@@ -2540,7 +2593,7 @@
 	zval *fetched;
 	char *dn;
 	size_t dn_len;
-	int i, j, k;
+	int i, j;
 	int num_mods, num_modprops, num_modvals;
 	LDAPMod **ldap_mods;
 	LDAPControl **lserverctrls = NULL;
@@ -2600,12 +2653,14 @@
 
 		num_mods = zend_hash_num_elements(Z_ARRVAL_P(mods));
 
-		for (i = 0; i < num_mods; i++) {
-			/* is the numbering consecutive? */
-			if ((fetched = zend_hash_index_find(Z_ARRVAL_P(mods), i)) == NULL) {
-				zend_argument_value_error(3, "must have consecutive integer indices starting from 0");
-				RETURN_THROWS();
-			}
+		if (!php_ldap_is_numerically_indexed_array(Z_ARRVAL_P(mods))) {
+			zend_argument_value_error(3, "must be an array with numeric keys");
+			RETURN_THROWS();
+		}
+
+		i = 0;
+		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(mods), fetched) {
+			ZVAL_DEREF(fetched);
 			mod = fetched;
 
 			/* is it an array? */
@@ -2618,8 +2673,11 @@
 			/* for the modification hashtable... */
 			zend_hash_internal_pointer_reset(Z_ARRVAL_P(mod));
 			num_modprops = zend_hash_num_elements(Z_ARRVAL_P(mod));
+			bool has_attrib_key = false;
+			bool has_modtype_key = false;
 
 			for (j = 0; j < num_modprops; j++) {
+
 				/* are the keys strings? */
 				if (zend_hash_get_current_key(Z_ARRVAL_P(mod), &modkey, &tmpUlong) != HASH_KEY_IS_STRING) {
 					zend_argument_type_error(3, "must only contain string-indexed arrays");
@@ -2641,6 +2699,7 @@
 
 				/* does the value type match the key? */
 				if (_ldap_str_equal_to_const(ZSTR_VAL(modkey), ZSTR_LEN(modkey), LDAP_MODIFY_BATCH_ATTRIB)) {
+					has_attrib_key = true;
 					if (Z_TYPE_P(modinfo) != IS_STRING) {
 						zend_type_error("%s(): Option \"" LDAP_MODIFY_BATCH_ATTRIB "\" must be of type string, %s given", get_active_function_name(), zend_zval_value_name(modinfo));
 						RETURN_THROWS();
@@ -2652,6 +2711,7 @@
 					}
 				}
 				else if (_ldap_str_equal_to_const(ZSTR_VAL(modkey), ZSTR_LEN(modkey), LDAP_MODIFY_BATCH_MODTYPE)) {
+					has_modtype_key = true;
 					if (Z_TYPE_P(modinfo) != IS_LONG) {
 						zend_type_error("%s(): Option \"" LDAP_MODIFY_BATCH_MODTYPE "\" must be of type int, %s given", get_active_function_name(), zend_zval_value_name(modinfo));
 						RETURN_THROWS();
@@ -2698,24 +2758,26 @@
 						RETURN_THROWS();
 					}
 
-					/* are its keys integers? */
-					if (zend_hash_get_current_key_type(Z_ARRVAL_P(modinfo)) != HASH_KEY_IS_LONG) {
-						zend_value_error("%s(): Option \"" LDAP_MODIFY_BATCH_VALUES "\" must be integer-indexed", get_active_function_name());
+					if (!php_ldap_is_numerically_indexed_array(Z_ARRVAL_P(modinfo))) {
+						zend_value_error("%s(): Option \"" LDAP_MODIFY_BATCH_VALUES "\" must be an array with numeric keys", get_active_function_name());
 						RETURN_THROWS();
 					}
-
-					/* are the keys consecutive? */
-					for (k = 0; k < num_modvals; k++) {
-						if ((fetched = zend_hash_index_find(Z_ARRVAL_P(modinfo), k)) == NULL) {
-							zend_value_error("%s(): Option \"" LDAP_MODIFY_BATCH_VALUES "\" must have consecutive integer indices starting from 0", get_active_function_name());
-							RETURN_THROWS();
-						}
-					}
 				}
 
 				zend_hash_move_forward(Z_ARRVAL_P(mod));
 			}
-		}
+
+			if (!has_attrib_key) {
+				zend_value_error("%s(): Required option \"" LDAP_MODIFY_BATCH_ATTRIB "\" is missing", get_active_function_name());
+				RETURN_THROWS();
+			}
+			if (!has_modtype_key) {
+				zend_value_error("%s(): Required option \"" LDAP_MODIFY_BATCH_MODTYPE "\" is missing", get_active_function_name());
+				RETURN_THROWS();
+			}
+
+			i++;
+		} ZEND_HASH_FOREACH_END();
 	}
 	/* validation was successful */
 
@@ -2723,12 +2785,12 @@
 	ldap_mods = safe_emalloc((num_mods+1), sizeof(LDAPMod *), 0);
 
 	/* for each modification */
-	for (i = 0; i < num_mods; i++) {
+	i = 0;
+	ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(mods), fetched) {
 		/* allocate the modification struct */
 		ldap_modsi = safe_emalloc(1, sizeof(LDAPMod), 0);
 
 		/* fetch the relevant data */
-		fetched = zend_hash_index_find(Z_ARRVAL_P(mods), i);
 		mod = fetched;
 
 		_ldap_hash_fetch(mod, LDAP_MODIFY_BATCH_ATTRIB, &attrib);
@@ -2769,9 +2831,9 @@
 			ldap_modsi->mod_bvalues = safe_emalloc((num_modvals+1), sizeof(struct berval *), 0);
 
 			/* for each value */
-			for (j = 0; j < num_modvals; j++) {
+			j = 0;
+			ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(vals), fetched) {
 				/* fetch it */
-				fetched = zend_hash_index_find(Z_ARRVAL_P(vals), j);
 				modval = zval_get_string(fetched);
 				if (EG(exception)) {
 					RETVAL_FALSE;
@@ -2787,12 +2849,15 @@
 				ldap_modsi->mod_bvaluesj->bv_len = ZSTR_LEN(modval);
 				ldap_modsi->mod_bvaluesj->bv_val = estrndup(ZSTR_VAL(modval), ZSTR_LEN(modval));
 				zend_string_release(modval);
-			}
+				j++;
+			} ZEND_HASH_FOREACH_END();
 
 			/* NULL-terminate values */
 			ldap_modsi->mod_bvaluesnum_modvals = NULL;
 		}
-	}
+
+		i++;
+	} ZEND_HASH_FOREACH_END();
 
 	/* NULL-terminate modifications */
 	ldap_modsnum_mods = NULL;
@@ -3138,15 +3203,7 @@
 	}
 
 	switch (option) {
-	/* options with int value */
-	case LDAP_OPT_DEREF:
-	case LDAP_OPT_SIZELIMIT:
-	case LDAP_OPT_TIMELIMIT:
-	case LDAP_OPT_PROTOCOL_VERSION:
-	case LDAP_OPT_ERROR_NUMBER:
-#ifdef LDAP_OPT_DEBUG_LEVEL
-	case LDAP_OPT_DEBUG_LEVEL:
-#endif
+	/* TLS options with int value */
 #ifdef LDAP_OPT_X_TLS_REQUIRE_CERT
 	case LDAP_OPT_X_TLS_REQUIRE_CERT:
 #endif
@@ -3156,6 +3213,18 @@
 #ifdef LDAP_OPT_X_TLS_PROTOCOL_MIN
 	case LDAP_OPT_X_TLS_PROTOCOL_MIN:
 #endif
+		/* TLS option change requires resetting TLS context */
+		LDAPG(tls_newctx) = true;
+		ZEND_FALLTHROUGH;
+	/* other options with int value */
+	case LDAP_OPT_DEREF:
+	case LDAP_OPT_SIZELIMIT:
+	case LDAP_OPT_TIMELIMIT:
+	case LDAP_OPT_PROTOCOL_VERSION:
+	case LDAP_OPT_ERROR_NUMBER:
+#ifdef LDAP_OPT_DEBUG_LEVEL
+	case LDAP_OPT_DEBUG_LEVEL:
+#endif
 #ifdef LDAP_OPT_X_KEEPALIVE_IDLE
 	case LDAP_OPT_X_KEEPALIVE_IDLE:
 	case LDAP_OPT_X_KEEPALIVE_PROBES:
@@ -3211,17 +3280,7 @@
 			}
 		} break;
 #endif
-		/* options with string value */
-	case LDAP_OPT_ERROR_STRING:
-#ifdef LDAP_OPT_HOST_NAME
-	case LDAP_OPT_HOST_NAME:
-#endif
-#ifdef HAVE_LDAP_SASL
-	case LDAP_OPT_X_SASL_MECH:
-	case LDAP_OPT_X_SASL_REALM:
-	case LDAP_OPT_X_SASL_AUTHCID:
-	case LDAP_OPT_X_SASL_AUTHZID:
-#endif
+	/* TLS options with string value */
 #if (LDAP_API_VERSION > 2000)
 	case LDAP_OPT_X_TLS_CACERTDIR:
 	case LDAP_OPT_X_TLS_CACERTFILE:
@@ -3236,6 +3295,20 @@
 #ifdef LDAP_OPT_X_TLS_DHFILE
 	case LDAP_OPT_X_TLS_DHFILE:
 #endif
+		/* TLS option change requires resetting TLS context */
+		LDAPG(tls_newctx) = true;
+		ZEND_FALLTHROUGH;
+	/* other options with string value */
+	case LDAP_OPT_ERROR_STRING:
+#ifdef LDAP_OPT_HOST_NAME
+	case LDAP_OPT_HOST_NAME:
+#endif
+#ifdef HAVE_LDAP_SASL
+	case LDAP_OPT_X_SASL_MECH:
+	case LDAP_OPT_X_SASL_REALM:
+	case LDAP_OPT_X_SASL_AUTHCID:
+	case LDAP_OPT_X_SASL_AUTHZID:
+#endif
 #ifdef LDAP_OPT_MATCHED_DN
 	case LDAP_OPT_MATCHED_DN:
 #endif
@@ -3654,6 +3727,9 @@
 	zval *link;
 	ldap_linkdata *ld;
 	int rc, protocol = LDAP_VERSION3;
+#ifdef LDAP_OPT_X_TLS_NEWCTX
+	int val = 0;
+#endif
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS(), "O", &link, ldap_link_ce) != SUCCESS) {
 		RETURN_THROWS();
@@ -3663,13 +3739,16 @@
 	VERIFY_LDAP_LINK_CONNECTED(ld);
 
 	if (((rc = ldap_set_option(ld->link, LDAP_OPT_PROTOCOL_VERSION, &protocol)) != LDAP_SUCCESS) ||
+#ifdef LDAP_OPT_X_TLS_NEWCTX
+		(LDAPG(tls_newctx) && (rc = ldap_set_option(ld->link, LDAP_OPT_X_TLS_NEWCTX, &val)) != LDAP_OPT_SUCCESS) ||
+#endif
 		((rc = ldap_start_tls_s(ld->link, NULL, NULL)) != LDAP_SUCCESS)
 	) {
 		php_error_docref(NULL, E_WARNING,"Unable to start TLS: %s", ldap_err2string(rc));
 		RETURN_FALSE;
-	} else {
-		RETURN_TRUE;
 	}
+	LDAPG(tls_newctx) = false;
+	RETURN_TRUE;
 }
 /* }}} */
 #endif
@@ -3758,13 +3837,23 @@
 	zend_string *ret;
 
 	for (i = 0; i < valuelen; i++) {
-		len += (map(unsigned char) valuei) ? 3 : 1;
+		size_t addend = (map(unsigned char) valuei) ? 3 : 1;
+		if (len > ZSTR_MAX_LEN - addend) {
+			return NULL;
+		}
+		len += addend;
 	}
 	/* Per RFC 4514, a leading and trailing space must be escaped */
 	if ((flags & PHP_LDAP_ESCAPE_DN) && (value0 == ' ')) {
+		if (len > ZSTR_MAX_LEN - 2) {
+			return NULL;
+		}
 		len += 2;
 	}
 	if ((flags & PHP_LDAP_ESCAPE_DN) && ((valuelen > 1) && (valuevaluelen - 1 == ' '))) {
+		if (len > ZSTR_MAX_LEN - 2) {
+			return NULL;
+		}
 		len += 2;
 	}
 
@@ -3831,7 +3920,13 @@
 		php_ldap_escape_map_set_chars(map, ignores, ignoreslen, 0);
 	}
 
-	RETURN_NEW_STR(php_ldap_do_escape(map, value, valuelen, flags));
+	zend_string *result = php_ldap_do_escape(map, value, valuelen, flags);
+	if (UNEXPECTED(!result)) {
+		zend_argument_value_error(1, "is too long");
+		RETURN_THROWS();
+	}
+
+	RETURN_NEW_STR(result);
 }
 
 #ifdef STR_TRANSLATION
@@ -4168,7 +4263,7 @@
 	ext_functions,
 	PHP_MINIT(ldap),
 	PHP_MSHUTDOWN(ldap),
-	NULL,
+	PHP_RINIT(ldap),
 	NULL,
 	PHP_MINFO(ldap),
 	PHP_LDAP_VERSION,

php-8.3.7.tar.xz/ext/ldap/php_ldap.h -> php-8.3.21.tar.xz/ext/ldap/php_ldap.h Changed

php-8.3.21.tar.xz/ext/ldap/tests/GHSA-g665-fm4p-vhff-1.phpt Added

php-8.3.21.tar.xz/ext/ldap/tests/GHSA-g665-fm4p-vhff-2.phpt Added

php-8.3.21.tar.xz/ext/ldap/tests/gh16032-1.phpt Added

php-8.3.21.tar.xz/ext/ldap/tests/gh16032-2.phpt Added

php-8.3.21.tar.xz/ext/ldap/tests/gh16101.phpt Added

php-8.3.21.tar.xz/ext/ldap/tests/gh16132-1.phpt Added

php-8.3.21.tar.xz/ext/ldap/tests/gh16132-2.phpt Added

php-8.3.21.tar.xz/ext/ldap/tests/gh16136.phpt Added

php-8.3.21.tar.xz/ext/ldap/tests/gh17280.phpt Added

php-8.3.21.tar.xz/ext/ldap/tests/gh17704.phpt Added

php-8.3.7.tar.xz/ext/ldap/tests/ldap_add_error.phpt -> php-8.3.21.tar.xz/ext/ldap/tests/ldap_add_error.phpt Changed

php-8.3.7.tar.xz/ext/ldap/tests/ldap_modify_batch_error.phpt -> php-8.3.21.tar.xz/ext/ldap/tests/ldap_modify_batch_error.phpt Changed

php-8.3.7.tar.xz/ext/ldap/tests/ldap_search_error.phpt -> php-8.3.21.tar.xz/ext/ldap/tests/ldap_search_error.phpt Changed

php-8.3.7.tar.xz/ext/ldap/tests/ldap_set_rebind_proc_basic.phpt -> php-8.3.21.tar.xz/ext/ldap/tests/ldap_set_rebind_proc_basic.phpt Changed

php-8.3.7.tar.xz/ext/ldap/tests/ldap_start_tls_basic.phpt -> php-8.3.21.tar.xz/ext/ldap/tests/ldap_start_tls_basic.phpt Changed

php-8.3.7.tar.xz/ext/ldap/tests/ldap_unbind_variation.phpt -> php-8.3.21.tar.xz/ext/ldap/tests/ldap_unbind_variation.phpt Changed

php-8.3.21.tar.xz/ext/ldap/tests/ldaps_basic.phpt Added

@@ -0,0 +1,55 @@
+--TEST--
+ldap_connect() - Basic ldaps test
+--EXTENSIONS--
+ldap
+--XFAIL--
+Passes locally but fails on CI - need investigation (configuration ?)
+--SKIPIF--
+<?php require_once __DIR__ .'/skipifbindfailure.inc'; ?>
+--FILE--
+<?php
+require_once "connect.inc";
+
+$uri = "ldaps://$host:636";
+
+// CI uses self signed certificate
+
+// No cert option - fails
+$link = ldap_connect($uri);
+ldap_set_option($link, LDAP_OPT_PROTOCOL_VERSION, $protocol_version);
+var_dump(@ldap_bind($link, $user, $passwd));
+ldap_unbind($link);
+
+// No cert check - passes
+ldap_set_option(null, LDAP_OPT_X_TLS_REQUIRE_CERT, LDAP_OPT_X_TLS_ALLOW);
+$link = ldap_connect($uri);
+ldap_set_option($link, LDAP_OPT_PROTOCOL_VERSION, $protocol_version);
+var_dump(@ldap_bind($link, $user, $passwd));
+ldap_unbind($link);
+
+// No change to TLS options
+$link = ldap_connect($uri);
+ldap_set_option($link, LDAP_OPT_PROTOCOL_VERSION, $protocol_version);
+var_dump(@ldap_bind($link, $user, $passwd));
+ldap_unbind($link);
+
+// With cert check - fails
+ldap_set_option(null, LDAP_OPT_X_TLS_REQUIRE_CERT, LDAP_OPT_X_TLS_DEMAND);
+$link = ldap_connect($uri);
+ldap_set_option($link, LDAP_OPT_PROTOCOL_VERSION, $protocol_version);
+var_dump(@ldap_bind($link, $user, $passwd));
+ldap_unbind($link);
+
+// No change to TLS options
+$link = ldap_connect($uri);
+ldap_set_option($link, LDAP_OPT_PROTOCOL_VERSION, $protocol_version);
+var_dump(@ldap_bind($link, $user, $passwd));
+ldap_unbind($link);
+
+?>
+--EXPECT--
+bool(false)
+bool(true)
+bool(true)
+bool(false)
+bool(false)

php-8.3.7.tar.xz/ext/libxml/libxml.c -> php-8.3.21.tar.xz/ext/libxml/libxml.c Changed

@@ -525,41 +525,52 @@
 		if (Z_TYPE(s->wrapperdata) == IS_ARRAY) {
 			zval *header;
 
-			ZEND_HASH_FOREACH_VAL_IND(Z_ARRVAL(s->wrapperdata), header) {
+			/* Scan backwards: The header array might contain the headers for multiple responses, if
+			 * a redirect was followed.
+			 */
+			ZEND_HASH_REVERSE_FOREACH_VAL_IND(Z_ARRVAL(s->wrapperdata), header) {
 				const char buf = "Content-Type:";
-				if (Z_TYPE_P(header) == IS_STRING &&
-						!zend_binary_strncasecmp(Z_STRVAL_P(header), Z_STRLEN_P(header), buf, sizeof(buf)-1, sizeof(buf)-1)) {
-					char needle = "charset=";
-					char *haystack = estrndup(Z_STRVAL_P(header), Z_STRLEN_P(header));
-					char *encoding = php_stristr(haystack, needle, Z_STRLEN_P(header), strlen(needle));
-
-					if (encoding) {
-						char *end;
-
-						encoding += sizeof("charset=")-1;
-						if (*encoding == '"') {
-							encoding++;
-						}
-						end = strchr(encoding, ';');
-						if (end == NULL) {
-							end = encoding + strlen(encoding);
-						}
-						end--; /* end == encoding-1 isn't a buffer underrun */
-						while (*end == ' ' || *end == '\t') {
-							end--;
-						}
-						if (*end == '"') {
-							end--;
-						}
-						if (encoding >= end) continue;
-						*(end+1) = '\0';
-						enc = xmlParseCharEncoding(encoding);
-						if (enc <= XML_CHAR_ENCODING_NONE) {
-							enc = XML_CHAR_ENCODING_NONE;
+				if (Z_TYPE_P(header) == IS_STRING) {
+					/* If no colon is found in the header, we assume it's the HTTP status line and bail out. */
+					char *colon = memchr(Z_STRVAL_P(header), ':', Z_STRLEN_P(header));
+					char *space = memchr(Z_STRVAL_P(header), ' ', Z_STRLEN_P(header));
+					if (colon == NULL || space < colon) {
+						break;
+					}
+
+					if (!zend_binary_strncasecmp(Z_STRVAL_P(header), Z_STRLEN_P(header), buf, sizeof(buf)-1, sizeof(buf)-1)) {
+						char needle = "charset=";
+						char *haystack = estrndup(Z_STRVAL_P(header), Z_STRLEN_P(header));
+						char *encoding = php_stristr(haystack, needle, Z_STRLEN_P(header), sizeof("charset=")-1);
+
+						if (encoding) {
+							char *end;
+
+							encoding += sizeof("charset=")-1;
+							if (*encoding == '"') {
+								encoding++;
+							}
+							end = strchr(encoding, ';');
+							if (end == NULL) {
+								end = encoding + strlen(encoding);
+							}
+							end--; /* end == encoding-1 isn't a buffer underrun */
+							while (*end == ' ' || *end == '\t') {
+								end--;
+							}
+							if (*end == '"') {
+								end--;
+							}
+							if (encoding >= end) continue;
+							*(end+1) = '\0';
+							enc = xmlParseCharEncoding(encoding);
+							if (enc <= XML_CHAR_ENCODING_NONE) {
+								enc = XML_CHAR_ENCODING_NONE;
+							}
 						}
+						efree(haystack);
+						break; /* found content-type */
 					}
-					efree(haystack);
-					break; /* found content-type */
 				}
 			} ZEND_HASH_FOREACH_END();
 		}
@@ -580,19 +591,21 @@
 static xmlOutputBufferPtr
 php_libxml_output_buffer_create_filename(const char *URI,
                               xmlCharEncodingHandlerPtr encoder,
-                              int compression ATTRIBUTE_UNUSED)
+                              int compression)
 {
+	ZEND_IGNORE_VALUE(compression);
+
 	xmlOutputBufferPtr ret;
 	xmlURIPtr puri;
 	void *context = NULL;
 	char *unescaped = NULL;
 
 	if (URI == NULL)
-		return(NULL);
+		goto err;
 
 	if (strstr(URI, "%00")) {
 		php_error_docref(NULL, E_WARNING, "URI must not contain percent-encoded NUL bytes");
-		return NULL;
+		goto err;
 	}
 
 	puri = xmlParseURI(URI);
@@ -613,7 +626,7 @@
 	}
 
 	if (context == NULL) {
-		return(NULL);
+		goto err;
 	}
 
 	/* Allocate the Output buffer front-end. */
@@ -625,6 +638,11 @@
 	}
 
 	return(ret);
+
+err:
+	/* Similarly to __xmlOutputBufferCreateFilename we should also close the encoder on failure. */
+	xmlCharEncCloseFunc(encoder);
+	return NULL;
 }
 
 static void _php_libxml_free_error(void *ptr)
@@ -775,13 +793,18 @@
 is_string:
 			resource = Z_STRVAL(retval);
 		} else if (Z_TYPE(retval) == IS_RESOURCE) {
-			php_stream *stream;
-			php_stream_from_zval_no_verify(stream, &retval);
-			if (stream == NULL) {
-				php_libxml_ctx_error(context,
-						"The user entity loader callback '%s' has returned a "
-						"resource, but it is not a stream",
-						ZSTR_VAL(LIBXML(entity_loader_callback).function_handler->common.function_name));
+			php_stream *stream = (php_stream*)zend_fetch_resource2_ex(&retval, NULL, php_file_le_stream(), php_file_le_pstream());
+			if (UNEXPECTED(stream == NULL)) {
+				zval callable;
+				zend_get_callable_zval_from_fcc(&LIBXML(entity_loader_callback), &callable);
+				zend_string *callable_name = zend_get_callable_name(&callable);
+				zend_string *func_name = get_active_function_or_method_name();
+				zend_type_error(
+					"%s(): The user entity loader callback \"%s\" has returned a resource, but it is not a stream",
+					ZSTR_VAL(func_name), ZSTR_VAL(callable_name));
+				zend_string_release(func_name);
+				zend_string_release(callable_name);
+				zval_ptr_dtor(&callable);
 			} else {
 				/* TODO: allow storing the encoding in the stream context? */
 				xmlCharEncoding enc = XML_CHAR_ENCODING_NONE;

php-8.3.7.tar.xz/ext/libxml/php_libxml.h -> php-8.3.21.tar.xz/ext/libxml/php_libxml.h Changed

php-8.3.7.tar.xz/ext/libxml/php_libxml2.def -> php-8.3.21.tar.xz/ext/libxml/php_libxml2.def Changed

php-8.3.7.tar.xz/ext/libxml/tests/bug61367-read_2.phpt -> php-8.3.21.tar.xz/ext/libxml/tests/bug61367-read_2.phpt Changed

php-8.3.7.tar.xz/ext/libxml/tests/libxml_disable_entity_loader_2.phpt -> php-8.3.21.tar.xz/ext/libxml/tests/libxml_disable_entity_loader_2.phpt Changed

php-8.3.7.tar.xz/ext/libxml/tests/libxml_get_external_entity_loader_error_callback_name.phpt -> php-8.3.21.tar.xz/ext/libxml/tests/libxml_get_external_entity_loader_error_callback_name.phpt Changed

php-8.3.7.tar.xz/ext/libxml/tests/libxml_set_external_entity_loader_variation1.phpt -> php-8.3.21.tar.xz/ext/libxml/tests/libxml_set_external_entity_loader_variation1.phpt Changed

php-8.3.7.tar.xz/ext/mbstring/libmbfl/mbfl/mbfl_encoding.h -> php-8.3.21.tar.xz/ext/mbstring/libmbfl/mbfl/mbfl_encoding.h Changed

php-8.3.7.tar.xz/ext/mbstring/mbstring.c -> php-8.3.21.tar.xz/ext/mbstring/mbstring.c Changed

@@ -1567,7 +1567,9 @@
 		char *mimetype = NULL;
 
 		/* Analyze mime type */
-		if (SG(sapi_headers).mimetype && _php_mb_match_regex(MBSTRG(http_output_conv_mimetypes), SG(sapi_headers).mimetype, strlen(SG(sapi_headers).mimetype))) {
+		if (SG(sapi_headers).mimetype
+		 && MBSTRG(http_output_conv_mimetypes)
+		 && _php_mb_match_regex(MBSTRG(http_output_conv_mimetypes), SG(sapi_headers).mimetype, strlen(SG(sapi_headers).mimetype))) {
 			char *s;
 			if ((s = strchr(SG(sapi_headers).mimetype, ';')) == NULL) {
 				mimetype = estrdup(SG(sapi_headers).mimetype);
@@ -2321,6 +2323,16 @@
 		Z_PARAM_STR_OR_NULL(encoding)
 	ZEND_PARSE_PARAMETERS_END();
 
+	if (from == ZEND_LONG_MIN) {
+		zend_argument_value_error(2, "must be between " ZEND_LONG_FMT " and " ZEND_LONG_FMT, (ZEND_LONG_MIN + 1), ZEND_LONG_MAX);
+		RETURN_THROWS();
+	}
+
+	if (!len_is_null && len == ZEND_LONG_MIN) {
+		zend_argument_value_error(3, "must be between " ZEND_LONG_FMT " and " ZEND_LONG_FMT, (ZEND_LONG_MIN + 1), ZEND_LONG_MAX);
+		RETURN_THROWS();
+	}
+
 	const mbfl_encoding *enc = php_mb_get_encoding(encoding, 4);
 	if (!enc) {
 		RETURN_THROWS();
@@ -3082,7 +3094,8 @@
 	}
 
 	for (size_t i = 0; i < length; i++) {
-		arrayi.demerits *= arrayi.multiplier;
+		double demerits = arrayi.demerits * (double) arrayi.multiplier;
+		arrayi.demerits = demerits < (double) UINT64_MAX ? (uint64_t) demerits : UINT64_MAX;
 	}
 
 	return length;
@@ -3514,7 +3527,22 @@
 
 		HashTable *ht = HASH_OF(var);
 		if (ht != NULL) {
-			ZEND_HASH_FOREACH_VAL_IND(ht, entry) {
+			ZEND_HASH_FOREACH_VAL(ht, entry) {
+				/* Can be a typed property declaration, in which case we need to remove the reference from the source list.
+				 * Just using ZEND_TRY_ASSIGN_STRINGL is not sufficient because that would not unwrap the reference
+				 * and change values through references (see bug #26639). */
+				if (Z_TYPE_P(entry) == IS_INDIRECT) {
+					ZEND_ASSERT(Z_TYPE_P(var) == IS_OBJECT);
+
+					entry = Z_INDIRECT_P(entry);
+					if (Z_ISREF_P(entry) && Z_TYPE_P(Z_REFVAL_P(entry)) == IS_STRING) {
+						zend_property_info *info = zend_get_typed_property_info_for_slot(Z_OBJ_P(var), entry);
+						if (info) {
+							ZEND_REF_DEL_TYPE_SOURCE(Z_REF_P(entry), info);
+						}
+					}
+				}
+
 				if (mb_recursive_convert_variable(entry, from_encoding, to_encoding)) {
 					if (Z_REFCOUNTED_P(var)) {
 						Z_UNPROTECT_RECURSION_P(var);
@@ -4346,7 +4374,7 @@
 	smart_str str = {0};
 	bool empty = true;
 
-	if (str_headers != NULL) {
+	if (str_headers != NULL && ZSTR_LEN(str_headers) > 0) {
 		/* Strip trailing CRLF from `str_headers`; we will add CRLF back if necessary */
 		size_t len = ZSTR_LEN(str_headers);
 		if (ZSTR_VAL(str_headers)len-1 == '\n') {

php-8.3.21.tar.xz/ext/mbstring/tests/gh16229.phpt Added

php-8.3.21.tar.xz/ext/mbstring/tests/gh16261.phpt Added

php-8.3.21.tar.xz/ext/mbstring/tests/gh16360.phpt Added

php-8.3.21.tar.xz/ext/mbstring/tests/gh17503.phpt Added

php-8.3.21.tar.xz/ext/mbstring/tests/gh17989.phpt Added

php-8.3.7.tar.xz/ext/mysqli/mysqli.c -> php-8.3.21.tar.xz/ext/mysqli/mysqli.c Changed

php-8.3.7.tar.xz/ext/mysqli/tests/063.phpt -> php-8.3.21.tar.xz/ext/mysqli/tests/063.phpt Changed

php-8.3.7.tar.xz/ext/mysqli/tests/bug71863.phpt -> php-8.3.21.tar.xz/ext/mysqli/tests/bug71863.phpt Changed

php-8.3.7.tar.xz/ext/mysqli/tests/bug73462.phpt -> php-8.3.21.tar.xz/ext/mysqli/tests/bug73462.phpt Changed

php-8.3.21.tar.xz/ext/mysqli/tests/fake_server.inc Added

@@ -0,0 +1,872 @@
+<?php
+
+function my_mysqli_data_fields(): array
+{
+    return 
+        'intval' => 
+            'type' => '03',
+            'charset' => '3f00',
+            'length' => '0b000000',
+            'flags' => '0110',
+            'decimal' => '00',
+            'query_data_packet_length' => '080000',
+            'query_data_value' => '023134',
+            'stmt_data_packet_length' => '0b0000',
+            'stmt_data_value' => '0e000000'
+        ,
+        'fltval' => 
+            'type' => '04',
+            'charset' => '3f00',
+            'length' => '0c000000',
+            'flags' => '0110',
+            'decimal' => '1f',
+            'query_data_packet_length' => '090000',
+            'query_data_value' => '03322e33',
+            'stmt_data_packet_length' => '0b0000',
+            'stmt_data_value' => '33331340',
+        ,
+        'dblval' => 
+            'type' => '05',
+            'charset' => '3f00',
+            'length' => '16000000',
+            'flags' => '0110',
+            'decimal' => '1f',
+            'query_data_packet_length' => '090000',
+            'query_data_value' => '03312e32',
+            'stmt_data_packet_length' => '0f0000',
+            'stmt_data_value' => '333333333333f33f'
+        ,
+        'datval' => 
+            'type' => '0a',
+            'charset' => '3f00',
+            'length' => '0a000000',
+            'flags' => '8110',
+            'decimal' => '00',
+            'query_data_packet_length' => '100000',
+            'query_data_value' => '0a323031342d31322d3135',
+            'stmt_data_packet_length' => '0c0000',
+            'stmt_data_value' => '04de070c0f'
+        ,
+        'timval' => 
+            'type' => '0b',
+            'charset' => '3f00',
+            'length' => '0a000000',
+            'flags' => '8110',
+            'decimal' => '00',
+            'query_data_packet_length' => '0e0000',
+            'query_data_value' => '0831333a30303a3032',
+            'stmt_data_packet_length' => '100000',
+            'stmt_data_value' => '080000000000150801'
+        ,
+        'dtival' => 
+            'type' => '0c',
+            'charset' => '3f00',
+            'length' => '13000000',
+            'flags' => '8110',
+            'decimal' => '00',
+            'query_data_packet_length' => '190000',
+            'query_data_value' => '13323031342d31322d31362031333a30303a3031',
+            'stmt_data_packet_length' => '0f0000',
+            'stmt_data_value' => '07de070c100d0001'
+        ,
+        'bitval' => 
+            'type' => '10',
+            'charset' => '3f00',
+            'length' => '40000000',
+            'flags' => '2110',
+            'decimal' => '00',
+            'query_data_packet_length' => '0e0000',
+            'query_data_value' => '080808080808080808',
+            'stmt_data_packet_length' => '100000',
+            'stmt_data_value' => '080808080808080808'
+        ,
+        'strval' => 
+            'type' => 'fd',
+            'charset' => 'e000',
+            'length' => 'c8000000',
+            'flags' => '0110',
+            'decimal' => '00',
+            'query_data_packet_length' => '0a0000',
+            'query_data_value' => '0474657374',
+            'stmt_data_packet_length' => '0c0000',
+            'stmt_data_value' => '0474657374'
+        ,
+    ;
+}
+
+function my_mysqli_data_field(string $field): array
+{
+    $fields = my_mysqli_data_fields();
+    if (!isset($fields$field)) {
+        throw new Exception("Unknown field $field");
+    }
+    return $fields$field;
+}
+
+
+
+class my_mysqli_fake_packet_item
+{
+    public function __construct(public string|null $name, public string $value, public bool $is_hex = true)
+    {
+    }
+}
+
+class my_mysqli_fake_packet
+{
+    private array $data = array();
+
+    public function __get(string $name)
+    {
+        foreach ($this->data as $item) {
+            if ($item->name === $name) {
+                return $item->value;
+            }
+        }
+        return null;
+    }
+
+    public function __set(string $name, string|my_mysqli_fake_packet_item $value)
+    {
+        if ($value instanceof my_mysqli_fake_packet_item) {
+            if ($value->name === null) {
+                $value->name = $name;
+            }
+        } else {
+            $value = new my_mysqli_fake_packet_item($name, $value, true);
+        }
+
+        for ($i = 0; $i < count($this->data); $i++) {
+            if ($this->data$i->name === $name) {
+                $this->data$i = $value;
+                return;
+            }
+        }
+
+        $this->data = $value;
+    }
+
+    public function to_bytes(): string
+    {
+        $bytes = '';
+        foreach ($this->data as $item) {
+            $bytes .= $item->is_hex ? hex2bin($item->value) : $item->value;
+        }
+        return $bytes;
+    }
+}
+
+class my_mysqli_fake_packet_generator
+{
+    public static function create_packet_item(int|string $value, bool $is_hex = false, string $format = 'v'): my_mysqli_fake_packet_item
+    {
+        if (is_string($value)) {
+            $packed_value = $value;
+        } else {
+            $packed_value = pack($format, $value);
+        }
+        return new my_mysqli_fake_packet_item(null, $packed_value, $is_hex);
+    }
+
+    public function server_ok(): my_mysqli_fake_packet
+    {
+        $packet = new my_mysqli_fake_packet();
+        $packet->packet_length = "070000";
+        $packet->packet_number = "02";
+        $packet->header = "00"; // OK
+        $packet->affected_rows = "00";
+        $packet->last_insert_id = "00";
+        $packet->server_status = "0200";
+        $packet->warning_count = "0000";
+        return $packet;
+    }
+
+    public function server_greetings(): my_mysqli_fake_packet
+    {
+        $packet = new my_mysqli_fake_packet();
+        $packet->packet_length = "580000";
+        $packet->packet_number = "00";
+        $packet->proto_version = "0a";
+        $packet->version = self::create_packet_item('5.5.5-10.5.18-MariaDB' . chr(0));
+        $packet->thread_id = "03000000";
+        $packet->salt = "473e3f6047257c67";
+        $packet->filler = "00";
+        $packet->server_capabilities = self::create_packet_item(0b1111011111111110);
+        $packet->server_character_set = "08";
+        $packet->server_status = self::create_packet_item(0b000000000000010);
+        $packet->extended_server_capabilities = self::create_packet_item(0b1000000111111111);
+        $packet->auth_plugin = "15";
+        $packet->unused = "000000000000";
+        $packet->mariadb_extended_server_capabilities = self::create_packet_item(0b1111, false, 'V');
+        $packet->mariadb_extended_server_capabilities_salt = "6c6b55463f49335f686c643100";
+        $packet->mariadb_extended_server_capabilities_auth_plugin = self::create_packet_item('mysql_native_password');
+
+        return $packet;
+    }
+
+    public function server_tabular_query_response(): array
+    {
+        $qr1 = new my_mysqli_fake_packet();
+        $qr1->packet_length = "010000";
+        $qr1->packet_number = "01";
+        $qr1->field_count = "01";
+
+        $qr2 = new my_mysqli_fake_packet();
+        $qr2->packet_length = "190000";
+        $qr2->packet_number = "02";
+        $qr2->catalog_length_plus_name = "0164";
+        $qr2->db_length_plus_name = "0164";
+        $qr2->table_length_plus_name = "0164";
+        $qr2->original_t = "0164";
+        $qr2->name_length_plus_name = "0164";
+        $qr2->original_n = "0164";
+        $qr2->canary = "0c";
+        $qr2->charset = "3f00";
+        $qr2->length = "0b000000";
+        $qr2->type = "03";
+        $qr2->flags = "0350";
+        $qr2->decimals = "000000";
+
+        $qr3 = new my_mysqli_fake_packet();
+        $qr3->full = "05000003fe00002200";
+
+        $qr4 = new my_mysqli_fake_packet();
+        $qr4->full = "0400000401350174";
+
+        $qr5 = new my_mysqli_fake_packet();
+        $qr5->full = "05000005fe00002200";
+
+        return $qr1, $qr2, $qr3, $qr4, $qr5;
+    }
+
+    public function server_upsert_query_response(): array
+    {
+        $qr1 = new my_mysqli_fake_packet();
+        $qr1->packet_length = "010000";
+        $qr1->packet_number = "01";
+        $qr1->field_count = "00"; // UPSERT
+        $qr1->affected_rows = "00";
+        $qr1->affected_rows = "00";
+        $qr1->last_insert_id = "00";
+        $qr1->server_status = "0000";
+        $qr1->warning_count = "0000";
+        $qr1->len = "01";
+        $qr1->filename = "65";
+        $qr1->packet_length = sprintf("%02x0000", strlen($qr1->to_bytes())-4);
+
+        return $qr1;
+    }
+
+    public function server_stmt_prepare_response_start($num_field): my_mysqli_fake_packet
+    {
+        $pr1 = new my_mysqli_fake_packet();
+        $pr1->packet_length = "0c0000";
+        $pr1->packet_number = "01";
+        $pr1->response_code = '00'; // OK
+        $pr1->statement_id = '01000000';
+        $pr1->num_fields = $num_field;
+        $pr1->num_params = '0000';
+        $pr1->filler = '00';
+        $pr1->warnings = '0000';
+
+        return $pr1;
+    }
+
+    public function server_stmt_prepare_response_end($packer_number): my_mysqli_fake_packet
+    {
+        $pr3 = new my_mysqli_fake_packet();
+        $pr3->packet_length = "050000";
+        $pr3->packet_number = $packer_number;
+        $pr3->packet_type = 'fe'; // EOF
+        $pr3->warnings = '0000';
+        $pr3->server_status = '0200';
+
+        return $pr3;
+    }
+
+    public function server_stmt_prepare_items_response(): array
+    {
+        $pr1 = $this->server_stmt_prepare_response_start('0100');
+
+        $pr2 = new my_mysqli_fake_packet();
+        $pr2->packet_length = "300000";
+        $pr2->packet_number = "02";
+        $pr2->catalogue_len = '03';
+        $pr2->catalogue = '646566'; // def
+        $pr2->db_len = '08';
+        $pr2->db = '7068705f74657374'; // php_test
+        $pr2->table_len = '05';
+        $pr2->table = '6974656d73'; // items
+        $pr2->orig_table_len = '05';
+        $pr2->orig_table = '6974656d73'; // items
+        $pr2->name_len = '04';
+        $pr2->name = '6974656d';
+        $pr2->orig_name_len = '04';
+        $pr2->orig_name = '6974656d';
+        $pr2->something = '0c';
+        $pr2->charset = 'e000';
+        $pr2->length = 'c8000000';
+        $pr2->field_type = 'fd'; // FIELD_TYPE_VAR_STRING
+        $pr2->flags = '0110';
+        $pr2->decimal = '00';
+        $pr2->padding = '0000';
+
+        $pr3 = $this->server_stmt_prepare_response_end('03');
+
+        return $pr1, $pr2, $pr3;
+    }
+
+    public function server_stmt_prepare_data_response_field($packet_number, $field_name): my_mysqli_fake_packet
+    {
+        if (strlen($field_name) != 6) {
+            throw new Exception("Invalid field length - only 6 is allowed");
+        }
+
+        $field = my_mysqli_data_field($field_name);
+
+        $pr = new my_mysqli_fake_packet();
+        $pr->packet_length = "320000";
+        $pr->packet_number = $packet_number;
+        $pr->catalogue_len = '03';
+        $pr->catalogue = bin2hex('def');
+        $pr->db_len = '08';
+        $pr->db = bin2hex('php_test');
+        $pr->table_len = '04';
+        $pr->table = bin2hex('data');
+        $pr->orig_table_len = '04';
+        $pr->orig_table = bin2hex('data');
+        $pr->name_len = '06';
+        $pr->name = bin2hex($field_name);
+        $pr->orig_name_len = '06';
+        $pr->orig_name =  bin2hex($field_name);
+        $pr->something = '0c';
+        $pr->charset = $field'charset';
+        $pr->length = $field'length';
+        $pr->field_type = $field'type';
+        $pr->flags = $field'flags';
+        $pr->decimal = $field'decimal';
+        $pr->padding = '0000';
+
+        return $pr;
+    }
+
+    public function server_stmt_prepare_data_response(string $field_name): array
+    {
+        $pr1 = $this->server_stmt_prepare_response_start('0200');
+
+        $pr2 = $this->server_stmt_prepare_data_response_field('02', 'strval');
+        $pr3 = $this->server_stmt_prepare_data_response_field('03', $field_name);
+
+        $pr4 = $this->server_stmt_prepare_response_end('04');
+
+        return $pr1, $pr2, $pr3, $pr4;
+    }
+
+    public function server_stmt_execute_items_response(): array
+    {
+        $pr1 = new my_mysqli_fake_packet();
+        $pr1->packet_length = "010000";
+        $pr1->packet_number = "01";
+        $pr1->num_fields = '01';
+
+        $pr2 = new my_mysqli_fake_packet();
+        $pr2->packet_length = "300000";
+        $pr2->packet_number = "02";
+        $pr2->catalogue_len = '03';
+        $pr2->catalogue = '646566'; // def
+        $pr2->db_len = '08';
+        $pr2->db = '7068705f74657374'; // php_test
+        $pr2->table_len = '05';
+        $pr2->table = '6974656d73'; // items
+        $pr2->orig_table_len = '05';
+        $pr2->orig_table = '6974656d73'; // items
+        $pr2->name_len = '04';
+        $pr2->name = '6974656d';
+        $pr2->orig_name_len = '04';
+        $pr2->orig_name = '6974656d';
+        $pr2->something = '0c';
+        $pr2->charset = 'e000';
+        $pr2->length = 'c8000000';
+        $pr2->field_type = 'fd'; // FIELD_TYPE_VAR_STRING
+        $pr2->flags = '0110';
+        $pr2->decimal = '00';
+        $pr2->padding = '0000';
+
+        $pr3 = new my_mysqli_fake_packet();
+        $pr3->packet_length = "050000";
+        $pr3->packet_number = "03";
+        $pr3->packet_type = 'fe'; // EOF
+        $pr3->warnings = '0000';
+        $pr3->server_status = '2200';
+
+        $pr4 = new my_mysqli_fake_packet();
+        $pr4->packet_length = "070000";
+        $pr4->packet_number = "04";
+        $pr4->packet_type = '00'; // OK
+        $pr4->affected_rows = '00';
+        $pr4->row_data_len = '04';
+        $pr4->row_data = '74657374'; // item
+
+        $pr5 = new my_mysqli_fake_packet();
+        $pr5->full = '05000005fe00002200';
+
+        return $pr1, $pr2, $pr3, $pr4, $pr5;
+    }
+
+    private function server_execute_data_response_start(string $field_name): array
+    {
+        $pr1 = new my_mysqli_fake_packet();
+        $pr1->packet_length = "010000";
+        $pr1->packet_number = "01";
+        $pr1->num_fields = '02';
+
+        $pr2 = new my_mysqli_fake_packet();
+        $pr2->packet_length = "320000";
+        $pr2->packet_number = "02";
+        $pr2->catalogue_len = '03';
+        $pr2->catalogue = '646566'; // def
+        $pr2->db_len = '08';
+        $pr2->db = '7068705f74657374'; // php_test
+        $pr2->table_len = '04';
+        $pr2->table = bin2hex('data');
+        $pr2->orig_table_len = '04';
+        $pr2->orig_table = bin2hex('data');
+        $pr2->name_len = '06';
+        $pr2->name = bin2hex('strval');
+        $pr2->orig_name_len = '06';
+        $pr2->orig_name =  bin2hex('strval');
+        $pr2->something = '0c';
+        $pr2->charset = 'e000';
+        $pr2->length = 'c8000000';
+        $pr2->field_type = 'fd'; // FIELD_TYPE_VAR_STRING
+        $pr2->flags = '0110';
+        $pr2->decimal = '00';
+        $pr2->padding = '0000';
+
+        $field = my_mysqli_data_field($field_name);
+
+        $pr3 = new my_mysqli_fake_packet();
+        $pr3->packet_length = "320000";
+        $pr3->packet_number = "03";
+        $pr3->catalogue_len = '03';
+        $pr3->catalogue = '646566'; // def
+        $pr3->db_len = '08';
+        $pr3->db = '7068705f74657374'; // php_test
+        $pr3->table_len = '04';
+        $pr3->table = bin2hex('data');
+        $pr3->orig_table_len = '04';
+        $pr3->orig_table = bin2hex('data');
+        $pr3->name_len = '06';
+        $pr3->name = bin2hex($field_name);
+        $pr3->orig_name_len = '06';
+        $pr3->orig_name =  bin2hex($field_name);
+        $pr3->something = '0c';
+        $pr3->charset = $field'charset';
+        $pr3->length = $field'length';
+        $pr3->field_type = $field'type';
+        $pr3->flags = $field'flags';
+        $pr3->decimal = $field'decimal';
+        $pr3->padding = '0000';
+
+        $pr4 = new my_mysqli_fake_packet();
+        $pr4->packet_length = "050000";
+        $pr4->packet_number = "04";
+        $pr4->packet_type = 'fe'; // EOF
+        $pr4->warnings = '0000';
+        $pr4->server_status = '2200';
+
+        return $field, $pr1, $pr2, $pr3, $pr4;
+    }
+
+    private function server_execute_data_response_end(): my_mysqli_fake_packet
+    {
+        $pr6 = new my_mysqli_fake_packet();
+        $pr6->packet_length = '050000';
+        $pr6->packet_number = "06";
+        $pr6->packet_type = 'fe'; // EOF
+        $pr6->warnings = '0000';
+        $pr6->server_status = '2200';
+
+        return $pr6;
+    }
+
+    public function server_stmt_execute_data_response(string $field_name): array
+    {
+        $field, $pr1, $pr2, $pr3, $pr4 = $this->server_execute_data_response_start($field_name);
+
+        $pr5 = new my_mysqli_fake_packet();
+        $pr5->packet_length = $field'stmt_data_packet_length';
+        $pr5->packet_number = "05";
+        $pr5->packet_type = '00'; // OK
+        $pr5->affected_rows = '00';
+        $pr5->row_field1_len = '04';
+        $pr5->row_field1_data = '74657374'; // test
+        $pr5->row_field2 = $field'stmt_data_value';
+
+        return $pr1, $pr2, $pr3, $pr4, $pr5, $this->server_execute_data_response_end();
+    }
+
+    public function server_query_execute_data_response(string $field_name): array
+    {
+        $field, $pr1, $pr2, $pr3, $pr4 = $this->server_execute_data_response_start($field_name);
+
+        $pr5 = new my_mysqli_fake_packet();
+        $pr5->packet_length = $field'query_data_packet_length';
+        $pr5->packet_number = "05";
+        $pr5->row_field1_len = '04';
+        $pr5->row_field1_data = '74657374'; // test
+        $pr5->row_field2 = $field'query_data_value';
+
+        return $pr1, $pr2, $pr3, $pr4, $pr5, $this->server_execute_data_response_end();
+    }
+}
+
+class my_mysqli_fake_server_conn
+{
+    private $conn;
+    public $packet_generator;
+
+    public function __construct($socket)
+    {
+        $this->packet_generator = new my_mysqli_fake_packet_generator();
+        $this->conn = stream_socket_accept($socket);
+        if ($this->conn) {
+            fprintf(STDERR, "* Connection established\n");
+        } else {
+            fprintf(STDERR, "* Failed to establish connection\n");
+        }
+    }
+
+    public function packets_to_bytes(array $packets): string
+    {
+        return implode('', array_map(fn($s) => $s->to_bytes(), $packets));
+    }
+
+    public function send($payload, $message = null): void
+    {
+        if ($message) {
+            fprintf(STDERR, "* Sending - %s: %s\n", $message, bin2hex($payload));
+        }
+        fwrite($this->conn, $payload);
+    }
+
+    public function read($bytes_len = 1024)
+    {
+        // wait 20ms to fill the buffer
+        usleep(20000);
+        $data = fread($this->conn, $bytes_len);
+        if ($data) {
+            fprintf(STDERR, "* Received: %s\n", bin2hex($data));
+        }
+    }
+
+    public function close()
+    {
+        fclose($this->conn);
+    }
+
+    public function send_server_greetings()
+    {
+        $this->send($this->packet_generator->server_greetings()->to_bytes(), "Server Greeting");
+    }
+
+    public function send_server_ok()
+    {
+        $this->send($this->packet_generator->server_ok()->to_bytes(), "Server OK");
+    }
+
+    public function send_server_tabular_query_response(): void
+    {
+        $packets = $this->packet_generator->server_tabular_query_response();
+        $this->send($this->packets_to_bytes($packets), "Tabular response");
+    }
+
+    public function send_server_stmt_prepare_items_response(): void
+    {
+        $packets = $this->packet_generator->server_stmt_prepare_items_response();
+        $this->send($this->packets_to_bytes($packets), "Stmt prepare items");
+    }
+
+
+    public function send_server_stmt_prepare_data_response(string $field_name): void
+    {
+        $packets = $this->packet_generator->server_stmt_prepare_data_response($field_name);
+        $this->send($this->packets_to_bytes($packets), "Stmt prepare data $field_name");
+    }
+
+    public function send_server_stmt_execute_items_response(): void
+    {
+        $packets = $this->packet_generator->server_stmt_execute_items_response();
+        $this->send($this->packets_to_bytes($packets), "Stmt execute items");
+    }
+
+    public function send_server_stmt_execute_data_response(string $field_name): void
+    {
+        $packets = $this->packet_generator->server_stmt_execute_data_response($field_name);
+        $this->send($this->packets_to_bytes($packets), "Stmt execute data $field_name");
+    }
+
+    public function send_server_query_execute_data_response(string $field_name): void
+    {
+        $packets = $this->packet_generator->server_query_execute_data_response($field_name);
+        $this->send($this->packets_to_bytes($packets), "Query execute data $field_name");
+    }
+}
+
+class my_mysqli_fake_server_process
+{
+    private int $port;
+
+    public function __construct(private $process, private array $pipes) {}
+
+    public function terminate(bool $wait = false): void
+    {
+        if ($wait) {
+            $this->wait();
+        }
+        proc_terminate($this->process);
+    }
+
+    public function wait(): void
+    {
+        $line = fgets($this->pipes1);
+        if (preg_match('/\\*\ Server started on \d+\.\d+\.\d+\.\d+:(\d+)/', $line, $matches)) {
+            $this->port = (int)$matches1;
+        }
+        echo $line;
+    }
+
+    public function getPort(): int
+    {
+        return $this->port ?? throw new RuntimeException("Port not set");
+    }
+}
+
+function my_mysqli_test_tabular_response_def_over_read(my_mysqli_fake_server_conn $conn): void
+{
+    $rh = $conn->packet_generator->server_tabular_query_response();
+
+    // Length of the packet is modified to include the next added data
+    $rh1->packet_length = "1e0000";
+
+    // We add a length field encoded on 4 bytes which evaluates to 65536. If the process crashes because
+    // the heap has been overread, lower this value.
+    $rh1->extra_def_size = "fd000001";  # 65536
+
+    // Filler
+    $rh1->extra_def_data = "aa";
+
+    $trrh = $conn->packets_to_bytes($rh);
+
+    $conn->send_server_greetings();
+    $conn->read();
+    $conn->send_server_ok();
+    $conn->read();
+    $conn->send($trrh, "Malicious Tabular Response Extract heap through buffer over-read");
+    $conn->read(65536);
+}
+
+function my_mysqli_test_upsert_response_filename_over_read(my_mysqli_fake_server_conn $conn): void
+{
+    $rh = $conn->packet_generator->server_upsert_query_response();
+
+    // Set extra length to overread
+    $rh0->len = "fa";
+
+    $trrh = $conn->packets_to_bytes($rh);
+
+    $conn->send_server_greetings();
+    $conn->read();
+    $conn->send_server_ok();
+    $conn->read();
+    $conn->send($trrh, "Malicious Tabular Response Extract heap through buffer over-read");
+    $conn->read(65536);
+}
+
+function my_mysqli_test_auth_response_message_over_read(my_mysqli_fake_server_conn $conn): void
+{
+    $p = $conn->packet_generator->server_ok();
+    $p->packet_length = "090000";
+    $p->message_len = "fcff";
+
+    $conn->send_server_greetings();
+    $conn->read();
+    $conn->send($p->to_bytes(), "Malicious OK Auth Response Extract heap through buffer over-read");
+    $conn->read();
+}
+
+function my_mysqli_test_stmt_response_row_over_read_string(my_mysqli_fake_server_conn $conn): void
+{
+    $rh = $conn->packet_generator->server_stmt_execute_items_response();
+
+    // Set extra length to overread
+    $rh3->row_data_len = "fa";
+
+    $conn->send_server_greetings();
+    $conn->read();
+    $conn->send_server_ok();
+    $conn->read();
+    $conn->send_server_stmt_prepare_items_response();
+    $conn->read();
+    $conn->send($conn->packets_to_bytes($rh), "Malicious Stmt Response for items Extract heap through buffer over-read");
+    $conn->read(65536);
+}
+
+function my_mysqli_test_stmt_response_row_over_read_two_fields(
+    my_mysqli_fake_server_conn $conn,
+    string $field_name,
+    string $row_field1_len = '06'
+): void {
+    $rh = $conn->packet_generator->server_stmt_execute_data_response($field_name);
+
+    // Set extra length to overread by two bytes
+    $rh4->row_field1_len = $row_field1_len;
+
+    $conn->send_server_greetings();
+    $conn->read();
+    $conn->send_server_ok();
+    $conn->read();
+    $conn->send_server_stmt_prepare_data_response($field_name);
+    $conn->read();
+    $conn->send(
+        $conn->packets_to_bytes($rh),
+        "Malicious Stmt Response for data $field_name Extract heap through buffer over-read"
+    );
+    $conn->read(65536);
+}
+
+function my_mysqli_test_stmt_response_row_over_read_int(my_mysqli_fake_server_conn $conn): void
+{
+    my_mysqli_test_stmt_response_row_over_read_two_fields($conn, 'intval');
+}
+
+function my_mysqli_test_stmt_response_row_over_read_float(my_mysqli_fake_server_conn $conn): void
+{
+    my_mysqli_test_stmt_response_row_over_read_two_fields($conn, 'fltval');
+}
+
+function my_mysqli_test_stmt_response_row_over_read_double(my_mysqli_fake_server_conn $conn): void
+{
+    my_mysqli_test_stmt_response_row_over_read_two_fields($conn, 'dblval');
+}
+
+function my_mysqli_test_stmt_response_row_over_read_date(my_mysqli_fake_server_conn $conn): void
+{
+    my_mysqli_test_stmt_response_row_over_read_two_fields($conn, 'datval');
+}
+
+function my_mysqli_test_stmt_response_row_over_read_time(my_mysqli_fake_server_conn $conn): void
+{
+    my_mysqli_test_stmt_response_row_over_read_two_fields($conn, 'timval', '0c');
+}
+
+function my_mysqli_test_stmt_response_row_over_read_datetime(my_mysqli_fake_server_conn $conn): void
+{
+    my_mysqli_test_stmt_response_row_over_read_two_fields($conn, 'dtival');
+}
+
+function my_mysqli_test_stmt_response_row_no_space(my_mysqli_fake_server_conn $conn): void
+{
+    my_mysqli_test_stmt_response_row_over_read_two_fields($conn, 'strval', '09');
+}
+
+function my_mysqli_test_stmt_response_row_over_read_bit(my_mysqli_fake_server_conn $conn): void
+{
+    my_mysqli_test_stmt_response_row_over_read_two_fields($conn, 'bitval');
+}
+
+function my_mysqli_test_stmt_response_row_read_two_fields(my_mysqli_fake_server_conn $conn): void
+{
+    $conn->send_server_greetings();
+    $conn->read();
+    $conn->send_server_ok();
+    $conn->read();
+    $field_names = array_keys(my_mysqli_data_fields());
+    foreach ($field_names as $field_name) {
+        $conn->send_server_stmt_prepare_data_response($field_name);
+        $conn->read(65536);
+        $conn->send_server_stmt_execute_data_response($field_name);
+        $conn->read(65536);
+    }
+}
+
+function my_mysqli_test_query_response_row_length_overflow(my_mysqli_fake_server_conn $conn): void
+{
+    $rh = $conn->packet_generator->server_query_execute_data_response('strval');
+
+    // Set extra length to overread by two bytes
+    $rh4->row_field2 = 'fefefefefe';
+
+    $conn->send_server_greetings();
+    $conn->read();
+    $conn->send_server_ok();
+    $conn->read();
+    $conn->send($conn->packets_to_bytes($rh), "Malicious Query Response for data strval field length overflow");
+    $conn->read(65536);
+}
+
+function my_mysqli_test_query_response_row_read_two_fields(my_mysqli_fake_server_conn $conn): void
+{
+    $conn->send_server_greetings();
+    $conn->read();
+    $conn->send_server_ok();
+    $conn->read();
+    $field_names = array_keys(my_mysqli_data_fields());
+    foreach ($field_names as $field_name) {
+        $conn->send_server_query_execute_data_response($field_name);
+        $conn->read();
+    }
+}
+
+function run_fake_server(string $test_function, int|string $port = 0): int
+{
+    $host = '127.0.0.1';
+
+    $socket = @stream_socket_server("tcp://$host:$port", $errno, $errstr);
+    if (!$socket) {
+        die("Failed to create socket: $errstr ($errno)\n");
+    }
+    if (intval($port) === 0) {
+        $address = stream_socket_get_name($socket, false);
+        list($host, $port) = explode(":", $address);
+    }
+
+    echo "* Server started on $host:$port\n";
+
+    try {
+        $conn = new my_mysqli_fake_server_conn($socket);
+        $test_function_name = 'my_mysqli_test_' . $test_function;
+        call_user_func($test_function_name, $conn);
+        $conn->close();
+    } catch (Exception $e) {
+        fprintf(STDERR, "! Exception: " . $e->getMessage() . "\n");
+    }
+
+    fclose($socket);
+
+    echo "* Server finished\n";
+}
+
+
+function run_fake_server_in_background($test_function, $port = 0): my_mysqli_fake_server_process
+{
+    $command = PHP_BINARY, '-n', __FILE__, 'mysqli_fake_server', $test_function, $port;
+
+    $descriptorspec = array(
+        0 => array("pipe", "r"),
+        1 => array("pipe", "w"),
+        2 => STDERR,
+    );
+
+    $process = proc_open($command, $descriptorspec, $pipes);
+
+    if (is_resource($process)) {
+        return new my_mysqli_fake_server_process($process, $pipes);
+    } else {
+        throw new Exception("Failed to start server process");
+    }
+}
+
+if (isset($argv) && $argc > 2 && $argv1 == 'mysqli_fake_server') {
+    run_fake_server($argv2, $argv3 ?? 0);
+}

php-8.3.21.tar.xz/ext/mysqli/tests/gh14255.phpt Added

php-8.3.21.tar.xz/ext/mysqli/tests/gh15432.phpt Added

php-8.3.21.tar.xz/ext/mysqli/tests/ghsa-h35g-vwh6-m678-auth-message.phpt Added

@@ -0,0 +1,37 @@
+--TEST--
+GHSA-h35g-vwh6-m678 (mysqlnd leaks partial content of the heap - auth message buffer over-read)
+--EXTENSIONS--
+mysqli
+--FILE--
+<?php
+require_once 'fake_server.inc';
+
+$servername = "127.0.0.1";
+$username = "root";
+$password = "";
+
+$process = run_fake_server_in_background('auth_response_message_over_read');
+$process->wait();
+
+try {
+    $conn = new mysqli( $servername, $username, $password, "", $process->getPort());
+    $info = mysqli_info($conn);
+    var_dump($info);
+} catch (Exception $e) {
+    echo $e->getMessage() . PHP_EOL;
+}
+
+$process->terminate();
+
+print "done!";
+?>
+--EXPECTF--
+* Server started on 127.0.0.1:%d
+* Connection established
+* Sending - Server Greeting: 580000000a352e352e352d31302e352e31382d4d6172696144420003000000473e3f6047257c6700fef7080200ff81150000000000000f0000006c6b55463f49335f686c6431006d7973716c5f6e61746976655f70617373776f7264
+* Received: 6900000185a21a00000000c0080000000000000000000000000000000000000000000000726f6f7400006d7973716c5f6e61746976655f70617373776f7264002c0c5f636c69656e745f6e616d65076d7973716c6e640c5f7365727665725f686f7374093132372e302e302e31
+* Sending - Malicious OK Auth Response Extract heap through buffer over-read: 0900000200000002000000fcff
+
+Warning: mysqli::__construct(): OK packet message length is past the packet size in %s on line %d
+Unknown error while trying to connect via tcp://127.0.0.1:%d
+done!

php-8.3.21.tar.xz/ext/mysqli/tests/ghsa-h35g-vwh6-m678-def.phpt Added

@@ -0,0 +1,45 @@
+--TEST--
+GHSA-h35g-vwh6-m678 (mysqlnd leaks partial content of the heap - tabular default)
+--EXTENSIONS--
+mysqli
+--FILE--
+<?php
+require_once 'fake_server.inc';
+
+$servername = "127.0.0.1";
+$username = "root";
+$password = "";
+
+$process = run_fake_server_in_background('tabular_response_def_over_read');
+$process->wait();
+
+$conn = new mysqli($servername, $username, $password, "", $process->getPort());
+
+echo "* Running query on the fake server...\n";
+
+$result = $conn->query("SELECT * from users");
+
+if ($result) {
+    $all_fields = $result->fetch_fields();
+    var_dump($result->fetch_all(MYSQLI_ASSOC));
+    var_dump(get_object_vars($all_fields0)"def");
+}
+
+$conn->close();
+
+$process->terminate();
+
+print "done!";
+?>
+--EXPECTF--
+* Server started on 127.0.0.1:%d
+* Connection established
+* Sending - Server Greeting: 580000000a352e352e352d31302e352e31382d4d6172696144420003000000473e3f6047257c6700fef7080200ff81150000000000000f0000006c6b55463f49335f686c6431006d7973716c5f6e61746976655f70617373776f7264
+* Received: 6900000185a21a00000000c0080000000000000000000000000000000000000000000000726f6f7400006d7973716c5f6e61746976655f70617373776f7264002c0c5f636c69656e745f6e616d65076d7973716c6e640c5f7365727665725f686f7374093132372e302e302e31
+* Sending - Server OK: 0700000200000002000000
+* Running query on the fake server...
+* Received: 140000000353454c454354202a2066726f6d207573657273
+* Sending - Malicious Tabular Response Extract heap through buffer over-read: 01000001011e0000020164016401640164016401640c3f000b000000030350000000fd000001aa05000003fe00002200040000040135017405000005fe00002200
+
+Warning: mysqli::query(): Protocol error. Server sent default for unsupported field list (mysqlnd_wireprotocol.c:%d) in %s on line %d
+done!

php-8.3.21.tar.xz/ext/mysqli/tests/ghsa-h35g-vwh6-m678-filename.phpt Added

@@ -0,0 +1,42 @@
+--TEST--
+GHSA-h35g-vwh6-m678 (mysqlnd leaks partial content of the heap - upsert filename buffer over-read)
+--EXTENSIONS--
+mysqli
+--FILE--
+<?php
+require_once 'fake_server.inc';
+
+$servername = "127.0.0.1";
+$username = "root";
+$password = "";
+
+$process = run_fake_server_in_background('upsert_response_filename_over_read');
+$process->wait();
+
+$conn = new mysqli($servername, $username, $password, "", $process->getPort());
+echo "* Running query on the fake server...\n";
+
+$result = $conn->query("SELECT * from users");
+$info = mysqli_info($conn);
+
+var_dump($info);
+
+$process->terminate();
+
+print "done!";
+?>
+--EXPECTF--
+* Server started on 127.0.0.1:%d
+* Connection established
+* Sending - Server Greeting: 580000000a352e352e352d31302e352e31382d4d6172696144420003000000473e3f6047257c6700fef7080200ff81150000000000000f0000006c6b55463f49335f686c6431006d7973716c5f6e61746976655f70617373776f7264
+* Received: 6900000185a21a00000000c0080000000000000000000000000000000000000000000000726f6f7400006d7973716c5f6e61746976655f70617373776f7264002c0c5f636c69656e745f6e616d65076d7973716c6e640c5f7365727665725f686f7374093132372e302e302e31
+* Sending - Server OK: 0700000200000002000000
+* Running query on the fake server...
+* Received: 140000000353454c454354202a2066726f6d207573657273
+* Sending - Malicious Tabular Response Extract heap through buffer over-read: 0900000100000000000000fa65
+
+Warning: mysqli::query(): RSET_HEADER packet additional data length is past 249 bytes the packet size in %s on line %d
+
+Warning: mysqli::query(): Error reading result set's header in %s on line %d
+NULL
+done!

php-8.3.21.tar.xz/ext/mysqli/tests/ghsa-h35g-vwh6-m678-query-len-overflow.phpt Added

@@ -0,0 +1,47 @@
+--TEST--
+GHSA-h35g-vwh6-m678 (mysqlnd leaks partial content of the heap - stmt row no space for the field)
+--EXTENSIONS--
+mysqli
+--FILE--
+<?php
+require_once 'fake_server.inc';
+
+$servername = "127.0.0.1";
+$username = "root";
+$password = "";
+
+$process = run_fake_server_in_background('query_response_row_length_overflow');
+$process->wait();
+
+$conn = new mysqli($servername, $username, $password, "", $process->getPort());
+
+echo "* Query the fake server...\n";
+$sql = "SELECT strval, strval FROM data";
+
+$result = $conn->query($sql);
+
+if ($result->num_rows > 0) {
+    while ($row = $result->fetch_assoc()) {
+        var_dump($row'strval');
+    }
+}
+$conn->close();
+
+$process->terminate(true);
+
+print "done!";
+?>
+--EXPECTF--
+* Server started on 127.0.0.1:%d
+* Connection established
+* Sending - Server Greeting: 580000000a352e352e352d31302e352e31382d4d6172696144420003000000473e3f6047257c6700fef7080200ff81150000000000000f0000006c6b55463f49335f686c6431006d7973716c5f6e61746976655f70617373776f7264
+* Received: 6900000185a21a00000000c0080000000000000000000000000000000000000000000000726f6f7400006d7973716c5f6e61746976655f70617373776f7264002c0c5f636c69656e745f6e616d65076d7973716c6e640c5f7365727665725f686f7374093132372e302e302e31
+* Sending - Server OK: 0700000200000002000000
+* Query the fake server...
+* Received: 200000000353454c4543542073747276616c2c2073747276616c2046524f4d2064617461
+* Sending - Malicious Query Response for data strval field length overflow: 01000001023200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd011000000005000004fe000022000a0000050474657374fefefefefe05000006fe00002200
+
+Warning: mysqli_result::fetch_assoc(): Malformed server packet. Field length pointing after end of packet in %s on line %d
+* Received: 0100000001
+* Server finished
+done!

php-8.3.21.tar.xz/ext/mysqli/tests/ghsa-h35g-vwh6-m678-stmt-row-bit.phpt Added

@@ -0,0 +1,52 @@
+--TEST--
+GHSA-h35g-vwh6-m678 (mysqlnd leaks partial content of the heap - stmt row bit buffer over-read)
+--EXTENSIONS--
+mysqli
+--FILE--
+<?php
+require_once 'fake_server.inc';
+
+$servername = "127.0.0.1";
+$username = "root";
+$password = "";
+
+$process = run_fake_server_in_background('stmt_response_row_over_read_bit');
+$process->wait();
+
+$conn = new mysqli($servername, $username, $password, "", $process->getPort());
+
+echo "* Preparing statement on the fake server...\n";
+$stmt = $conn->prepare("SELECT bitval, timval FROM data");
+
+$stmt->execute();
+$result = $stmt->get_result();
+
+// Fetch and display the results
+if ($result->num_rows > 0) {
+    while ($row = $result->fetch_assoc()) {
+        var_dump($row"bitval");
+    }
+}
+$stmt->close();
+$conn->close();
+
+$process->terminate(true);
+
+print "done!";
+?>
+--EXPECTF--
+* Server started on 127.0.0.1:%d
+* Connection established
+* Sending - Server Greeting: 580000000a352e352e352d31302e352e31382d4d6172696144420003000000473e3f6047257c6700fef7080200ff81150000000000000f0000006c6b55463f49335f686c6431006d7973716c5f6e61746976655f70617373776f7264
+* Received: 6900000185a21a00000000c0080000000000000000000000000000000000000000000000726f6f7400006d7973716c5f6e61746976655f70617373776f7264002c0c5f636c69656e745f6e616d65076d7973716c6e640c5f7365727665725f686f7374093132372e302e302e31
+* Sending - Server OK: 0700000200000002000000
+* Preparing statement on the fake server...
+* Received: 200000001653454c4543542062697476616c2c2074696d76616c2046524f4d2064617461
+* Sending - Stmt prepare data bitval: 0c0000010001000000020000000000003200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f74657374046461746104646174610662697476616c0662697476616c0c3f004000000010211000000005000004fe00000200
+* Received: 0a00000017010000000001000000
+* Sending - Malicious Stmt Response for data bitval Extract heap through buffer over-read: 01000001023200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f74657374046461746104646174610662697476616c0662697476616c0c3f004000000010211000000005000004fe00002200100000050000067465737408080808080808080805000006fe00002200
+
+Warning: mysqli_result::fetch_assoc(): Malformed server packet. Field length pointing after the end of packet in %s on line %d
+* Received: 0500000019010000000100000001
+* Server finished
+done!

php-8.3.21.tar.xz/ext/mysqli/tests/ghsa-h35g-vwh6-m678-stmt-row-date.phpt Added

@@ -0,0 +1,52 @@
+--TEST--
+GHSA-h35g-vwh6-m678 (mysqlnd leaks partial content of the heap - stmt row date buffer over-read)
+--EXTENSIONS--
+mysqli
+--FILE--
+<?php
+require_once 'fake_server.inc';
+
+$servername = "127.0.0.1";
+$username = "root";
+$password = "";
+
+$process = run_fake_server_in_background('stmt_response_row_over_read_date');
+$process->wait();
+
+$conn = new mysqli($servername, $username, $password, "", $process->getPort());
+
+echo "* Preparing statement on the fake server...\n";
+$stmt = $conn->prepare("SELECT strval, datval FROM data");
+
+$stmt->execute();
+$result = $stmt->get_result();
+
+// Fetch and display the results
+if ($result->num_rows > 0) {
+    while ($row = $result->fetch_assoc()) {
+        var_dump($row"datval");
+    }
+}
+$stmt->close();
+$conn->close();
+
+$process->terminate(true);
+
+print "done!";
+?>
+--EXPECTF--
+* Server started on 127.0.0.1:%d
+* Connection established
+* Sending - Server Greeting: 580000000a352e352e352d31302e352e31382d4d6172696144420003000000473e3f6047257c6700fef7080200ff81150000000000000f0000006c6b55463f49335f686c6431006d7973716c5f6e61746976655f70617373776f7264
+* Received: 6900000185a21a00000000c0080000000000000000000000000000000000000000000000726f6f7400006d7973716c5f6e61746976655f70617373776f7264002c0c5f636c69656e745f6e616d65076d7973716c6e640c5f7365727665725f686f7374093132372e302e302e31
+* Sending - Server OK: 0700000200000002000000
+* Preparing statement on the fake server...
+* Received: 200000001653454c4543542073747276616c2c2064617476616c2046524f4d2064617461
+* Sending - Stmt prepare data datval: 0c0000010001000000020000000000003200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f74657374046461746104646174610664617476616c0664617476616c0c3f000a0000000a811000000005000004fe00000200
+* Received: 0a00000017010000000001000000
+* Sending - Malicious Stmt Response for data datval Extract heap through buffer over-read: 01000001023200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f74657374046461746104646174610664617476616c0664617476616c0c3f000a0000000a811000000005000004fe000022000c0000050000067465737404de070c0f05000006fe00002200
+
+Warning: mysqli_result::fetch_assoc(): Malformed server packet. Field length pointing after the end of packet in %s on line %d
+* Received: 0500000019010000000100000001
+* Server finished
+done!

php-8.3.21.tar.xz/ext/mysqli/tests/ghsa-h35g-vwh6-m678-stmt-row-datetime.phpt Added

@@ -0,0 +1,52 @@
+--TEST--
+GHSA-h35g-vwh6-m678 (mysqlnd leaks partial content of the heap - stmt row datetime buffer over-read)
+--EXTENSIONS--
+mysqli
+--FILE--
+<?php
+require_once 'fake_server.inc';
+
+$servername = "127.0.0.1";
+$username = "root";
+$password = "";
+
+$process = run_fake_server_in_background('stmt_response_row_over_read_datetime');
+$process->wait();
+
+$conn = new mysqli($servername, $username, $password, "", $process->getPort());
+
+echo "* Preparing statement on the fake server...\n";
+$stmt = $conn->prepare("SELECT strval, dtival FROM data");
+
+$stmt->execute();
+$result = $stmt->get_result();
+
+// Fetch and display the results
+if ($result->num_rows > 0) {
+    while ($row = $result->fetch_assoc()) {
+        var_dump($row"dtival");
+    }
+}
+$stmt->close();
+$conn->close();
+
+$process->terminate(true);
+
+print "done!";
+?>
+--EXPECTF--
+* Server started on 127.0.0.1:%d
+* Connection established
+* Sending - Server Greeting: 580000000a352e352e352d31302e352e31382d4d6172696144420003000000473e3f6047257c6700fef7080200ff81150000000000000f0000006c6b55463f49335f686c6431006d7973716c5f6e61746976655f70617373776f7264
+* Received: 6900000185a21a00000000c0080000000000000000000000000000000000000000000000726f6f7400006d7973716c5f6e61746976655f70617373776f7264002c0c5f636c69656e745f6e616d65076d7973716c6e640c5f7365727665725f686f7374093132372e302e302e31
+* Sending - Server OK: 0700000200000002000000
+* Preparing statement on the fake server...
+* Received: 200000001653454c4543542073747276616c2c2064746976616c2046524f4d2064617461
+* Sending - Stmt prepare data dtival: 0c0000010001000000020000000000003200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f74657374046461746104646174610664746976616c0664746976616c0c3f00130000000c811000000005000004fe00000200
+* Received: 0a00000017010000000001000000
+* Sending - Malicious Stmt Response for data dtival Extract heap through buffer over-read: 01000001023200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f74657374046461746104646174610664746976616c0664746976616c0c3f00130000000c811000000005000004fe000022000f0000050000067465737407de070c100d000105000006fe00002200
+
+Warning: mysqli_result::fetch_assoc(): Malformed server packet. Field length pointing after the end of packet in %s on line %d
+* Received: 0500000019010000000100000001
+* Server finished
+done!

php-8.3.21.tar.xz/ext/mysqli/tests/ghsa-h35g-vwh6-m678-stmt-row-double.phpt Added

@@ -0,0 +1,52 @@
+--TEST--
+GHSA-h35g-vwh6-m678 (mysqlnd leaks partial content of the heap - stmt row double buffer over-read)
+--EXTENSIONS--
+mysqli
+--FILE--
+<?php
+require_once 'fake_server.inc';
+
+$servername = "127.0.0.1";
+$username = "root";
+$password = "";
+
+$process = run_fake_server_in_background('stmt_response_row_over_read_double');
+$process->wait();
+
+$conn = new mysqli($servername, $username, $password, "", $process->getPort());
+
+echo "* Preparing statement on the fake server...\n";
+$stmt = $conn->prepare("SELECT strval, dblval FROM data");
+
+$stmt->execute();
+$result = $stmt->get_result();
+
+// Fetch and display the results
+if ($result->num_rows > 0) {
+    while ($row = $result->fetch_assoc()) {
+        var_dump($row"dblval");
+    }
+}
+$stmt->close();
+$conn->close();
+
+$process->terminate(true);
+
+print "done!";
+?>
+--EXPECTF--
+* Server started on 127.0.0.1:%d
+* Connection established
+* Sending - Server Greeting: 580000000a352e352e352d31302e352e31382d4d6172696144420003000000473e3f6047257c6700fef7080200ff81150000000000000f0000006c6b55463f49335f686c6431006d7973716c5f6e61746976655f70617373776f7264
+* Received: 6900000185a21a00000000c0080000000000000000000000000000000000000000000000726f6f7400006d7973716c5f6e61746976655f70617373776f7264002c0c5f636c69656e745f6e616d65076d7973716c6e640c5f7365727665725f686f7374093132372e302e302e31
+* Sending - Server OK: 0700000200000002000000
+* Preparing statement on the fake server...
+* Received: 200000001653454c4543542073747276616c2c2064626c76616c2046524f4d2064617461
+* Sending - Stmt prepare data dblval: 0c0000010001000000020000000000003200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f74657374046461746104646174610664626c76616c0664626c76616c0c3f00160000000501101f000005000004fe00000200
+* Received: 0a00000017010000000001000000
+* Sending - Malicious Stmt Response for data dblval Extract heap through buffer over-read: 01000001023200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f74657374046461746104646174610664626c76616c0664626c76616c0c3f00160000000501101f000005000004fe000022000f00000500000674657374333333333333f33f05000006fe00002200
+
+Warning: mysqli_result::fetch_assoc(): Malformed server packet. Field length pointing after the end of packet in %s on line %d
+* Received: 0500000019010000000100000001
+* Server finished
+done!

php-8.3.21.tar.xz/ext/mysqli/tests/ghsa-h35g-vwh6-m678-stmt-row-float.phpt Added

@@ -0,0 +1,52 @@
+--TEST--
+GHSA-h35g-vwh6-m678 (mysqlnd leaks partial content of the heap - stmt row int buffer over-read)
+--EXTENSIONS--
+mysqli
+--FILE--
+<?php
+require_once 'fake_server.inc';
+
+$servername = "127.0.0.1";
+$username = "root";
+$password = "";
+
+$process = run_fake_server_in_background('stmt_response_row_over_read_float');
+$process->wait();
+
+$conn = new mysqli($servername, $username, $password, "", $process->getPort());
+
+echo "* Preparing statement on the fake server...\n";
+$stmt = $conn->prepare("SELECT strval, fltval FROM data");
+
+$stmt->execute();
+$result = $stmt->get_result();
+
+// Fetch and display the results
+if ($result->num_rows > 0) {
+    while ($row = $result->fetch_assoc()) {
+        var_dump($row"fltval");
+    }
+}
+$stmt->close();
+$conn->close();
+
+$process->terminate(true);
+
+print "done!";
+?>
+--EXPECTF--
+* Server started on 127.0.0.1:%d
+* Connection established
+* Sending - Server Greeting: 580000000a352e352e352d31302e352e31382d4d6172696144420003000000473e3f6047257c6700fef7080200ff81150000000000000f0000006c6b55463f49335f686c6431006d7973716c5f6e61746976655f70617373776f7264
+* Received: 6900000185a21a00000000c0080000000000000000000000000000000000000000000000726f6f7400006d7973716c5f6e61746976655f70617373776f7264002c0c5f636c69656e745f6e616d65076d7973716c6e640c5f7365727665725f686f7374093132372e302e302e31
+* Sending - Server OK: 0700000200000002000000
+* Preparing statement on the fake server...
+* Received: 200000001653454c4543542073747276616c2c20666c7476616c2046524f4d2064617461
+* Sending - Stmt prepare data fltval: 0c0000010001000000020000000000003200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f746573740464617461046461746106666c7476616c06666c7476616c0c3f000c0000000401101f000005000004fe00000200
+* Received: 0a00000017010000000001000000
+* Sending - Malicious Stmt Response for data fltval Extract heap through buffer over-read: 01000001023200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f746573740464617461046461746106666c7476616c06666c7476616c0c3f000c0000000401101f000005000004fe000022000b000005000006746573743333134005000006fe00002200
+
+Warning: mysqli_result::fetch_assoc(): Malformed server packet. Field length pointing after the end of packet in %s on line %d
+* Received: 0500000019010000000100000001
+* Server finished
+done!

php-8.3.21.tar.xz/ext/mysqli/tests/ghsa-h35g-vwh6-m678-stmt-row-int.phpt Added

@@ -0,0 +1,52 @@
+--TEST--
+GHSA-h35g-vwh6-m678 (mysqlnd leaks partial content of the heap - stmt row int buffer over-read)
+--EXTENSIONS--
+mysqli
+--FILE--
+<?php
+require_once 'fake_server.inc';
+
+$servername = "127.0.0.1";
+$username = "root";
+$password = "";
+
+$process = run_fake_server_in_background('stmt_response_row_over_read_int');
+$process->wait();
+
+$conn = new mysqli($servername, $username, $password, "", $process->getPort());
+
+echo "* Preparing statement on the fake server...\n";
+$stmt = $conn->prepare("SELECT strval, intval FROM data");
+
+$stmt->execute();
+$result = $stmt->get_result();
+
+// Fetch and display the results
+if ($result->num_rows > 0) {
+    while ($row = $result->fetch_assoc()) {
+        var_dump($row"intval");
+    }
+}
+$stmt->close();
+$conn->close();
+
+$process->terminate(true);
+
+print "done!";
+?>
+--EXPECTF--
+* Server started on 127.0.0.1:%d
+* Connection established
+* Sending - Server Greeting: 580000000a352e352e352d31302e352e31382d4d6172696144420003000000473e3f6047257c6700fef7080200ff81150000000000000f0000006c6b55463f49335f686c6431006d7973716c5f6e61746976655f70617373776f7264
+* Received: 6900000185a21a00000000c0080000000000000000000000000000000000000000000000726f6f7400006d7973716c5f6e61746976655f70617373776f7264002c0c5f636c69656e745f6e616d65076d7973716c6e640c5f7365727665725f686f7374093132372e302e302e31
+* Sending - Server OK: 0700000200000002000000
+* Preparing statement on the fake server...
+* Received: 200000001653454c4543542073747276616c2c20696e7476616c2046524f4d2064617461
+* Sending - Stmt prepare data intval: 0c0000010001000000020000000000003200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f746573740464617461046461746106696e7476616c06696e7476616c0c3f000b00000003011000000005000004fe00000200
+* Received: 0a00000017010000000001000000
+* Sending - Malicious Stmt Response for data intval Extract heap through buffer over-read: 01000001023200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f746573740464617461046461746106696e7476616c06696e7476616c0c3f000b00000003011000000005000004fe000022000b000005000006746573740e00000005000006fe00002200
+
+Warning: mysqli_result::fetch_assoc(): Malformed server packet. Field length pointing after the end of packet in %s on line %d
+* Received: 0500000019010000000100000001
+* Server finished
+done!

php-8.3.21.tar.xz/ext/mysqli/tests/ghsa-h35g-vwh6-m678-stmt-row-no-space.phpt Added

@@ -0,0 +1,52 @@
+--TEST--
+GHSA-h35g-vwh6-m678 (mysqlnd leaks partial content of the heap - stmt row no space for the field)
+--EXTENSIONS--
+mysqli
+--FILE--
+<?php
+require_once 'fake_server.inc';
+
+$servername = "127.0.0.1";
+$username = "root";
+$password = "";
+
+$process = run_fake_server_in_background('stmt_response_row_no_space');
+$process->wait();
+
+$conn = new mysqli($servername, $username, $password, "", $process->getPort());
+
+echo "* Preparing statement on the fake server...\n";
+$stmt = $conn->prepare("SELECT strval, strval FROM data");
+
+$stmt->execute();
+$result = $stmt->get_result();
+
+// Fetch and display the results
+if ($result->num_rows > 0) {
+    while ($row = $result->fetch_assoc()) {
+        var_dump($row"strval");
+    }
+}
+$stmt->close();
+$conn->close();
+
+$process->terminate(true);
+
+print "done!";
+?>
+--EXPECTF--
+* Server started on 127.0.0.1:%d
+* Connection established
+* Sending - Server Greeting: 580000000a352e352e352d31302e352e31382d4d6172696144420003000000473e3f6047257c6700fef7080200ff81150000000000000f0000006c6b55463f49335f686c6431006d7973716c5f6e61746976655f70617373776f7264
+* Received: 6900000185a21a00000000c0080000000000000000000000000000000000000000000000726f6f7400006d7973716c5f6e61746976655f70617373776f7264002c0c5f636c69656e745f6e616d65076d7973716c6e640c5f7365727665725f686f7374093132372e302e302e31
+* Sending - Server OK: 0700000200000002000000
+* Preparing statement on the fake server...
+* Received: 200000001653454c4543542073747276616c2c2073747276616c2046524f4d2064617461
+* Sending - Stmt prepare data strval: 0c0000010001000000020000000000003200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd011000000005000004fe00000200
+* Received: 0a00000017010000000001000000
+* Sending - Malicious Stmt Response for data strval Extract heap through buffer over-read: 01000001023200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd011000000005000004fe000022000c00000500000974657374047465737405000006fe00002200
+
+Warning: mysqli_result::fetch_assoc(): Malformed server packet. No packet space left for the field in %s on line %d
+* Received: 0500000019010000000100000001
+* Server finished
+done!

php-8.3.21.tar.xz/ext/mysqli/tests/ghsa-h35g-vwh6-m678-stmt-row-string.phpt Added

@@ -0,0 +1,52 @@
+--TEST--
+GHSA-h35g-vwh6-m678 (mysqlnd leaks partial content of the heap - stmt row string buffer over-read)
+--EXTENSIONS--
+mysqli
+--FILE--
+<?php
+require_once 'fake_server.inc';
+
+$servername = "127.0.0.1";
+$username = "root";
+$password = "";
+
+$process = run_fake_server_in_background('stmt_response_row_over_read_string');
+$process->wait();
+
+$conn = new mysqli($servername, $username, $password, "", $process->getPort());
+
+echo "* Preparing statement on the fake server...\n";
+$stmt = $conn->prepare("SELECT item FROM items");
+
+$stmt->execute();
+$result = $stmt->get_result();
+
+// Fetch and display the results
+if ($result->num_rows > 0) {
+    while ($row = $result->fetch_assoc()) {
+        var_dump($row"item");
+    }
+}
+$stmt->close();
+$conn->close();
+
+$process->terminate(true);
+
+print "done!";
+?>
+--EXPECTF--
+* Server started on 127.0.0.1:%d
+* Connection established
+* Sending - Server Greeting: 580000000a352e352e352d31302e352e31382d4d6172696144420003000000473e3f6047257c6700fef7080200ff81150000000000000f0000006c6b55463f49335f686c6431006d7973716c5f6e61746976655f70617373776f7264
+* Received: 6900000185a21a00000000c0080000000000000000000000000000000000000000000000726f6f7400006d7973716c5f6e61746976655f70617373776f7264002c0c5f636c69656e745f6e616d65076d7973716c6e640c5f7365727665725f686f7374093132372e302e302e31
+* Sending - Server OK: 0700000200000002000000
+* Preparing statement on the fake server...
+* Received: 170000001653454c454354206974656d2046524f4d206974656d73
+* Sending - Stmt prepare items: 0c0000010001000000010000000000003000000203646566087068705f74657374056974656d73056974656d73046974656d046974656d0ce000c8000000fd011000000005000003fe00000200
+* Received: 0a00000017010000000001000000
+* Sending - Malicious Stmt Response for items Extract heap through buffer over-read: 01000001013000000203646566087068705f74657374056974656d73056974656d73046974656d046974656d0ce000c8000000fd011000000005000003fe00002200070000040000fa7465737405000005fe00002200
+
+Warning: mysqli_result::fetch_assoc(): Malformed server packet. Field length pointing after the end of packet in %s on line %d
+* Received: 05000000190100000%d
+* Server finished
+done!

php-8.3.21.tar.xz/ext/mysqli/tests/ghsa-h35g-vwh6-m678-stmt-row-time.phpt Added

@@ -0,0 +1,52 @@
+--TEST--
+GHSA-h35g-vwh6-m678 (mysqlnd leaks partial content of the heap - stmt row time buffer over-read)
+--EXTENSIONS--
+mysqli
+--FILE--
+<?php
+require_once 'fake_server.inc';
+
+$servername = "127.0.0.1";
+$username = "root";
+$password = "";
+
+$process = run_fake_server_in_background('stmt_response_row_over_read_time');
+$process->wait();
+
+$conn = new mysqli($servername, $username, $password, "", $process->getPort());
+
+echo "* Preparing statement on the fake server...\n";
+$stmt = $conn->prepare("SELECT strval, timval FROM data");
+
+$stmt->execute();
+$result = $stmt->get_result();
+
+// Fetch and display the results
+if ($result->num_rows > 0) {
+    while ($row = $result->fetch_assoc()) {
+        var_dump($row"timval");
+    }
+}
+$stmt->close();
+$conn->close();
+
+$process->terminate(true);
+
+print "done!";
+?>
+--EXPECTF--
+* Server started on 127.0.0.1:%d
+* Connection established
+* Sending - Server Greeting: 580000000a352e352e352d31302e352e31382d4d6172696144420003000000473e3f6047257c6700fef7080200ff81150000000000000f0000006c6b55463f49335f686c6431006d7973716c5f6e61746976655f70617373776f7264
+* Received: 6900000185a21a00000000c0080000000000000000000000000000000000000000000000726f6f7400006d7973716c5f6e61746976655f70617373776f7264002c0c5f636c69656e745f6e616d65076d7973716c6e640c5f7365727665725f686f7374093132372e302e302e31
+* Sending - Server OK: 0700000200000002000000
+* Preparing statement on the fake server...
+* Received: 200000001653454c4543542073747276616c2c2074696d76616c2046524f4d2064617461
+* Sending - Stmt prepare data timval: 0c0000010001000000020000000000003200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f74657374046461746104646174610674696d76616c0674696d76616c0c3f000a0000000b811000000005000004fe00000200
+* Received: 0a00000017010000000001000000
+* Sending - Malicious Stmt Response for data timval Extract heap through buffer over-read: 01000001023200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f74657374046461746104646174610674696d76616c0674696d76616c0c3f000a0000000b811000000005000004fe000022001000000500000c7465737408000000000015080105000006fe00002200
+
+Warning: mysqli_result::fetch_assoc(): Malformed server packet. Field length pointing after the end of packet in %s on line %d
+* Received: 0500000019010000000100000001
+* Server finished
+done!

php-8.3.7.tar.xz/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt -> php-8.3.21.tar.xz/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt Changed

php-8.3.21.tar.xz/ext/mysqli/tests/protocol_query_row_fetch_data.phpt Added

@@ -0,0 +1,73 @@
+--TEST--
+MySQL protocol - statement row data fetch)
+--EXTENSIONS--
+mysqli
+--FILE--
+<?php
+require_once 'fake_server.inc';
+
+$servername = "127.0.0.1";
+$username = "root";
+$password = "";
+
+$process = run_fake_server_in_background('query_response_row_read_two_fields');
+$process->wait();
+
+$conn = new mysqli($servername, $username, $password, "", $process->getPort());
+
+function my_query($conn, $field)
+{
+    $sql = "SELECT strval, $field FROM data";
+
+    $result = $conn->query($sql);
+
+    if ($result->num_rows > 0) {
+        while ($row = $result->fetch_assoc()) {
+            var_dump($row$field);
+        }
+    }
+}
+
+foreach (my_mysqli_data_fields() as $field_name => $field) {
+    my_query($conn, $field_name);
+}
+
+$conn->close();
+
+$process->terminate(true);
+
+print "done!";
+?>
+--EXPECTF--
+* Server started on 127.0.0.1:%d
+* Connection established
+* Sending - Server Greeting: 580000000a352e352e352d31302e352e31382d4d6172696144420003000000473e3f6047257c6700fef7080200ff81150000000000000f0000006c6b55463f49335f686c6431006d7973716c5f6e61746976655f70617373776f7264
+* Received: 6900000185a21a00000000c0080000000000000000000000000000000000000000000000726f6f7400006d7973716c5f6e61746976655f70617373776f7264002c0c5f636c69656e745f6e616d65076d7973716c6e640c5f7365727665725f686f7374093132372e302e302e31
+* Sending - Server OK: 0700000200000002000000
+* Received: 200000000353454c4543542073747276616c2c20696e7476616c2046524f4d2064617461
+* Sending - Query execute data intval: 01000001023200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f746573740464617461046461746106696e7476616c06696e7476616c0c3f000b00000003011000000005000004fe0000220008000005047465737402313405000006fe00002200
+string(2) "14"
+* Received: 200000000353454c4543542073747276616c2c20666c7476616c2046524f4d2064617461
+* Sending - Query execute data fltval: 01000001023200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f746573740464617461046461746106666c7476616c06666c7476616c0c3f000c0000000401101f000005000004fe0000220009000005047465737403322e3305000006fe00002200
+string(3) "2.3"
+* Received: 200000000353454c4543542073747276616c2c2064626c76616c2046524f4d2064617461
+* Sending - Query execute data dblval: 01000001023200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f74657374046461746104646174610664626c76616c0664626c76616c0c3f00160000000501101f000005000004fe0000220009000005047465737403312e3205000006fe00002200
+string(3) "1.2"
+* Received: 200000000353454c4543542073747276616c2c2064617476616c2046524f4d2064617461
+* Sending - Query execute data datval: 01000001023200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f74657374046461746104646174610664617476616c0664617476616c0c3f000a0000000a811000000005000004fe000022001000000504746573740a323031342d31322d313505000006fe00002200
+string(10) "2014-12-15"
+* Received: 200000000353454c4543542073747276616c2c2074696d76616c2046524f4d2064617461
+* Sending - Query execute data timval: 01000001023200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f74657374046461746104646174610674696d76616c0674696d76616c0c3f000a0000000b811000000005000004fe000022000e00000504746573740831333a30303a303205000006fe00002200
+string(8) "13:00:02"
+* Received: 200000000353454c4543542073747276616c2c2064746976616c2046524f4d2064617461
+* Sending - Query execute data dtival: 01000001023200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f74657374046461746104646174610664746976616c0664746976616c0c3f00130000000c811000000005000004fe0000220019000005047465737413323031342d31322d31362031333a30303a303105000006fe00002200
+string(19) "2014-12-16 13:00:01"
+* Received: 200000000353454c4543542073747276616c2c2062697476616c2046524f4d2064617461
+* Sending - Query execute data bitval: 01000001023200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f74657374046461746104646174610662697476616c0662697476616c0c3f004000000010211000000005000004fe000022000e000005047465737408080808080808080805000006fe00002200
+string(18) "578721382704613384"
+* Received: 200000000353454c4543542073747276616c2c2073747276616c2046524f4d2064617461
+* Sending - Query execute data strval: 01000001023200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd011000000005000004fe000022000a0000050474657374047465737405000006fe00002200
+string(4) "test"
+* Received: 0100000001
+* Server finished
+done!

php-8.3.21.tar.xz/ext/mysqli/tests/protocol_stmt_row_fetch_data.phpt Added

@@ -0,0 +1,90 @@
+--TEST--
+MySQL protocol - statement row data fetch)
+--EXTENSIONS--
+mysqli
+--FILE--
+<?php
+require_once 'fake_server.inc';
+
+$servername = "127.0.0.1";
+$username = "root";
+$password = "";
+
+$process = run_fake_server_in_background('stmt_response_row_read_two_fields');
+$process->wait();
+
+$conn = new mysqli($servername, $username, $password, "", $process->getPort());
+
+function my_query($conn, $field)
+{
+    $stmt = $conn->prepare("SELECT strval, $field FROM data");
+
+    $stmt->execute();
+    $result = $stmt->get_result();
+
+    if ($result->num_rows > 0) {
+        while ($row = $result->fetch_assoc()) {
+            var_dump($row$field);
+        }
+    }
+}
+
+foreach (my_mysqli_data_fields() as $field_name => $field) {
+    my_query($conn, $field_name);
+}
+
+$conn->close();
+
+$process->terminate(true);
+
+print "done!";
+?>
+--EXPECTF--
+* Server started on 127.0.0.1:%d
+* Connection established
+* Sending - Server Greeting: 580000000a352e352e352d31302e352e31382d4d6172696144420003000000473e3f6047257c6700fef7080200ff81150000000000000f0000006c6b55463f49335f686c6431006d7973716c5f6e61746976655f70617373776f7264
+* Received: 6900000185a21a00000000c0080000000000000000000000000000000000000000000000726f6f7400006d7973716c5f6e61746976655f70617373776f7264002c0c5f636c69656e745f6e616d65076d7973716c6e640c5f7365727665725f686f7374093132372e302e302e31
+* Sending - Server OK: 0700000200000002000000
+* Received: 200000001653454c4543542073747276616c2c20696e7476616c2046524f4d2064617461
+* Sending - Stmt prepare data intval: 0c0000010001000000020000000000003200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f746573740464617461046461746106696e7476616c06696e7476616c0c3f000b00000003011000000005000004fe00000200
+* Received: 0a00000017010000000001000000
+* Sending - Stmt execute data intval: 01000001023200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f746573740464617461046461746106696e7476616c06696e7476616c0c3f000b00000003011000000005000004fe000022000b000005000004746573740e00000005000006fe00002200
+int(14)
+* Received: 050000001901000000200000001653454c4543542073747276616c2c20666c7476616c2046524f4d2064617461
+* Sending - Stmt prepare data fltval: 0c0000010001000000020000000000003200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f746573740464617461046461746106666c7476616c06666c7476616c0c3f000c0000000401101f000005000004fe00000200
+* Received: 0a00000017010000000001000000
+* Sending - Stmt execute data fltval: 01000001023200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f746573740464617461046461746106666c7476616c06666c7476616c0c3f000c0000000401101f000005000004fe000022000b000005000004746573743333134005000006fe00002200
+float(2.3)
+* Received: 050000001901000000200000001653454c4543542073747276616c2c2064626c76616c2046524f4d2064617461
+* Sending - Stmt prepare data dblval: 0c0000010001000000020000000000003200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f74657374046461746104646174610664626c76616c0664626c76616c0c3f00160000000501101f000005000004fe00000200
+* Received: 0a00000017010000000001000000
+* Sending - Stmt execute data dblval: 01000001023200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f74657374046461746104646174610664626c76616c0664626c76616c0c3f00160000000501101f000005000004fe000022000f00000500000474657374333333333333f33f05000006fe00002200
+float(1.2)
+* Received: 050000001901000000200000001653454c4543542073747276616c2c2064617476616c2046524f4d2064617461
+* Sending - Stmt prepare data datval: 0c0000010001000000020000000000003200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f74657374046461746104646174610664617476616c0664617476616c0c3f000a0000000a811000000005000004fe00000200
+* Received: 0a00000017010000000001000000
+* Sending - Stmt execute data datval: 01000001023200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f74657374046461746104646174610664617476616c0664617476616c0c3f000a0000000a811000000005000004fe000022000c0000050000047465737404de070c0f05000006fe00002200
+string(10) "2014-12-15"
+* Received: 050000001901000000200000001653454c4543542073747276616c2c2074696d76616c2046524f4d2064617461
+* Sending - Stmt prepare data timval: 0c0000010001000000020000000000003200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f74657374046461746104646174610674696d76616c0674696d76616c0c3f000a0000000b811000000005000004fe00000200
+* Received: 0a00000017010000000001000000
+* Sending - Stmt execute data timval: 01000001023200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f74657374046461746104646174610674696d76616c0674696d76616c0c3f000a0000000b811000000005000004fe00002200100000050000047465737408000000000015080105000006fe00002200
+string(8) "21:08:01"
+* Received: 050000001901000000200000001653454c4543542073747276616c2c2064746976616c2046524f4d2064617461
+* Sending - Stmt prepare data dtival: 0c0000010001000000020000000000003200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f74657374046461746104646174610664746976616c0664746976616c0c3f00130000000c811000000005000004fe00000200
+* Received: 0a00000017010000000001000000
+* Sending - Stmt execute data dtival: 01000001023200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f74657374046461746104646174610664746976616c0664746976616c0c3f00130000000c811000000005000004fe000022000f0000050000047465737407de070c100d000105000006fe00002200
+string(19) "2014-12-16 13:00:01"
+* Received: 050000001901000000200000001653454c4543542073747276616c2c2062697476616c2046524f4d2064617461
+* Sending - Stmt prepare data bitval: 0c0000010001000000020000000000003200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f74657374046461746104646174610662697476616c0662697476616c0c3f004000000010211000000005000004fe00000200
+* Received: 0a00000017010000000001000000
+* Sending - Stmt execute data bitval: 01000001023200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f74657374046461746104646174610662697476616c0662697476616c0c3f004000000010211000000005000004fe00002200100000050000047465737408080808080808080805000006fe00002200
+%s578721382704613384%s
+* Received: 050000001901000000200000001653454c4543542073747276616c2c2073747276616c2046524f4d2064617461
+* Sending - Stmt prepare data strval: 0c0000010001000000020000000000003200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd011000000005000004fe00000200
+* Received: 0a00000017010000000001000000
+* Sending - Stmt execute data strval: 01000001023200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd011000000005000004fe000022000c00000500000474657374047465737405000006fe00002200
+string(4) "test"
+* Received: 0500000019010000000100000001
+* Server finished
+done!

php-8.3.7.tar.xz/ext/mysqlnd/mysqlnd_ps_codec.c -> php-8.3.21.tar.xz/ext/mysqlnd/mysqlnd_ps_codec.c Changed

@@ -50,11 +50,46 @@
 #define MYSQLND_PS_SKIP_RESULT_W_LEN	-1
 #define MYSQLND_PS_SKIP_RESULT_STR		-2
 
+static inline void ps_fetch_over_read_error(const zend_uchar ** row)
+{
+	php_error_docref(NULL, E_WARNING, "Malformed server packet. Field length pointing after the end of packet");
+	*row = NULL;
+}
+
+static inline bool ps_fetch_is_packet_over_read_with_variable_length(const unsigned int pack_len,
+		const zend_uchar ** row, const zend_uchar *p, unsigned int length)
+{
+	if (pack_len == 0) {
+		return false;
+	}
+	size_t length_len = *row - p;
+	if (length_len > pack_len || length > pack_len - length_len) {
+		ps_fetch_over_read_error(row);
+		return true;
+	}
+	return false;
+}
+
+static inline bool ps_fetch_is_packet_over_read_with_static_length(const unsigned int pack_len,
+		const zend_uchar ** row, unsigned int length)
+{
+	if (pack_len > 0 && length > pack_len) {
+		ps_fetch_over_read_error(row);
+		return true;
+	}
+	return false;
+}
+
+
 /* {{{ ps_fetch_from_1_to_8_bytes */
 void
 ps_fetch_from_1_to_8_bytes(zval * zv, const MYSQLND_FIELD * const field, const unsigned int pack_len,
 						   const zend_uchar ** row, unsigned int byte_count)
 {
+	if (UNEXPECTED(ps_fetch_is_packet_over_read_with_static_length(pack_len, row, byte_count))) {
+		return;
+	}
+
 	bool is_bit = field->type == MYSQL_TYPE_BIT;
 	DBG_ENTER("ps_fetch_from_1_to_8_bytes");
 	DBG_INF_FMT("zv=%p byte_count=%u", zv, byte_count);
@@ -174,6 +209,11 @@
 	float fval;
 	double dval;
 	DBG_ENTER("ps_fetch_float");
+
+	if (UNEXPECTED(ps_fetch_is_packet_over_read_with_static_length(pack_len, row, 4))) {
+		return;
+	}
+
 	float4get(fval, *row);
 	(*row)+= 4;
 	DBG_INF_FMT("value=%f", fval);
@@ -196,6 +236,11 @@
 {
 	double value;
 	DBG_ENTER("ps_fetch_double");
+
+	if (UNEXPECTED(ps_fetch_is_packet_over_read_with_static_length(pack_len, row, 8))) {
+		return;
+	}
+
 	float8get(value, *row);
 	ZVAL_DOUBLE(zv, value);
 	(*row)+= 8;
@@ -211,9 +256,14 @@
 {
 	struct st_mysqlnd_time t;
 	zend_ulong length; /* First byte encodes the length */
+	const zend_uchar *p = *row;
 	DBG_ENTER("ps_fetch_time");
 
 	if ((length = php_mysqlnd_net_field_length(row))) {
+		if (UNEXPECTED(ps_fetch_is_packet_over_read_with_variable_length(pack_len, row, p, length))) {
+			return;
+		}
+
 		const zend_uchar * to = *row;
 
 		t.time_type = MYSQLND_TIMESTAMP_TIME;
@@ -256,9 +306,14 @@
 {
 	struct st_mysqlnd_time t = {0};
 	zend_ulong length; /* First byte encodes the length*/
+	const zend_uchar *p = *row;
 	DBG_ENTER("ps_fetch_date");
 
 	if ((length = php_mysqlnd_net_field_length(row))) {
+		if (UNEXPECTED(ps_fetch_is_packet_over_read_with_variable_length(pack_len, row, p, length))) {
+			return;
+		}
+
 		const zend_uchar * to = *row;
 
 		t.time_type = MYSQLND_TIMESTAMP_DATE;
@@ -288,9 +343,14 @@
 {
 	struct st_mysqlnd_time t;
 	zend_ulong length; /* First byte encodes the length*/
+	const zend_uchar *p = *row;
 	DBG_ENTER("ps_fetch_datetime");
 
 	if ((length = php_mysqlnd_net_field_length(row))) {
+		if (UNEXPECTED(ps_fetch_is_packet_over_read_with_variable_length(pack_len, row, p, length))) {
+			return;
+		}
+
 		const zend_uchar * to = *row;
 
 		t.time_type = MYSQLND_TIMESTAMP_DATETIME;
@@ -332,7 +392,11 @@
 static void
 ps_fetch_string(zval * zv, const MYSQLND_FIELD * const field, const unsigned int pack_len, const zend_uchar ** row)
 {
+	const zend_uchar *p = *row;
 	const zend_ulong length = php_mysqlnd_net_field_length(row);
+	if (UNEXPECTED(ps_fetch_is_packet_over_read_with_variable_length(pack_len, row, p, length))) {
+		return;
+	}
 	DBG_ENTER("ps_fetch_string");
 	DBG_INF_FMT("len = " ZEND_ULONG_FMT, length);
 	DBG_INF("copying from the row buffer");
@@ -348,7 +412,11 @@
 static void
 ps_fetch_bit(zval * zv, const MYSQLND_FIELD * const field, const unsigned int pack_len, const zend_uchar ** row)
 {
+	const zend_uchar *p = *row;
 	const zend_ulong length = php_mysqlnd_net_field_length(row);
+	if (UNEXPECTED(ps_fetch_is_packet_over_read_with_variable_length(pack_len, row, p, length))) {
+		return;
+	}
 	ps_fetch_from_1_to_8_bytes(zv, field, pack_len, row, length);
 }
 /* }}} */

php-8.3.7.tar.xz/ext/mysqlnd/mysqlnd_result.c -> php-8.3.21.tar.xz/ext/mysqlnd/mysqlnd_result.c Changed

php-8.3.7.tar.xz/ext/mysqlnd/mysqlnd_vio.c -> php-8.3.21.tar.xz/ext/mysqlnd/mysqlnd_vio.c Changed

@@ -112,6 +112,20 @@
 }
 /* }}} */
 
+static void mysqlnd_fixup_regular_list(php_stream *net_stream)
+{
+	/*
+	  Streams are not meant for C extensions! Thus we need a hack. Every connected stream will
+	  be registered as resource (in EG(regular_list). So far, so good. However, it won't be
+	  unregistered until the script ends. So, we need to take care of that.
+	*/
+	dtor_func_t origin_dtor = EG(regular_list).pDestructor;
+	EG(regular_list).pDestructor = NULL;
+	zend_hash_index_del(&EG(regular_list), net_stream->res->handle);
+	EG(regular_list).pDestructor = origin_dtor;
+	efree(net_stream->res);
+	net_stream->res = NULL;
+}
 
 /* {{{ mysqlnd_vio::open_pipe */
 static php_stream *
@@ -119,7 +133,6 @@
 									   MYSQLND_STATS * const conn_stats, MYSQLND_ERROR_INFO * const error_info)
 {
 	unsigned int streams_options = 0;
-	dtor_func_t origin_dtor;
 	php_stream * net_stream = NULL;
 
 	DBG_ENTER("mysqlnd_vio::open_pipe");
@@ -132,16 +145,34 @@
 		SET_CLIENT_ERROR(error_info, CR_CONNECTION_ERROR, UNKNOWN_SQLSTATE, "Unknown error while connecting");
 		DBG_RETURN(NULL);
 	}
-	/*
-	  Streams are not meant for C extensions! Thus we need a hack. Every connected stream will
-	  be registered as resource (in EG(regular_list). So far, so good. However, it won't be
-	  unregistered until the script ends. So, we need to take care of that.
-	*/
-	origin_dtor = EG(regular_list).pDestructor;
-	EG(regular_list).pDestructor = NULL;
-	zend_hash_index_del(&EG(regular_list), net_stream->res->handle); /* ToDO: should it be res->handle, do streams register with addref ?*/
-	EG(regular_list).pDestructor = origin_dtor;
-	net_stream->res = NULL;
+
+	if (persistent) {
+		/* This is a similar hack as for mysqlnd_vio::open_tcp_or_unix.
+		 * The main difference here is that we have no access to the hashed key.
+		 * We can however perform a loop over the persistent resource list to find
+		 * which one corresponds to our newly allocated stream.
+		 * This loop is pretty cheap because it will normally either be the last entry or second to last entry
+		 * in the list, depending on whether the socket connection itself is persistent or not.
+		 * That's why we use a reverse loop. */
+		Bucket *bucket;
+		/* Use a bucket loop to make deletion cheap. */
+		ZEND_HASH_MAP_REVERSE_FOREACH_BUCKET(&EG(persistent_list), bucket) {
+			zend_resource *current_res = Z_RES(bucket->val);
+			if (current_res->ptr == net_stream) {
+				dtor_func_t origin_dtor = EG(persistent_list).pDestructor;
+				EG(persistent_list).pDestructor = NULL;
+				zend_hash_del_bucket(&EG(persistent_list), bucket);
+				EG(persistent_list).pDestructor = origin_dtor;
+				pefree(current_res, 1);
+				break;
+			}
+		} ZEND_HASH_FOREACH_END();
+#if ZEND_DEBUG
+		php_stream_auto_cleanup(net_stream);
+#endif
+	}
+
+	mysqlnd_fixup_regular_list(net_stream);
 
 	DBG_RETURN(net_stream);
 }
@@ -205,6 +236,7 @@
 		zend_resource *le;
 
 		if ((le = zend_hash_str_find_ptr(&EG(persistent_list), hashed_details, hashed_details_len))) {
+			ZEND_ASSERT(le->ptr == net_stream);
 			origin_dtor = EG(persistent_list).pDestructor;
 			/*
 			  in_free will let streams code skip destructing - big HACK,
@@ -218,22 +250,12 @@
 		}
 #if ZEND_DEBUG
 		/* Shut-up the streams, they don't know what they are doing */
-		net_stream->__exposed = 1;
+		php_stream_auto_cleanup(net_stream);
 #endif
 		mnd_sprintf_free(hashed_details);
 	}
 
-	/*
-	  Streams are not meant for C extensions! Thus we need a hack. Every connected stream will
-	  be registered as resource (in EG(regular_list). So far, so good. However, it won't be
-	  unregistered until the script ends. So, we need to take care of that.
-	*/
-	origin_dtor = EG(regular_list).pDestructor;
-	EG(regular_list).pDestructor = NULL;
-	zend_hash_index_del(&EG(regular_list), net_stream->res->handle); /* ToDO: should it be res->handle, do streams register with addref ?*/
-	efree(net_stream->res);
-	net_stream->res = NULL;
-	EG(regular_list).pDestructor = origin_dtor;
+	mysqlnd_fixup_regular_list(net_stream);
 	DBG_RETURN(net_stream);
 }
 /* }}} */

php-8.3.7.tar.xz/ext/mysqlnd/mysqlnd_wireprotocol.c -> php-8.3.21.tar.xz/ext/mysqlnd/mysqlnd_wireprotocol.c Changed

@@ -440,8 +440,31 @@
 	if (packet->server_capabilities & CLIENT_PLUGIN_AUTH) {
 		BAIL_IF_NO_MORE_DATA;
 		/* The server is 5.5.x and supports authentication plugins */
-		packet->auth_protocol = estrdup((char *)p);
-		p+= strlen(packet->auth_protocol) + 1; /* eat the '\0' */
+		size_t remaining_size = packet->header.size - (size_t)(p - buf);
+		if (remaining_size == 0) {
+			/* Might be better to fail but this will fail anyway */
+			packet->auth_protocol = estrdup("");
+		} else {
+			/* Check if NUL present */
+			char *null_terminator = memchr(p, '\0', remaining_size);
+			size_t auth_protocol_len;
+			if (null_terminator) {
+				/* If present, do basically estrdup */
+				auth_protocol_len = null_terminator - (char *)p;
+			} else {
+				/* If not present, copy the rest of the buffer */
+				auth_protocol_len = remaining_size;
+			}
+			char *auth_protocol = emalloc(auth_protocol_len + 1);
+			memcpy(auth_protocol, p, auth_protocol_len);
+			auth_protocolauth_protocol_len = '\0';
+			packet->auth_protocol = auth_protocol;
+
+			p += auth_protocol_len;
+			if (null_terminator) {
+				p++;
+			}
+		}
 	}
 
 	DBG_INF_FMT("proto=%u server=%s thread_id=%u",
@@ -703,7 +726,14 @@
 
 		/* There is a message */
 		if (packet->header.size > (size_t) (p - buf) && (net_len = php_mysqlnd_net_field_length(&p))) {
-			packet->message_len = MIN(net_len, buf_len - (p - begin));
+			/* p can get past packet size when getting field length so it needs to be checked first
+			 * and after that it can be checked that the net_len is not greater than the packet size */
+			if ((p - buf) > packet->header.size || packet->header.size - (p - buf) < net_len) {
+				DBG_ERR_FMT("OK packet message length is past the packet size");
+				php_error_docref(NULL, E_WARNING, "OK packet message length is past the packet size");
+				DBG_RETURN(FAIL);
+			}
+			packet->message_len = net_len;
 			packet->message = mnd_pestrndup((char *)p, packet->message_len, FALSE);
 		} else {
 			packet->message = NULL;
@@ -1084,6 +1114,17 @@
 			BAIL_IF_NO_MORE_DATA;
 			/* Check for additional textual data */
 			if (packet->header.size  > (size_t) (p - buf) && (len = php_mysqlnd_net_field_length(&p))) {
+				/* p can get past packet size when getting field length so it needs to be checked first
+				 * and after that it can be checked that the len is not greater than the packet size */
+				if ((p - buf) > packet->header.size || packet->header.size - (p - buf) < len) {
+					size_t local_file_name_over_read = ((p - buf) - packet->header.size) + len;
+					DBG_ERR_FMT("RSET_HEADER packet additional data length is past %zu bytes the packet size",
+						local_file_name_over_read);
+					php_error_docref(NULL, E_WARNING,
+						"RSET_HEADER packet additional data length is past %zu bytes the packet size",
+						local_file_name_over_read);
+					DBG_RETURN(FAIL);
+				}
 				packet->info_or_local_file.s = mnd_emalloc(len + 1);
 				memcpy(packet->info_or_local_file.s, p, len);
 				packet->info_or_local_file.slen = '\0';
@@ -1234,23 +1275,16 @@
 		meta->flags |= NUM_FLAG;
 	}
 
-
-	/*
-	  def could be empty, thus don't allocate on the root.
-	  NULL_LENGTH (0xFB) comes from COM_FIELD_LIST when the default value is NULL.
-	  Otherwise the string is length encoded.
-	*/
+	/* COM_FIELD_LIST is no longer supported so def should not be present */
 	if (packet->header.size > (size_t) (p - buf) &&
 		(len = php_mysqlnd_net_field_length(&p)) &&
 		len != MYSQLND_NULL_LENGTH)
 	{
-		BAIL_IF_NO_MORE_DATA;
-		DBG_INF_FMT("Def found, length " ZEND_ULONG_FMT, len);
-		meta->def = packet->memory_pool->get_chunk(packet->memory_pool, len + 1);
-		memcpy(meta->def, p, len);
-		meta->deflen = '\0';
-		meta->def_length = len;
-		p += len;
+		DBG_ERR_FMT("Protocol error. Server sent default for unsupported field list");
+		php_error_docref(NULL, E_WARNING,
+			"Protocol error. Server sent default for unsupported field list (mysqlnd_wireprotocol.c:%u)",
+			__LINE__);
+		DBG_RETURN(FAIL);
 	}
 
 	root_ptr = meta->root = packet->memory_pool->get_chunk(packet->memory_pool, total_len);
@@ -1413,8 +1447,10 @@
 									  const unsigned int field_count, const MYSQLND_FIELD * const fields_metadata,
 									  const bool as_int_or_float, MYSQLND_STATS * const stats)
 {
-	unsigned int i;
-	const zend_uchar * p = row_buffer->ptr;
+	unsigned int i, j;
+	size_t rbs = row_buffer->size;
+	const zend_uchar * rbp = row_buffer->ptr;
+	const zend_uchar * p = rbp;
 	const zend_uchar * null_ptr;
 	zend_uchar bit;
 	zval *current_field, *end_field, *start_field;
@@ -1447,7 +1483,21 @@
 			statistic = STAT_BINARY_TYPE_FETCHED_NULL;
 		} else {
 			enum_mysqlnd_field_types type = fields_metadatai.type;
-			mysqlnd_ps_fetch_functionstype.func(current_field, &fields_metadatai, 0, &p);
+			size_t row_position = p - rbp;
+			if (rbs <= row_position) {
+				for (j = 0, current_field = start_field; j < i; current_field++, j++) {
+					zval_ptr_dtor(current_field);
+				}
+				php_error_docref(NULL, E_WARNING, "Malformed server packet. No packet space left for the field");
+				DBG_RETURN(FAIL);
+			}
+			mysqlnd_ps_fetch_functionstype.func(current_field, &fields_metadatai, rbs - row_position, &p);
+			if (p == NULL) {
+				for (j = 0, current_field = start_field; j < i; current_field++, j++) {
+					zval_ptr_dtor(current_field);
+				}
+				DBG_RETURN(FAIL);
+			}
 
 			if (MYSQLND_G(collect_statistics)) {
 				switch (fields_metadatai.type) {
@@ -1504,7 +1554,7 @@
 									unsigned int field_count, const MYSQLND_FIELD * fields_metadata,
 									bool as_int_or_float, MYSQLND_STATS * stats)
 {
-	unsigned int i;
+	unsigned int i, j;
 	zval *current_field, *end_field, *start_field;
 	zend_uchar * p = row_buffer->ptr;
 	const size_t data_size = row_buffer->size;
@@ -1525,9 +1575,11 @@
 		/* NULL or NOT NULL, this is the question! */
 		if (len == MYSQLND_NULL_LENGTH) {
 			ZVAL_NULL(current_field);
-		} else if ((p + len) > packet_end) {
-			php_error_docref(NULL, E_WARNING, "Malformed server packet. Field length pointing %zu"
-											  " bytes after end of packet", (p + len) - packet_end - 1);
+		} else if (p > packet_end || len > packet_end - p) {
+			php_error_docref(NULL, E_WARNING, "Malformed server packet. Field length pointing after end of packet");
+			for (j = 0, current_field = start_field; j < i; current_field++, j++) {
+				zval_ptr_dtor(current_field);
+			}
 			DBG_RETURN(FAIL);
 		} else {
 			struct st_mysqlnd_perm_bind perm_bind =

php-8.3.7.tar.xz/ext/odbc/tests/odbc_data_source_001.phpt -> php-8.3.21.tar.xz/ext/odbc/tests/odbc_data_source_001.phpt Changed

php-8.3.7.tar.xz/ext/opcache/ZendAccelerator.c -> php-8.3.21.tar.xz/ext/opcache/ZendAccelerator.c Changed

@@ -141,6 +141,8 @@
 # define LOCKVAL(v)   (ZCSG(v))
 #endif
 
+#define ZCG_KEY_LEN (MAXPATHLEN * 8)
+
 /**
  * Clear AVX/SSE2-aligned memory.
  */
@@ -1190,7 +1192,8 @@
 	char *key;
 	int key_length;
 
-	ZSTR_LEN(&ZCG(key)) = 0;
+	ZEND_ASSERT(GC_REFCOUNT(ZCG(key)) == 1);
+	ZSTR_LEN(ZCG(key)) = 0;
 
 	/* CWD and include_path don't matter for absolute file names and streams */
 	if (IS_ABSOLUTE_PATH(path, path_length)) {
@@ -1300,7 +1303,7 @@
 		}
 
 		/* Calculate key length */
-		if (UNEXPECTED((size_t)(cwd_len + path_length + include_path_len + 2) >= sizeof(ZCG(_key)))) {
+		if (UNEXPECTED((size_t)(cwd_len + path_length + include_path_len + 2) >= ZCG_KEY_LEN)) {
 			return NULL;
 		}
 
@@ -1309,7 +1312,7 @@
 		 * since in itself, it may include colons (which we use to separate
 		 * different components of the key)
 		 */
-		key = ZSTR_VAL(&ZCG(key));
+		key = ZSTR_VAL(ZCG(key));
 		memcpy(key, path, path_length);
 		keypath_length = ':';
 		key_length = path_length + 1;
@@ -1331,9 +1334,14 @@
 		    EXPECTED((parent_script = zend_get_executed_filename_ex()) != NULL)) {
 
 			parent_script_len = ZSTR_LEN(parent_script);
-			while ((--parent_script_len > 0) && !IS_SLASH(ZSTR_VAL(parent_script)parent_script_len));
+			while (parent_script_len > 0) {
+				--parent_script_len;
+				if (IS_SLASH(ZSTR_VAL(parent_script)parent_script_len)) {
+					break;
+				}
+			}
 
-			if (UNEXPECTED((size_t)(key_length + parent_script_len + 1) >= sizeof(ZCG(_key)))) {
+			if (UNEXPECTED((size_t)(key_length + parent_script_len + 1) >= ZCG_KEY_LEN)) {
 				return NULL;
 			}
 			keykey_length = ':';
@@ -1342,11 +1350,9 @@
 			key_length += parent_script_len;
 		}
 		keykey_length = '\0';
-		GC_SET_REFCOUNT(&ZCG(key), 1);
-		GC_TYPE_INFO(&ZCG(key)) = GC_STRING;
-		ZSTR_H(&ZCG(key)) = 0;
-		ZSTR_LEN(&ZCG(key)) = key_length;
-		return &ZCG(key);
+		ZSTR_H(ZCG(key)) = 0;
+		ZSTR_LEN(ZCG(key)) = key_length;
+		return ZCG(key);
 	}
 
 	/* not use_cwd */
@@ -2014,8 +2020,8 @@
 	      ZCG(cache_opline) == EG(current_execute_data)->opline))) {
 
 		persistent_script = ZCG(cache_persistent_script);
-		if (ZSTR_LEN(&ZCG(key))) {
-			key = &ZCG(key);
+		if (ZSTR_LEN(ZCG(key))) {
+			key = ZCG(key);
 		}
 
 	} else {
@@ -2153,7 +2159,10 @@
 		 */
 		from_shared_memory = false;
 		if (persistent_script) {
+			/* See GH-17246: we disable GC so that user code cannot be executed during the optimizer run. */
+			bool orig_gc_state = gc_enable(false);
 			persistent_script = cache_script_in_shared_memory(persistent_script, key, &from_shared_memory);
+			gc_enable(orig_gc_state);
 		}
 
 		/* Caching is disabled, returning op_array;
@@ -2552,7 +2561,7 @@
 							SHM_PROTECT();
 							HANDLE_UNBLOCK_INTERRUPTIONS();
 						} else {
-							ZSTR_LEN(&ZCG(key)) = 0;
+							ZSTR_LEN(ZCG(key)) = 0;
 						}
 						ZCG(cache_opline) = EG(current_execute_data) ? EG(current_execute_data)->opline : NULL;
 						ZCG(cache_persistent_script) = persistent_script;
@@ -2924,7 +2933,16 @@
 	ZEND_TSRMLS_CACHE_UPDATE();
 #endif
 	memset(accel_globals, 0, sizeof(zend_accel_globals));
+	accel_globals->key = zend_string_alloc(ZCG_KEY_LEN, true);
+	GC_MAKE_PERSISTENT_LOCAL(accel_globals->key);
+}
+
+#ifdef ZTS
+static void accel_globals_dtor(zend_accel_globals *accel_globals)
+{
+	zend_string_free(accel_globals->key);
 }
+#endif
 
 #ifdef HAVE_HUGE_CODE_PAGES
 # ifndef _WIN32
@@ -3097,7 +3115,7 @@
 static int accel_startup(zend_extension *extension)
 {
 #ifdef ZTS
-	accel_globals_id = ts_allocate_id(&accel_globals_id, sizeof(zend_accel_globals), (ts_allocate_ctor) accel_globals_ctor, NULL);
+	accel_globals_id = ts_allocate_id(&accel_globals_id, sizeof(zend_accel_globals), (ts_allocate_ctor) accel_globals_ctor, (ts_allocate_dtor) accel_globals_dtor);
 #else
 	accel_globals_ctor(&accel_globals);
 #endif
@@ -3258,6 +3276,8 @@
 				if (JIT_G(buffer_size) != 0) {
 					zend_accel_error(ACCEL_LOG_WARNING, "Could not enable JIT!");
 				}
+			} else {
+				zend_jit_startup_ok = true;
 			}
 		}
 #endif
@@ -4642,6 +4662,11 @@
 		EG(class_table) = NULL;
 		EG(function_table) = NULL;
 		PG(report_memleaks) = orig_report_memleaks;
+#ifdef ZTS
+		/* Reset the virtual CWD state back to the original state created by virtual_cwd_startup().
+		 * This is necessary because the normal startup code assumes the CWD state is active. */
+		virtual_cwd_activate();
+#endif
 	} else {
 		zend_shared_alloc_unlock();
 		ret = FAILURE;

php-8.3.7.tar.xz/ext/opcache/ZendAccelerator.h -> php-8.3.21.tar.xz/ext/opcache/ZendAccelerator.h Changed

php-8.3.7.tar.xz/ext/opcache/config.m4 -> php-8.3.21.tar.xz/ext/opcache/config.m4 Changed

php-8.3.7.tar.xz/ext/opcache/jit/zend_jit.c -> php-8.3.21.tar.xz/ext/opcache/jit/zend_jit.c Changed

@@ -103,6 +103,8 @@
 #define JIT_STUB(name, offset, adjustment) \
 	{JIT_STUB_PREFIX #name, zend_jit_ ## name ## _stub, offset, adjustment}
 
+bool zend_jit_startup_ok = false;
+
 zend_ulong zend_jit_profile_counter = 0;
 int zend_jit_profile_counter_rid = -1;
 
@@ -696,16 +698,16 @@
 	return NULL;
 }
 
-static bool zend_may_be_dynamic_property(zend_class_entry *ce, zend_string *member, bool on_this, zend_string *filename)
+static bool zend_may_be_dynamic_property(zend_class_entry *ce, zend_string *member, bool on_this, const zend_op_array *op_array)
 {
 	zend_property_info *info;
 
-	if (!ce || (ce->ce_flags & ZEND_ACC_TRAIT)) {
+	if (!ce || (ce->ce_flags & ZEND_ACC_TRAIT) || (op_array->fn_flags & ZEND_ACC_TRAIT_CLONE)) {
 		return 1;
 	}
 
 	if (!(ce->ce_flags & ZEND_ACC_IMMUTABLE)) {
-		if (ce->info.user.filename != filename) {
+		if (ce->info.user.filename != op_array->filename) {
 			/* class declaration might be changed independently */
 			return 1;
 		}
@@ -3191,7 +3193,7 @@
 						if (opline->op1_type == IS_UNUSED) {
 							op1_info = MAY_BE_OBJECT|MAY_BE_RC1|MAY_BE_RCN;
 							ce = op_array->scope;
-							ce_is_instanceof = (ce->ce_flags & ZEND_ACC_FINAL) != 0;
+							ce_is_instanceof = !(ce->ce_flags & ZEND_ACC_FINAL);
 							op1_addr = 0;
 							on_this = 1;
 						} else {
@@ -3239,7 +3241,7 @@
 						if (opline->op1_type == IS_UNUSED) {
 							op1_info = MAY_BE_OBJECT|MAY_BE_RC1|MAY_BE_RCN;
 							ce = op_array->scope;
-							ce_is_instanceof = (ce->ce_flags & ZEND_ACC_FINAL) != 0;
+							ce_is_instanceof = !(ce->ce_flags & ZEND_ACC_FINAL);
 							op1_addr = 0;
 							on_this = 1;
 						} else {
@@ -3280,7 +3282,7 @@
 						if (opline->op1_type == IS_UNUSED) {
 							op1_info = MAY_BE_OBJECT|MAY_BE_RC1|MAY_BE_RCN;
 							ce = op_array->scope;
-							ce_is_instanceof = (ce->ce_flags & ZEND_ACC_FINAL) != 0;
+							ce_is_instanceof = !(ce->ce_flags & ZEND_ACC_FINAL);
 							op1_addr = 0;
 							on_this = 1;
 						} else {
@@ -3783,7 +3785,7 @@
 							op1_info = MAY_BE_OBJECT|MAY_BE_RC1|MAY_BE_RCN;
 							op1_addr = 0;
 							ce = op_array->scope;
-							ce_is_instanceof = (ce->ce_flags & ZEND_ACC_FINAL) != 0;
+							ce_is_instanceof = !(ce->ce_flags & ZEND_ACC_FINAL);
 							on_this = 1;
 						} else {
 							op1_info = OP1_INFO();
@@ -3934,7 +3936,7 @@
 							op1_info = MAY_BE_OBJECT|MAY_BE_RC1|MAY_BE_RCN;
 							op1_addr = 0;
 							ce = op_array->scope;
-							ce_is_instanceof = (ce->ce_flags & ZEND_ACC_FINAL) != 0;
+							ce_is_instanceof = !(ce->ce_flags & ZEND_ACC_FINAL);
 							on_this = 1;
 						} else {
 							op1_info = OP1_INFO();
@@ -3992,7 +3994,13 @@
 				case ZEND_OP_DATA:
 				case ZEND_SWITCH_LONG:
 				case ZEND_SWITCH_STRING:
+					break;
 				case ZEND_MATCH:
+					/* We have to exit to the VM because the MATCH handler performs an N-way jump for
+					 * which we can't generate simple (opcache.jit=1201) JIT code. */
+					if (!zend_jit_tail_handler(&dasm_state, opline)) {
+						goto jit_failure;
+					}
 					break;
 				case ZEND_JMP:
 					if (JIT_G(opt_level) < ZEND_JIT_LEVEL_INLINE) {
@@ -4207,16 +4215,19 @@
 	}
 }
 
-static int zend_real_jit_func(zend_op_array *op_array, zend_script *script, const zend_op *rt_opline)
+static int zend_real_jit_func(zend_op_array *op_array, zend_script *script, const zend_op *rt_opline, uint8_t trigger)
 {
 	zend_ssa ssa;
 	void *checkpoint;
 	zend_func_info *func_info;
+	uint8_t orig_trigger;
 
 	if (*dasm_ptr == dasm_end) {
 		return FAILURE;
 	}
 
+	orig_trigger = JIT_G(trigger);
+	JIT_G(trigger) = trigger;
 	checkpoint = zend_arena_checkpoint(CG(arena));
 
 	/* Build SSA */
@@ -4249,11 +4260,13 @@
 
 	zend_jit_cleanup_func_info(op_array);
 	zend_arena_release(&CG(arena), checkpoint);
+	JIT_G(trigger) = orig_trigger;
 	return SUCCESS;
 
 jit_failure:
 	zend_jit_cleanup_func_info(op_array);
 	zend_arena_release(&CG(arena), checkpoint);
+	JIT_G(trigger) = orig_trigger;
 	return FAILURE;
 }
 
@@ -4284,7 +4297,7 @@
 			opline->handler = jit_extension->orig_handler;
 
 			/* perform real JIT for this function */
-			zend_real_jit_func(op_array, NULL, NULL);
+			zend_real_jit_func(op_array, NULL, NULL, ZEND_JIT_ON_FIRST_EXEC);
 		} zend_catch {
 			do_bailout = true;
 		} zend_end_try();
@@ -4330,7 +4343,7 @@
 			jit_extension = (zend_jit_op_array_extension*)ZEND_FUNC_INFO(op_array);
 			opline->handler = jit_extension->orig_handler;
 			if (((double)counter / (double)zend_jit_profile_counter) > JIT_G(prof_threshold)) {
-				zend_real_jit_func(op_array, NULL, NULL);
+				zend_real_jit_func(op_array, NULL, NULL, ZEND_JIT_ON_PROF_REQUEST);
 			}
 		}
 	} ZEND_HASH_FOREACH_END();
@@ -4356,7 +4369,7 @@
 			}
 
 			/* perform real JIT for this function */
-			zend_real_jit_func(op_array, NULL, opline);
+			zend_real_jit_func(op_array, NULL, opline, ZEND_JIT_ON_HOT_COUNTERS);
 		} zend_catch {
 			do_bailout = 1;
 		} zend_end_try();
@@ -4524,7 +4537,7 @@
 	} else if (JIT_G(trigger) == ZEND_JIT_ON_HOT_TRACE) {
 		return zend_jit_setup_hot_trace_counters(op_array);
 	} else if (JIT_G(trigger) == ZEND_JIT_ON_SCRIPT_LOAD) {
-		return zend_real_jit_func(op_array, script, NULL);
+		return zend_real_jit_func(op_array, script, NULL, ZEND_JIT_ON_SCRIPT_LOAD);
 	} else {
 		ZEND_UNREACHABLE();
 	}
@@ -4776,7 +4789,7 @@
 	JIT_G(opt_level) = jit % 10;
 
 	jit /= 10;
-	if (jit % 10 > 5) return FAILURE;
+	if (jit % 10 > 5 || jit % 10 == 4) return FAILURE;
 	JIT_G(trigger) = jit % 10;
 
 	jit /= 10;
@@ -4803,12 +4816,12 @@
 		return FAILURE;
 	}
 
-	if (ZSTR_LEN(jit) == 0
-	 || zend_string_equals_literal_ci(jit, "disable")) {
+	if (zend_string_equals_literal_ci(jit, "disable")) {
 		JIT_G(enabled) = 0;
 		JIT_G(on) = 0;
 		return SUCCESS;
-	} else if (zend_string_equals_literal_ci(jit, "0")
+	} else if (ZSTR_LEN(jit) == 0
+			|| zend_string_equals_literal_ci(jit, "0")
 			|| zend_string_equals_literal_ci(jit, "off")
 			|| zend_string_equals_literal_ci(jit, "no")
 			|| zend_string_equals_literal_ci(jit, "false")) {
@@ -4895,7 +4908,9 @@
 	}
 
 	if (zend_execute_ex != execute_ex) {
-		if (strcmp(sapi_module.name, "phpdbg") != 0) {
+		if (zend_dtrace_enabled) {
+			zend_error(E_WARNING, "JIT is incompatible with DTrace. JIT disabled.");
+		} else if (strcmp(sapi_module.name, "phpdbg") != 0) {
 			zend_error(E_WARNING, "JIT is incompatible with third party extensions that override zend_execute_ex(). JIT disabled.");
 		}
 		JIT_G(enabled) = 0;
@@ -5091,6 +5106,13 @@
 
 ZEND_EXT_API void zend_jit_activate(void)
 {
+#ifdef ZTS
+	if (!zend_jit_startup_ok) {
+		JIT_G(enabled) = 0;
+		JIT_G(on) = 0;
+		return;
+	}
+#endif
 	zend_jit_profile_counter = 0;
 	if (JIT_G(on)) {
 		if (JIT_G(trigger) == ZEND_JIT_ON_HOT_COUNTERS) {

php-8.3.7.tar.xz/ext/opcache/jit/zend_jit.h -> php-8.3.21.tar.xz/ext/opcache/jit/zend_jit.h Changed

php-8.3.7.tar.xz/ext/opcache/jit/zend_jit_arm64.dasc -> php-8.3.21.tar.xz/ext/opcache/jit/zend_jit_arm64.dasc Changed

@@ -110,6 +110,8 @@
 
 #if ZTS
 static size_t tsrm_ls_cache_tcb_offset = 0;
+static size_t tsrm_tls_index = 0;
+static size_t tsrm_tls_offset = 0;
 # ifdef __APPLE__
 struct TLVDescriptor {
 	void*       (*thunk)(struct TLVDescriptor*);
@@ -117,6 +119,13 @@
 	uint64_t    offset;
 };
 typedef struct TLVDescriptor TLVDescriptor;
+# elif defined(__FreeBSD__)
+/* https://github.com/freebsd/freebsd-src/blob/c52ca7dd09066648b1cc40f758289404d68ab886/libexec/rtld-elf/aarch64/reloc.c#L180-L184 */
+typedef struct TLSDescriptor {
+	void*   thunk;
+	int     index;
+	size_t  offset;
+} TLSDescriptor;
 # endif
 #endif
 
@@ -494,8 +503,18 @@
 |	MEM_ACCESS_64_WITH_UOFFSET_64 ldr, reg, TMP3, (((TLVDescriptor*)tsrm_ls_cache_tcb_offset)->offset), TMP1
 ||#else
 |	.long 0xd53bd051 // TODO: hard-coded: mrs TMP3, tpidr_el0
-||	ZEND_ASSERT(tsrm_ls_cache_tcb_offset <= LDR_STR_PIMM64);
-|	ldr reg, TMP3, #tsrm_ls_cache_tcb_offset
+||	if (tsrm_ls_cache_tcb_offset == 0) {
+||#ifdef __MUSL__
+|		ldr TMP3, TMP3, #-8
+||#else
+|		ldr TMP3, TMP3, #0
+||#endif
+|		MEM_ACCESS_64_WITH_UOFFSET_64 ldr, TMP3, TMP3, tsrm_tls_index, TMP1
+|		MEM_ACCESS_64_WITH_UOFFSET_64 ldr, reg, TMP3, tsrm_tls_offset, TMP1
+||	} else {
+||		ZEND_ASSERT(tsrm_ls_cache_tcb_offset <= LDR_STR_PIMM64);
+|		ldr reg, TMP3, #tsrm_ls_cache_tcb_offset
+||	}
 ||#endif
 |.endmacro
 
@@ -1533,6 +1552,9 @@
 ||			}
 |			IF_GC_MAY_NOT_LEAK FCARG1x, >4, Rw(tmp_reg1), Rw(tmp_reg2)
 |			// gc_possible_root(Z_COUNTED_P(z))
+||			if (opline) {
+|				SET_EX_OPLINE opline, TMP1
+||			}
 |			EXT_CALL gc_possible_root, Rx(tmp_reg1)
 ||		}
 ||		if (cold && ((op_info) & ((MAY_BE_ANY|MAY_BE_UNDEF|MAY_BE_INDIRECT|MAY_BE_GUARD)-(MAY_BE_OBJECT|MAY_BE_RESOURCE))) != 0) {
@@ -2754,7 +2776,41 @@
 
 #if ZTS
 	tsrm_ls_cache_tcb_offset = tsrm_get_ls_cache_tcb_offset();
+# if defined(__FreeBSD__)
+	if (tsrm_ls_cache_tcb_offset == 0) {
+		TLSDescriptor **where;
+
+		__asm__(
+			"adrp %0, :tlsdesc:_tsrm_ls_cache\n"
+			"add %0, %0, :tlsdesc_lo12:_tsrm_ls_cache\n"
+			: "=r" (where));
+		/* See https://github.com/ARM-software/abi-aa/blob/2a70c42d62e9c3eb5887fa50b71257f20daca6f9/aaelf64/aaelf64.rst
+		 * section "Relocations for thread-local storage".
+		 * The first entry holds a pointer to the variable's TLS descriptor resolver function and the second entry holds
+		 * a platform-specific offset or pointer. */
+		TLSDescriptor *tlsdesc = where1;
+
+		tsrm_tls_offset = tlsdesc->offset;
+		/* Index is offset by 1 on FreeBSD (https://github.com/freebsd/freebsd-src/blob/22ca6db50f4e6bd75a141f57cf953d8de6531a06/lib/libc/gen/tls.c#L88) */
+		tsrm_tls_index = (tlsdesc->index + 1) * 8;
+	}
+# elif defined(__MUSL__)
+	if (tsrm_ls_cache_tcb_offset == 0) {
+		size_t **where;
+
+		__asm__(
+			"adrp %0, :tlsdesc:_tsrm_ls_cache\n"
+			"add %0, %0, :tlsdesc_lo12:_tsrm_ls_cache\n"
+			: "=r" (where));
+		/* See https://github.com/ARM-software/abi-aa/blob/2a70c42d62e9c3eb5887fa50b71257f20daca6f9/aaelf64/aaelf64.rst */
+		size_t *tlsdesc = where1;
+
+		tsrm_tls_offset = tlsdesc1;
+		tsrm_tls_index = tlsdesc0 * 8;
+	}
+# else
 	ZEND_ASSERT(tsrm_ls_cache_tcb_offset != 0);
+# endif
 #endif
 
     memset(sp_adj, 0, sizeof(sp_adj));
@@ -5935,6 +5991,9 @@
 			if (RC_MAY_BE_N(var_info) && (var_info & (MAY_BE_ARRAY|MAY_BE_OBJECT)) != 0) {
 				|4:
 				|	IF_GC_MAY_NOT_LEAK FCARG1x, >8, TMP1w, TMP2w
+				if (opline) {
+					|	SET_EX_OPLINE opline, REG0
+				}
 				|	EXT_CALL gc_possible_root, REG0
 				if (in_cold) {
 					|	b >8
@@ -5962,6 +6021,9 @@
 				|	GET_ZVAL_PTR FCARG1x, var_use_addr, TMP1
 				|	GC_DELREF FCARG1x, TMP1w
 				|	IF_GC_MAY_NOT_LEAK FCARG1x, >5, TMP1w, TMP2w
+				if (opline) {
+					|	SET_EX_OPLINE opline, TMP1
+				}
 				|	EXT_CALL gc_possible_root, TMP1
 				if (Z_REG(var_use_addr) != ZREG_FP) {
 					|	ldr Rx(Z_REG(var_use_addr)), T1 // restore
@@ -8409,6 +8471,7 @@
 {
 	uint32_t used_stack;
 	bool stack_check = 1;
+	const size_t func_type_offset = is_closure ? offsetof(zend_closure, func.type) : offsetof(zend_function, type);
 
 	// REG0   -> zend_function
 	// FCARG1 -> used_stack
@@ -8422,15 +8485,11 @@
 		used_stack = (ZEND_CALL_FRAME_SLOT + opline->extended_value + ZEND_OBSERVER_ENABLED) * sizeof(zval);
 
 		|	// if (EXPECTED(ZEND_USER_CODE(func->type))) {
-		if (!is_closure) {
-			|	LOAD_32BIT_VAL FCARG1w, used_stack
-			|	// Check whether REG0 is an internal function.
-			|	ldrb TMP1w, REG0, #offsetof(zend_function, type)
-			|	TST_32_WITH_CONST TMP1w, 1, TMP2w
-			|	bne >1
-		} else {
-			|	LOAD_32BIT_VAL FCARG1w, used_stack
-		}
+		|	LOAD_32BIT_VAL FCARG1w, used_stack
+		|	// Check whether REG0 is an internal function.
+		|	ldrb TMP1w, REG0, #func_type_offset
+		|	TST_32_WITH_CONST TMP1w, 1, TMP2w
+		|	bne >1
 		|	// used_stack += (func->op_array.last_var + func->op_array.T - MIN(func->op_array.num_args, num_args)) * sizeof(zval);
 		|	LOAD_32BIT_VAL REG2w, opline->extended_value
 		if (!is_closure) {
@@ -8596,11 +8655,18 @@
 		|	str TMP1w, EX:RX->This.u1.type_info
 		|	// Z_PTR(call->This) = object_or_called_scope;
 		|	str REG1, EX:RX->This.value.ptr
-		|	ldr TMP1, REG0, #offsetof(zend_closure, func.op_array.run_time_cache__ptr)
-		|	cbnz TMP1, >1
-		|	add FCARG1x, REG0, #offsetof(zend_closure, func)
-		|	EXT_CALL zend_jit_init_func_run_time_cache_helper, REG0
-		|1:
+		if (!func) {
+			|	ldrb TMP1w, REG0, #offsetof(zend_closure, func.type)
+			|	cmp TMP1w, #ZEND_USER_FUNCTION
+			|	bne >1
+		}
+		if (!func || func->common.type == ZEND_USER_FUNCTION) {
+			|	add FCARG1x, REG0, #offsetof(zend_closure, func)
+			|	EXT_CALL zend_jit_init_func_run_time_cache_helper, REG0
+		}
+		if (!func) {
+			|1:
+		}
 	}
 	|	// ZEND_CALL_NUM_ARGS(call) = num_args;
 	|	LOAD_32BIT_VAL TMP1w, opline->extended_value
@@ -9141,9 +9207,9 @@
 			func = call_info->callee_func;
 		}
 		if ((op_array->fn_flags & ZEND_ACC_TRAIT_CLONE)
-		 && JIT_G(current_frame)
-		 && JIT_G(current_frame)->call
-		 && !JIT_G(current_frame)->call->func) {
+		 && (!JIT_G(current_frame) ||
+		     !JIT_G(current_frame)->call ||
+		     !JIT_G(current_frame)->call->func)) {
 			call_info = NULL; func = NULL; /* megamorphic call from trait */
 		}
 	}
@@ -11822,6 +11888,9 @@
 			|3:
 			|	// GC_ZVAL_CHECK_POSSIBLE_ROOT(variable_ptr)
 			|	IF_GC_MAY_NOT_LEAK FCARG1x, >5, TMP1w, TMP2w
+			if (opline) {
+				|	SET_EX_OPLINE opline, REG0
+			}
 			|	EXT_CALL gc_possible_root, REG0
 			|	b >5
 		}
@@ -12191,7 +12260,7 @@
 		|	cmp REG2, TMP1
 		|	bne >5
 		|	MEM_ACCESS_64_WITH_UOFFSET ldr, REG0, REG0, ((opline->extended_value & ~ZEND_FETCH_OBJ_FLAGS)  + sizeof(void*)), TMP1
-		may_be_dynamic = zend_may_be_dynamic_property(ce, Z_STR_P(member), opline->op1_type == IS_UNUSED, op_array->filename);
+		may_be_dynamic = zend_may_be_dynamic_property(ce, Z_STR_P(member), opline->op1_type == IS_UNUSED, op_array);
 		if (may_be_dynamic) {
 			|	tst REG0, REG0
 			if (opline->opcode == ZEND_FETCH_OBJ_W) {
@@ -13839,7 +13908,9 @@
 
 static int zend_jit_fetch_this(dasm_State **Dst, const zend_op *opline, const zend_op_array *op_array, bool check_only)
 {
-	if (!op_array->scope || (op_array->fn_flags & ZEND_ACC_STATIC)) {
+	if (!op_array->scope ||
+			(op_array->fn_flags & ZEND_ACC_STATIC) ||
+			((op_array->fn_flags & (ZEND_ACC_CLOSURE|ZEND_ACC_IMMUTABLE)) == ZEND_ACC_CLOSURE)) {
 		if (JIT_G(trigger) == ZEND_JIT_ON_HOT_TRACE) {
 			if (!JIT_G(current_frame) ||
 			    !TRACE_FRAME_IS_THIS_CHECKED(JIT_G(current_frame))) {

php-8.3.7.tar.xz/ext/opcache/jit/zend_jit_helpers.c -> php-8.3.21.tar.xz/ext/opcache/jit/zend_jit_helpers.c Changed

@@ -1636,7 +1636,7 @@
 	zend_string *result_str;
 	uint32_t flags = ZSTR_GET_COPYABLE_CONCAT_PROPERTIES_BOTH(Z_STR_P(op1), Z_STR_P(op2));
 
-	if (UNEXPECTED(op1_len > SIZE_MAX - op2_len)) {
+	if (UNEXPECTED(op1_len > ZSTR_MAX_LEN - op2_len)) {
 		zend_throw_error(NULL, "String size overflow");
 		return;
 	}
@@ -1672,7 +1672,7 @@
 	zend_string *result_str;
 	uint32_t flags = ZSTR_GET_COPYABLE_CONCAT_PROPERTIES_BOTH(Z_STR_P(op1), Z_STR_P(op2));
 
-	if (UNEXPECTED(op1_len > SIZE_MAX - op2_len)) {
+	if (UNEXPECTED(op1_len > ZSTR_MAX_LEN - op2_len)) {
 		zend_throw_error(NULL, "String size overflow");
 		return;
 	}
@@ -1696,7 +1696,7 @@
 	zend_string *result_str;
 	uint32_t flags = ZSTR_GET_COPYABLE_CONCAT_PROPERTIES_BOTH(Z_STR_P(op1), Z_STR_P(op2));
 
-	if (UNEXPECTED(op1_len > SIZE_MAX - op2_len)) {
+	if (UNEXPECTED(op1_len > ZSTR_MAX_LEN - op2_len)) {
 		zend_throw_error(NULL, "String size overflow");
 		return;
 	}
@@ -1830,6 +1830,12 @@
 
 static void ZEND_FASTCALL zend_jit_verify_return_slow(zval *arg, const zend_op_array *op_array, zend_arg_info *arg_info, void **cache_slot)
 {
+    if (Z_TYPE_P(arg) == IS_NULL) {
+		ZEND_ASSERT(ZEND_TYPE_IS_SET(arg_info->type));
+		if (EXPECTED(ZEND_TYPE_CONTAINS_CODE(arg_info->type, IS_NULL))) {
+			return;
+		}
+	}
 	if (UNEXPECTED(!zend_check_user_type_slow(
 			&arg_info->type, arg, /* ref */ NULL, cache_slot, /* is_return_type */ true))) {
 		zend_verify_return_error((zend_function*)op_array, arg);

php-8.3.7.tar.xz/ext/opcache/jit/zend_jit_trace.c -> php-8.3.21.tar.xz/ext/opcache/jit/zend_jit_trace.c Changed

@@ -1251,7 +1251,8 @@
 			}
 		} else if (p->op == ZEND_JIT_TRACE_DO_ICALL) {
 			if (JIT_G(opt_level) < ZEND_JIT_LEVEL_OPT_FUNC) {
-				if (p->func != (zend_function*)&zend_pass_function
+				if (p->func
+				 && p->func != (zend_function*)&zend_pass_function
 				 && (zend_string_equals_literal(p->func->common.function_name, "extract")
 				  || zend_string_equals_literal(p->func->common.function_name, "compact")
 				  || zend_string_equals_literal(p->func->common.function_name, "get_defined_vars"))) {
@@ -1744,7 +1745,8 @@
 						if (!(orig_op1_type & IS_TRACE_PACKED)) {
 							zend_ssa_var_info *info = &tssa->var_infotssa->opsidx.op1_use;
 
-							if (MAY_BE_PACKED(info->type) && MAY_BE_HASH(info->type)) {
+							if (MAY_BE_PACKED(info->type) && MAY_BE_HASH(info->type)
+							 && (info->type & (MAY_BE_ANY|MAY_BE_UNDEF)) == MAY_BE_ARRAY) {
 								info->type |= MAY_BE_PACKED_GUARD;
 								info->type &= ~MAY_BE_ARRAY_PACKED;
 							}
@@ -1753,7 +1755,8 @@
 								&& val_type != IS_UNDEF) {
 							zend_ssa_var_info *info = &tssa->var_infotssa->opsidx.op1_use;
 
-							if (MAY_BE_PACKED(info->type) && MAY_BE_HASH(info->type)) {
+							if (MAY_BE_PACKED(info->type) && MAY_BE_HASH(info->type)
+							 && (info->type & (MAY_BE_ANY|MAY_BE_UNDEF)) == MAY_BE_ARRAY) {
 								info->type |= MAY_BE_PACKED_GUARD;
 								info->type &= ~(MAY_BE_ARRAY_NUMERIC_HASH|MAY_BE_ARRAY_STRING_HASH);
 							}
@@ -1832,7 +1835,8 @@
 
 						zend_ssa_var_info *info = &tssa->var_infotssa->opsidx.op1_use;
 
-						if (MAY_BE_PACKED(info->type) && MAY_BE_HASH(info->type)) {
+						if (MAY_BE_PACKED(info->type) && MAY_BE_HASH(info->type)
+						 && (info->type & (MAY_BE_ANY|MAY_BE_UNDEF)) == MAY_BE_ARRAY) {
 							info->type |= MAY_BE_PACKED_GUARD;
 							if (orig_op1_type & IS_TRACE_PACKED) {
 								info->type &= ~(MAY_BE_ARRAY_NUMERIC_HASH|MAY_BE_ARRAY_STRING_HASH);
@@ -1934,7 +1938,8 @@
 
 						zend_ssa_var_info *info = &tssa->var_infotssa->opsidx.op1_use;
 
-						if (MAY_BE_PACKED(info->type) && MAY_BE_HASH(info->type)) {
+						if (MAY_BE_PACKED(info->type) && MAY_BE_HASH(info->type)
+						 && (info->type & (MAY_BE_ANY|MAY_BE_UNDEF)) == MAY_BE_ARRAY) {
 							info->type |= MAY_BE_PACKED_GUARD;
 							if (orig_op1_type & IS_TRACE_PACKED) {
 								info->type &= ~(MAY_BE_ARRAY_NUMERIC_HASH|MAY_BE_ARRAY_STRING_HASH);
@@ -1964,7 +1969,8 @@
 
 						zend_ssa_var_info *info = &tssa->var_infotssa->opsidx.op1_use;
 
-						if (MAY_BE_PACKED(info->type) && MAY_BE_HASH(info->type)) {
+						if (MAY_BE_PACKED(info->type) && MAY_BE_HASH(info->type)
+						 && (info->type & (MAY_BE_ANY|MAY_BE_UNDEF)) == MAY_BE_ARRAY) {
 							info->type |= MAY_BE_PACKED_GUARD;
 							info->type &= ~MAY_BE_ARRAY_PACKED;
 						}
@@ -2209,7 +2215,7 @@
 					assert(0);
 				}
 				if (opline->opcode == ZEND_ASSIGN_DIM_OP
-				 && ssa_opsidx.op1_def > 0
+				 && ssa_opsidx.op1_def >= 0
 				 && op1_type == IS_ARRAY
 				 && (orig_op1_type & IS_TRACE_PACKED)
 				 && val_type != IS_UNKNOWN
@@ -4163,10 +4169,14 @@
 			if ((info & MAY_BE_PACKED_GUARD) != 0
 			 && (trace_buffer->stop == ZEND_JIT_TRACE_STOP_LOOP
 			  || trace_buffer->stop == ZEND_JIT_TRACE_STOP_RECURSIVE_CALL
-			  || trace_buffer->stop == ZEND_JIT_TRACE_STOP_RECURSIVE_RET)
+			  || (trace_buffer->stop == ZEND_JIT_TRACE_STOP_RECURSIVE_RET
+			   && (opline-1)->result_type == IS_VAR
+			   && EX_VAR_TO_NUM((opline-1)->result.var) == i))
 			 && (ssa->varsi.use_chain != -1
 			  || (ssa->varsi.phi_use_chain
 			   && !(ssa->var_infossa->varsi.phi_use_chain->ssa_var.type & MAY_BE_PACKED_GUARD)))) {
+				ZEND_ASSERT(STACK_TYPE(stack, i) == IS_ARRAY);
+
 				if (!zend_jit_packed_guard(&dasm_state, opline, EX_NUM_TO_VAR(i), info)) {
 					goto jit_failure;
 				}
@@ -4651,7 +4661,7 @@
 						if (opline->op1_type == IS_UNUSED) {
 							op1_info = MAY_BE_OBJECT|MAY_BE_RC1|MAY_BE_RCN;
 							ce = op_array->scope;
-							ce_is_instanceof = (ce->ce_flags & ZEND_ACC_FINAL) != 0;
+							ce_is_instanceof = !(ce->ce_flags & ZEND_ACC_FINAL);
 							op1_addr = 0;
 							on_this = 1;
 						} else {
@@ -4742,7 +4752,7 @@
 						if (opline->op1_type == IS_UNUSED) {
 							op1_info = MAY_BE_OBJECT|MAY_BE_RC1|MAY_BE_RCN;
 							ce = op_array->scope;
-							ce_is_instanceof = (ce->ce_flags & ZEND_ACC_FINAL) != 0;
+							ce_is_instanceof = !(ce->ce_flags & ZEND_ACC_FINAL);
 							op1_addr = 0;
 							on_this = 1;
 						} else {
@@ -4822,7 +4832,7 @@
 						if (opline->op1_type == IS_UNUSED) {
 							op1_info = MAY_BE_OBJECT|MAY_BE_RC1|MAY_BE_RCN;
 							ce = op_array->scope;
-							ce_is_instanceof = (ce->ce_flags & ZEND_ACC_FINAL) != 0;
+							ce_is_instanceof = !(ce->ce_flags & ZEND_ACC_FINAL);
 							op1_addr = 0;
 							on_this = 1;
 						} else {
@@ -5037,7 +5047,7 @@
 								zend_may_throw_ex(opline, ssa_op, op_array, ssa, op1_info, op2_info))) {
 							goto jit_failure;
 						}
-						if (ssa_op->op2_def > 0
+						if (ssa_op->op2_def >= 0
 						 && Z_MODE(op2_addr) == IS_REG
 						 && ssa->varsssa_op->op2_def.no_val) {
 							uint8_t type = (op2_info & MAY_BE_LONG) ? IS_LONG : IS_DOUBLE;
@@ -5087,7 +5097,7 @@
 								res_use_info, res_info, res_addr)) {
 							goto jit_failure;
 						}
-						if (ssa_op->op1_def > 0
+						if (ssa_op->op1_def >= 0
 						 && Z_MODE(op1_addr) == IS_REG
 						 && ssa->varsssa_op->op1_def.no_val) {
 							uint8_t type = (op1_info & MAY_BE_LONG) ? IS_LONG : IS_DOUBLE;
@@ -5184,7 +5194,7 @@
 								op1_info, op1_addr, op1_def_addr)) {
 							goto jit_failure;
 						}
-						if (ssa_op->op1_def > 0
+						if (ssa_op->op1_def >= 0
 						 && Z_MODE(op1_addr) == IS_REG
 						 && ssa->varsssa_op->op1_def.no_val) {
 							uint8_t type = (op1_info & MAY_BE_LONG) ? IS_LONG : IS_DOUBLE;
@@ -5407,6 +5417,9 @@
 							res_type = Z_TYPE_P(RT_CONSTANT(opline, opline->op1));
 						} else if (op1_type != IS_UNKNOWN) {
 							res_type = op1_type;
+							if (res_type == IS_UNDEF) {
+								res_type = IS_NULL;
+							}
 						}
 						if (op_array->type == ZEND_EVAL_CODE
 						 // TODO: support for top-level code
@@ -5734,7 +5747,7 @@
 								op1_info, op1_addr, op2_info, RES_REG_ADDR(), val_type)) {
 							goto jit_failure;
 						}
-						if (ssa_op->result_def > 0
+						if (ssa_op->result_def >= 0
 						 && (opline->opcode == ZEND_FETCH_DIM_W || opline->opcode == ZEND_FETCH_LIST_W)
 						 && !(op1_info & (MAY_BE_FALSE|MAY_BE_TRUE|MAY_BE_LONG|MAY_BE_DOUBLE|MAY_BE_STRING|MAY_BE_OBJECT|MAY_BE_RESOURCE|MAY_BE_REF))
 						 && !(op2_info & (MAY_BE_UNDEF|MAY_BE_RESOURCE|MAY_BE_ARRAY|MAY_BE_OBJECT))) {
@@ -5842,7 +5855,7 @@
 						if (opline->op1_type == IS_UNUSED) {
 							op1_info = MAY_BE_OBJECT|MAY_BE_RC1|MAY_BE_RCN;
 							ce = op_array->scope;
-							ce_is_instanceof = (ce->ce_flags & ZEND_ACC_FINAL) != 0;
+							ce_is_instanceof = !(ce->ce_flags & ZEND_ACC_FINAL);
 							op1_addr = 0;
 							on_this = 1;
 						} else {
@@ -6121,7 +6134,7 @@
 						if (opline->op1_type == IS_UNUSED) {
 							op1_info = MAY_BE_OBJECT|MAY_BE_RC1|MAY_BE_RCN;
 							ce = op_array->scope;
-							ce_is_instanceof = (ce->ce_flags & ZEND_ACC_FINAL) != 0;
+							ce_is_instanceof = !(ce->ce_flags & ZEND_ACC_FINAL);
 							op1_addr = 0;
 							on_this = 1;
 						} else {
@@ -6225,7 +6238,7 @@
 					goto jit_failure;
 				}
 				if ((p+1)->op == ZEND_JIT_TRACE_INIT_CALL && (p+1)->func) {
-					if (opline->opcode == ZEND_NEW && ssa_op->result_def >= 0) {
+					if (opline->opcode == ZEND_NEW && opline->result_type != IS_UNUSED) {
 						SET_STACK_TYPE(stack, EX_VAR_TO_NUM(opline->result.var), IS_OBJECT, 1);
 					}
 					if (zend_jit_may_be_polymorphic_call(opline) ||
@@ -6973,7 +6986,7 @@
 					for (i = 0; i < op_array->last_var + op_array->T; i++) {
 						SET_STACK_TYPE(stack, i, IS_UNKNOWN, 1);
 					}
-					exit_point = zend_jit_trace_get_exit_point(opline, ZEND_JIT_EXIT_TO_VM);
+					exit_point = zend_jit_trace_get_exit_point(zend_jit_tracest->link.opline, ZEND_JIT_EXIT_TO_VM);
 					timeout_exit_addr = zend_jit_trace_get_exit_addr(exit_point);
 					if (!timeout_exit_addr) {
 						goto jit_failure;
@@ -7177,6 +7190,11 @@
 			t->polymorphism = 0;
 			t->jmp_table_size = 0;
 			t->op_array = trace_buffer0.op_array;
+			if (!(t->op_array->fn_flags & ZEND_ACC_IMMUTABLE)) {
+				zend_jit_op_array_trace_extension *jit_extension =
+					(zend_jit_op_array_trace_extension*)ZEND_FUNC_INFO(t->op_array);
+				t->op_array = jit_extension->op_array;
+			}
 			t->opline = trace_buffer1.opline;
 			t->exit_info = exit_info;
 			t->stack_map = NULL;
@@ -8329,7 +8347,20 @@
 		if (!(ZEND_OP_TRACE_INFO(t->opline, jit_extension->offset)->trace_flags & (ZEND_JIT_TRACE_JITED|ZEND_JIT_TRACE_BLACKLISTED))) {
 			/* skip: not JIT-ed nor blacklisted */
 		} else if (ZEND_JIT_TRACE_NUM >= JIT_G(max_root_traces)) {
-			/* skip: too many root traces */
+			/* too many root traces, blacklist the root trace */
+			if (!(ZEND_OP_TRACE_INFO(t->opline, jit_extension->offset)->trace_flags & ZEND_JIT_TRACE_BLACKLISTED)) {
+				SHM_UNPROTECT();
+				zend_jit_unprotect();
+
+				((zend_op*)opline)->handler =
+					ZEND_OP_TRACE_INFO(t->opline, jit_extension->offset)->orig_handler;
+
+				ZEND_OP_TRACE_INFO(t->opline, jit_extension->offset)->trace_flags &= ~ZEND_JIT_TRACE_JITED;
+				ZEND_OP_TRACE_INFO(t->opline, jit_extension->offset)->trace_flags |= ZEND_JIT_TRACE_BLACKLISTED;
+
+				zend_jit_protect();
+				SHM_PROTECT();
+			}
 		} else {
 			SHM_UNPROTECT();
 			zend_jit_unprotect();

php-8.3.7.tar.xz/ext/opcache/jit/zend_jit_vm_helpers.c -> php-8.3.21.tar.xz/ext/opcache/jit/zend_jit_vm_helpers.c Changed

php-8.3.7.tar.xz/ext/opcache/jit/zend_jit_x86.dasc -> php-8.3.21.tar.xz/ext/opcache/jit/zend_jit_x86.dasc Changed

@@ -1443,6 +1443,9 @@
 |1:
 ||			}
 |			IF_GC_MAY_NOT_LEAK FCARG1a, >4
+||			if (opline) {
+|				SET_EX_OPLINE opline, r0
+||			}
 |			// gc_possible_root(Z_COUNTED_P(z))
 |			EXT_CALL gc_possible_root, r0
 ||		}
@@ -2910,6 +2913,15 @@
 			: "=a" (ti));
 		tsrm_tls_offset = ti1;
 		tsrm_tls_index = ti0 * 8;
+#elif defined(__FreeBSD__)
+		size_t *ti;
+
+		__asm__(
+			"leaq _tsrm_ls_cache@tlsgd(%%rip), %0\n"
+			: "=a" (ti));
+		tsrm_tls_offset = ti1;
+		/* Index is offset by 1 on FreeBSD (https://github.com/freebsd/freebsd-src/blob/bf56e8b9c8639ac4447d223b83cdc128107cc3cd/libexec/rtld-elf/rtld.c#L5260) */
+		tsrm_tls_index = (ti0 + 1) * 8;
 #else
 		size_t *ti;
 
@@ -6513,6 +6525,9 @@
 			if (RC_MAY_BE_N(var_info) && (var_info & (MAY_BE_ARRAY|MAY_BE_OBJECT)) != 0) {
 				|4:
 				|	IF_GC_MAY_NOT_LEAK FCARG1a, >8
+				if (opline) {
+					|	SET_EX_OPLINE opline, r0
+				}
 				|	EXT_CALL gc_possible_root, r0
 				if (in_cold) {
 					|	jmp >8
@@ -6540,6 +6555,9 @@
 				|	GET_ZVAL_PTR FCARG1a, var_use_addr
 				|	GC_DELREF FCARG1a
 				|	IF_GC_MAY_NOT_LEAK FCARG1a, >5
+				if (opline) {
+					|	SET_EX_OPLINE opline, r0
+				}
 				|	EXT_CALL gc_possible_root, r0
 				if (Z_REG(var_use_addr) != ZREG_FP) {
 					|	mov Ra(Z_REG(var_use_addr)), T1 // restore
@@ -9054,6 +9072,7 @@
 {
 	uint32_t used_stack;
 	bool stack_check = 1;
+	const size_t func_type_offset = is_closure ? offsetof(zend_closure, func.type) : offsetof(zend_function, type);
 
 	if (func) {
 		used_stack = zend_vm_calc_used_stack(opline->extended_value, func);
@@ -9064,13 +9083,9 @@
 		used_stack = (ZEND_CALL_FRAME_SLOT + opline->extended_value + ZEND_OBSERVER_ENABLED) * sizeof(zval);
 
 		|	// if (EXPECTED(ZEND_USER_CODE(func->type))) {
-		if (!is_closure) {
-			|	test byte r0 + offsetof(zend_function, type), 1
-			|	mov FCARG1a, used_stack
-			|	jnz >1
-		} else {
-			|	mov FCARG1a, used_stack
-		}
+		|	test byte r0 + func_type_offset, 1
+		|	mov FCARG1a, used_stack
+		|	jnz >1
 		|	// used_stack += (func->op_array.last_var + func->op_array.T - MIN(func->op_array.num_args, num_args)) * sizeof(zval);
 		|	mov edx, opline->extended_value
 		if (!is_closure) {
@@ -9240,11 +9255,17 @@
 		|	or dword EX:RX->This.u1.type_info, edx
 		|	// Z_PTR(call->This) = object_or_called_scope;
 		|	mov aword EX:RX->This.value.ptr, r1
-		|	cmp aword r0 + offsetof(zend_closure, func.op_array.run_time_cache__ptr), 0
-		|	jnz >1
-		|	lea FCARG1a, aword r0 + offsetof(zend_closure, func)
-		|	EXT_CALL zend_jit_init_func_run_time_cache_helper, r0
-		|1:
+		if (!func) {
+			|	cmp byte r0 + offsetof(zend_closure, func.type), ZEND_USER_FUNCTION
+			|	jnz >1
+		}
+		if (!func || func->common.type == ZEND_USER_FUNCTION) {
+			|	lea FCARG1a, aword r0 + offsetof(zend_closure, func)
+			|	EXT_CALL zend_jit_init_func_run_time_cache_helper, r0
+		}
+		if (!func) {
+			|1:
+		}
 	}
 	|	// ZEND_CALL_NUM_ARGS(call) = num_args;
 	|	mov dword EX:RX->This.u2.num_args, opline->extended_value
@@ -9256,19 +9277,11 @@
 	int32_t exit_point;
 	const void *exit_addr;
 
-	if (func->type == ZEND_INTERNAL_FUNCTION) {
-#ifdef ZEND_WIN32
-		// TODO: ASLR may cause different addresses in different workers ???
-		return 0;
-#endif
-	} else if (func->type == ZEND_USER_FUNCTION) {
+	if (func->type == ZEND_USER_FUNCTION) {
 		if (!zend_accel_in_shm(func->op_array.opcodes)) {
 			/* op_array and op_array->opcodes are not persistent. We can't link. */
 			return 0;
 		}
-	} else {
-		ZEND_UNREACHABLE();
-		return 0;
 	}
 
 	exit_point = zend_jit_trace_get_exit_point(to_opline, ZEND_JIT_EXIT_POLYMORPHISM);
@@ -9302,6 +9315,22 @@
 		|		cmp aword r1 + offsetof(zend_op_array, opcodes), opcodes
 		|	.endif
 		|	jne &exit_addr
+#ifdef _WIN32
+	} else if (func->type == ZEND_INTERNAL_FUNCTION) {
+		const zif_handler handler = func->internal_function.handler;
+
+		|   .if X64
+		||		if (!IS_SIGNED_32BIT(handler)) {
+		|			mov64 r2, ((ptrdiff_t)handler)
+		|			cmp aword r1 + offsetof(zend_internal_function, handler), r2
+		||		} else {
+		|			cmp aword r1 + offsetof(zend_internal_function, handler), handler
+		||		}
+		|	.else
+		|		cmp aword r1 + offsetof(zend_internal_function, handler), handler
+		|	.endif
+		|	jne &exit_addr
+#endif
 	} else {
 		|   .if X64
 		||		if (!IS_SIGNED_32BIT(func)) {
@@ -9448,6 +9477,22 @@
 					|		cmp aword r0 + offsetof(zend_op_array, opcodes), opcodes
 					|	.endif
 					|	jz >3
+#ifdef _WIN32
+				} else if (func->type == ZEND_INTERNAL_FUNCTION) {
+					const zif_handler handler = func->internal_function.handler;
+
+					|   .if X64
+					||		if (!IS_SIGNED_32BIT(handler)) {
+					|			mov64 r1, ((ptrdiff_t)handler)
+					|			cmp aword r0 + offsetof(zend_internal_function, handler), r1
+					||		} else {
+					|			cmp aword r0 + offsetof(zend_internal_function, handler), handler
+					||		}
+					|	.else
+					|		cmp aword r0 + offsetof(zend_internal_function, handler), handler
+					|	.endif
+					|	jz >3
+#endif
 				} else {
 					|   .if X64
 					||		if (!IS_SIGNED_32BIT(func)) {
@@ -9634,11 +9679,7 @@
 	if ((!func || zend_jit_may_be_modified(func, op_array))
 	 && trace
 	 && trace->op == ZEND_JIT_TRACE_INIT_CALL
-	 && trace->func
-#ifdef _WIN32
-	 && trace->func->type != ZEND_INTERNAL_FUNCTION
-#endif
-	) {
+	 && trace->func) {
 		int32_t exit_point;
 		const void *exit_addr;
 
@@ -9667,6 +9708,22 @@
 			|		cmp aword r0 + offsetof(zend_op_array, opcodes), opcodes
 			|	.endif
 			|	jne &exit_addr
+#ifdef _WIN32
+		} else if (func->type == ZEND_INTERNAL_FUNCTION) {
+			const zif_handler handler = func->internal_function.handler;
+
+			|   .if X64
+			||		if (!IS_SIGNED_32BIT(handler)) {
+			|			mov64 r1, ((ptrdiff_t)handler)
+			|			cmp aword r0 + offsetof(zend_internal_function, handler), r1
+			||		} else {
+			|			cmp aword r0 + offsetof(zend_internal_function, handler), handler
+			||		}
+			|	.else
+			|		cmp aword r0 + offsetof(zend_internal_function, handler), handler
+			|	.endif
+			|	jne &exit_addr
+#endif
 		} else {
 			|   .if X64
 			||		if (!IS_SIGNED_32BIT(func)) {
@@ -9880,9 +9937,9 @@
 			func = call_info->callee_func;
 		}
 		if ((op_array->fn_flags & ZEND_ACC_TRAIT_CLONE)
-		 && JIT_G(current_frame)
-		 && JIT_G(current_frame)->call
-		 && !JIT_G(current_frame)->call->func) {
+		 && (!JIT_G(current_frame) ||
+		     !JIT_G(current_frame)->call ||
+		     !JIT_G(current_frame)->call->func)) {
 			call_info = NULL; func = NULL; /* megamorphic call from trait */
 		}
 	}
@@ -12608,6 +12665,9 @@
 			|3:
 			|	// GC_ZVAL_CHECK_POSSIBLE_ROOT(variable_ptr)
 			|	IF_GC_MAY_NOT_LEAK FCARG1a, >5
+			if (opline) {
+				|	SET_EX_OPLINE opline, r0
+			}
 			|	EXT_CALL gc_possible_root, r1
 			|	jmp >5
 		}
@@ -12985,7 +13045,7 @@
 		|	cmp r2, aword FCARG1a + offsetof(zend_object, ce)
 		|	jne >5
 		|	mov r0, aword r0 + (opline->extended_value & ~ZEND_FETCH_OBJ_FLAGS) + sizeof(void*)
-		may_be_dynamic = zend_may_be_dynamic_property(ce, Z_STR_P(member), opline->op1_type == IS_UNUSED, op_array->filename);
+		may_be_dynamic = zend_may_be_dynamic_property(ce, Z_STR_P(member), opline->op1_type == IS_UNUSED, op_array);
 		if (may_be_dynamic) {
 			|	test r0, r0
 			if (opline->opcode == ZEND_FETCH_OBJ_W) {
@@ -14789,7 +14849,9 @@
 
 static int zend_jit_fetch_this(dasm_State **Dst, const zend_op *opline, const zend_op_array *op_array, bool check_only)
 {
-	if (!op_array->scope || (op_array->fn_flags & ZEND_ACC_STATIC)) {
+	if (!op_array->scope ||
+			(op_array->fn_flags & ZEND_ACC_STATIC) ||
+			((op_array->fn_flags & (ZEND_ACC_CLOSURE|ZEND_ACC_IMMUTABLE)) == ZEND_ACC_CLOSURE)) {
 		if (JIT_G(trigger) == ZEND_JIT_ON_HOT_TRACE) {
 			if (!JIT_G(current_frame) ||
 			    !TRACE_FRAME_IS_THIS_CHECKED(JIT_G(current_frame))) {

php-8.3.7.tar.xz/ext/opcache/shared_alloc_mmap.c -> php-8.3.21.tar.xz/ext/opcache/shared_alloc_mmap.c Changed

@@ -20,6 +20,9 @@
 */
 
 #include "zend_shared_alloc.h"
+#ifdef HAVE_JIT
+# include "jit/zend_jit.h"
+#endif
 
 #ifdef USE_MMAP
 
@@ -48,7 +51,7 @@
 # define MAP_HUGETLB MAP_ALIGNED_SUPER
 #endif
 
-#if (defined(__linux__) || defined(__FreeBSD__)) && (defined(__x86_64__) || defined (__aarch64__)) && !defined(__SANITIZE_ADDRESS__)
+#if defined(HAVE_JIT) && (defined(__linux__) || defined(__FreeBSD__)) && (defined(__x86_64__) || defined (__aarch64__)) && !defined(__SANITIZE_ADDRESS__)
 static void *find_prefered_mmap_base(size_t requested_size)
 {
 	size_t huge_page_size = 2 * 1024 * 1024;
@@ -197,8 +200,17 @@
 #ifdef PROT_MAX
 	flags |= PROT_MAX(PROT_READ | PROT_WRITE | PROT_EXEC);
 #endif
-#if (defined(__linux__) || defined(__FreeBSD__)) && (defined(__x86_64__) || defined (__aarch64__)) && !defined(__SANITIZE_ADDRESS__)
-	void *hint = find_prefered_mmap_base(requested_size);
+#if defined(HAVE_JIT) && (defined(__linux__) || defined(__FreeBSD__)) && (defined(__x86_64__) || defined (__aarch64__)) && !defined(__SANITIZE_ADDRESS__)
+	void *hint;
+	if (JIT_G(enabled) && JIT_G(buffer_size)
+			&& zend_jit_check_support() == SUCCESS) {
+		hint = find_prefered_mmap_base(requested_size);
+	} else {
+		/* Do not use a hint if JIT is not enabled, as this profits only JIT and
+		 * this is potentially unsafe when the only suitable candidate is just
+		 * after the heap (e.g. in non-PIE builds) (GH-13775). */
+		hint = MAP_FAILED;
+	}
 	if (hint != MAP_FAILED) {
 # ifdef MAP_HUGETLB
 		size_t huge_page_size = 2 * 1024 * 1024;

php-8.3.7.tar.xz/ext/opcache/tests/bug78185.phpt -> php-8.3.21.tar.xz/ext/opcache/tests/bug78185.phpt Changed

php-8.3.21.tar.xz/ext/opcache/tests/gh13817.phpt Added

@@ -0,0 +1,51 @@
+--TEST--
+GH-13712 (Segmentation fault for enabled observers after pass 4)
+--EXTENSIONS--
+opcache
+zend_test
+--INI--
+zend_test.observer.enabled=1
+zend_test.observer.show_output=1
+zend_test.observer.observe_all=1
+opcache.enable=1
+opcache.enable_cli=1
+opcache.optimization_level=0x4069
+--FILE--
+<?php
+
+function inner() {
+	echo "Ok\n";
+}
+
+function foo() {
+	// If stack size is wrong, inner() will corrupt the previous observed frame
+	inner();
+}
+
+// After foo() def so that we land here, with step_two undone for foo() first
+function outer() {
+	// Pass 15 does constant string propagation, which gives a ZEND_INIT_DYNAMIC_FCALL on a const which Pass 4 will optimize
+	// Pass 4 must calc the right stack size here
+	(NAME)();
+}
+
+const NAME = "foo";
+
+outer();
+
+?>
+--EXPECTF--
+
+<file '%s'>
+  
+  <outer>
+    
+    <foo>
+      
+      <inner>
+Ok
+      </inner>
+    </foo>
+  </outer>
+</file '%s'>
+

php-8.3.21.tar.xz/ext/opcache/tests/gh17106.phpt Added

php-8.3.7.tar.xz/ext/opcache/tests/gh9164.phpt -> php-8.3.21.tar.xz/ext/opcache/tests/gh9164.phpt Changed

php-8.3.7.tar.xz/ext/opcache/tests/gh9259_003.phpt -> php-8.3.21.tar.xz/ext/opcache/tests/gh9259_003.phpt Changed

php-8.3.21.tar.xz/ext/opcache/tests/jit/assign_obj_005.phpt Added

php-8.3.21.tar.xz/ext/opcache/tests/jit/gh14267_001.phpt Added

php-8.3.21.tar.xz/ext/opcache/tests/jit/gh14267_002.phpt Added

php-8.3.21.tar.xz/ext/opcache/tests/jit/gh15652.phpt Added

php-8.3.21.tar.xz/ext/opcache/tests/jit/gh15658.phpt Added

php-8.3.21.tar.xz/ext/opcache/tests/jit/gh15666.phpt Added

php-8.3.21.tar.xz/ext/opcache/tests/jit/gh15973.phpt Added

php-8.3.21.tar.xz/ext/opcache/tests/jit/gh16393.phpt Added

php-8.3.21.tar.xz/ext/opcache/tests/jit/gh16499.phpt Added

php-8.3.21.tar.xz/ext/opcache/tests/jit/gh16770.phpt Added

php-8.3.21.tar.xz/ext/opcache/tests/jit/gh16829.phpt Added

php-8.3.21.tar.xz/ext/opcache/tests/jit/gh16829_1.inc Added

php-8.3.21.tar.xz/ext/opcache/tests/jit/gh16829_2.inc Added

php-8.3.21.tar.xz/ext/opcache/tests/jit/gh17246.inc Added

php-8.3.21.tar.xz/ext/opcache/tests/jit/gh17246.phpt Added

php-8.3.21.tar.xz/ext/opcache/tests/jit/gh17307.phpt Added

php-8.3.21.tar.xz/ext/opcache/tests/jit/gh17577.phpt Added

php-8.3.21.tar.xz/ext/opcache/tests/jit/gh17654.phpt Added

php-8.3.21.tar.xz/ext/opcache/tests/jit/gh9011.phpt Added

php-8.3.7.tar.xz/ext/opcache/tests/opcache_invalidate_deleted_file.phpt -> php-8.3.21.tar.xz/ext/opcache/tests/opcache_invalidate_deleted_file.phpt Changed

php-8.3.21.tar.xz/ext/opcache/tests/opcache_jit_prof_threshold.phpt Added

php-8.3.7.tar.xz/ext/opcache/tests/opt/gh11170.phpt -> php-8.3.21.tar.xz/ext/opcache/tests/opt/gh11170.phpt Changed

php-8.3.21.tar.xz/ext/opcache/tests/opt/gh18107_1.phpt Added

@@ -0,0 +1,47 @@
+--TEST--
+GH-18107 (Opcache CFG jmp optimization with try-finally breaks the exception table)
+--CREDITS--
+SpencerMalone
+--EXTENSIONS--
+opcache
+--INI--
+opcache.enable=1
+opcache.enable_cli=1
+opcache.optimization_level=0x10
+opcache.opt_debug_level=0x20000
+--FILE--
+<?php
+
+if (!isset($badvar)) {
+    throw new Exception("Should happen");
+}
+try {
+    while (true) { }
+} finally {
+    throw new Exception("Should not happen");
+}
+
+?>
+--EXPECTF--
+$_main:
+     ; (lines=%d, args=0, vars=%d, tmps=%d)
+     ; (after optimizer)
+     ; %s
+0000 T1 = ISSET_ISEMPTY_CV (isset) CV0($badvar)
+0001 JMPNZ T1 0006
+0002 V3 = NEW 1 string("Exception")
+0003 SEND_VAL_EX string("Should happen") 1
+0004 DO_FCALL
+0005 THROW V3
+0006 JMP 0006
+0007 V6 = NEW 1 string("Exception")
+0008 SEND_VAL_EX string("Should not happen") 1
+0009 DO_FCALL
+0010 THROW V6
+0011 FAST_RET T5
+EXCEPTION TABLE:
+     0006, -, 0007, 0011
+Fatal error: Uncaught Exception: Should happen in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d

php-8.3.21.tar.xz/ext/opcache/tests/opt/gh18107_2.phpt Added

@@ -0,0 +1,54 @@
+--TEST--
+GH-18107 (Opcache CFG jmp optimization with try-finally breaks the exception table)
+--CREDITS--
+SpencerMalone
+--EXTENSIONS--
+opcache
+--INI--
+opcache.enable=1
+opcache.enable_cli=1
+opcache.optimization_level=0x10
+opcache.opt_debug_level=0x20000
+--FILE--
+<?php
+
+if (!isset($badvar)) {
+    throw new Exception("Should happen");
+}
+try {
+    goto foo;
+} catch (Throwable $e) {
+    echo "foo";
+    foo:;
+} finally {
+    throw new Exception("Should not happen");
+}
+
+?>
+--EXPECTF--
+$_main:
+     ; (lines=%d, args=0, vars=%d, tmps=%d)
+     ; (after optimizer)
+     ; %s
+0000 T2 = ISSET_ISEMPTY_CV (isset) CV0($badvar)
+0001 JMPNZ T2 0008
+0002 V4 = NEW 1 string("Exception")
+0003 SEND_VAL_EX string("Should happen") 1
+0004 DO_FCALL
+0005 THROW V4
+0006 CV1($e) = CATCH string("Throwable")
+0007 ECHO string("foo")
+0008 T6 = FAST_CALL 0010
+0009 JMP 0015
+0010 V7 = NEW 1 string("Exception")
+0011 SEND_VAL_EX string("Should not happen") 1
+0012 DO_FCALL
+0013 THROW V7
+0014 FAST_RET T6
+0015 RETURN int(1)
+EXCEPTION TABLE:
+     0006, 0006, 0010, 0014
+Fatal error: Uncaught Exception: Should happen in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d

php-8.3.7.tar.xz/ext/opcache/tests/opt/nullsafe_002.phpt -> php-8.3.21.tar.xz/ext/opcache/tests/opt/nullsafe_002.phpt Changed

php-8.3.7.tar.xz/ext/opcache/tests/opt/prop_types.phpt -> php-8.3.21.tar.xz/ext/opcache/tests/opt/prop_types.phpt Changed

@@ -40,7 +40,7 @@
 ?>
 --EXPECTF--
 $_main:
-     ; (lines=1, args=0, vars=0, tmps=0, ssa_vars=0, no_loops)
+     ; (lines=1, args=0, vars=0, tmps=%d, ssa_vars=0, no_loops)
      ; (before dfa pass)
      ; %s
      ; return  long RANGE1..1
@@ -50,7 +50,7 @@
 0000 RETURN int(1)
 
 noScope:
-     ; (lines=10, args=1, vars=1, tmps=4, ssa_vars=5, no_loops)
+     ; (lines=10, args=1, vars=1, tmps=%d, ssa_vars=5, no_loops)
      ; (before dfa pass)
      ; %s
      ; return  null RANGE0..0
@@ -70,7 +70,7 @@
 0009 RETURN null
 
 Test::inTest:
-     ; (lines=9, args=0, vars=0, tmps=4, ssa_vars=3, no_loops)
+     ; (lines=9, args=0, vars=0, tmps=%d, ssa_vars=3, no_loops)
      ; (before dfa pass)
      ; %s
      ; return  null RANGE0..0
@@ -88,7 +88,7 @@
 0008 RETURN null
 
 Test::inTestWithTest2:
-     ; (lines=10, args=1, vars=1, tmps=4, ssa_vars=5, no_loops)
+     ; (lines=10, args=1, vars=1, tmps=%d, ssa_vars=5, no_loops)
      ; (before dfa pass)
      ; %s
      ; return  null RANGE0..0
@@ -108,7 +108,7 @@
 0009 RETURN null
 
 Test2::inTest2:
-     ; (lines=9, args=0, vars=0, tmps=4, ssa_vars=3, no_loops)
+     ; (lines=9, args=0, vars=0, tmps=%d, ssa_vars=3, no_loops)
      ; (before dfa pass)
      ; %s
      ; return  null RANGE0..0

php-8.3.7.tar.xz/ext/opcache/zend_accelerator_module.c -> php-8.3.21.tar.xz/ext/opcache/zend_accelerator_module.c Changed

php-8.3.7.tar.xz/ext/opcache/zend_accelerator_util_funcs.c -> php-8.3.21.tar.xz/ext/opcache/zend_accelerator_util_funcs.c Changed

php-8.3.7.tar.xz/ext/opcache/zend_persist.c -> php-8.3.21.tar.xz/ext/opcache/zend_persist.c Changed

@@ -38,7 +38,9 @@
 #define zend_set_str_gc_flags(str) do { \
 	GC_SET_REFCOUNT(str, 2); \
 	uint32_t flags = GC_STRING | (ZSTR_IS_VALID_UTF8(str) ? IS_STR_VALID_UTF8 : 0); \
-	if (file_cache_only) { \
+	if (file_cache_only \
+	 || (ZCG(current_persistent_script) && ZCG(current_persistent_script)->corrupted)) { \
+		GC_TYPE_INFO(str) = GC_STRING | (IS_STR_INTERNED << GC_FLAGS_SHIFT); \
 		flags |= (IS_STR_INTERNED << GC_FLAGS_SHIFT); \
 	} else { \
 		flags |= ((IS_STR_INTERNED | IS_STR_PERMANENT) << GC_FLAGS_SHIFT); \
@@ -692,7 +694,10 @@
 			}
 		}
 #ifdef HAVE_JIT
-		if (JIT_G(on) && JIT_G(opt_level) <= ZEND_JIT_LEVEL_OPT_FUNCS) {
+		if (JIT_G(on)
+		 && JIT_G(opt_level) <= ZEND_JIT_LEVEL_OPT_FUNCS
+		 && (!ZCG(current_persistent_script)
+		  || !ZCG(current_persistent_script)->corrupted)) {
 			zend_jit_op_array(op_array, ZCG(current_persistent_script) ? &ZCG(current_persistent_script)->script : NULL);
 		}
 #endif
@@ -805,12 +810,17 @@
 
 static void zend_persist_class_constant(zval *zv)
 {
-	zend_class_constant *c = zend_shared_alloc_get_xlat_entry(Z_PTR_P(zv));
+	zend_class_constant *orig_c = Z_PTR_P(zv);
+	zend_class_constant *c = zend_shared_alloc_get_xlat_entry(orig_c);
 	zend_class_entry *ce;
 
 	if (c) {
 		Z_PTR_P(zv) = c;
 		return;
+	} else if (((orig_c->ce->ce_flags & ZEND_ACC_IMMUTABLE) && !(Z_CONSTANT_FLAGS(orig_c->value) & CONST_OWNED))
+	 || orig_c->ce->type == ZEND_INTERNAL_CLASS) {
+		/* Class constant comes from a different file in shm or internal class, keep existing pointer. */
+		return;
 	} else if (!ZCG(current_persistent_script)->corrupted
 	 && zend_accel_in_shm(Z_PTR_P(zv))) {
 		return;

php-8.3.7.tar.xz/ext/opcache/zend_persist_calc.c -> php-8.3.21.tar.xz/ext/opcache/zend_persist_calc.c Changed

php-8.3.7.tar.xz/ext/opcache/zend_shared_alloc.c -> php-8.3.21.tar.xz/ext/opcache/zend_shared_alloc.c Changed

php-8.3.7.tar.xz/ext/openssl/openssl.c -> php-8.3.21.tar.xz/ext/openssl/openssl.c Changed

@@ -1500,11 +1500,13 @@
 
 	*free_cert = 1;
 
-	if (!try_convert_to_string(val)) {
+	zend_string *str = zval_try_get_string(val);
+	if (str == NULL) {
 		return NULL;
 	}
-
-	return php_openssl_x509_from_str(Z_STR_P(val), arg_num, is_from_array, option_name);
+	X509 *cert = php_openssl_x509_from_str(str, arg_num, is_from_array, option_name);
+	zend_string_release(str);
+	return cert;
 }
 /* }}} */
 
@@ -1536,7 +1538,7 @@
 	}
 
 	if (!php_openssl_check_path(filename, filename_len, file_path, 2)) {
-		return;
+		goto exit_cleanup_cert;
 	}
 
 	bio_out = BIO_new_file(file_path, PHP_OPENSSL_BIO_MODE_W(PKCS7_BINARY));
@@ -1554,13 +1556,14 @@
 		php_error_docref(NULL, E_WARNING, "Error opening file %s", file_path);
 	}
 
-	if (cert_str) {
-		X509_free(cert);
-	}
-
 	if (!BIO_free(bio_out)) {
 		php_openssl_store_errors();
 	}
+
+exit_cleanup_cert:
+	if (cert_str) {
+		X509_free(cert);
+	}
 }
 /* }}} */
 
@@ -2129,7 +2132,7 @@
 	/* Can return NULL on error or memory allocation failure */
 	if (!bn_serial) {
 		php_openssl_store_errors();
-		RETURN_FALSE;
+		goto err;
 	}
 
 	hex_serial = BN_bn2hex(bn_serial);
@@ -2137,7 +2140,7 @@
 	/* Can return NULL on error or memory allocation failure */
 	if (!hex_serial) {
 		php_openssl_store_errors();
-		RETURN_FALSE;
+		goto err;
 	}
 
 	str_serial = i2s_ASN1_INTEGER(NULL, asn1_serial);
@@ -2209,19 +2212,15 @@
 		bio_out = BIO_new(BIO_s_mem());
 		if (bio_out == NULL) {
 			php_openssl_store_errors();
-			RETURN_FALSE;
+			goto err_subitem;
 		}
 		if (nid == NID_subject_alt_name) {
 			if (openssl_x509v3_subjectAltName(bio_out, extension) == 0) {
 				BIO_get_mem_ptr(bio_out, &bio_buf);
 				add_assoc_stringl(&subitem, extname, bio_buf->data, bio_buf->length);
 			} else {
-				zend_array_destroy(Z_ARR_P(return_value));
 				BIO_free(bio_out);
-				if (cert_str) {
-					X509_free(cert);
-				}
-				RETURN_FALSE;
+				goto err_subitem;
 			}
 		}
 		else if (X509V3_EXT_print(bio_out, extension, 0, 0)) {
@@ -2236,6 +2235,16 @@
 	if (cert_str) {
 		X509_free(cert);
 	}
+	return;
+
+err_subitem:
+	zval_ptr_dtor(&subitem);
+err:
+	zend_array_destroy(Z_ARR_P(return_value));
+	if (cert_str) {
+		X509_free(cert);
+	}
+	RETURN_FALSE;
 }
 /* }}} */
 
@@ -3102,7 +3111,7 @@
 	}
 
 	if (!php_openssl_check_path(filename, filename_len, file_path, 2)) {
-		return;
+		goto exit_cleanup;
 	}
 
 	bio_out = BIO_new_file(file_path, PHP_OPENSSL_BIO_MODE_W(PKCS7_BINARY));
@@ -3122,6 +3131,7 @@
 		php_error_docref(NULL, E_WARNING, "Error opening file %s", file_path);
 	}
 
+exit_cleanup:
 	if (csr_str) {
 		X509_REQ_free(csr);
 	}
@@ -3238,6 +3248,11 @@
 		goto cleanup;
 	}
 
+	if (num_days < 0 || num_days > LONG_MAX / 86400) {
+		php_error_docref(NULL, E_WARNING, "Days must be between 0 and %ld", LONG_MAX / 86400);
+		goto cleanup;
+	}
+
 	if (PHP_SSL_REQ_PARSE(&req, args) == FAILURE) {
 		goto cleanup;
 	}
@@ -3289,7 +3304,7 @@
 		goto cleanup;
 	}
 	X509_gmtime_adj(X509_getm_notBefore(new_cert), 0);
-	X509_gmtime_adj(X509_getm_notAfter(new_cert), 60*60*24*(long)num_days);
+	X509_gmtime_adj(X509_getm_notAfter(new_cert), 60*60*24*num_days);
 	i = X509_set_pubkey(new_cert, key);
 	if (!i) {
 		php_openssl_store_errors();
@@ -3558,6 +3573,7 @@
 		} else {
 			ZVAL_COPY(&tmp, zphrase);
 			if (!try_convert_to_string(&tmp)) {
+				zval_ptr_dtor(&tmp);
 				return NULL;
 			}
 
@@ -3604,12 +3620,14 @@
 		if (!(Z_TYPE_P(val) == IS_STRING || Z_TYPE_P(val) == IS_OBJECT)) {
 			TMP_CLEAN;
 		}
-		if (!try_convert_to_string(val)) {
+		zend_string *val_str = zval_try_get_string(val);
+		if (!val_str) {
 			TMP_CLEAN;
 		}
 
-		if (Z_STRLEN_P(val) > 7 && memcmp(Z_STRVAL_P(val), "file://", sizeof("file://") - 1) == 0) {
-			if (!php_openssl_check_path_str(Z_STR_P(val), file_path, arg_num)) {
+		if (ZSTR_LEN(val_str) > 7 && memcmp(ZSTR_VAL(val_str), "file://", sizeof("file://") - 1) == 0) {
+			if (!php_openssl_check_path_str(val_str, file_path, arg_num)) {
+				zend_string_release_ex(val_str, false);
 				TMP_CLEAN;
 			}
 			is_file = true;
@@ -3617,7 +3635,7 @@
 		/* it's an X509 file/cert of some kind, and we need to extract the data from that */
 		if (public_key) {
             php_openssl_errors_set_mark();
-			cert = php_openssl_x509_from_str(Z_STR_P(val), arg_num, false, NULL);
+			cert = php_openssl_x509_from_str(val_str, arg_num, false, NULL);
 
 			if (cert) {
 				free_cert = 1;
@@ -3628,10 +3646,11 @@
 				if (is_file) {
 					in = BIO_new_file(file_path, PHP_OPENSSL_BIO_MODE_R(PKCS7_BINARY));
 				} else {
-					in = BIO_new_mem_buf(Z_STRVAL_P(val), (int)Z_STRLEN_P(val));
+					in = BIO_new_mem_buf(ZSTR_VAL(val_str), (int)ZSTR_LEN(val_str));
 				}
 				if (in == NULL) {
 					php_openssl_store_errors();
+					zend_string_release_ex(val_str, false);
 					TMP_CLEAN;
 				}
 				key = PEM_read_bio_PUBKEY(in, NULL,NULL, NULL);
@@ -3644,10 +3663,11 @@
 			if (is_file) {
 				in = BIO_new_file(file_path, PHP_OPENSSL_BIO_MODE_R(PKCS7_BINARY));
 			} else {
-				in = BIO_new_mem_buf(Z_STRVAL_P(val), (int)Z_STRLEN_P(val));
+				in = BIO_new_mem_buf(ZSTR_VAL(val_str), (int)ZSTR_LEN(val_str));
 			}
 
 			if (in == NULL) {
+				zend_string_release_ex(val_str, false);
 				TMP_CLEAN;
 			}
 			if (passphrase == NULL) {
@@ -3660,6 +3680,8 @@
 			}
 			BIO_free(in);
 		}
+
+		zend_string_release_ex(val_str, false);
 	}
 
 	if (key == NULL) {
@@ -4736,7 +4758,7 @@
 	}
 
 	if (!php_openssl_check_path(filename, filename_len, file_path, 2)) {
-		RETURN_FALSE;
+		goto clean_exit_key;
 	}
 
 	PHP_SSL_REQ_INIT(&req);
@@ -4772,8 +4794,9 @@
 
 clean_exit:
 	PHP_SSL_REQ_DISPOSE(&req);
-	EVP_PKEY_free(key);
 	BIO_free(bio_out);
+clean_exit_key:
+	EVP_PKEY_free(key);
 }
 /* }}} */
 
@@ -5719,8 +5742,8 @@
 				BIO_get_mem_ptr(bio_out, &bio_buf);
 				ZVAL_STRINGL(&zcert, bio_buf->data, bio_buf->length);
 				add_index_zval(zout, i, &zcert);
-				BIO_free(bio_out);
 			}
+			BIO_free(bio_out);
 		}
 	}
 
@@ -5734,8 +5757,8 @@
 				BIO_get_mem_ptr(bio_out, &bio_buf);
 				ZVAL_STRINGL(&zcert, bio_buf->data, bio_buf->length);
 				add_index_zval(zout, i, &zcert);
-				BIO_free(bio_out);
 			}
+			BIO_free(bio_out);
 		}
 	}
 
@@ -6360,8 +6383,8 @@
 				BIO_get_mem_ptr(bio_out, &bio_buf);
 				ZVAL_STRINGL(&zcert, bio_buf->data, bio_buf->length);
 				add_index_zval(zout, i, &zcert);
-				BIO_free(bio_out);
 			}
+			BIO_free(bio_out);
 		}
 	}
 
@@ -6375,8 +6398,8 @@
 				BIO_get_mem_ptr(bio_out, &bio_buf);
 				ZVAL_STRINGL(&zcert, bio_buf->data, bio_buf->length);
 				add_index_zval(zout, i, &zcert);
-				BIO_free(bio_out);
 			}
+			BIO_free(bio_out);
 		}
 	}
 
@@ -6936,6 +6959,7 @@
 		mdtype = php_openssl_get_evp_md_from_algo(method_long);
 	}
 	if (!mdtype) {
+		EVP_PKEY_free(pkey);
 		php_error_docref(NULL, E_WARNING, "Unknown digest algorithm");
 		RETURN_FALSE;
 	}
@@ -7916,11 +7940,10 @@
 	PHP_OPENSSL_CHECK_LONG_TO_INT_NULL_RETURN(buffer_length, length);
 	PHP_OPENSSL_RAND_ADD_TIME();
 	if (RAND_bytes((unsigned char*)ZSTR_VAL(buffer), (int)buffer_length) <= 0) {
+		php_openssl_store_errors();
 		zend_string_release_ex(buffer, 0);
 		zend_throw_exception(zend_ce_exception, "Error reading from source device", 0);
 		return NULL;
-	} else {
-		php_openssl_store_errors();
 	}
 
 	return buffer;
@@ -7937,17 +7960,15 @@
 		RETURN_THROWS();
 	}
 
-	if (zstrong_result_returned) {
-		ZEND_TRY_ASSIGN_REF_FALSE(zstrong_result_returned);
-	}
-
 	if ((buffer = php_openssl_random_pseudo_bytes(buffer_length))) {
 		ZSTR_VAL(buffer)buffer_length = 0;
 		RETVAL_NEW_STR(buffer);
-	}
 
-	if (zstrong_result_returned) {
-		ZEND_TRY_ASSIGN_REF_TRUE(zstrong_result_returned);
+		if (zstrong_result_returned) {
+			ZEND_TRY_ASSIGN_REF_TRUE(zstrong_result_returned);
+		}
+	} else if (zstrong_result_returned) {
+		ZEND_TRY_ASSIGN_REF_FALSE(zstrong_result_returned);
 	}
 }
 /* }}} */

php-8.3.7.tar.xz/ext/openssl/openssl.stub.php -> php-8.3.21.tar.xz/ext/openssl/openssl.stub.php Changed

php-8.3.7.tar.xz/ext/openssl/openssl_arginfo.h -> php-8.3.21.tar.xz/ext/openssl/openssl_arginfo.h Changed

php-8.3.7.tar.xz/ext/openssl/tests/CertificateGenerator.inc -> php-8.3.21.tar.xz/ext/openssl/tests/CertificateGenerator.inc Changed

@@ -4,26 +4,33 @@
 {
     const CONFIG = __DIR__. DIRECTORY_SEPARATOR . 'openssl.cnf';
 
-    /** @var OpenSSLCertificate */
-    private $ca;
+    /** @var OpenSSLCertificate|false */
+    private $ca = false;
 
-    /** @var resource */
-    private $caKey;
+    /** @var OpenSSLAsymmetricKey|false */
+    private $caKey = false;
 
-    /** @var resource|null */
+    /** @var bool */
+    private $useSelfSignedCert;
+
+    /** @var OpenSSLCertificate|null */
     private $lastCert;
 
-    /** @var resource|null */
+    /** @var OpenSSLAsymmetricKey|null */
     private $lastKey;
 
-    public function __construct()
+    public function __construct(bool $useSelfSignedCert = false)
     {
         if (!extension_loaded('openssl')) {
             throw new RuntimeException(
                 'openssl extension must be loaded to generate certificates'
             );
         }
-        $this->generateCa();
+        $this->useSelfSignedCert = $useSelfSignedCert;
+
+        if (!$this->useSelfSignedCert) {
+            $this->generateCa();
+        }
     }
 
     /**
@@ -54,40 +61,32 @@
             'commonName' => 'CA for PHP Tests'
         ;
 
-        $this->ca = openssl_csr_sign(
-            openssl_csr_new(
-                $dn,
-                $this->caKey,
-                
-                    'x509_extensions' => 'v3_ca',
-                    'config' => self::CONFIG,
-                
-            ),
-            null,
-            $this->caKey,
-            2,
-            
-                'config' => self::CONFIG,
-            
-        );
+        $csr = openssl_csr_new($dn, $this->caKey, 'config' => self::CONFIG);
+        $this->ca = openssl_csr_sign($csr, null, $this->caKey, 365, 'config' => self::CONFIG);
     }
 
     public function getCaCert()
     {
+        if ($this->useSelfSignedCert) {
+            throw new RuntimeException("CA is not generated in self-signed mode.");
+        }
+
         $output = '';
         openssl_x509_export($this->ca, $output);
-
         return $output;
     }
 
     public function saveCaCert($file)
     {
+        if ($this->useSelfSignedCert) {
+            throw new RuntimeException("CA is not available in self-signed mode.");
+        }
+
         openssl_x509_export_to_file($this->ca, $file);
     }
 
-    private function generateCertAndKey(
-        $commonNameForCert, $file, $keyLength = null, $subjectAltName = null
-    ) {
+    private function generateCertAndKey($commonNameForCert, $file, $keyLength = null, $subjectAltName = null)
+    {
         $dn = 
             'countryName' => 'BY',
             'stateOrProvinceName' => 'Minsk',
@@ -98,8 +97,7 @@
             $dn'commonName' = $commonNameForCert;
         }
 
-        $subjectAltNameConfig =
-            $subjectAltName ? "subjectAltName = $subjectAltName" : "";
+        $subjectAltNameConfig = $subjectAltName ? "subjectAltName = $subjectAltName" : "";
         $configCode = <<<CONFIG
  req 
 distinguished_name = req_distinguished_name
@@ -128,12 +126,17 @@
 
         $this->lastKey = self::generateKey($keyLength);
         $csr = openssl_csr_new($dn, $this->lastKey, $config);
+
+        // If in self-signed mode, sign with the same key, otherwise use CA
+        $signingCert = $this->useSelfSignedCert ? null : $this->ca;
+        $signingKey = $this->useSelfSignedCert ? $this->lastKey : $this->caKey;
+
         $this->lastCert = openssl_csr_sign(
             $csr,
-            $this->ca,
-            $this->caKey,
-            /* days */ 2,
-            $config,
+            $signingCert,
+            $signingKey,
+            365, // 1 year validity
+            $config
         );
 
         return $config;
@@ -166,6 +169,22 @@
         unlink($config'config');
     }
 
+    public function saveNewCertAndPubKey(
+        $commonNameForCert, $certFile, $pubKeyFile, $keyLength = null, $subjectAltName = null
+    ) {
+        $config = $this->generateCertAndKey($commonNameForCert, $certFile, $keyLength, $subjectAltName);
+
+        openssl_x509_export_to_file($this->lastCert, $certFile);
+
+        $keyDetails = openssl_pkey_get_details($this->lastKey);
+        if ($keyDetails === false || !isset($keyDetails'key')) {
+            throw new RuntimeException("Failed to extract public key.");
+        }
+
+        file_put_contents($pubKeyFile, $keyDetails'key');
+        unlink($config'config');
+    }
+
     public function getCertDigest($algo)
     {
         return openssl_x509_fingerprint($this->lastCert, $algo);

php-8.3.7.tar.xz/ext/openssl/tests/ServerClientTestCase.inc -> php-8.3.21.tar.xz/ext/openssl/tests/ServerClientTestCase.inc Changed

@@ -4,14 +4,19 @@
 
 const WORKER_DEFAULT_NAME = 'server';
 
-function phpt_notify($worker = WORKER_DEFAULT_NAME)
+function phpt_notify(string $worker = WORKER_DEFAULT_NAME, string $message = ""): void
 {
-    ServerClientTestCase::getInstance()->notify($worker);
+    ServerClientTestCase::getInstance()->notify($worker, $message);
 }
 
-function phpt_wait($worker = WORKER_DEFAULT_NAME, $timeout = null)
+function phpt_wait($worker = WORKER_DEFAULT_NAME, $timeout = null): ?string
 {
-    ServerClientTestCase::getInstance()->wait($worker, $timeout);
+    return ServerClientTestCase::getInstance()->wait($worker, $timeout);
+}
+
+function phpt_notify_server_start($server): void
+{
+    ServerClientTestCase::getInstance()->notify_server_start($server);
 }
 
 function phpt_has_sslv3() {
@@ -149,43 +154,73 @@
         eval($code);
     }
 
-    public function run($masterCode, $workerCode)
+    /**
+     * Run client and all workers
+     *
+     * @param string       $clientCode The client PHP code
+     * @param string|array $workerCode
+     * @param bool         $ephemeral Select whether automatic port selection and automatic awaiting is used
+     * @return void
+     * @throws Exception
+     */
+    public function run(string $clientCode, string|array $workerCode, bool $ephemeral = true): void
     {
         if (!is_array($workerCode)) {
             $workerCode = WORKER_DEFAULT_NAME => $workerCode;
         }
-        foreach ($workerCode as $worker => $code) {
+        reset($workerCode);
+        $code = current($workerCode);
+        $worker = key($workerCode);
+        while ($worker != null) {
             $this->spawnWorkerProcess($worker, $this->stripPhpTagsFromCode($code));
+            $code = next($workerCode);
+            if ($ephemeral) {
+                $addr = trim($this->wait($worker));
+                if (empty($addr)) {
+                    throw new \Exception("Failed server start");
+                }
+                if ($code === false) {
+                    $clientCode = preg_replace('/{{\s*ADDR\s*}}/', $addr, $clientCode);
+                } else {
+                    $code = preg_replace('/{{\s*ADDR\s*}}/', $addr, $code);
+                }
+            }
+            $worker = key($workerCode);
         }
-        eval($this->stripPhpTagsFromCode($masterCode));
+
+        eval($this->stripPhpTagsFromCode($clientCode));
         foreach ($workerCode as $worker => $code) {
             $this->cleanupWorkerProcess($worker);
         }
     }
 
-    public function wait($worker, $timeout = null)
+    public function wait($worker, $timeout = null): ?string
     {
         $handle = $this->isWorker ? STDIN : $this->workerStdOut$worker;
         if ($timeout === null) {
-            fgets($handle);
-            return true;
+            return fgets($handle);
         }
 
         stream_set_blocking($handle, false);
         $read = $handle;
         $result = stream_select($read, $write, $except, $timeout);
         if (!$result) {
-            return false;
+            return null;
         }
 
-        fgets($handle);
+        $result = fgets($handle);
         stream_set_blocking($handle, true);
-        return true;
+        return $result;
+    }
+
+    public function notify(string $worker, string $message = ""): void
+    {
+        fwrite($this->isWorker ? STDOUT : $this->workerStdIn$worker, "$message\n");
     }
 
-    public function notify($worker)
+    public function notify_server_start($server): void
     {
-        fwrite($this->isWorker ? STDOUT : $this->workerStdIn$worker, "\n");
+        echo stream_socket_get_name($server, false) . "\n";
     }
 }

php-8.3.7.tar.xz/ext/openssl/tests/bug46127.phpt -> php-8.3.21.tar.xz/ext/openssl/tests/bug46127.phpt Changed

@@ -11,14 +11,14 @@
 $certFile = __DIR__ . DIRECTORY_SEPARATOR . 'bug46127.pem.tmp';
 
 $serverCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://127.0.0.1:0";
     $serverFlags = STREAM_SERVER_BIND | STREAM_SERVER_LISTEN;
     $serverCtx = stream_context_create('ssl' => 
         'local_cert' => '%s',
     );
 
     $sock = stream_socket_server($serverUri, $errno, $errstr, $serverFlags, $serverCtx);
-    phpt_notify();
+    phpt_notify_server_start($sock);
 
     $link = stream_socket_accept($sock);
     fwrite($link, "Sending bug 46127\n");
@@ -26,7 +26,7 @@
 $serverCode = sprintf($serverCode, $certFile);
 
 $clientCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://{{ ADDR }}";
     $clientFlags = STREAM_CLIENT_CONNECT;
 
     $clientCtx = stream_context_create('ssl' => 
@@ -34,7 +34,6 @@
         'verify_peer_name' => false
     );
 
-    phpt_wait();
     $sock = stream_socket_client($serverUri, $errno, $errstr, 2, $clientFlags, $clientCtx);
 
     echo fgets($sock);

php-8.3.7.tar.xz/ext/openssl/tests/bug48182.phpt -> php-8.3.21.tar.xz/ext/openssl/tests/bug48182.phpt Changed

@@ -12,14 +12,14 @@
 $cacertFile = __DIR__ . DIRECTORY_SEPARATOR . 'bug48182-ca.pem.tmp';
 
 $serverCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://127.0.0.1:0";
     $serverFlags = STREAM_SERVER_BIND | STREAM_SERVER_LISTEN;
     $serverCtx = stream_context_create('ssl' => 
         'local_cert' => '%s'
     );
 
     $server = stream_socket_server($serverUri, $errno, $errstr, $serverFlags, $serverCtx);
-    phpt_notify();
+    phpt_notify_server_start($server);
 
     $client = @stream_socket_accept($server, 1);
 
@@ -30,14 +30,13 @@
 
 $peerName = 'bug48182';
 $clientCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://{{ ADDR }}";
     $clientFlags = STREAM_CLIENT_CONNECT | STREAM_CLIENT_ASYNC_CONNECT;
     $clientCtx = stream_context_create('ssl' => 
         'cafile' => '%s',
         'peer_name' => '%s'
     );
 
-    phpt_wait();
     $client = stream_socket_client($serverUri, $errno, $errstr, 10, $clientFlags, $clientCtx);
 
     $data = "Sending data over to SSL server in async mode with contents like Hello World\n";

php-8.3.7.tar.xz/ext/openssl/tests/bug54992.phpt -> php-8.3.21.tar.xz/ext/openssl/tests/bug54992.phpt Changed

@@ -12,14 +12,14 @@
 $cacertFile = __DIR__ . DIRECTORY_SEPARATOR . 'bug54992-ca.pem.tmp';
 
 $serverCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://127.0.0.1:0";
     $serverFlags = STREAM_SERVER_BIND | STREAM_SERVER_LISTEN;
     $serverCtx = stream_context_create('ssl' => 
         'local_cert' => '%s',
     );
 
     $server = stream_socket_server($serverUri, $errno, $errstr, $serverFlags, $serverCtx);
-    phpt_notify();
+    phpt_notify_server_start($server);
 
     @stream_socket_accept($server, 1);
 CODE;
@@ -28,7 +28,7 @@
 $peerName = 'bug54992_actual_peer_name';
 $wrongPeerName = 'bug54992_expected_peer_name';
 $clientCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://{{ ADDR }}";
     $clientFlags = STREAM_CLIENT_CONNECT;
     $clientCtx = stream_context_create('ssl' => 
         'verify_peer' => true,
@@ -36,7 +36,6 @@
         'peer_name' => '%s',
     );
 
-    phpt_wait();
     $client = stream_socket_client($serverUri, $errno, $errstr, 2, $clientFlags, $clientCtx);
 
     var_dump($client);
@@ -61,5 +60,5 @@
 
 Warning: stream_socket_client(): Failed to enable crypto in %s on line %d
 
-Warning: stream_socket_client(): Unable to connect to ssl://127.0.0.1:64321 (Unknown error) in %s on line %d
+Warning: stream_socket_client(): Unable to connect to ssl://127.0.0.1:%d (Unknown error) in %s on line %d
 bool(false)

php-8.3.7.tar.xz/ext/openssl/tests/bug62890.phpt -> php-8.3.21.tar.xz/ext/openssl/tests/bug62890.phpt Changed

php-8.3.7.tar.xz/ext/openssl/tests/bug65538_001.phpt -> php-8.3.21.tar.xz/ext/openssl/tests/bug65538_001.phpt Changed

php-8.3.7.tar.xz/ext/openssl/tests/bug65538_003.phpt -> php-8.3.21.tar.xz/ext/openssl/tests/bug65538_003.phpt Changed

php-8.3.7.tar.xz/ext/openssl/tests/bug65729.phpt -> php-8.3.21.tar.xz/ext/openssl/tests/bug65729.phpt Changed

@@ -12,14 +12,14 @@
 $cacertFile = __DIR__ . DIRECTORY_SEPARATOR . 'bug65729-ca.pem.tmp';
 
 $serverCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://127.0.0.1:0";
     $serverFlags = STREAM_SERVER_BIND | STREAM_SERVER_LISTEN;
     $serverCtx = stream_context_create('ssl' => 
         'local_cert' => '%s'
     );
 
     $server = stream_socket_server($serverUri, $errno, $errstr, $serverFlags, $serverCtx);
-    phpt_notify();
+    phpt_notify_server_start($server);
 
     $expected_names = 'foo.test.com.sg', 'foo.test.com', 'FOO.TEST.COM', 'foo.bar.test.com';
     foreach ($expected_names as $name) {
@@ -29,11 +29,9 @@
 $serverCode = sprintf($serverCode, $certFile);
 
 $clientCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://{{ ADDR }}";
     $clientFlags = STREAM_CLIENT_CONNECT;
 
-    phpt_wait();
-
     $expected_names = 'foo.test.com.sg', 'foo.test.com', 'FOO.TEST.COM', 'foo.bar.test.com';
     foreach ($expected_names as $expected_name) {
         $clientCtx = stream_context_create('ssl' => 
@@ -65,7 +63,7 @@
 
 Warning: stream_socket_client(): Failed to enable crypto in %s on line %d
 
-Warning: stream_socket_client(): Unable to connect to ssl://127.0.0.1:64321 (Unknown error) in %s on line %d
+Warning: stream_socket_client(): Unable to connect to ssl://127.0.0.1:%d (Unknown error) in %s on line %d
 bool(false)
 resource(%d) of type (stream)
 resource(%d) of type (stream)
@@ -74,5 +72,5 @@
 
 Warning: stream_socket_client(): Failed to enable crypto in %s on line %d
 
-Warning: stream_socket_client(): Unable to connect to ssl://127.0.0.1:64321 (Unknown error) in %s on line %d
+Warning: stream_socket_client(): Unable to connect to ssl://127.0.0.1:%d (Unknown error) in %s on line %d
 bool(false)

php-8.3.7.tar.xz/ext/openssl/tests/bug68265.phpt -> php-8.3.21.tar.xz/ext/openssl/tests/bug68265.phpt Changed

@@ -12,21 +12,21 @@
 $san = 'DNS:debs.ak-online.be., DNS:debs.ak-online.net.';
 
 $serverCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://127.0.0.1:0";
     $serverFlags = STREAM_SERVER_BIND | STREAM_SERVER_LISTEN;
     $serverCtx = stream_context_create('ssl' => 
         'local_cert' => '%s',
     );
 
     $server = stream_socket_server($serverUri, $errno, $errstr, $serverFlags, $serverCtx);
-    phpt_notify();
+    phpt_notify_server_start($server);
 
     stream_socket_accept($server, 30);
 CODE;
 $serverCode = sprintf($serverCode, $certFile);
 
 $clientCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://{{ ADDR }}";
     $clientFlags = STREAM_CLIENT_CONNECT;
     $clientCtx = stream_context_create('ssl' => 
         'verify_peer' => false,
@@ -34,8 +34,6 @@
         'peer_name' => 'debs.ak-online.net',
     );
 
-    phpt_wait();
-
     var_dump(stream_socket_client($serverUri, $errno, $errstr, 1, $clientFlags, $clientCtx));
 CODE;

php-8.3.7.tar.xz/ext/openssl/tests/bug68879.phpt -> php-8.3.21.tar.xz/ext/openssl/tests/bug68879.phpt Changed

@@ -12,21 +12,21 @@
 $san = 'DNS:test.com, DNS:www.test.com, DNS:subdomain.test.com, IP:0:0:0:0:0:FFFF:A02:1, IP:10.2.0.1';
 
 $serverCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://127.0.0.1:0";
     $serverFlags = STREAM_SERVER_BIND | STREAM_SERVER_LISTEN;
     $serverCtx = stream_context_create('ssl' => 
         'local_cert' => '%s',
     );
 
     $server = stream_socket_server($serverUri, $errno, $errstr, $serverFlags, $serverCtx);
-    phpt_notify();
+    phpt_notify_server_start($server);
 
     stream_socket_accept($server, 30);
 CODE;
 $serverCode = sprintf($serverCode, $certFile);
 
 $clientCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://{{ ADDR }}";
     $clientFlags = STREAM_CLIENT_CONNECT;
     $clientCtx = stream_context_create('ssl' => 
         'verify_peer' => false,
@@ -34,8 +34,6 @@
         'peer_name' => '10.2.0.1',
     );
 
-    phpt_wait();
-
     var_dump(stream_socket_client($serverUri, $errno, $errstr, 30, $clientFlags, $clientCtx));
 CODE;

php-8.3.7.tar.xz/ext/openssl/tests/bug68920.phpt -> php-8.3.21.tar.xz/ext/openssl/tests/bug68920.phpt Changed

@@ -11,14 +11,14 @@
 $certFile = __DIR__ . DIRECTORY_SEPARATOR . 'bug68920.pem.tmp';
 
 $serverCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://127.0.0.1:0";
     $serverFlags = STREAM_SERVER_BIND | STREAM_SERVER_LISTEN;
     $serverCtx = stream_context_create('ssl' => 
         'local_cert' => '%s',
     );
 
     $server = stream_socket_server($serverUri, $errno, $errstr, $serverFlags, $serverCtx);
-    phpt_notify();
+    phpt_notify_server_start($server);
 
     stream_socket_accept($server, 30);
     stream_socket_accept($server, 30);
@@ -28,11 +28,9 @@
 $serverCode = sprintf($serverCode, $certFile);
 
 $clientCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://{{ ADDR }}";
     $clientFlags = STREAM_CLIENT_CONNECT;
 
-    phpt_wait();
-
     $ctx = stream_context_create('ssl' => 'verify_peer'=> false, 'peer_fingerprint' => true);
     $sock = stream_socket_client($serverUri, $errno, $errstr, 30, $clientFlags, $ctx);
     var_dump($sock);

php-8.3.7.tar.xz/ext/openssl/tests/bug69215.phpt -> php-8.3.21.tar.xz/ext/openssl/tests/bug69215.phpt Changed

@@ -13,7 +13,7 @@
 $serverCertFile = __DIR__ . DIRECTORY_SEPARATOR . 'bug69215-server.pem.tmp';
 
 $serverCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://127.0.0.1:0";
     $serverFlags = STREAM_SERVER_BIND | STREAM_SERVER_LISTEN;
     $serverCtx = stream_context_create('ssl' => 
         'local_cert' => '%s',
@@ -24,14 +24,14 @@
     );
 
     $server = stream_socket_server($serverUri, $errno, $errstr, $serverFlags, $serverCtx);
-    phpt_notify();
+    phpt_notify_server_start($server);
 
     stream_socket_accept($server, 30);
 CODE;
 $serverCode = sprintf($serverCode, $serverCertFile, $caCertFile);
 
 $clientCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://{{ ADDR }}";
     $clientFlags = STREAM_CLIENT_CONNECT;
     $clientCtx = stream_context_create('ssl' => 
         'local_cert' => '%s',
@@ -41,8 +41,6 @@
         'peer_name' => 'bug69215-server',
     );
 
-    phpt_wait();
-
     var_dump(stream_socket_client($serverUri, $errno, $errstr, 1, $clientFlags, $clientCtx));
 CODE;
 $clientCode = sprintf($clientCode, $clientCertFile, $caCertFile);

php-8.3.7.tar.xz/ext/openssl/tests/bug72333.phpt -> php-8.3.21.tar.xz/ext/openssl/tests/bug72333.phpt Changed

php-8.3.7.tar.xz/ext/openssl/tests/bug73072.phpt -> php-8.3.21.tar.xz/ext/openssl/tests/bug73072.phpt Changed

php-8.3.7.tar.xz/ext/openssl/tests/bug74159.phpt -> php-8.3.21.tar.xz/ext/openssl/tests/bug74159.phpt Changed

@@ -15,7 +15,7 @@
 // not really reliable on more powerful machine but cover different
 // scenarios which might be useful. More reliable test is bug72333.phpt
 $serverCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:10012";
+    $serverUri = "ssl://127.0.0.1:0";
     $serverFlags = STREAM_SERVER_BIND | STREAM_SERVER_LISTEN;
     $serverCtx = stream_context_create('ssl' => 
         'local_cert' => '%s',
@@ -23,7 +23,7 @@
     );
 
     $server = stream_socket_server($serverUri, $errno, $errstr, $serverFlags, $serverCtx);
-    phpt_notify();
+    phpt_notify_server_start($server);
 
     $client = stream_socket_accept($server, 1);
 
@@ -73,7 +73,7 @@
         exit("$errstr\n");
     });
 
-    $serverUri = "tcp://127.0.0.1:10012";
+    $serverUri = "tcp://{{ ADDR }}";
     $clientFlags = STREAM_CLIENT_CONNECT;
     $clientCtx = stream_context_create('ssl' => 
         'verify_peer' => true,
@@ -81,8 +81,6 @@
         'peer_name' => '%s',
     );
 
-    phpt_wait();
-
     $fp = stream_socket_client($serverUri, $errno, $errstr, 1, $clientFlags, $clientCtx);
 
     stream_set_blocking($fp, false);

php-8.3.7.tar.xz/ext/openssl/tests/bug74341.phpt -> php-8.3.21.tar.xz/ext/openssl/tests/bug74341.phpt Changed

php-8.3.7.tar.xz/ext/openssl/tests/bug76705.phpt -> php-8.3.21.tar.xz/ext/openssl/tests/bug76705.phpt Changed

php-8.3.7.tar.xz/ext/openssl/tests/bug77390.phpt -> php-8.3.21.tar.xz/ext/openssl/tests/bug77390.phpt Changed

@@ -15,11 +15,7 @@
 $clientCode = <<<'CODE'
     $context = stream_context_create('ssl' => 'verify_peer' => false, 'peer_name' => '%s');
 
-    phpt_wait('server');
-    phpt_notify('proxy');
-
-    phpt_wait('proxy');
-    $fp = stream_socket_client("ssl://127.0.0.1:10012", $errornum, $errorstr, 3000, STREAM_CLIENT_CONNECT, $context);
+    $fp = stream_socket_client("ssl://{{ ADDR }}", $errornum, $errorstr, 3000, STREAM_CLIENT_CONNECT, $context);
     stream_set_blocking($fp, false);
 
     $read = $fp;
@@ -57,8 +53,8 @@
     $context = stream_context_create('ssl' => 'local_cert' => '%s');
 
     $flags = STREAM_SERVER_BIND|STREAM_SERVER_LISTEN;
-    $fp = stream_socket_server("ssl://127.0.0.1:10011", $errornum, $errorstr, $flags, $context);
-    phpt_notify();
+    $fp = stream_socket_server("ssl://127.0.0.1:0", $errornum, $errorstr, $flags, $context);
+    phpt_notify_server_start($fp);
 
     $conn = stream_socket_accept($fp);
     fwrite($conn, 'warmup');
@@ -71,14 +67,12 @@
 $serverCode = sprintf($serverCode, $certFile);
 
 $proxyCode = <<<'CODE'
-    phpt_wait();
-
-    $upstream = stream_socket_client("tcp://127.0.0.1:10011", $errornum, $errorstr, 3000, STREAM_CLIENT_CONNECT);
+    $upstream = stream_socket_client("tcp://{{ ADDR }}", $errornum, $errorstr, 3000, STREAM_CLIENT_CONNECT);
     stream_set_blocking($upstream, false);
 
     $flags = STREAM_SERVER_BIND|STREAM_SERVER_LISTEN;
-    $server = stream_socket_server("tcp://127.0.0.1:10012", $errornum, $errorstr, $flags);
-    phpt_notify();
+    $server = stream_socket_server("tcp://127.0.0.1:0", $errornum, $errorstr, $flags);
+    phpt_notify_server_start($server);
 
     $conn = stream_socket_accept($server);
     stream_set_blocking($conn, false);

php-8.3.7.tar.xz/ext/openssl/tests/capture_peer_cert_001.phpt -> php-8.3.21.tar.xz/ext/openssl/tests/capture_peer_cert_001.phpt Changed

@@ -12,14 +12,14 @@
 $cacertFile = __DIR__ . DIRECTORY_SEPARATOR . 'capture_peer_cert_001-ca.pem.tmp';
 
 $serverCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://127.0.0.1:0";
     $serverFlags = STREAM_SERVER_BIND | STREAM_SERVER_LISTEN;
     $serverCtx = stream_context_create('ssl' => 
         'local_cert' => '%s'
     );
 
     $server = stream_socket_server($serverUri, $errno, $errstr, $serverFlags, $serverCtx);
-    phpt_notify();
+    phpt_notify_server_start($server);
 
     @stream_socket_accept($server, 1);
 CODE;
@@ -27,14 +27,13 @@
 
 $peerName = 'capture_peer_cert_001';
 $clientCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://{{ ADDR }}";
     $clientFlags = STREAM_CLIENT_CONNECT;
     $clientCtx = stream_context_create('ssl' => 
         'capture_peer_cert' => true,
         'cafile' => '%s'
     );
 
-    phpt_wait();
     $client = @stream_socket_client($serverUri, $errno, $errstr, 1, $clientFlags, $clientCtx);
     $cert = stream_context_get_options($clientCtx)'ssl''peer_certificate';
     var_dump(openssl_x509_parse($cert)'subject''CN');

php-8.3.7.tar.xz/ext/openssl/tests/gh10495.phpt -> php-8.3.21.tar.xz/ext/openssl/tests/gh10495.phpt Changed

@@ -15,11 +15,7 @@
 $clientCode = <<<'CODE'
     $context = stream_context_create('ssl' => 'verify_peer' => false, 'peer_name' => '%s');
 
-    phpt_wait('server');
-    phpt_notify('proxy');
-
-    phpt_wait('proxy');
-    $fp = stream_socket_client("tlsv1.2://127.0.0.1:10012", $errornum, $errorstr, 1, STREAM_CLIENT_CONNECT, $context);
+    $fp = stream_socket_client("tlsv1.2://{{ ADDR }}", $errornum, $errorstr, 1, STREAM_CLIENT_CONNECT, $context);
 
     phpt_wait('proxy');
 
@@ -38,8 +34,8 @@
     $context = stream_context_create('ssl' => 'local_cert' => '%s');
 
     $flags = STREAM_SERVER_BIND|STREAM_SERVER_LISTEN;
-    $fp = stream_socket_server("tlsv1.2://127.0.0.1:10011", $errornum, $errorstr, $flags, $context);
-    phpt_notify();
+    $fp = stream_socket_server("tlsv1.2://127.0.0.1:0", $errornum, $errorstr, $flags, $context);
+    phpt_notify_server_start($fp);
 
     $conn = stream_socket_accept($fp);
     fwrite($conn, 'warmup');
@@ -50,14 +46,12 @@
 $serverCode = sprintf($serverCode, $certFile);
 
 $proxyCode = <<<'CODE'
-    phpt_wait();
-
-    $upstream = stream_socket_client("tcp://127.0.0.1:10011", $errornum, $errorstr, 3000, STREAM_CLIENT_CONNECT);
+    $upstream = stream_socket_client("tcp://{{ ADDR }}", $errornum, $errorstr, 3000, STREAM_CLIENT_CONNECT);
     stream_set_blocking($upstream, false);
 
     $flags = STREAM_SERVER_BIND|STREAM_SERVER_LISTEN;
-    $server = stream_socket_server("tcp://127.0.0.1:10012", $errornum, $errorstr, $flags);
-    phpt_notify();
+    $server = stream_socket_server("tcp://127.0.0.1:0", $errornum, $errorstr, $flags);
+    phpt_notify_server_start($server);
     $conn = stream_socket_accept($server);
     stream_set_blocking($conn, false);

php-8.3.7.tar.xz/ext/openssl/tests/gh13860.phpt -> php-8.3.21.tar.xz/ext/openssl/tests/gh13860.phpt Changed

php-8.3.21.tar.xz/ext/openssl/tests/gh16357.phpt Added

php-8.3.21.tar.xz/ext/openssl/tests/gh16433.phpt Added

php-8.3.7.tar.xz/ext/openssl/tests/gh9310.phpt -> php-8.3.21.tar.xz/ext/openssl/tests/gh9310.phpt Changed

@@ -29,7 +29,7 @@
 $serverCodeTemplate = <<<'CODE'
     ini_set('log_errors', 'On');
     ini_set('open_basedir',  __DIR__ . '/gh9310');
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://127.0.0.1:0";
     $serverFlags = STREAM_SERVER_BIND | STREAM_SERVER_LISTEN;
     $serverCtx = stream_context_create('ssl' => 
         'local_cert' => '%s',
@@ -37,13 +37,13 @@
     );
 
     $sock = stream_socket_server($serverUri, $errno, $errstr, $serverFlags, $serverCtx);
-    phpt_notify();
+    phpt_notify_server_start($sock);
 
     $link = stream_socket_accept($sock);
 CODE;
 
 $clientCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://{{ ADDR }}";
     $clientFlags = STREAM_CLIENT_CONNECT;
 
     $clientCtx = stream_context_create('ssl' => 
@@ -51,7 +51,6 @@
         'verify_peer_name' => false
     );
 
-    phpt_wait();
     @stream_socket_client($serverUri, $errno, $errstr, 2, $clientFlags, $clientCtx);
 CODE;
 
@@ -65,8 +64,8 @@
         
     );
 
-    $server = stream_socket_server('tls://127.0.0.1:64321', $errno, $errstr, $flags, $ctx);
-    phpt_notify();
+    $server = stream_socket_server('tls://127.0.0.1:0', $errno, $errstr, $flags, $ctx);
+    phpt_notify_server_start($server);
 
     stream_socket_accept($server);
 CODE;
@@ -84,8 +83,8 @@
         
     );
 
-    $server = stream_socket_server('tls://127.0.0.1:64321', $errno, $errstr, $flags, $ctx);
-    phpt_notify();
+    $server = stream_socket_server('tls://127.0.0.1:0', $errno, $errstr, $flags, $ctx);
+    phpt_notify_server_start($server);
 
     stream_socket_accept($server);
 CODE;
@@ -103,8 +102,8 @@
         
     );
 
-    $server = stream_socket_server('tls://127.0.0.1:64321', $errno, $errstr, $flags, $ctx);
-    phpt_notify();
+    $server = stream_socket_server('tls://127.0.0.1:0', $errno, $errstr, $flags, $ctx);
+    phpt_notify_server_start($server);
 
     stream_socket_accept($server);
 CODE;
@@ -115,11 +114,9 @@
         'cafile' => __DIR__ . '/sni_server_ca.pem',
     ;
 
-    phpt_wait();
-
     $ctxArr'peer_name' = '%s';
     $ctx = stream_context_create('ssl' => $ctxArr);
-    @stream_socket_client("tls://127.0.0.1:64321", $errno, $errstr, 1, $flags, $ctx);
+    @stream_socket_client("tls://{{ ADDR }}", $errno, $errstr, 1, $flags, $ctx);
 CODE;
 
 $serverCode = sprintf($serverCodeTemplate, $baseDirCertFile . "\0test", $baseDirPkFile);

php-8.3.21.tar.xz/ext/openssl/tests/openssl_csr_export_to_file_leak.phpt Added

php-8.3.7.tar.xz/ext/openssl/tests/openssl_peer_fingerprint_basic.phpt -> php-8.3.21.tar.xz/ext/openssl/tests/openssl_peer_fingerprint_basic.phpt Changed

@@ -12,14 +12,14 @@
 $cacertFile = __DIR__ . DIRECTORY_SEPARATOR . 'openssl_peer_fingerprint_basic-ca.pem.tmp';
 
 $serverCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://127.0.0.1:0";
     $serverFlags = STREAM_SERVER_BIND | STREAM_SERVER_LISTEN;
     $serverCtx = stream_context_create('ssl' => 
         'local_cert' => '%s'
     );
 
     $server = stream_socket_server($serverUri, $errno, $errstr, $serverFlags, $serverCtx);
-    phpt_notify();
+    phpt_notify_server_start($server);
 
     @stream_socket_accept($server, 1);
     @stream_socket_accept($server, 1);
@@ -28,7 +28,7 @@
 
 $peerName = 'openssl_peer_fingerprint_basic';
 $clientCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://{{ ADDR }}";
     $clientFlags = STREAM_CLIENT_CONNECT;
     $clientCtx = stream_context_create('ssl' => 
         'verify_peer'       => true,
@@ -37,8 +37,6 @@
         'peer_name'         => '%s',
     );
 
-    phpt_wait();
-
     stream_context_set_option($clientCtx, 'ssl', 'peer_fingerprint', '%s');
     var_dump(stream_socket_client($serverUri, $errno, $errstr, 2, $clientFlags, $clientCtx));
 
@@ -75,6 +73,6 @@
 
 Warning: stream_socket_client(): Failed to enable crypto in %s on line %d
 
-Warning: stream_socket_client(): Unable to connect to ssl://127.0.0.1:64321 (Unknown error) in %s on line %d
+Warning: stream_socket_client(): Unable to connect to ssl://127.0.0.1:%d (Unknown error) in %s on line %d
 bool(false)
 resource(%d) of type (stream)

php-8.3.21.tar.xz/ext/openssl/tests/openssl_pkey_export_to_file_leak.phpt Added

php-8.3.21.tar.xz/ext/openssl/tests/openssl_pkey_export_to_file_object_to_string.phpt Added

php-8.3.21.tar.xz/ext/openssl/tests/openssl_sign_invalid_algorithm.phpt Added

php-8.3.21.tar.xz/ext/openssl/tests/openssl_x509_export_to_file_leak.phpt Added

php-8.3.7.tar.xz/ext/openssl/tests/openssl_x509_verify.phpt -> php-8.3.21.tar.xz/ext/openssl/tests/openssl_x509_verify.phpt Changed

@@ -4,16 +4,24 @@
 openssl
 --FILE--
 <?php
-$fp = fopen(__DIR__ . "/cert.crt","r");
+
+$certFile = __DIR__ . '/openssl-x509-verify-cert.pem.tmp';
+$keyFile = __DIR__ . '/openssl-x509-verify-key.pem.tmp';
+
+include 'CertificateGenerator.inc';
+$certificateGenerator = new CertificateGenerator(true);
+$certificateGenerator->saveNewCertAndPubKey('openssl-x509-verify-server', $certFile, $keyFile);
+
+$fp = fopen($certFile,"r");
 $a = fread($fp, 8192);
 fclose($fp);
 
-$fp = fopen(__DIR__ . "/public.key","r");
+$fp = fopen($keyFile,"r");
 $b = fread($fp, 8192);
 fclose($fp);
 
-$cert = "file://" . __DIR__ . "/cert.crt";
-$key = "file://" . __DIR__ . "/public.key";
+$cert = "file://" . $certFile;
+$key = "file://" . $keyFile;
 $wrongKey = "file://" . __DIR__ . "/public_rsa_2048.key";
 
 var_dump(openssl_x509_verify($cert, $key));
@@ -23,6 +31,11 @@
 var_dump(openssl_x509_verify(openssl_x509_read($a), $b));
 var_dump(openssl_x509_verify($cert, $wrongKey));
 ?>
+--CLEAN--
+<?php
+@unlink(__DIR__ . '/openssl-x509-verify-cert.pem.tmp');
+@unlink(__DIR__ . '/openssl-x509-verify-key.pem.tmp');
+?>
 --EXPECT--
 int(1)
 int(-1)

php-8.3.7.tar.xz/ext/openssl/tests/peer_verification.phpt -> php-8.3.21.tar.xz/ext/openssl/tests/peer_verification.phpt Changed

php-8.3.21.tar.xz/ext/openssl/tests/php_openssl_pkey_from_zval_leak.phpt Added

php-8.3.7.tar.xz/ext/openssl/tests/san_ipv6_peer_matching.phpt -> php-8.3.21.tar.xz/ext/openssl/tests/san_ipv6_peer_matching.phpt Changed

@@ -17,14 +17,14 @@
 $san = 'IP:2001:db8:85a3:8d3:1319:8a2e:370:7348';
 
 $serverCode = <<<'CODE'
-    $serverUri = "ssl://::1:64324";
+    $serverUri = "ssl://::1:0";
     $serverFlags = STREAM_SERVER_BIND | STREAM_SERVER_LISTEN;
     $serverCtx = stream_context_create('ssl' => 
         'local_cert' => '%s',
     );
 
     $server = stream_socket_server($serverUri, $errno, $errstr, $serverFlags, $serverCtx);
-    phpt_notify();
+    phpt_notify_server_start($server);
 
     @stream_socket_accept($server, 1);
     @stream_socket_accept($server, 1);
@@ -32,14 +32,12 @@
 $serverCode = sprintf($serverCode, $certFile);
 
 $clientCode = <<<'CODE'
-    $serverUri = "ssl://::1:64324";
+    $serverUri = "ssl://{{ ADDR }}";
     $clientFlags = STREAM_CLIENT_CONNECT;
     $clientCtx = stream_context_create('ssl' => 
         'verify_peer' => false,
     );
 
-    phpt_wait();
-
     stream_context_set_option($clientCtx, 'ssl', 'peer_name', '2001:db8:85a3:8d3:1319:8a2e:370:7348');
     var_dump(stream_socket_client($serverUri, $errno, $errstr, 1, $clientFlags, $clientCtx));
 
@@ -65,5 +63,5 @@
 
 Warning: stream_socket_client(): Failed to enable crypto in %s on line %d
 
-Warning: stream_socket_client(): Unable to connect to ssl://::1:64324 (Unknown error) in %s on line %d
+Warning: stream_socket_client(): Unable to connect to ssl://::1:%d (Unknown error) in %s on line %d
 bool(false)

php-8.3.7.tar.xz/ext/openssl/tests/san_peer_matching.phpt -> php-8.3.21.tar.xz/ext/openssl/tests/san_peer_matching.phpt Changed

@@ -12,14 +12,14 @@
 $san = 'DNS:example.org, DNS:www.example.org, DNS:test.example.org';
 
 $serverCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://127.0.0.1:0";
     $serverFlags = STREAM_SERVER_BIND | STREAM_SERVER_LISTEN;
     $serverCtx = stream_context_create('ssl' => 
         'local_cert' => '%s',
     );
 
     $server = stream_socket_server($serverUri, $errno, $errstr, $serverFlags, $serverCtx);
-    phpt_notify();
+    phpt_notify_server_start($server);
 
     @stream_socket_accept($server, 1);
     @stream_socket_accept($server, 1);
@@ -27,14 +27,12 @@
 $serverCode = sprintf($serverCode, $certFile);
 
 $clientCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://{{ ADDR }}";
     $clientFlags = STREAM_CLIENT_CONNECT;
     $clientCtx = stream_context_create('ssl' => 
         'verify_peer' => false,
     );
 
-    phpt_wait();
-
     stream_context_set_option($clientCtx, 'ssl', 'peer_name', 'example.org');
     var_dump(stream_socket_client($serverUri, $errno, $errstr, 1, $clientFlags, $clientCtx));
 
@@ -60,5 +58,5 @@
 
 Warning: stream_socket_client(): Failed to enable crypto in %s on line %d
 
-Warning: stream_socket_client(): Unable to connect to ssl://127.0.0.1:64321 (Unknown error) in %s on line %d
+Warning: stream_socket_client(): Unable to connect to ssl://127.0.0.1:%d (Unknown error) in %s on line %d
 bool(false)

php-8.3.7.tar.xz/ext/openssl/tests/session_meta_capture.phpt -> php-8.3.21.tar.xz/ext/openssl/tests/session_meta_capture.phpt Changed

@@ -12,7 +12,7 @@
 $cacertFile = __DIR__ . DIRECTORY_SEPARATOR . 'session_meta_capture-ca.pem.tmp';
 
 $serverCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://127.0.0.1:0";
     $serverFlags = STREAM_SERVER_BIND | STREAM_SERVER_LISTEN;
     $serverCtx = stream_context_create('ssl' => 
         'local_cert' => '%s',
@@ -20,7 +20,7 @@
     );
 
     $server = stream_socket_server($serverUri, $errno, $errstr, $serverFlags, $serverCtx);
-    phpt_notify();
+    phpt_notify_server_start($server);
 
     @stream_socket_accept($server, 1);
     @stream_socket_accept($server, 1);
@@ -31,7 +31,7 @@
 
 $peerName = 'session_meta_capture';
 $clientCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://{{ ADDR }}";
     $clientFlags = STREAM_CLIENT_CONNECT;
     $clientCtx = stream_context_create('ssl' => 
         'verify_peer' => true,
@@ -40,8 +40,6 @@
         'security_level' => 0,
     );
 
-    phpt_wait();
-
     stream_context_set_option($clientCtx, 'ssl', 'crypto_method', STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT);
     $stream = stream_socket_client($serverUri, $errno, $errstr, 1, $clientFlags, $clientCtx);
     var_dump(stream_get_meta_data($stream)'crypto''protocol');

php-8.3.7.tar.xz/ext/openssl/tests/session_meta_capture_tlsv13.phpt -> php-8.3.21.tar.xz/ext/openssl/tests/session_meta_capture_tlsv13.phpt Changed

@@ -13,7 +13,7 @@
 $cacertFile = __DIR__ . DIRECTORY_SEPARATOR . 'session_meta_capture_tlsv13-ca.pem.tmp';
 
 $serverCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://127.0.0.1:0";
     $serverFlags = STREAM_SERVER_BIND | STREAM_SERVER_LISTEN;
     $serverCtx = stream_context_create('ssl' => 
         'local_cert' => '%s',
@@ -21,7 +21,7 @@
     );
 
     $server = stream_socket_server($serverUri, $errno, $errstr, $serverFlags, $serverCtx);
-    phpt_notify();
+    phpt_notify_server_start($server);
 
     @stream_socket_accept($server, 1);
 CODE;
@@ -29,7 +29,7 @@
 
 $peerName = 'session_meta_capture_tlsv13';
 $clientCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://{{ ADDR }}";
     $clientFlags = STREAM_CLIENT_CONNECT;
     $clientCtx = stream_context_create('ssl' => 
         'verify_peer' => true,
@@ -37,8 +37,6 @@
         'peer_name' => '%s'
     );
 
-    phpt_wait();
-
     stream_context_set_option($clientCtx, 'ssl', 'crypto_method', STREAM_CRYPTO_METHOD_TLSv1_3_CLIENT);
     $stream = stream_socket_client($serverUri, $errno, $errstr, 1, $clientFlags, $clientCtx);
     var_dump(stream_get_meta_data($stream)'crypto''protocol');
@@ -53,5 +51,10 @@
 include 'ServerClientTestCase.inc';
 ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
 ?>
+--CLEAN--
+<?php
+@unlink(__DIR__ . DIRECTORY_SEPARATOR . 'session_meta_capture_tlsv13.pem.tmp');
+@unlink(__DIR__ . DIRECTORY_SEPARATOR . 'session_meta_capture_tlsv13-ca.pem.tmp');
+?>
 --EXPECT--
 string(7) "TLSv1.3"

php-8.3.7.tar.xz/ext/openssl/tests/sni_server.phpt -> php-8.3.21.tar.xz/ext/openssl/tests/sni_server.phpt Changed

@@ -18,8 +18,8 @@
         
     );
 
-    $server = stream_socket_server('tls://127.0.0.1:64321', $errno, $errstr, $flags, $ctx);
-    phpt_notify();
+    $server = stream_socket_server('tls://127.0.0.1:0', $errno, $errstr, $flags, $ctx);
+    phpt_notify_server_start($server);
 
     for ($i=0; $i < 3; $i++) {
         @stream_socket_accept($server, 3);
@@ -33,23 +33,21 @@
         'capture_peer_cert' => true
     ;
 
-    phpt_wait();
-
     $ctxArr'peer_name' = 'cs.php.net';
     $ctx = stream_context_create('ssl' => $ctxArr);
-    $client = stream_socket_client("tls://127.0.0.1:64321", $errno, $errstr, 1, $flags, $ctx);
+    $client = stream_socket_client("tls://{{ ADDR }}", $errno, $errstr, 1, $flags, $ctx);
     $cert = stream_context_get_options($ctx)'ssl''peer_certificate';
     var_dump(openssl_x509_parse($cert)'subject''CN');
 
     $ctxArr'peer_name' = 'uk.php.net';
     $ctx = stream_context_create('ssl' => $ctxArr);
-    $client = @stream_socket_client("tls://127.0.0.1:64321", $errno, $errstr, 1, $flags, $ctx);
+    $client = @stream_socket_client("tls://{{ ADDR }}", $errno, $errstr, 1, $flags, $ctx);
     $cert = stream_context_get_options($ctx)'ssl''peer_certificate';
     var_dump(openssl_x509_parse($cert)'subject''CN');
 
     $ctxArr'peer_name' = 'us.php.net';
     $ctx = stream_context_create('ssl' => $ctxArr);
-    $client = @stream_socket_client("tls://127.0.0.1:64321", $errno, $errstr, 1, $flags, $ctx);
+    $client = @stream_socket_client("tls://{{ ADDR }}", $errno, $errstr, 1, $flags, $ctx);
     $cert = stream_context_get_options($ctx)'ssl''peer_certificate';
     var_dump(openssl_x509_parse($cert)'subject''CN');
 CODE;

php-8.3.7.tar.xz/ext/openssl/tests/sni_server_key_cert.phpt -> php-8.3.21.tar.xz/ext/openssl/tests/sni_server_key_cert.phpt Changed

@@ -27,8 +27,8 @@
         
     );
 
-    $server = stream_socket_server('tls://127.0.0.1:64321', $errno, $errstr, $flags, $ctx);
-    phpt_notify();
+    $server = stream_socket_server('tls://127.0.0.1:0', $errno, $errstr, $flags, $ctx);
+    phpt_notify_server_start($server);
 
     for ($i=0; $i < 3; $i++) {
         @stream_socket_accept($server, 3);
@@ -42,23 +42,21 @@
         'capture_peer_cert' => true
     ;
 
-    phpt_wait();
-
     $ctxArr'peer_name' = 'cs.php.net';
     $ctx = stream_context_create('ssl' => $ctxArr);
-    $client = stream_socket_client("tls://127.0.0.1:64321", $errno, $errstr, 1, $flags, $ctx);
+    $client = stream_socket_client("tls://{{ ADDR }}", $errno, $errstr, 1, $flags, $ctx);
     $cert = stream_context_get_options($ctx)'ssl''peer_certificate';
     var_dump(openssl_x509_parse($cert)'subject''CN');
 
     $ctxArr'peer_name' = 'uk.php.net';
     $ctx = stream_context_create('ssl' => $ctxArr);
-    $client = @stream_socket_client("tls://127.0.0.1:64321", $errno, $errstr, 1, $flags, $ctx);
+    $client = @stream_socket_client("tls://{{ ADDR }}", $errno, $errstr, 1, $flags, $ctx);
     $cert = stream_context_get_options($ctx)'ssl''peer_certificate';
     var_dump(openssl_x509_parse($cert)'subject''CN');
 
     $ctxArr'peer_name' = 'us.php.net';
     $ctx = stream_context_create('ssl' => $ctxArr);
-    $client = @stream_socket_client("tls://127.0.0.1:64321", $errno, $errstr, 1, $flags, $ctx);
+    $client = @stream_socket_client("tls://{{ ADDR }}", $errno, $errstr, 1, $flags, $ctx);
     $cert = stream_context_get_options($ctx)'ssl''peer_certificate';
     var_dump(openssl_x509_parse($cert)'subject''CN');
 CODE;

php-8.3.7.tar.xz/ext/openssl/tests/stream_crypto_flags_001.phpt -> php-8.3.21.tar.xz/ext/openssl/tests/stream_crypto_flags_001.phpt Changed

@@ -12,7 +12,7 @@
 $cacertFile = __DIR__ . DIRECTORY_SEPARATOR . 'stream_crypto_flags_001-ca.pem.tmp';
 
 $serverCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://127.0.0.1:0";
     $serverFlags = STREAM_SERVER_BIND | STREAM_SERVER_LISTEN;
     $serverCtx = stream_context_create('ssl' => 
         'local_cert' => '%s',
@@ -20,7 +20,7 @@
     );
 
     $server = stream_socket_server($serverUri, $errno, $errstr, $serverFlags, $serverCtx);
-    phpt_notify();
+    phpt_notify_server_start($server);
 
     @stream_socket_accept($server, 1);
     @stream_socket_accept($server, 1);
@@ -30,7 +30,7 @@
 
 $peerName = 'stream_crypto_flags_001';
 $clientCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://{{ ADDR }}";
     $clientFlags = STREAM_CLIENT_CONNECT;
     $clientCtx = stream_context_create('ssl' => 
         'verify_peer' => true,
@@ -39,8 +39,6 @@
         'security_level' => 0,
     );
 
-    phpt_wait();
-
     stream_context_set_option($clientCtx, 'ssl', 'crypto_method', STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT);
     var_dump(stream_socket_client($serverUri, $errno, $errstr, 1, $clientFlags, $clientCtx));

php-8.3.7.tar.xz/ext/openssl/tests/stream_crypto_flags_002.phpt -> php-8.3.21.tar.xz/ext/openssl/tests/stream_crypto_flags_002.phpt Changed

@@ -12,7 +12,7 @@
 $cacertFile = __DIR__ . DIRECTORY_SEPARATOR . 'stream_crypto_flags_002-ca.pem.tmp';
 
 $serverCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://127.0.0.1:0";
     $serverFlags = STREAM_SERVER_BIND | STREAM_SERVER_LISTEN;
     $serverCtx = stream_context_create('ssl' => 
         'local_cert' => '%s',
@@ -20,7 +20,7 @@
     );
 
     $server = stream_socket_server($serverUri, $errno, $errstr, $serverFlags, $serverCtx);
-    phpt_notify();
+    phpt_notify_server_start($server);
 
     @stream_socket_accept($server, 1);
     @stream_socket_accept($server, 1);
@@ -31,7 +31,7 @@
 
 $peerName = 'stream_crypto_flags_002';
 $clientCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://{{ ADDR }}";
     $clientFlags = STREAM_CLIENT_CONNECT;
     $clientCtx = stream_context_create('ssl' => 
         'verify_peer' => true,
@@ -40,8 +40,6 @@
         'security_level' => 0,
     );
 
-    phpt_wait();
-
     stream_context_set_option($clientCtx, 'ssl', 'crypto_method', STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT);
     var_dump(stream_socket_client($serverUri, $errno, $errstr, 2, $clientFlags, $clientCtx));

php-8.3.7.tar.xz/ext/openssl/tests/stream_crypto_flags_003.phpt -> php-8.3.21.tar.xz/ext/openssl/tests/stream_crypto_flags_003.phpt Changed

@@ -13,7 +13,7 @@
 $cacertFile = __DIR__ . DIRECTORY_SEPARATOR . 'stream_crypto_flags_003-ca.pem.tmp';
 
 $serverCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://127.0.0.1:0";
     $serverFlags = STREAM_SERVER_BIND | STREAM_SERVER_LISTEN;
     $serverCtx = stream_context_create('ssl' => 
         'local_cert' => '%s',
@@ -24,7 +24,7 @@
     );
 
     $server = stream_socket_server($serverUri, $errno, $errstr, $serverFlags, $serverCtx);
-    phpt_notify();
+    phpt_notify_server_start($server);
 
     @stream_socket_accept($server, 1);
     @stream_socket_accept($server, 1);
@@ -35,7 +35,7 @@
 
 $peerName = 'stream_crypto_flags_003';
 $clientCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://{{ ADDR }}";
     $clientFlags = STREAM_CLIENT_CONNECT;
     $clientCtx = stream_context_create('ssl' => 
         'verify_peer' => true,
@@ -44,8 +44,6 @@
         'security_level' => 0,
     );
 
-    phpt_wait();
-
     stream_context_set_option($clientCtx, 'ssl', 'crypto_method', STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT);
     var_dump(stream_socket_client($serverUri, $errno, $errstr, 1, $clientFlags, $clientCtx));

php-8.3.7.tar.xz/ext/openssl/tests/stream_crypto_flags_004.phpt -> php-8.3.21.tar.xz/ext/openssl/tests/stream_crypto_flags_004.phpt Changed

@@ -12,7 +12,7 @@
 $cacertFile = __DIR__ . DIRECTORY_SEPARATOR . 'stream_crypto_flags_004-ca.pem.tmp';
 
 $serverCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://127.0.0.1:0";
     $serverFlags = STREAM_SERVER_BIND | STREAM_SERVER_LISTEN;
     $serverCtx = stream_context_create('ssl' => 
         'local_cert' => '%s',
@@ -21,7 +21,7 @@
     );
 
     $server = stream_socket_server($serverUri, $errno, $errstr, $serverFlags, $serverCtx);
-    phpt_notify();
+    phpt_notify_server_start($server);
 
     @stream_socket_accept($server, 1);
     @stream_socket_accept($server, 1);
@@ -32,7 +32,7 @@
 
 $peerName = 'stream_crypto_flags_004';
 $clientCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://{{ ADDR }}";
     $clientFlags = STREAM_CLIENT_CONNECT;
     $clientCtx = stream_context_create('ssl' => 
         'verify_peer' => true,
@@ -41,8 +41,6 @@
         'security_level' => 0,
     );
 
-    phpt_wait();
-
     // Should succeed because the SSLv23 handshake here is compatible with the
     // TLSv1 hello method employed in the server
     var_dump(@stream_socket_client($serverUri, $errno, $errstr, 1, $clientFlags, $clientCtx));

php-8.3.7.tar.xz/ext/openssl/tests/stream_security_level.phpt -> php-8.3.21.tar.xz/ext/openssl/tests/stream_security_level.phpt Changed

@@ -19,7 +19,7 @@
 $cacertFile = __DIR__ . DIRECTORY_SEPARATOR . 'stream_security_level-ca.pem.tmp';
 
 $serverCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64322";
+    $serverUri = "ssl://127.0.0.1:0";
     $serverFlags = STREAM_SERVER_BIND | STREAM_SERVER_LISTEN;
     $serverCtx = stream_context_create('ssl' => 
         'local_cert' => '%s',
@@ -29,14 +29,14 @@
     );
 
     $server = stream_socket_server($serverUri, $errno, $errstr, $serverFlags, $serverCtx);
-    phpt_notify();
+    phpt_notify_server_start($server);
 
     @stream_socket_accept($server, 1);
 CODE;
 $serverCode = sprintf($serverCode, $certFile);
 
 $clientCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64322";
+    $serverUri = "ssl://{{ ADDR }}";
     $clientFlags = STREAM_CLIENT_CONNECT;
     $clientCtx = stream_context_create('ssl' => 
         'security_level' => %d,
@@ -45,7 +45,6 @@
         'verify_peer_name' => false
     );
 
-    phpt_wait();
     $client = stream_socket_client($serverUri, $errno, $errstr, 1, $clientFlags, $clientCtx);
 
     var_dump($client);
@@ -71,5 +70,5 @@
 
 Warning: stream_socket_client(): Failed to enable crypto in %s : eval()'d code on line %d
 
-Warning: stream_socket_client(): Unable to connect to ssl://127.0.0.1:64322 (Unknown error) in %s : eval()'d code on line %d
+Warning: stream_socket_client(): Unable to connect to ssl://127.0.0.1:%d (Unknown error) in %s : eval()'d code on line %d
 bool(false)

php-8.3.7.tar.xz/ext/openssl/tests/stream_server_reneg_limit.phpt -> php-8.3.21.tar.xz/ext/openssl/tests/stream_server_reneg_limit.phpt Changed

php-8.3.7.tar.xz/ext/openssl/tests/stream_verify_peer_name_001.phpt -> php-8.3.21.tar.xz/ext/openssl/tests/stream_verify_peer_name_001.phpt Changed

@@ -11,14 +11,14 @@
 $certFile = __DIR__ . DIRECTORY_SEPARATOR . 'stream_verify_peer_name_001.pem.tmp';
 
 $serverCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://127.0.0.1:0";
     $serverFlags = STREAM_SERVER_BIND | STREAM_SERVER_LISTEN;
     $serverCtx = stream_context_create('ssl' => 
         'local_cert' => '%s'
     );
 
     $server = stream_socket_server($serverUri, $errno, $errstr, $serverFlags, $serverCtx);
-    phpt_notify();
+    phpt_notify_server_start($server);
 
     @stream_socket_accept($server, 1);
 CODE;
@@ -26,14 +26,13 @@
 
 $peerName = 'stream_verify_peer_name_001';
 $clientCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://{{ ADDR }}";
     $clientFlags = STREAM_CLIENT_CONNECT;
     $clientCtx = stream_context_create('ssl' => 
         'verify_peer' => false,
         'peer_name' => '%s'
     );
 
-    phpt_wait();
     $client = stream_socket_client($serverUri, $errno, $errstr, 1, $clientFlags, $clientCtx);
 
     var_dump($client);

php-8.3.7.tar.xz/ext/openssl/tests/stream_verify_peer_name_002.phpt -> php-8.3.21.tar.xz/ext/openssl/tests/stream_verify_peer_name_002.phpt Changed

@@ -12,14 +12,14 @@
 $cacertFile = __DIR__ . DIRECTORY_SEPARATOR . 'stream_verify_peer_name_002-ca.pem.tmp';
 
 $serverCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://127.0.0.1:0";
     $serverFlags = STREAM_SERVER_BIND | STREAM_SERVER_LISTEN;
     $serverCtx = stream_context_create('ssl' => 
         'local_cert' => '%s'
     );
 
     $server = stream_socket_server($serverUri, $errno, $errstr, $serverFlags, $serverCtx);
-    phpt_notify();
+    phpt_notify_server_start($server);
 
     @stream_socket_accept($server, 1);
 CODE;
@@ -27,7 +27,7 @@
 
 $actualPeerName = 'stream_verify_peer_name_002';
 $clientCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://{{ ADDR }}";
     $clientFlags = STREAM_CLIENT_CONNECT;
     $clientCtx = stream_context_create('ssl' => 
         'verify_peer' => true,
@@ -35,7 +35,6 @@
         'verify_peer_name' => false
     );
 
-    phpt_wait();
     $client = stream_socket_client($serverUri, $errno, $errstr, 2, $clientFlags, $clientCtx);
 
     var_dump($client);

php-8.3.7.tar.xz/ext/openssl/tests/stream_verify_peer_name_003.phpt -> php-8.3.21.tar.xz/ext/openssl/tests/stream_verify_peer_name_003.phpt Changed

@@ -12,14 +12,14 @@
 $cacertFile = __DIR__ . DIRECTORY_SEPARATOR . 'stream_verify_peer_name_003-ca.pem.tmp';
 
 $serverCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://127.0.0.1:0";
     $serverFlags = STREAM_SERVER_BIND | STREAM_SERVER_LISTEN;
     $serverCtx = stream_context_create('ssl' => 
         'local_cert' => '%s'
     );
 
     $server = stream_socket_server($serverUri, $errno, $errstr, $serverFlags, $serverCtx);
-    phpt_notify();
+    phpt_notify_server_start($server);
 
     @stream_socket_accept($server, 1);
 CODE;
@@ -27,14 +27,13 @@
 
 $actualPeerName = 'stream_verify_peer_name_003';
 $clientCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://{{ ADDR }}";
     $clientFlags = STREAM_CLIENT_CONNECT;
     $clientCtx = stream_context_create('ssl' => 
         'verify_peer' => true,
         'cafile' => '%s'
     );
 
-    phpt_wait();
     $client = stream_socket_client($serverUri, $errno, $errstr, 1, $clientFlags, $clientCtx);
 
     var_dump($client);
@@ -59,5 +58,5 @@
 
 Warning: stream_socket_client(): Failed to enable crypto in %s on line %d
 
-Warning: stream_socket_client(): Unable to connect to ssl://127.0.0.1:64321 (Unknown error) in %s on line %d
+Warning: stream_socket_client(): Unable to connect to ssl://127.0.0.1:%d (Unknown error) in %s on line %d
 bool(false)

php-8.3.7.tar.xz/ext/openssl/tests/streams_crypto_method.phpt -> php-8.3.21.tar.xz/ext/openssl/tests/streams_crypto_method.phpt Changed

@@ -11,14 +11,14 @@
 $certFile = __DIR__ . DIRECTORY_SEPARATOR . 'streams_crypto_method.pem.tmp';
 
 $serverCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://127.0.0.1:0";
     $serverFlags = STREAM_SERVER_BIND | STREAM_SERVER_LISTEN;
     $serverCtx = stream_context_create('ssl' => 
         'local_cert' => '%s',
     );
 
     $server = stream_socket_server($serverUri, $errno, $errstr, $serverFlags, $serverCtx);
-    phpt_notify();
+    phpt_notify_server_start($server);
 
     $client = @stream_socket_accept($server);
     if ($client) {
@@ -39,7 +39,7 @@
 $serverCode = sprintf($serverCode, $certFile);
 
 $clientCode = <<<'CODE'
-    $serverUri = "https://127.0.0.1:64321/";
+    $serverUri = "https://{{ ADDR }}/";
     $clientFlags = STREAM_CLIENT_CONNECT;
     $clientCtx = stream_context_create('ssl' => 
         'crypto_method' => STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT,
@@ -47,7 +47,6 @@
         'verify_peer_name' => false
     );
 
-    phpt_wait();
     echo file_get_contents($serverUri, false, $clientCtx);
 CODE;

php-8.3.7.tar.xz/ext/openssl/tests/tls_min_v1.0_max_v1.1_wrapper.phpt -> php-8.3.21.tar.xz/ext/openssl/tests/tls_min_v1.0_max_v1.1_wrapper.phpt Changed

@@ -19,8 +19,8 @@
         'security_level' => 0,
     );
 
-    $server = stream_socket_server('tls://127.0.0.1:64321', $errno, $errstr, $flags, $ctx);
-    phpt_notify();
+    $server = stream_socket_server('tls://127.0.0.1:0', $errno, $errstr, $flags, $ctx);
+    phpt_notify_server_start($server);
 
     for ($i=0; $i < (phpt_has_sslv3() ? 6 : 5); $i++) {
         @stream_socket_accept($server, 3);
@@ -36,24 +36,22 @@
         'security_level' => 0,
     );
 
-    phpt_wait();
-
-    $client = stream_socket_client("tlsv1.0://127.0.0.1:64321", $errno, $errstr, 3, $flags, $ctx);
+    $client = stream_socket_client("tlsv1.0://{{ ADDR }}", $errno, $errstr, 3, $flags, $ctx);
     var_dump($client);
 
-    $client = @stream_socket_client("sslv3://127.0.0.1:64321", $errno, $errstr, 3, $flags, $ctx);
+    $client = @stream_socket_client("sslv3://{{ ADDR }}", $errno, $errstr, 3, $flags, $ctx);
     var_dump($client);
 
-    $client = @stream_socket_client("tlsv1.1://127.0.0.1:64321", $errno, $errstr, 3, $flags, $ctx);
+    $client = @stream_socket_client("tlsv1.1://{{ ADDR }}", $errno, $errstr, 3, $flags, $ctx);
     var_dump($client);
 
-    $client = @stream_socket_client("tlsv1.2://127.0.0.1:64321", $errno, $errstr, 3, $flags, $ctx);
+    $client = @stream_socket_client("tlsv1.2://{{ ADDR }}", $errno, $errstr, 3, $flags, $ctx);
     var_dump($client);
 
-    $client = @stream_socket_client("ssl://127.0.0.1:64321", $errno, $errstr, 3, $flags, $ctx);
+    $client = @stream_socket_client("ssl://{{ ADDR }}", $errno, $errstr, 3, $flags, $ctx);
     var_dump($client);
 
-    $client = @stream_socket_client("tls://127.0.0.1:64321", $errno, $errstr, 3, $flags, $ctx);
+    $client = @stream_socket_client("tls://{{ ADDR }}", $errno, $errstr, 3, $flags, $ctx);
     var_dump($client);
 CODE;

php-8.3.7.tar.xz/ext/openssl/tests/tls_wrapper.phpt -> php-8.3.21.tar.xz/ext/openssl/tests/tls_wrapper.phpt Changed

@@ -18,8 +18,8 @@
         'security_level' => 0,
     );
 
-    $server = stream_socket_server('tls://127.0.0.1:64321', $errno, $errstr, $flags, $ctx);
-    phpt_notify();
+    $server = stream_socket_server('tls://127.0.0.1:0', $errno, $errstr, $flags, $ctx);
+    phpt_notify_server_start($server);
 
     for ($i = 0; $i < (phpt_has_sslv3() ? 6 : 5); $i++) {
         @stream_socket_accept($server, 3);
@@ -35,24 +35,22 @@
         'security_level' => 0,
     );
 
-    phpt_wait();
-
-    $client = stream_socket_client("tlsv1.0://127.0.0.1:64321", $errno, $errstr, 3, $flags, $ctx);
+    $client = stream_socket_client("tlsv1.0://{{ ADDR }}", $errno, $errstr, 3, $flags, $ctx);
     var_dump($client);
 
-    $client = @stream_socket_client("sslv3://127.0.0.1:64321", $errno, $errstr, 3, $flags, $ctx);
+    $client = @stream_socket_client("sslv3://{{ ADDR }}", $errno, $errstr, 3, $flags, $ctx);
     var_dump($client);
 
-    $client = @stream_socket_client("tlsv1.1://127.0.0.1:64321", $errno, $errstr, 3, $flags, $ctx);
+    $client = @stream_socket_client("tlsv1.1://{{ ADDR }}", $errno, $errstr, 3, $flags, $ctx);
     var_dump($client);
 
-    $client = @stream_socket_client("tlsv1.2://127.0.0.1:64321", $errno, $errstr, 3, $flags, $ctx);
+    $client = @stream_socket_client("tlsv1.2://{{ ADDR }}", $errno, $errstr, 3, $flags, $ctx);
     var_dump($client);
 
-    $client = @stream_socket_client("ssl://127.0.0.1:64321", $errno, $errstr, 3, $flags, $ctx);
+    $client = @stream_socket_client("ssl://{{ ADDR }}", $errno, $errstr, 3, $flags, $ctx);
     var_dump($client);
 
-    $client = @stream_socket_client("tls://127.0.0.1:64321", $errno, $errstr, 3, $flags, $ctx);
+    $client = @stream_socket_client("tls://{{ ADDR }}", $errno, $errstr, 3, $flags, $ctx);
     var_dump($client);
 CODE;

php-8.3.7.tar.xz/ext/openssl/tests/tls_wrapper_with_tls_v1.3.phpt -> php-8.3.21.tar.xz/ext/openssl/tests/tls_wrapper_with_tls_v1.3.phpt Changed

@@ -18,8 +18,8 @@
         'security_level' => 0,
     );
 
-    $server = stream_socket_server('tls://127.0.0.1:64321', $errno, $errstr, $flags, $ctx);
-    phpt_notify();
+    $server = stream_socket_server('tls://127.0.0.1:0', $errno, $errstr, $flags, $ctx);
+    phpt_notify_server_start($server);
 
     for ($i = 0; $i < (phpt_has_sslv3() ? 7 : 6); $i++) {
         @stream_socket_accept($server, 3);
@@ -35,27 +35,25 @@
         'security_level' => 0,
     );
 
-    phpt_wait();
-
-    $client = stream_socket_client("tlsv1.0://127.0.0.1:64321", $errno, $errstr, 3, $flags, $ctx);
+    $client = stream_socket_client("tlsv1.0://{{ ADDR }}", $errno, $errstr, 3, $flags, $ctx);
     var_dump($client);
 
-    $client = @stream_socket_client("sslv3://127.0.0.1:64321", $errno, $errstr, 3, $flags, $ctx);
+    $client = @stream_socket_client("sslv3://{{ ADDR }}", $errno, $errstr, 3, $flags, $ctx);
     var_dump($client);
 
-    $client = @stream_socket_client("tlsv1.1://127.0.0.1:64321", $errno, $errstr, 3, $flags, $ctx);
+    $client = @stream_socket_client("tlsv1.1://{{ ADDR }}", $errno, $errstr, 3, $flags, $ctx);
     var_dump($client);
 
-    $client = @stream_socket_client("tlsv1.2://127.0.0.1:64321", $errno, $errstr, 3, $flags, $ctx);
+    $client = @stream_socket_client("tlsv1.2://{{ ADDR }}", $errno, $errstr, 3, $flags, $ctx);
     var_dump($client);
 
-    $client = @stream_socket_client("tlsv1.3://127.0.0.1:64321", $errno, $errstr, 3, $flags, $ctx);
+    $client = @stream_socket_client("tlsv1.3://{{ ADDR }}", $errno, $errstr, 3, $flags, $ctx);
     var_dump($client);
 
-    $client = @stream_socket_client("ssl://127.0.0.1:64321", $errno, $errstr, 3, $flags, $ctx);
+    $client = @stream_socket_client("ssl://{{ ADDR }}", $errno, $errstr, 3, $flags, $ctx);
     var_dump($client);
 
-    $client = @stream_socket_client("tls://127.0.0.1:64321", $errno, $errstr, 3, $flags, $ctx);
+    $client = @stream_socket_client("tls://{{ ADDR }}", $errno, $errstr, 3, $flags, $ctx);
     var_dump($client);
 CODE;

php-8.3.7.tar.xz/ext/openssl/tests/tlsv1.0_wrapper.phpt -> php-8.3.21.tar.xz/ext/openssl/tests/tlsv1.0_wrapper.phpt Changed

@@ -17,8 +17,8 @@
         'security_level' => 0,
     );
 
-    $server = stream_socket_server('tlsv1.0://127.0.0.1:64321', $errno, $errstr, $flags, $ctx);
-    phpt_notify();
+    $server = stream_socket_server('tlsv1.0://127.0.0.1:0', $errno, $errstr, $flags, $ctx);
+    phpt_notify_server_start($server);
 
     for ($i = 0; $i < (phpt_has_sslv3() ? 3 : 2); $i++) {
         @stream_socket_accept($server, 3);
@@ -34,15 +34,13 @@
         'security_level' => 0,
     );
 
-    phpt_wait();
-
-    $client = stream_socket_client("tlsv1.0://127.0.0.1:64321", $errno, $errstr, 3, $flags, $ctx);
+    $client = stream_socket_client("tlsv1.0://{{ ADDR }}", $errno, $errstr, 3, $flags, $ctx);
     var_dump($client);
 
-    $client = @stream_socket_client("sslv3://127.0.0.1:64321", $errno, $errstr, 3, $flags, $ctx);
+    $client = @stream_socket_client("sslv3://{{ ADDR }}", $errno, $errstr, 3, $flags, $ctx);
     var_dump($client);
 
-    $client = @stream_socket_client("tlsv1.2://127.0.0.1:64321", $errno, $errstr, 3, $flags, $ctx);
+    $client = @stream_socket_client("tlsv1.2://{{ ADDR }}", $errno, $errstr, 3, $flags, $ctx);
     var_dump($client);
 CODE;

php-8.3.7.tar.xz/ext/openssl/tests/tlsv1.1_wrapper.phpt -> php-8.3.21.tar.xz/ext/openssl/tests/tlsv1.1_wrapper.phpt Changed

@@ -17,8 +17,8 @@
         'security_level' => 0,
     );
 
-    $server = stream_socket_server('tlsv1.1://127.0.0.1:64321', $errno, $errstr, $flags, $ctx);
-    phpt_notify();
+    $server = stream_socket_server('tlsv1.1://127.0.0.1:0', $errno, $errstr, $flags, $ctx);
+    phpt_notify_server_start($server);
 
     for ($i = 0; $i < (phpt_has_sslv3() ? 3 : 2); $i++) {
         @stream_socket_accept($server, 3);
@@ -34,15 +34,13 @@
         'security_level' => 0,
     );
 
-    phpt_wait();
-
-    $client = stream_socket_client("tlsv1.1://127.0.0.1:64321", $errno, $errstr, 3, $flags, $ctx);
+    $client = stream_socket_client("tlsv1.1://{{ ADDR }}", $errno, $errstr, 3, $flags, $ctx);
     var_dump($client);
 
-    $client = @stream_socket_client("sslv3://127.0.0.1:64321", $errno, $errstr, 3, $flags, $ctx);
+    $client = @stream_socket_client("sslv3://{{ ADDR }}", $errno, $errstr, 3, $flags, $ctx);
     var_dump($client);
 
-    $client = @stream_socket_client("tlsv1.2://127.0.0.1:64321", $errno, $errstr, 3, $flags, $ctx);
+    $client = @stream_socket_client("tlsv1.2://{{ ADDR }}", $errno, $errstr, 3, $flags, $ctx);
     var_dump($client);
 CODE;

php-8.3.7.tar.xz/ext/openssl/tests/tlsv1.2_wrapper.phpt -> php-8.3.21.tar.xz/ext/openssl/tests/tlsv1.2_wrapper.phpt Changed

@@ -16,8 +16,8 @@
         'local_cert' => '%s',
     );
 
-    $server = stream_socket_server('tlsv1.2://127.0.0.1:64321', $errno, $errstr, $flags, $ctx);
-    phpt_notify();
+    $server = stream_socket_server('tlsv1.2://127.0.0.1:0', $errno, $errstr, $flags, $ctx);
+    phpt_notify_server_start($server);
 
     for ($i = 0; $i < (phpt_has_sslv3() ? 3 : 2); $i++) {
         @stream_socket_accept($server, 3);
@@ -32,15 +32,13 @@
         'verify_peer_name' => false,
     );
 
-    phpt_wait();
-
-    $client = stream_socket_client("tlsv1.2://127.0.0.1:64321", $errno, $errstr, 3, $flags, $ctx);
+    $client = stream_socket_client("tlsv1.2://{{ ADDR }}", $errno, $errstr, 3, $flags, $ctx);
     var_dump($client);
 
-    $client = @stream_socket_client("sslv3://127.0.0.1:64321", $errno, $errstr, 3, $flags, $ctx);
+    $client = @stream_socket_client("sslv3://{{ ADDR }}", $errno, $errstr, 3, $flags, $ctx);
     var_dump($client);
 
-    $client = @stream_socket_client("tlsv1.1://127.0.0.1:64321", $errno, $errstr, 3, $flags, $ctx);
+    $client = @stream_socket_client("tlsv1.1://{{ ADDR }}", $errno, $errstr, 3, $flags, $ctx);
     var_dump($client);
 CODE;

php-8.3.7.tar.xz/ext/openssl/tests/tlsv1.3_wrapper.phpt -> php-8.3.21.tar.xz/ext/openssl/tests/tlsv1.3_wrapper.phpt Changed

@@ -17,8 +17,8 @@
         'local_cert' => '%s',
     );
 
-    $server = stream_socket_server('tlsv1.3://127.0.0.1:64321', $errno, $errstr, $flags, $ctx);
-    phpt_notify();
+    $server = stream_socket_server('tlsv1.3://127.0.0.1:0', $errno, $errstr, $flags, $ctx);
+    phpt_notify_server_start($server);
 
     for ($i=0; $i < 3; $i++) {
         @stream_socket_accept($server, 3);
@@ -33,15 +33,13 @@
         'verify_peer_name' => false,
     );
 
-    phpt_wait();
-
-    $client = stream_socket_client("tlsv1.3://127.0.0.1:64321", $errno, $errstr, 3, $flags, $ctx);
+    $client = stream_socket_client("tlsv1.3://{{ ADDR }}", $errno, $errstr, 3, $flags, $ctx);
     var_dump($client);
 
-    $client = @stream_socket_client("tlsv1.0://127.0.0.1:64321", $errno, $errstr, 3, $flags, $ctx);
+    $client = @stream_socket_client("tlsv1.0://{{ ADDR }}", $errno, $errstr, 3, $flags, $ctx);
     var_dump($client);
 
-    $client = @stream_socket_client("tlsv1.2://127.0.0.1:64321", $errno, $errstr, 3, $flags, $ctx);
+    $client = @stream_socket_client("tlsv1.2://{{ ADDR }}", $errno, $errstr, 3, $flags, $ctx);
     var_dump($client);
 CODE;

php-8.3.7.tar.xz/ext/pcntl/pcntl.c -> php-8.3.21.tar.xz/ext/pcntl/pcntl.c Changed

php-8.3.21.tar.xz/ext/pcntl/tests/pcntl_exec_invalid_strings.phpt Added

php-8.3.7.tar.xz/ext/pcre/config0.m4 -> php-8.3.21.tar.xz/ext/pcre/config0.m4 Changed

php-8.3.7.tar.xz/ext/pcre/php_pcre.c -> php-8.3.21.tar.xz/ext/pcre/php_pcre.c Changed

php-8.3.7.tar.xz/ext/pcre/tests/bug75457.phpt -> php-8.3.21.tar.xz/ext/pcre/tests/bug75457.phpt Changed

php-8.3.21.tar.xz/ext/pcre/tests/gh16184.phpt Added

php-8.3.21.tar.xz/ext/pcre/tests/gh16189.phpt Added

php-8.3.7.tar.xz/ext/pdo/pdo_sql_parser.c -> php-8.3.21.tar.xz/ext/pdo/pdo_sql_parser.c Changed

@@ -1,4 +1,4 @@
-/* Generated by re2c 1.3 */
+/* Generated by re2c 3.0 */
 /*
   +----------------------------------------------------------------------+
   | Copyright (c) The PHP Group                                          |
@@ -53,303 +53,303 @@
 	if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
 	yych = *YYCURSOR;
 	switch (yych) {
-	case 0x00:	goto yy2;
-	case '"':	goto yy6;
-	case '\'':	goto yy8;
-	case '(':
-	case ')':
-	case '*':
-	case '+':
-	case ',':
-	case '.':	goto yy9;
-	case '-':	goto yy10;
-	case '/':	goto yy11;
-	case ':':	goto yy12;
-	case '?':	goto yy13;
-	default:	goto yy3;
+		case 0x00: goto yy1;
+		case '"': goto yy4;
+		case '\'': goto yy6;
+		case '(':
+		case ')':
+		case '*':
+		case '+':
+		case ',':
+		case '.': goto yy7;
+		case '-': goto yy8;
+		case '/': goto yy9;
+		case ':': goto yy10;
+		case '?': goto yy11;
+		default: goto yy2;
 	}
-yy2:
+yy1:
 	YYCURSOR = YYMARKER;
-	goto yy7;
-yy3:
+	goto yy5;
+yy2:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	switch (yych) {
-	case 0x00:
-	case '"':
-	case '\'':
-	case '(':
-	case ')':
-	case '*':
-	case '+':
-	case ',':
-	case '-':
-	case '.':
-	case '/':
-	case ':':
-	case '?':	goto yy5;
-	default:	goto yy3;
+		case 0x00:
+		case '"':
+		case '\'':
+		case '(':
+		case ')':
+		case '*':
+		case '+':
+		case ',':
+		case '-':
+		case '.':
+		case '/':
+		case ':':
+		case '?': goto yy3;
+		default: goto yy2;
 	}
-yy5:
+yy3:
 	{ RET(PDO_PARSER_TEXT); }
-yy6:
+yy4:
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych >= 0x01) goto yy16;
-yy7:
+	if (yych >= 0x01) goto yy14;
+yy5:
 	{ SKIP_ONE(PDO_PARSER_TEXT); }
-yy8:
+yy6:
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 0x00) goto yy7;
-	goto yy21;
-yy9:
+	if (yych <= 0x00) goto yy5;
+	goto yy18;
+yy7:
 	++YYCURSOR;
-	goto yy7;
-yy10:
+	goto yy5;
+yy8:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case '-':	goto yy25;
-	default:	goto yy7;
+		case '-': goto yy21;
+		default: goto yy5;
 	}
-yy11:
+yy9:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case '*':	goto yy28;
-	default:	goto yy7;
+		case '*': goto yy23;
+		default: goto yy5;
 	}
-yy12:
+yy10:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':
-	case 'A':
-	case 'B':
-	case 'C':
-	case 'D':
-	case 'E':
-	case 'F':
-	case 'G':
-	case 'H':
-	case 'I':
-	case 'J':
-	case 'K':
-	case 'L':
-	case 'M':
-	case 'N':
-	case 'O':
-	case 'P':
-	case 'Q':
-	case 'R':
-	case 'S':
-	case 'T':
-	case 'U':
-	case 'V':
-	case 'W':
-	case 'X':
-	case 'Y':
-	case 'Z':
-	case '_':
-	case 'a':
-	case 'b':
-	case 'c':
-	case 'd':
-	case 'e':
-	case 'f':
-	case 'g':
-	case 'h':
-	case 'i':
-	case 'j':
-	case 'k':
-	case 'l':
-	case 'm':
-	case 'n':
-	case 'o':
-	case 'p':
-	case 'q':
-	case 'r':
-	case 's':
-	case 't':
-	case 'u':
-	case 'v':
-	case 'w':
-	case 'x':
-	case 'y':
-	case 'z':	goto yy30;
-	case ':':	goto yy33;
-	default:	goto yy7;
+		case '0':
+		case '1':
+		case '2':
+		case '3':
+		case '4':
+		case '5':
+		case '6':
+		case '7':
+		case '8':
+		case '9':
+		case 'A':
+		case 'B':
+		case 'C':
+		case 'D':
+		case 'E':
+		case 'F':
+		case 'G':
+		case 'H':
+		case 'I':
+		case 'J':
+		case 'K':
+		case 'L':
+		case 'M':
+		case 'N':
+		case 'O':
+		case 'P':
+		case 'Q':
+		case 'R':
+		case 'S':
+		case 'T':
+		case 'U':
+		case 'V':
+		case 'W':
+		case 'X':
+		case 'Y':
+		case 'Z':
+		case '_':
+		case 'a':
+		case 'b':
+		case 'c':
+		case 'd':
+		case 'e':
+		case 'f':
+		case 'g':
+		case 'h':
+		case 'i':
+		case 'j':
+		case 'k':
+		case 'l':
+		case 'm':
+		case 'n':
+		case 'o':
+		case 'p':
+		case 'q':
+		case 'r':
+		case 's':
+		case 't':
+		case 'u':
+		case 'v':
+		case 'w':
+		case 'x':
+		case 'y':
+		case 'z': goto yy24;
+		case ':': goto yy26;
+		default: goto yy5;
 	}
-yy13:
+yy11:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case '?':	goto yy36;
-	default:	goto yy14;
+		case '?': goto yy28;
+		default: goto yy12;
 	}
-yy14:
+yy12:
 	{ RET(PDO_PARSER_BIND_POS); }
-yy15:
+yy13:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-yy16:
+yy14:
 	switch (yych) {
-	case 0x00:	goto yy2;
-	case '"':	goto yy17;
-	case '\\':	goto yy19;
-	default:	goto yy15;
+		case 0x00: goto yy1;
+		case '"': goto yy15;
+		case '\\': goto yy16;
+		default: goto yy13;
 	}
-yy17:
+yy15:
 	++YYCURSOR;
 	{ RET(PDO_PARSER_TEXT); }
-yy19:
+yy16:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	if (yych <= 0x00) goto yy2;
-	goto yy15;
-yy20:
+	if (yych <= 0x00) goto yy1;
+	goto yy13;
+yy17:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-yy21:
+yy18:
 	switch (yych) {
-	case 0x00:	goto yy2;
-	case '\'':	goto yy22;
-	case '\\':	goto yy24;
-	default:	goto yy20;
+		case 0x00: goto yy1;
+		case '\'': goto yy19;
+		case '\\': goto yy20;
+		default: goto yy17;
 	}
-yy22:
+yy19:
 	++YYCURSOR;
 	{ RET(PDO_PARSER_TEXT); }
-yy24:
+yy20:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	if (yych <= 0x00) goto yy2;
-	goto yy20;
-yy25:
+	if (yych <= 0x00) goto yy1;
+	goto yy17;
+yy21:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	switch (yych) {
-	case '\n':
-	case '\r':	goto yy27;
-	default:	goto yy25;
+		case '\n':
+		case '\r': goto yy22;
+		default: goto yy21;
 	}
-yy27:
+yy22:
 	{ RET(PDO_PARSER_TEXT); }
-yy28:
+yy23:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	switch (yych) {
-	case '*':	goto yy38;
-	default:	goto yy28;
+		case '*': goto yy29;
+		default: goto yy23;
 	}
-yy30:
+yy24:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	switch (yych) {
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':
-	case 'A':
-	case 'B':
-	case 'C':
-	case 'D':
-	case 'E':
-	case 'F':
-	case 'G':
-	case 'H':
-	case 'I':
-	case 'J':
-	case 'K':
-	case 'L':
-	case 'M':
-	case 'N':
-	case 'O':
-	case 'P':
-	case 'Q':
-	case 'R':
-	case 'S':
-	case 'T':
-	case 'U':
-	case 'V':
-	case 'W':
-	case 'X':
-	case 'Y':
-	case 'Z':
-	case '_':
-	case 'a':
-	case 'b':
-	case 'c':
-	case 'd':
-	case 'e':
-	case 'f':
-	case 'g':
-	case 'h':
-	case 'i':
-	case 'j':
-	case 'k':
-	case 'l':
-	case 'm':
-	case 'n':
-	case 'o':
-	case 'p':
-	case 'q':
-	case 'r':
-	case 's':
-	case 't':
-	case 'u':
-	case 'v':
-	case 'w':
-	case 'x':
-	case 'y':
-	case 'z':	goto yy30;
-	default:	goto yy32;
+		case '0':
+		case '1':
+		case '2':
+		case '3':
+		case '4':
+		case '5':
+		case '6':
+		case '7':
+		case '8':
+		case '9':
+		case 'A':
+		case 'B':
+		case 'C':
+		case 'D':
+		case 'E':
+		case 'F':
+		case 'G':
+		case 'H':
+		case 'I':
+		case 'J':
+		case 'K':
+		case 'L':
+		case 'M':
+		case 'N':
+		case 'O':
+		case 'P':
+		case 'Q':
+		case 'R':
+		case 'S':
+		case 'T':
+		case 'U':
+		case 'V':
+		case 'W':
+		case 'X':
+		case 'Y':
+		case 'Z':
+		case '_':
+		case 'a':
+		case 'b':
+		case 'c':
+		case 'd':
+		case 'e':
+		case 'f':
+		case 'g':
+		case 'h':
+		case 'i':
+		case 'j':
+		case 'k':
+		case 'l':
+		case 'm':
+		case 'n':
+		case 'o':
+		case 'p':
+		case 'q':
+		case 'r':
+		case 's':
+		case 't':
+		case 'u':
+		case 'v':
+		case 'w':
+		case 'x':
+		case 'y':
+		case 'z': goto yy24;
+		default: goto yy25;
 	}
-yy32:
+yy25:
 	{ RET(PDO_PARSER_BIND); }
-yy33:
+yy26:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	switch (yych) {
-	case ':':	goto yy33;
-	default:	goto yy35;
+		case ':': goto yy26;
+		default: goto yy27;
 	}
-yy35:
+yy27:
 	{ RET(PDO_PARSER_TEXT); }
-yy36:
+yy28:
 	++YYCURSOR;
 	{ RET(PDO_PARSER_ESCAPED_QUESTION); }
-yy38:
+yy29:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	switch (yych) {
-	case '*':	goto yy38;
-	case '/':	goto yy40;
-	default:	goto yy28;
+		case '*': goto yy29;
+		case '/': goto yy30;
+		default: goto yy23;
 	}
-yy40:
+yy30:
 	++YYCURSOR;
-	goto yy27;
+	goto yy22;
 }
 
 }

php-8.3.7.tar.xz/ext/pdo/pdo_stmt.c -> php-8.3.21.tar.xz/ext/pdo/pdo_stmt.c Changed

@@ -1252,6 +1252,7 @@
 	zval *arg2 = NULL;
 	zend_class_entry *old_ce;
 	zval old_ctor_args, *ctor_args = NULL;
+	HashTable *current_ctor = NULL;
 	bool error = false;
 	int flags, old_arg_count;
 
@@ -1269,6 +1270,10 @@
 
 	old_ce = stmt->fetch.cls.ce;
 	ZVAL_COPY_VALUE(&old_ctor_args, &stmt->fetch.cls.ctor_args);
+	if (Z_TYPE(old_ctor_args) == IS_ARRAY) {
+		/* Protect against destruction by marking this as immutable: we consider this non-owned temporarily */
+		Z_TYPE_INFO(stmt->fetch.cls.ctor_args) = IS_ARRAY;
+	}
 	old_arg_count = stmt->fetch.cls.fci.param_count;
 
 	do_fetch_opt_finish(stmt, 0);
@@ -1293,7 +1298,13 @@
 			}
 
 			if (ctor_args && zend_hash_num_elements(Z_ARRVAL_P(ctor_args)) > 0) {
-				ZVAL_COPY_VALUE(&stmt->fetch.cls.ctor_args, ctor_args); /* we're not going to free these */
+				/* We increase the refcount and store it in case usercode has been messing around with the ctor args.
+				 * We need to store current_ctor separately as usercode may change the ctor_args which will cause a leak. */
+				current_ctor = Z_ARRVAL_P(ctor_args);
+				ZVAL_COPY(&stmt->fetch.cls.ctor_args, ctor_args);
+				/* Protect against destruction by marking this as immutable: we consider this non-owned
+				 * as destruction is handled via current_ctor. */
+				Z_TYPE_INFO(stmt->fetch.cls.ctor_args) = IS_ARRAY;
 			} else {
 				ZVAL_UNDEF(&stmt->fetch.cls.ctor_args);
 			}
@@ -1365,6 +1376,7 @@
 	}
 
 	PDO_STMT_CLEAR_ERR();
+
 	if ((how & PDO_FETCH_GROUP) || how == PDO_FETCH_KEY_PAIR ||
 		(how == PDO_FETCH_USE_DEFAULT && stmt->default_fetch_type == PDO_FETCH_KEY_PAIR)
 	) {
@@ -1389,9 +1401,15 @@
 	}
 
 	do_fetch_opt_finish(stmt, 0);
+	if (current_ctor) {
+		zend_array_release(current_ctor);
+	}
 
 	/* Restore defaults which were changed by PDO_FETCH_CLASS mode */
 	stmt->fetch.cls.ce = old_ce;
+	/* ctor_args may have been changed to an owned object in the meantime, so destroy it.
+	 * If it was not, then the type flags update will have protected us against destruction. */
+	zval_ptr_dtor(&stmt->fetch.cls.ctor_args);
 	ZVAL_COPY_VALUE(&stmt->fetch.cls.ctor_args, &old_ctor_args);
 	stmt->fetch.cls.fci.param_count = old_arg_count;
 
@@ -2076,6 +2094,26 @@
 	return fbc;
 }
 
+static HashTable *dbstmt_get_gc(zend_object *object, zval **gc_data, int *gc_count)
+{
+	pdo_stmt_t *stmt = php_pdo_stmt_fetch_object(object);
+
+	zend_get_gc_buffer *gc_buffer = zend_get_gc_buffer_create();
+	zend_get_gc_buffer_add_zval(gc_buffer, &stmt->database_object_handle);
+	zend_get_gc_buffer_add_zval(gc_buffer, &stmt->fetch.into);
+	zend_get_gc_buffer_use(gc_buffer, gc_data, gc_count);
+
+	/**
+	 * If there are no dynamic properties and the default property is 1 (that is, there is only one property
+	 * of string that does not participate in GC), there is no need to call zend_std_get_properties().
+	 */
+	if (object->properties == NULL && object->ce->default_properties_count <= 1) {
+		return NULL;
+	} else {
+		return zend_std_get_properties(object);
+	}
+}
+
 zend_object_handlers pdo_dbstmt_object_handlers;
 zend_object_handlers pdo_row_object_handlers;
 
@@ -2450,6 +2488,18 @@
 	return NULL;
 }
 
+static zval *pdo_row_get_property_ptr_ptr(zend_object *object, zend_string *name, int type, void **cache_slot)
+{
+	ZEND_IGNORE_VALUE(object);
+	ZEND_IGNORE_VALUE(name);
+	ZEND_IGNORE_VALUE(type);
+
+	if (cache_slot) {
+		cache_slot0 = cache_slot1 = cache_slot2 = NULL;
+	}
+	return NULL;
+}
+
 void pdo_row_free_storage(zend_object *std)
 {
 	pdo_row_t *row = (pdo_row_t *)std;
@@ -2457,6 +2507,7 @@
 		ZVAL_UNDEF(&row->stmt->lazy_object_ref);
 		OBJ_RELEASE(&row->stmt->std);
 	}
+	zend_object_std_dtor(std);
 }
 
 zend_object *pdo_row_new(zend_class_entry *ce)
@@ -2482,6 +2533,7 @@
 	pdo_dbstmt_object_handlers.get_method = dbstmt_method_get;
 	pdo_dbstmt_object_handlers.compare = zend_objects_not_comparable;
 	pdo_dbstmt_object_handlers.clone_obj = NULL;
+	pdo_dbstmt_object_handlers.get_gc = dbstmt_get_gc;
 
 	pdo_row_ce = register_class_PDORow();
 	pdo_row_ce->create_object = pdo_row_new;
@@ -2490,7 +2542,7 @@
 	memcpy(&pdo_row_object_handlers, &std_object_handlers, sizeof(zend_object_handlers));
 	pdo_row_object_handlers.free_obj = pdo_row_free_storage;
 	pdo_row_object_handlers.clone_obj = NULL;
-	pdo_row_object_handlers.get_property_ptr_ptr = NULL;
+	pdo_row_object_handlers.get_property_ptr_ptr = pdo_row_get_property_ptr_ptr;
 	pdo_row_object_handlers.read_property = row_prop_read;
 	pdo_row_object_handlers.write_property = row_prop_write;
 	pdo_row_object_handlers.has_property = row_prop_exists;

php-8.3.21.tar.xz/ext/pdo/tests/gh16703.phpt Added

@@ -0,0 +1,48 @@
+--TEST--
+GH-16703: Memory leak of setFetchMode()
+--EXTENSIONS--
+pdo
+--SKIPIF--
+<?php
+$dir = getenv('REDIR_TEST_DIR');
+if (false == $dir) die('skip no driver');
+require_once $dir . 'pdo_test.inc';
+PDOTest::skip();
+?>
+--FILE--
+<?php
+if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.__DIR__ . '/../../pdo/tests/');
+class TestStmt extends PDOStatement
+{
+    public $name;
+}
+
+$db = new PDO(
+    getenv('PDOTEST_DSN'),
+    getenv('PDOTEST_USER') ?: null,
+    getenv('PDOTEST_PASS') ?: null,
+    
+        PDO::ATTR_CASE => PDO::CASE_LOWER,
+        PDO::ATTR_STATEMENT_CLASS => TestStmt::class,
+    ,
+);
+
+$db->exec('CREATE TABLE gh16703 (name varchar(255))');
+$db->exec("INSERT INTO gh16703 (name) VALUES ('test_name')");
+
+$stmt = $db->query('SELECT name FROM gh16703');
+$t = $stmt;
+$stmt->setFetchMode(PDO::FETCH_INTO, $stmt);
+$stmt->fetch();
+echo "done!\n";
+?>
+--CLEAN--
+<?php
+if (getenv('PDOTEST_DSN') === 'sqlite::memory:') return;
+
+require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
+$db = PDOTest::factory();
+$db->exec('DROP TABLE gh16703');
+?>
+--EXPECT--
+done!

php-8.3.21.tar.xz/ext/pdo/tests/pdo_fetch_class_change_ctor_args_during_fetch1.phpt Added

@@ -0,0 +1,54 @@
+--TEST--
+PDO Common: PDO::FETCH_CLASS with a constructor that changes the ctor args within PDO::fetch()
+--EXTENSIONS--
+pdo
+--SKIPIF--
+<?php
+$dir = getenv('REDIR_TEST_DIR');
+if (false == $dir) die('skip no driver');
+require_once $dir . 'pdo_test.inc';
+PDOTest::skip();
+?>
+--FILE--
+<?php
+if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.__DIR__ . '/../../pdo/tests/');
+require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
+$db = PDOTest::factory();
+
+class Test {
+    public string $val1;
+    public string $val2;
+
+    public function __construct(mixed $v) {
+        var_dump($v);
+        if ($v instanceof PDOStatement) {
+            $v->setFetchMode(PDO::FETCH_CLASS, 'Test', $this->val2);
+        }
+    }
+}
+
+// TODO Rename test table to pdo_fetch_class_change_ctor_one in PHP-8.4
+$db->exec('CREATE TABLE test(id int NOT NULL PRIMARY KEY, val1 VARCHAR(10), val2 VARCHAR(10))');
+$db->exec("INSERT INTO test VALUES(1, 'A', 'alpha')");
+$db->exec("INSERT INTO test VALUES(2, 'B', 'beta')");
+$db->exec("INSERT INTO test VALUES(3, 'C', 'gamma')");
+$db->exec("INSERT INTO test VALUES(4, 'D', 'delta')");
+
+$stmt = $db->prepare('SELECT val1, val2 FROM test');
+$stmt->setFetchMode(PDO::FETCH_CLASS, 'Test', $stmt);
+
+$stmt->execute();
+var_dump($stmt->fetch());
+
+?>
+--EXPECTF--
+object(PDOStatement)#%d (1) {
+  "queryString"=>
+  string(27) "SELECT val1, val2 FROM test"
+}
+object(Test)#%d (2) {
+  "val1"=>
+  string(1) "A"
+  "val2"=>
+  string(5) "alpha"
+}

php-8.3.21.tar.xz/ext/pdo/tests/pdo_fetch_class_change_ctor_args_during_fetch2.phpt Added

@@ -0,0 +1,53 @@
+--TEST--
+PDO Common: PDO::FETCH_CLASS with a constructor that changes the ctor args within PDO::fetchObject()
+--EXTENSIONS--
+pdo
+--SKIPIF--
+<?php
+$dir = getenv('REDIR_TEST_DIR');
+if (false == $dir) die('skip no driver');
+require_once $dir . 'pdo_test.inc';
+PDOTest::skip();
+?>
+--FILE--
+<?php
+if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.__DIR__ . '/../../pdo/tests/');
+require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
+$db = PDOTest::factory();
+
+class Test {
+    public string $val1;
+    public string $val2;
+
+    public function __construct(mixed $v) {
+        var_dump($v);
+        if ($v instanceof PDOStatement) {
+            $v->setFetchMode(PDO::FETCH_CLASS, 'Test', $this->val2);
+        }
+    }
+}
+
+// TODO Rename test table to pdo_fetch_class_change_ctor_two in PHP-8.4
+$db->exec('CREATE TABLE test(id int NOT NULL PRIMARY KEY, val1 VARCHAR(10), val2 VARCHAR(10))');
+$db->exec("INSERT INTO test VALUES(1, 'A', 'alpha')");
+$db->exec("INSERT INTO test VALUES(2, 'B', 'beta')");
+$db->exec("INSERT INTO test VALUES(3, 'C', 'gamma')");
+$db->exec("INSERT INTO test VALUES(4, 'D', 'delta')");
+
+$stmt = $db->prepare('SELECT val1, val2 FROM test');
+
+$stmt->execute();
+var_dump($stmt->fetchObject('Test', $stmt));
+
+?>
+--EXPECTF--
+object(PDOStatement)#%s (1) {
+  "queryString"=>
+  string(27) "SELECT val1, val2 FROM test"
+}
+object(Test)#%s (2) {
+  "val1"=>
+  string(1) "A"
+  "val2"=>
+  string(5) "alpha"
+}

php-8.3.21.tar.xz/ext/pdo/tests/pdo_fetch_class_change_ctor_args_during_fetch3.phpt Added

@@ -0,0 +1,81 @@
+--TEST--
+PDO Common: PDO::FETCH_CLASS with a constructor that changes the ctor args within PDO::fetchAll() (no args variation)
+--EXTENSIONS--
+pdo
+--SKIPIF--
+<?php
+$dir = getenv('REDIR_TEST_DIR');
+if (false == $dir) die('skip no driver');
+require_once $dir . 'pdo_test.inc';
+PDOTest::skip();
+?>
+--FILE--
+<?php
+if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.__DIR__ . '/../../pdo/tests/');
+require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
+$db = PDOTest::factory();
+
+class Test {
+    public string $val1;
+    public string $val2;
+
+    public function __construct(mixed $v) {
+        var_dump($v);
+        if ($v instanceof PDOStatement) {
+            $v->setFetchMode(PDO::FETCH_CLASS, 'Test', $this->val2);
+        }
+    }
+}
+
+// TODO Rename test table to pdo_fetch_class_change_ctor_three in PHP-8.4
+$db->exec('CREATE TABLE test(id int NOT NULL PRIMARY KEY, val1 VARCHAR(10), val2 VARCHAR(10))');
+$db->exec("INSERT INTO test VALUES(1, 'A', 'alpha')");
+$db->exec("INSERT INTO test VALUES(2, 'B', 'beta')");
+$db->exec("INSERT INTO test VALUES(3, 'C', 'gamma')");
+$db->exec("INSERT INTO test VALUES(4, 'D', 'delta')");
+
+$stmt = $db->prepare('SELECT val1, val2 FROM test');
+$stmt->setFetchMode(PDO::FETCH_CLASS, 'Test', $stmt);
+
+$stmt->execute();
+var_dump($stmt->fetchAll());
+
+?>
+--EXPECTF--
+object(PDOStatement)#%d (1) {
+  "queryString"=>
+  string(27) "SELECT val1, val2 FROM test"
+}
+string(5) "alpha"
+string(5) "alpha"
+string(5) "alpha"
+array(4) {
+  0=>
+  object(Test)#%d (2) {
+    "val1"=>
+    string(1) "A"
+    "val2"=>
+    string(5) "alpha"
+  }
+  1=>
+  object(Test)#%d (2) {
+    "val1"=>
+    string(1) "B"
+    "val2"=>
+    string(4) "beta"
+  }
+  2=>
+  object(Test)#%d (2) {
+    "val1"=>
+    string(1) "C"
+    "val2"=>
+    string(5) "gamma"
+  }
+  3=>
+  object(Test)#%d (2) {
+    "val1"=>
+    string(1) "D"
+    "val2"=>
+    string(5) "delta"
+  }
+}

php-8.3.21.tar.xz/ext/pdo/tests/pdo_fetch_class_change_ctor_args_during_fetch4.phpt Added

@@ -0,0 +1,80 @@
+--TEST--
+PDO Common: PDO::FETCH_CLASS with a constructor that changes the ctor args within PDO::fetchAll() (args in fetchAll)
+--EXTENSIONS--
+pdo
+--SKIPIF--
+<?php
+$dir = getenv('REDIR_TEST_DIR');
+if (false == $dir) die('skip no driver');
+require_once $dir . 'pdo_test.inc';
+PDOTest::skip();
+?>
+--FILE--
+<?php
+if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.__DIR__ . '/../../pdo/tests/');
+require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
+$db = PDOTest::factory();
+
+class Test {
+    public string $val1;
+    public string $val2;
+
+    public function __construct(mixed $v) {
+        var_dump($v);
+        if ($v instanceof PDOStatement) {
+            $v->setFetchMode(PDO::FETCH_CLASS, 'Test', $this->val2);
+        }
+    }
+}
+
+// TODO Rename test table to pdo_fetch_class_change_ctor_four in PHP-8.4
+$db->exec('CREATE TABLE test(id int NOT NULL PRIMARY KEY, val1 VARCHAR(10), val2 VARCHAR(10))');
+$db->exec("INSERT INTO test VALUES(1, 'A', 'alpha')");
+$db->exec("INSERT INTO test VALUES(2, 'B', 'beta')");
+$db->exec("INSERT INTO test VALUES(3, 'C', 'gamma')");
+$db->exec("INSERT INTO test VALUES(4, 'D', 'delta')");
+
+$stmt = $db->prepare('SELECT val1, val2 FROM test');
+
+$stmt->execute();
+var_dump($stmt->fetchAll(PDO::FETCH_CLASS, 'Test', $stmt));
+
+?>
+--EXPECTF--
+object(PDOStatement)#%d (1) {
+  "queryString"=>
+  string(27) "SELECT val1, val2 FROM test"
+}
+string(5) "alpha"
+string(5) "alpha"
+string(5) "alpha"
+array(4) {
+  0=>
+  object(Test)#%d (2) {
+    "val1"=>
+    string(1) "A"
+    "val2"=>
+    string(5) "alpha"
+  }
+  1=>
+  object(Test)#%d (2) {
+    "val1"=>
+    string(1) "B"
+    "val2"=>
+    string(4) "beta"
+  }
+  2=>
+  object(Test)#%d (2) {
+    "val1"=>
+    string(1) "C"
+    "val2"=>
+    string(5) "gamma"
+  }
+  3=>
+  object(Test)#%d (2) {
+    "val1"=>
+    string(1) "D"
+    "val2"=>
+    string(5) "delta"
+  }
+}

php-8.3.21.tar.xz/ext/pdo/tests/pdo_fetch_class_change_ctor_args_during_fetch5.phpt Added

@@ -0,0 +1,50 @@
+--TEST--
+PDO Common: PDO::FETCH_CLASS with a constructor that changes the ctor args within PDO::fetchAll() (via warning and error handler)
+--EXTENSIONS--
+pdo
+--SKIPIF--
+<?php
+$dir = getenv('REDIR_TEST_DIR');
+if (false == $dir) die('skip no driver');
+require_once $dir . 'pdo_test.inc';
+PDOTest::skip();
+?>
+--FILE--
+<?php
+if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.__DIR__ . '/../../pdo/tests/');
+require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
+$db = PDOTest::factory();
+
+// Warning to hook into error handler
+$db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_WARNING);
+
+class B {
+    public function __construct() {}
+}
+
+// TODO Rename test table to pdo_fetch_class_change_ctor_five in PHP-8.4
+$db->exec('CREATE TABLE test(id int NOT NULL PRIMARY KEY, val1 VARCHAR(10), val2 VARCHAR(10))');
+$db->exec("INSERT INTO test VALUES(1, 'A', 'alpha')");
+$db->exec("INSERT INTO test VALUES(2, 'B', 'beta')");
+$db->exec("INSERT INTO test VALUES(3, 'C', 'gamma')");
+$db->exec("INSERT INTO test VALUES(4, 'D', 'delta')");
+
+$stmt = $db->prepare('SELECT val1, val2 FROM test');
+$stmt->execute();
+
+function stuffingErrorHandler(int $errno, string $errstr, string $errfile, int $errline) {
+    global $stmt;
+    $stmt->setFetchMode(PDO::FETCH_CLASS, 'B', $errstr);
+    echo $errstr, PHP_EOL;
+}
+set_error_handler(stuffingErrorHandler(...));
+
+var_dump($stmt->fetchAll(PDO::FETCH_CLASS|PDO::FETCH_SERIALIZE, 'B', $stmt));
+
+?>
+--EXPECTF--
+PDOStatement::fetchAll(): The PDO::FETCH_SERIALIZE mode is deprecated
+PDOStatement::fetchAll(): SQLSTATEHY000: General error: cannot unserialize class
+PDOStatement::fetchAll(): SQLSTATEHY000: General error%S
+array(0) {
+}

php-8.3.21.tar.xz/ext/pdo/tests/pdo_fetch_class_cyclic_ctor.phpt Added

@@ -0,0 +1,54 @@
+--TEST--
+PDO Common: PDO::FETCH_CLASS with a constructor that changes the ctor args within PDO::fetch()
+--EXTENSIONS--
+pdo
+--SKIPIF--
+<?php
+$dir = getenv('REDIR_TEST_DIR');
+if (false == $dir) die('skip no driver');
+require_once $dir . 'pdo_test.inc';
+PDOTest::skip();
+?>
+--FILE--
+<?php
+if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.__DIR__ . '/../../pdo/tests/');
+require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
+$db = PDOTest::factory();
+
+class Test {
+    public string $val1;
+    public string $val2;
+
+    public function __construct(mixed $v) {
+        var_dump($v);
+    }
+}
+
+// TODO Rename test table to pdo_fetch_class_cyclic_ctor in PHP-8.4
+$db->exec('CREATE TABLE test(id int NOT NULL PRIMARY KEY, val1 VARCHAR(10), val2 VARCHAR(10))');
+$db->exec("INSERT INTO test VALUES(1, 'A', 'alpha')");
+$db->exec("INSERT INTO test VALUES(2, 'B', 'beta')");
+$db->exec("INSERT INTO test VALUES(3, 'C', 'gamma')");
+$db->exec("INSERT INTO test VALUES(4, 'D', 'delta')");
+
+$args = ;
+$args = &$args;
+
+$stmt = $db->prepare('SELECT val1, val2 FROM test');
+$stmt->setFetchMode(PDO::FETCH_CLASS, 'Test', $args);
+
+$stmt->execute();
+var_dump($stmt->fetch());
+
+?>
+--EXPECTF--
+array(1) {
+  0=>
+  *RECURSION*
+}
+object(Test)#%d (2) {
+  "val1"=>
+  string(1) "A"
+  "val2"=>
+  string(5) "alpha"
+}

php-8.3.21.tar.xz/ext/pdo/tests/pdo_stmt_cyclic_references.phpt Added

@@ -0,0 +1,132 @@
+--TEST--
+PDO Common: Cyclic PDOStatement child class
+--EXTENSIONS--
+pdo
+--SKIPIF--
+<?php
+$dir = getenv('REDIR_TEST_DIR');
+if (false == $dir) die('skip no driver');
+require_once $dir . 'pdo_test.inc';
+PDOTest::skip();
+?>
+--FILE--
+<?php
+if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.__DIR__ . '/../../pdo/tests/');
+require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
+
+class Ref {
+    public CyclicStatement $stmt;
+}
+
+class CyclicStatement extends PDOStatement {
+    protected function __construct(public Ref $ref) {}
+}
+
+class TestRow {
+    public $id;
+    public $val;
+    public $val2;
+
+    public function __construct(public string $arg) {}
+}
+
+$db = PDOTest::factory();
+$db->exec('CREATE TABLE test(id INT NOT NULL PRIMARY KEY, val VARCHAR(10), val2 VARCHAR(10))');
+$db->exec("INSERT INTO test VALUES(1, 'A', 'AA')");
+$db->exec("INSERT INTO test VALUES(2, 'B', 'BB')");
+$db->exec("INSERT INTO test VALUES(3, 'C', 'CC')");
+
+$db->setAttribute(PDO::ATTR_STATEMENT_CLASS, 'CyclicStatement', new Ref);
+
+echo "Column fetch:\n";
+$stmt = $db->query('SELECT id, val2, val FROM test');
+$stmt->ref->stmt = $stmt;
+$stmt->setFetchMode(PDO::FETCH_COLUMN, 2);
+foreach($stmt as $obj) {
+    var_dump($obj);
+}
+
+echo "Class fetch:\n";
+$stmt = $db->query('SELECT id, val2, val FROM test');
+$stmt->ref->stmt = $stmt;
+$stmt->setFetchMode(PDO::FETCH_CLASS, 'TestRow', 'Hello world');
+foreach($stmt as $obj) {
+    var_dump($obj);
+}
+
+echo "Fetch into:\n";
+$stmt = $db->query('SELECT id, val2, val FROM test');
+$stmt->ref->stmt = $stmt;
+$stmt->setFetchMode(PDO::FETCH_INTO, new TestRow('I am being fetch into'));
+foreach($stmt as $obj) {
+    var_dump($obj);
+}
+
+?>
+--EXPECTF--
+Column fetch:
+string(1) "A"
+string(1) "B"
+string(1) "C"
+Class fetch:
+object(TestRow)#%d (4) {
+  "id"=>
+  string(1) "1"
+  "val"=>
+  string(1) "A"
+  "val2"=>
+  string(2) "AA"
+  "arg"=>
+  string(11) "Hello world"
+}
+object(TestRow)#%d (4) {
+  "id"=>
+  string(1) "2"
+  "val"=>
+  string(1) "B"
+  "val2"=>
+  string(2) "BB"
+  "arg"=>
+  string(11) "Hello world"
+}
+object(TestRow)#%d (4) {
+  "id"=>
+  string(1) "3"
+  "val"=>
+  string(1) "C"
+  "val2"=>
+  string(2) "CC"
+  "arg"=>
+  string(11) "Hello world"
+}
+Fetch into:
+object(TestRow)#4 (4) {
+  "id"=>
+  string(1) "1"
+  "val"=>
+  string(1) "A"
+  "val2"=>
+  string(2) "AA"
+  "arg"=>
+  string(21) "I am being fetch into"
+}
+object(TestRow)#4 (4) {
+  "id"=>
+  string(1) "2"
+  "val"=>
+  string(1) "B"
+  "val2"=>
+  string(2) "BB"
+  "arg"=>
+  string(21) "I am being fetch into"
+}
+object(TestRow)#4 (4) {
+  "id"=>
+  string(1) "3"
+  "val"=>
+  string(1) "C"
+  "val2"=>
+  string(2) "CC"
+  "arg"=>
+  string(21) "I am being fetch into"
+}

php-8.3.7.tar.xz/ext/pdo_dblib/dblib_driver.c -> php-8.3.21.tar.xz/ext/pdo_dblib/dblib_driver.c Changed

php-8.3.21.tar.xz/ext/pdo_dblib/tests/GHSA-5hqh-c84r-qjcv.phpt Added

php-8.3.7.tar.xz/ext/pdo_firebird/firebird_driver.c -> php-8.3.21.tar.xz/ext/pdo_firebird/firebird_driver.c Changed

@@ -492,13 +492,13 @@
 	}
 
 	if (H->date_format) {
-		efree(H->date_format);
+		pefree(H->date_format, dbh->is_persistent);
 	}
 	if (H->time_format) {
-		efree(H->time_format);
+		pefree(H->time_format, dbh->is_persistent);
 	}
 	if (H->timestamp_format) {
-		efree(H->timestamp_format);
+		pefree(H->timestamp_format, dbh->is_persistent);
 	}
 
 	pefree(H, dbh->is_persistent);
@@ -664,7 +664,7 @@
 /* called by the PDO SQL parser to add quotes to values that are copied into SQL */
 static zend_string* firebird_handle_quoter(pdo_dbh_t *dbh, const zend_string *unquoted, enum pdo_param_type paramtype)
 {
-	int qcount = 0;
+	size_t qcount = 0;
 	char const *co, *l, *r;
 	char *c;
 	size_t quotedlen;
@@ -678,6 +678,10 @@
 	/* count the number of ' characters */
 	for (co = ZSTR_VAL(unquoted); (co = strchr(co,'\'')); qcount++, co++);
 
+	if (UNEXPECTED(ZSTR_LEN(unquoted) + 2 > ZSTR_MAX_LEN - qcount)) {
+		return NULL;
+	}
+
 	quotedlen = ZSTR_LEN(unquoted) + qcount + 2;
 	quoted_str = zend_string_alloc(quotedlen, 0);
 	c = ZSTR_VAL(quoted_str);
@@ -877,9 +881,10 @@
 					return false;
 				}
 				if (H->date_format) {
-					efree(H->date_format);
+					pefree(H->date_format, dbh->is_persistent);
+					H->date_format = NULL;
 				}
-				spprintf(&H->date_format, 0, "%s", ZSTR_VAL(str));
+				H->date_format = pestrndup(ZSTR_VAL(str), ZSTR_LEN(str),dbh->is_persistent);
 				zend_string_release_ex(str, 0);
 			}
 			return true;
@@ -891,9 +896,10 @@
 					return false;
 				}
 				if (H->time_format) {
-					efree(H->time_format);
+					pefree(H->time_format, dbh->is_persistent);
+					H->time_format = NULL;
 				}
-				spprintf(&H->time_format, 0, "%s", ZSTR_VAL(str));
+				H->time_format = pestrndup(ZSTR_VAL(str), ZSTR_LEN(str),dbh->is_persistent);
 				zend_string_release_ex(str, 0);
 			}
 			return true;
@@ -905,9 +911,10 @@
 					return false;
 				}
 				if (H->timestamp_format) {
-					efree(H->timestamp_format);
+					pefree(H->timestamp_format, dbh->is_persistent);
+					H->timestamp_format = NULL;
 				}
-				spprintf(&H->timestamp_format, 0, "%s", ZSTR_VAL(str));
+				H->timestamp_format = pestrndup(ZSTR_VAL(str), ZSTR_LEN(str),dbh->is_persistent);
 				zend_string_release_ex(str, 0);
 			}
 			return true;
@@ -977,8 +984,7 @@
 				ZVAL_STRING(val, tmp);
 				return 1;
 			}
-			/* TODO Check this is correct? */
-			ZEND_FALLTHROUGH;
+			return -1;
 
 		case PDO_ATTR_FETCH_TABLE_NAMES:
 			ZVAL_BOOL(val, H->fetch_table_names);

php-8.3.7.tar.xz/ext/pdo_firebird/firebird_statement.c -> php-8.3.21.tar.xz/ext/pdo_firebird/firebird_statement.c Changed

php-8.3.21.tar.xz/ext/pdo_firebird/tests/gh18276.phpt Added

@@ -0,0 +1,35 @@
+--TEST--
+GH-18276 (persistent connection - setAttribute(Pdo\Firebird::ATTR_DATE_FORMAT, ..) results in "zend_mm_heap corrupted")
+--EXTENSIONS--
+pdo_firebird
+--SKIPIF--
+<?php require('skipif.inc'); ?>
+--XLEAK--
+A bug in firebird causes a memory leak when calling `isc_attach_database()`.
+See https://github.com/FirebirdSQL/firebird/issues/7849
+--FILE--
+<?php
+
+require("testdb.inc");
+unset($dbh);
+
+for ($i = 0; $i < 2; $i++) {
+    $dbh = new PDO(
+        PDO_FIREBIRD_TEST_DSN,
+        PDO_FIREBIRD_TEST_USER,
+        PDO_FIREBIRD_TEST_PASS,
+        
+            PDO::ATTR_PERSISTENT => true,
+        ,
+    );
+    // Avoid interned
+    $dbh->setAttribute(PDO::FB_ATTR_DATE_FORMAT, str_repeat('Y----m----d', random_int(1, 1)));
+    $dbh->setAttribute(PDO::FB_ATTR_TIME_FORMAT, str_repeat('H::::i::::s', random_int(1, 1)));
+    $dbh->setAttribute(PDO::FB_ATTR_TIMESTAMP_FORMAT, str_repeat('Y----m----d....H::::i::::s', random_int(1, 1)));
+    unset($dbh);
+}
+
+echo 'done!';
+?>
+--EXPECT--
+done!

php-8.3.7.tar.xz/ext/pdo_mysql/mysql_statement.c -> php-8.3.21.tar.xz/ext/pdo_mysql/mysql_statement.c Changed

php-8.3.7.tar.xz/ext/pdo_odbc/odbc_stmt.c -> php-8.3.21.tar.xz/ext/pdo_odbc/odbc_stmt.c Changed

@@ -32,7 +32,7 @@
 	PDO_ODBC_CONV_FAIL
 };
 
-static int pdo_odbc_sqltype_is_unicode(pdo_odbc_stmt *S, SWORD sqltype)
+static int pdo_odbc_sqltype_is_unicode(pdo_odbc_stmt *S, SQLSMALLINT sqltype)
 {
 	if (!S->assume_utf8) return 0;
 	switch (sqltype) {
@@ -136,7 +136,11 @@
 {
 	pdo_odbc_stmt *S = (pdo_odbc_stmt*)stmt->driver_data;
 
-	if (S->stmt != SQL_NULL_HANDLE) {
+	// TODO: Factor this out; pg/mysql/firebird do the same thing
+	bool server_obj_usable = !Z_ISUNDEF(stmt->database_object_handle)
+		&& IS_OBJ_VALID(EG(objects_store).object_bucketsZ_OBJ_HANDLE(stmt->database_object_handle))
+		&& !(OBJ_FLAGS(Z_OBJ(stmt->database_object_handle)) & IS_OBJ_FREE_CALLED);
+	if (S->stmt != SQL_NULL_HANDLE && server_obj_usable) {
 		if (stmt->executed) {
 			SQLCloseCursor(S->stmt);
 		}
@@ -287,7 +291,7 @@
 {
 	pdo_odbc_stmt *S = (pdo_odbc_stmt*)stmt->driver_data;
 	RETCODE rc;
-	SWORD sqltype = 0, ctype = 0, scale = 0, nullable = 0;
+	SQLSMALLINT sqltype = 0, ctype = 0, scale = 0, nullable = 0;
 	SQLULEN precision = 0;
 	pdo_odbc_param *P;
 	zval *parameter;
@@ -563,7 +567,7 @@
 	pdo_odbc_stmt *S = (pdo_odbc_stmt*)stmt->driver_data;
 	struct pdo_column_data *col = &stmt->columnscolno;
 	RETCODE rc;
-	SWORD	colnamelen;
+	SQLSMALLINT colnamelen;
 	SQLULEN	colsize;
 	SQLLEN displaysize = 0;
 
@@ -689,11 +693,12 @@
 				/* read block. 256 bytes => 255 bytes are actually read, the last 1 is NULL */
 				rc = SQLGetData(S->stmt, colno+1, C->is_unicode ? SQL_C_BINARY : SQL_C_CHAR, buf2, 256, &C->fetched_len);
 
-				/* adjust `used` in case we have length info from the driver */
+				/* adjust `used` in case we have proper length info from the driver */
 				if (orig_fetched_len >= 0 && C->fetched_len >= 0) {
 					SQLLEN fixed_used = orig_fetched_len - C->fetched_len;
-					ZEND_ASSERT(fixed_used <= used + 1);
-					used = fixed_used;
+					if (fixed_used <= used + 1) {
+						used = fixed_used;
+					}
 				}
 
 				/* resize output buffer and reassemble block */

php-8.3.7.tar.xz/ext/pdo_odbc/php_pdo_odbc_int.h -> php-8.3.21.tar.xz/ext/pdo_odbc/php_pdo_odbc_int.h Changed

php-8.3.21.tar.xz/ext/pdo_odbc/tests/gh16450.phpt Added

@@ -0,0 +1,35 @@
+--TEST--
+GH-16450 (PDO_ODBC can inject garbage into field values)
+--EXTENSIONS--
+pdo_odbc
+--SKIPIF--
+<?php
+$dbpath = __DIR__ . "/test.mdb";
+try {
+    new PDO("odbc:Driver={Microsoft Access Driver (*.mdb, *.accdb)};Dbq=$dbpath;Uid=Admin;Pwd=;");
+} catch (PDOException $ex) {
+    die("skip Cannot connect to MS Access database");
+}
+?>
+--FILE--
+<?php
+$dbpath = __DIR__ . "/test.mdb";
+$pdo = new PDO("odbc:Driver={Microsoft Access Driver (*.mdb, *.accdb)};Dbq=$dbpath;Uid=Admin;Pwd=;");
+
+$pdo->exec("CREATE TABLE gh16450 (Id INT, MyLongText LONGCHAR)");
+$pdo->exec(sprintf("INSERT INTO gh16450 VALUES (1, '%s')", str_repeat("_", 2048)));
+$pdo->exec(sprintf("INSERT INTO gh16450 VALUES (1, '%s')", str_repeat("_", 2049)));
+
+$stmt = $pdo->query("SELECT MyLongText FROM gh16450");
+var_dump($stmt->fetchColumn(0));
+var_dump($stmt->fetchColumn(0));
+?>
+--CLEAN--
+<?php
+$dbpath = __DIR__ . "/test.mdb";
+$pdo = new PDO("odbc:Driver={Microsoft Access Driver (*.mdb, *.accdb)};Dbq=$dbpath;Uid=Admin;Pwd=;");
+$pdo->exec("DROP TABLE gh16450");
+?>
+--EXPECT--
+string(2048) "________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________"
+string(2049) "_________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________"

php-8.3.21.tar.xz/ext/pdo_odbc/tests/test.mdb Added

php-8.3.21.tar.xz/ext/pdo_pgsql/tests/pg_debug_emulated_prepares.phpt Changed

php-8.3.7.tar.xz/ext/pdo_sqlite/sqlite_statement.c -> php-8.3.21.tar.xz/ext/pdo_sqlite/sqlite_statement.c Changed

php-8.3.21.tar.xz/ext/pdo_sqlite/tests/gh14712.phpt Added

php-8.3.21.tar.xz/ext/pdo_sqlite/tests/gh17837.phpt Added

php-8.3.21.tar.xz/ext/pdo_sqlite/tests/gh18114.phpt Added

php-8.3.7.tar.xz/ext/pgsql/pgsql.c -> php-8.3.21.tar.xz/ext/pgsql/pgsql.c Changed

@@ -984,12 +984,15 @@
 		}
 		link = FETCH_DEFAULT_LINK();
 		CHECK_DEFAULT_LINK(link);
-	} else {
+	} else if (ZEND_NUM_ARGS() == 2) {
 		if (zend_parse_parameters(ZEND_NUM_ARGS(), "Os", &pgsql_link, pgsql_link_ce, &query, &query_len) == FAILURE) {
 			RETURN_THROWS();
 		}
 		link = Z_PGSQL_LINK_P(pgsql_link);
 		CHECK_PGSQL_LINK(link);
+	} else {
+		zend_wrong_parameters_count_error(1, 2);
+		RETURN_THROWS();
 	}
 
 	pgsql = link->conn;
@@ -1078,12 +1081,15 @@
 		}
 		link = FETCH_DEFAULT_LINK();
 		CHECK_DEFAULT_LINK(link);
-	} else {
+	} else if (ZEND_NUM_ARGS() == 3) {
 		if (zend_parse_parameters(ZEND_NUM_ARGS(), "Osa", &pgsql_link, pgsql_link_ce, &query, &query_len, &pv_param_arr) == FAILURE) {
 			RETURN_THROWS();
 		}
 		link = Z_PGSQL_LINK_P(pgsql_link);
 		CHECK_PGSQL_LINK(link);
+	} else {
+		zend_wrong_parameters_count_error(2, 3);
+		RETURN_THROWS();
 	}
 
 	pgsql = link->conn;
@@ -1183,12 +1189,15 @@
 		}
 		link = FETCH_DEFAULT_LINK();
 		CHECK_DEFAULT_LINK(link);
-	} else {
+	} else if (ZEND_NUM_ARGS() == 3) {
 		if (zend_parse_parameters(ZEND_NUM_ARGS(), "Oss", &pgsql_link, pgsql_link_ce, &stmtname, &stmtname_len, &query, &query_len) == FAILURE) {
 			RETURN_THROWS();
 		}
 		link = Z_PGSQL_LINK_P(pgsql_link);
 		CHECK_PGSQL_LINK(link);
+	} else {
+		zend_wrong_parameters_count_error(2, 3);
+		RETURN_THROWS();
 	}
 
 	pgsql = link->conn;
@@ -1264,12 +1273,15 @@
 		}
 		link = FETCH_DEFAULT_LINK();
 		CHECK_DEFAULT_LINK(link);
-	} else {
+	} else if (ZEND_NUM_ARGS() == 3) {
 		if (zend_parse_parameters(ZEND_NUM_ARGS(), "Osa", &pgsql_link, pgsql_link_ce, &stmtname, &stmtname_len, &pv_param_arr) == FAILURE) {
 			RETURN_THROWS();
 		}
 		link = Z_PGSQL_LINK_P(pgsql_link);
 		CHECK_PGSQL_LINK(link);
+	} else {
+		zend_wrong_parameters_count_error(2, 3);
+		RETURN_THROWS();
 	}
 
 	pgsql = link->conn;
@@ -1710,7 +1722,7 @@
 			Z_PARAM_OBJECT_OF_CLASS(result, pgsql_result_ce)
 			Z_PARAM_STR_OR_LONG(field_name, field_offset)
 		ZEND_PARSE_PARAMETERS_END();
-	} else {
+	} else if (ZEND_NUM_ARGS() == 3) {
 		ZEND_PARSE_PARAMETERS_START(3, 3)
 			Z_PARAM_OBJECT_OF_CLASS(result, pgsql_result_ce)
 			if (zend_string_equals_literal(EG(current_execute_data)->func->common.function_name, "pg_result")) {
@@ -1720,6 +1732,9 @@
 			}
 			Z_PARAM_STR_OR_LONG(field_name, field_offset)
 		ZEND_PARSE_PARAMETERS_END();
+	} else {
+		zend_wrong_parameters_count_error(2, 3);
+		RETURN_THROWS();
 	}
 
 	pg_result = Z_PGSQL_RESULT_P(result);
@@ -2021,7 +2036,7 @@
 			Z_PARAM_OBJECT_OF_CLASS(result, pgsql_result_ce)
 			Z_PARAM_STR_OR_LONG(field_name, field_offset)
 		ZEND_PARSE_PARAMETERS_END();
-	} else {
+	} else if (ZEND_NUM_ARGS() == 3) {
 		ZEND_PARSE_PARAMETERS_START(3, 3)
 			Z_PARAM_OBJECT_OF_CLASS(result, pgsql_result_ce)
 			if (nullable_row) {
@@ -2031,6 +2046,9 @@
 			}
 			Z_PARAM_STR_OR_LONG(field_name, field_offset)
 		ZEND_PARSE_PARAMETERS_END();
+	} else {
+		zend_wrong_parameters_count_error(2, 3);
+		RETURN_THROWS();
 	}
 
 	pg_result = Z_PGSQL_RESULT_P(result);
@@ -2846,12 +2864,15 @@
 		}
 		link = FETCH_DEFAULT_LINK();
 		CHECK_DEFAULT_LINK(link);
-	} else {
+	} else if (ZEND_NUM_ARGS() == 2) {
 		if (zend_parse_parameters(ZEND_NUM_ARGS(), "Ol", &pgsql_link, pgsql_link_ce, &verbosity) == FAILURE) {
 			RETURN_THROWS();
 		}
 		link = Z_PGSQL_LINK_P(pgsql_link);
 		CHECK_PGSQL_LINK(link);
+	} else {
+		zend_wrong_parameters_count_error(1, 2);
+		RETURN_THROWS();
 	}
 
 	pgsql = link->conn;
@@ -2904,12 +2925,15 @@
 		}
 		link = FETCH_DEFAULT_LINK();
 		CHECK_DEFAULT_LINK(link);
-	} else {
+	} else if (ZEND_NUM_ARGS() == 2) {
 		if (zend_parse_parameters(ZEND_NUM_ARGS(), "Os", &pgsql_link, pgsql_link_ce, &encoding, &encoding_len) == FAILURE) {
 			RETURN_THROWS();
 		}
 		link = Z_PGSQL_LINK_P(pgsql_link);
 		CHECK_PGSQL_LINK(link);
+	} else {
+		zend_wrong_parameters_count_error(1, 2);
+		RETURN_THROWS();
 	}
 
 	pgsql = link->conn;
@@ -2993,12 +3017,15 @@
 		}
 		link = FETCH_DEFAULT_LINK();
 		CHECK_DEFAULT_LINK(link);
-	} else {
+	} else if (ZEND_NUM_ARGS() == 2) {
 		if (zend_parse_parameters(ZEND_NUM_ARGS(), "Os", &pgsql_link, pgsql_link_ce, &query, &query_len) == FAILURE) {
 			RETURN_THROWS();
 		}
 		link = Z_PGSQL_LINK_P(pgsql_link);
 		CHECK_PGSQL_LINK(link);
+	} else {
+		zend_wrong_parameters_count_error(1, 2);
+		RETURN_THROWS();
 	}
 
 	pgsql = link->conn;

php-8.3.7.tar.xz/ext/pgsql/tests/80_bug14383.phpt -> php-8.3.21.tar.xz/ext/pgsql/tests/80_bug14383.phpt Changed

php-8.3.21.tar.xz/ext/pgsql/tests/gh17158.phpt Added

php-8.3.21.tar.xz/ext/pgsql/tests/gh17165.phpt Added

@@ -0,0 +1,65 @@
+--TEST--
+Fix pg_query()/pg_query_params()/pg_prepare()/pg_execute()/pg_set_error_verbosity()/pg_set_client_encoding()/pg_put_line() pg field infos calls ArgumentCountError message.
+--EXTENSIONS--
+pgsql
+--SKIPIF--
+<?php
+include("skipif.inc");
+?>
+--FILE--
+<?php
+
+
+include "config.inc";
+
+$db = pg_connect($conn_str);
+try {
+    pg_query("a", "b", "c");
+} catch (ArgumentCountError $e) {
+    echo $e->getMessage(), PHP_EOL;
+}
+
+try {
+    pg_query_params($db, "b", array(), "d");
+} catch (ArgumentCountError $e) {
+    echo $e->getMessage(), PHP_EOL;
+}
+
+try {
+    pg_prepare($db, "a", "b", "c");
+} catch (ArgumentCountError $e) {
+    echo $e->getMessage(), PHP_EOL;
+}
+
+try {
+    pg_set_error_verbosity($db, 0, PHP_INT_MAX);
+} catch (ArgumentCountError $e) {
+    echo $e->getMessage(), PHP_EOL;
+}
+
+try {
+    pg_set_client_encoding($db, "foo", "bar");
+} catch (ArgumentCountError $e) {
+    echo $e->getMessage(), PHP_EOL;
+}
+
+try {
+    pg_put_line($db, "my", "data");
+} catch (ArgumentCountError $e) {
+    echo $e->getMessage(), PHP_EOL;
+}
+
+try {
+    pg_field_is_null($db, false, "myfield", new stdClass());
+} catch (ArgumentCountError $e) {
+    echo $e->getMessage(), PHP_EOL;
+}
+?>
+--EXPECT--
+pg_query() expects at most 2 arguments, 3 given
+pg_query_params() expects at most 3 arguments, 4 given
+pg_prepare() expects at most 3 arguments, 4 given
+pg_set_error_verbosity() expects at most 2 arguments, 3 given
+pg_set_client_encoding() expects at most 2 arguments, 3 given
+pg_put_line() expects at most 2 arguments, 3 given
+pg_field_is_null() expects at most 3 arguments, 4 given

php-8.3.7.tar.xz/ext/phar/phar.c -> php-8.3.21.tar.xz/ext/phar/phar.c Changed

@@ -457,14 +457,14 @@
 
 #ifdef WORDS_BIGENDIAN
 # define PHAR_GET_32(buffer, var) \
-	var = ((((unsigned char*)(buffer))3) << 24) \
-		| ((((unsigned char*)(buffer))2) << 16) \
-		| ((((unsigned char*)(buffer))1) <<  8) \
-		| (((unsigned char*)(buffer))0); \
+	var = ((uint32_t)(((unsigned char*)(buffer))3) << 24) \
+		| ((uint32_t)(((unsigned char*)(buffer))2) << 16) \
+		| ((uint32_t)(((unsigned char*)(buffer))1) <<  8) \
+		| ((uint32_t)((unsigned char*)(buffer))0); \
 	(buffer) += 4
 # define PHAR_GET_16(buffer, var) \
-	var = ((((unsigned char*)(buffer))1) <<  8) \
-		| (((unsigned char*)(buffer))0); \
+	var = ((uint16_t)(((unsigned char*)(buffer))1) <<  8) \
+		| ((uint16_t)((unsigned char*)(buffer))0); \
 	(buffer) += 2
 #else
 # define PHAR_GET_32(buffer, var) \
@@ -1504,6 +1504,7 @@
 			}
 		}
 
+		ZEND_ASSERT(!mydata->is_persistent);
 		mydata->alias = alias ? estrndup(alias, alias_len) : estrndup(mydata->fname, fname_len);
 		mydata->alias_len = alias ? alias_len : fname_len;
 	}
@@ -1774,7 +1775,7 @@
 				return phar_parse_zipfile(fp, fname, fname_len, alias, alias_len, pphar, error);
 			}
 
-			if (got > 512) {
+			if (got >= 512) {
 				if (phar_is_tar(pos, fname)) {
 					php_stream_rewind(fp);
 					return phar_parse_tarfile(fp, fname, fname_len, alias, alias_len, pphar, is_data, compression, error);

php-8.3.7.tar.xz/ext/phar/phar_object.c -> php-8.3.21.tar.xz/ext/phar/phar_object.c Changed

@@ -2112,9 +2112,8 @@
 	efree(newname);
 
 	if (PHAR_G(manifest_cached) && NULL != (pphar = zend_hash_str_find_ptr(&cached_phars, newpath, phar->fname_len))) {
-		efree(oldpath);
 		zend_throw_exception_ex(spl_ce_BadMethodCallException, 0, "Unable to add newly converted phar \"%s\" to the list of phars, new phar name is in phar.cache_list", phar->fname);
-		return NULL;
+		goto err_oldpath;
 	}
 
 	if (NULL != (pphar = zend_hash_str_find_ptr(&(PHAR_G(phar_fname_map)), newpath, phar->fname_len))) {
@@ -2126,41 +2125,42 @@
 				pphar->flags = phar->flags;
 				pphar->fp = phar->fp;
 				phar->fp = NULL;
-				/* FIX: GH-10755 Double-free issue caught by ASAN check */
-				pphar->alias = phar->alias; /* Transfer alias to pphar to */
-				phar->alias = NULL;         /* avoid being free'd twice   */
+				/* The alias is not owned by the phar, so set it to NULL to avoid freeing it. */
+				phar->alias = NULL;
 				phar_destroy_phar_data(phar);
 				*sphar = NULL;
 				phar = pphar;
+				/* NOTE: this phar is now reused, so the refcount must be increased. */
+				phar->refcount++;
 				newpath = oldpath;
 				goto its_ok;
 			}
 		}
 
-		efree(oldpath);
 		zend_throw_exception_ex(spl_ce_BadMethodCallException, 0, "Unable to add newly converted phar \"%s\" to the list of phars, a phar with that name already exists", phar->fname);
-		return NULL;
+		goto err_oldpath;
 	}
 its_ok:
 	if (SUCCESS == php_stream_stat_path(newpath, &ssb)) {
 		zend_throw_exception_ex(spl_ce_BadMethodCallException, 0, "phar \"%s\" exists and must be unlinked prior to conversion", newpath);
-		efree(oldpath);
-		return NULL;
+		goto err_reused_oldpath;
 	}
 	if (!phar->is_data) {
 		if (SUCCESS != phar_detect_phar_fname_ext(newpath, phar->fname_len, (const char **) &(phar->ext), &ext_len, 1, 1, 1)) {
-			efree(oldpath);
 			zend_throw_exception_ex(spl_ce_BadMethodCallException, 0, "phar \"%s\" has invalid extension %s", phar->fname, ext);
-			return NULL;
+			goto err_reused_oldpath;
 		}
 		phar->ext_len = ext_len;
 
-		if (phar->alias) {
+		/* If we are reusing a phar, then the aliases should be already set up correctly,
+		 * and so we should not clear out the alias information.
+		 * This would also leak memory because, unlike the non-reuse path, we actually own the alias memory. */
+		if (phar->alias && phar != pphar) {
 			if (phar->is_temporary_alias) {
 				phar->alias = NULL;
 				phar->alias_len = 0;
 			} else {
-				phar->alias = estrndup(newpath, strlen(newpath));
+				phar->alias = pestrndup(newpath, strlen(newpath), phar->is_persistent);
 				phar->alias_len = strlen(newpath);
 				phar->is_temporary_alias = 1;
 				zend_hash_str_update_ptr(&(PHAR_G(phar_alias_map)), newpath, phar->fname_len, phar);
@@ -2170,20 +2170,21 @@
 	} else {
 
 		if (SUCCESS != phar_detect_phar_fname_ext(newpath, phar->fname_len, (const char **) &(phar->ext), &ext_len, 0, 1, 1)) {
-			efree(oldpath);
 			zend_throw_exception_ex(spl_ce_BadMethodCallException, 0, "data phar \"%s\" has invalid extension %s", phar->fname, ext);
-			return NULL;
+			goto err_reused_oldpath;
 		}
 		phar->ext_len = ext_len;
 
-		phar->alias = NULL;
-		phar->alias_len = 0;
+		/* See comment in other branch. */
+		if (phar != pphar) {
+			phar->alias = NULL;
+			phar->alias_len = 0;
+		}
 	}
 
 	if ((!pphar || phar == pphar) && NULL == zend_hash_str_update_ptr(&(PHAR_G(phar_fname_map)), newpath, phar->fname_len, phar)) {
-		efree(oldpath);
 		zend_throw_exception_ex(spl_ce_BadMethodCallException, 0, "Unable to add newly converted phar \"%s\" to the list of phars", phar->fname);
-		return NULL;
+		goto err_oldpath;
 	}
 
 	phar_flush(phar, 0, 0, 1, &error);
@@ -2193,8 +2194,7 @@
 		*sphar = NULL;
 		zend_throw_exception_ex(spl_ce_BadMethodCallException, 0, "%s", error);
 		efree(error);
-		efree(oldpath);
-		return NULL;
+		goto err_oldpath;
 	}
 
 	efree(oldpath);
@@ -2217,6 +2217,16 @@
 	zend_call_known_instance_method_with_1_params(ce->constructor, Z_OBJ(ret), NULL, &arg1);
 	zval_ptr_dtor(&arg1);
 	return Z_OBJ(ret);
+
+err_reused_oldpath:
+	if (pphar == phar) {
+		/* NOTE: we know it's not the last reference because the phar is reused. */
+		phar->refcount--;
+	}
+	/* fallthrough */
+err_oldpath:
+	efree(oldpath);
+	return NULL;
 }
 /* }}} */
 
@@ -2300,6 +2310,9 @@
 			newentry.tar_type = (entry->is_dir ? TAR_DIR : TAR_FILE);
 		}
 
+		/* The header offset is only used for unmodified zips.
+		 * Once modified, phar_zip_changed_apply_int() will update the header_offset. */
+		newentry.header_offset = 0;
 		newentry.is_modified = 1;
 		newentry.phar = phar;
 		newentry.old_flags = newentry.flags & ~PHAR_ENT_COMPRESSION_MASK; /* remove compression from old_flags */
@@ -2744,7 +2757,7 @@
 	old_temp = phar_obj->archive->is_temporary_alias;
 
 	if (alias_len) {
-		phar_obj->archive->alias = estrndup(alias, alias_len);
+		phar_obj->archive->alias = pestrndup(alias, alias_len, phar_obj->archive->is_persistent);
 	} else {
 		phar_obj->archive->alias = NULL;
 	}
@@ -4293,7 +4306,7 @@
 			if (FAILURE == phar_extract_file(overwrite, entry, pathto, pathto_len, error)) return -1;
 			extracted++;
 		} ZEND_HASH_FOREACH_END();
-	} else if ('/' == ZSTR_VAL(search)ZSTR_LEN(search) - 1) {
+	} else if (ZSTR_LEN(search) > 0 && '/' == ZSTR_VAL(search)ZSTR_LEN(search) - 1) {
 		/* ends in "/" -- extract all entries having that prefix */
 		ZEND_HASH_MAP_FOREACH_PTR(&archive->manifest, entry) {
 			if (0 != strncmp(ZSTR_VAL(search), entry->filename, ZSTR_LEN(search))) continue;
@@ -4470,6 +4483,9 @@
 	efree(entry);
 
 	entry_obj->entry = entry_info;
+	if (!entry_info->is_persistent && !entry_info->is_temp_dir) {
+		++entry_info->fp_refcount;
+	}
 
 	ZVAL_STRINGL(&arg1, fname, fname_len);
 
@@ -4499,15 +4515,23 @@
 		RETURN_THROWS();
 	}
 
-	if (entry_obj->entry && entry_obj->entry->is_temp_dir) {
+	if (!entry_obj->entry) {
+		return;
+	}
+
+	if (entry_obj->entry->is_temp_dir) {
 		if (entry_obj->entry->filename) {
 			efree(entry_obj->entry->filename);
 			entry_obj->entry->filename = NULL;
 		}
 
 		efree(entry_obj->entry);
-		entry_obj->entry = NULL;
+	} else if (!entry_obj->entry->is_persistent) {
+		--entry_obj->entry->fp_refcount;
+		/* It is necessarily still in the manifest, which will ultimately free this. */
 	}
+
+	entry_obj->entry = NULL;
 }
 /* }}} */

php-8.3.7.tar.xz/ext/phar/phar_path_check.c -> php-8.3.21.tar.xz/ext/phar/phar_path_check.c Changed

@@ -1,4 +1,4 @@
-/* Generated by re2c 1.3 */
+/* Generated by re2c 3.0 */
 /*
   +----------------------------------------------------------------------+
   | phar php single-file executable PHP extension                        |
@@ -48,42 +48,42 @@
 	if (yych <= '') {
 		if (yych <= ')') {
 			if (yych <= '\f') {
-				if (yych >= 0x01) goto yy4;
+				if (yych >= 0x01) goto yy1;
 			} else {
-				if (yych <= '\r') goto yy6;
-				if (yych <= 0x19) goto yy4;
-				goto yy7;
+				if (yych <= '\r') goto yy3;
+				if (yych <= 0x19) goto yy1;
+				goto yy4;
 			}
 		} else {
 			if (yych <= '/') {
-				if (yych <= '*') goto yy9;
-				if (yych <= '.') goto yy7;
-				goto yy11;
-			} else {
-				if (yych == '?') goto yy12;
+				if (yych <= '*') goto yy6;
+				if (yych <= '.') goto yy4;
 				goto yy7;
+			} else {
+				if (yych == '?') goto yy8;
+				goto yy4;
 			}
 		}
 	} else {
 		if (yych <= 0xEC) {
 			if (yych <= 0xC1) {
-				if (yych <= '\\') goto yy14;
-				if (yych <= 0x7F) goto yy7;
-				goto yy4;
+				if (yych <= '\\') goto yy9;
+				if (yych <= 0x7F) goto yy4;
+				goto yy1;
 			} else {
-				if (yych <= 0xDF) goto yy16;
-				if (yych <= 0xE0) goto yy17;
-				goto yy18;
+				if (yych <= 0xDF) goto yy10;
+				if (yych <= 0xE0) goto yy11;
+				goto yy12;
 			}
 		} else {
 			if (yych <= 0xF0) {
-				if (yych <= 0xED) goto yy19;
-				if (yych <= 0xEF) goto yy18;
-				goto yy20;
+				if (yych <= 0xED) goto yy13;
+				if (yych <= 0xEF) goto yy12;
+				goto yy14;
 			} else {
-				if (yych <= 0xF3) goto yy21;
-				if (yych <= 0xF4) goto yy22;
-				goto yy4;
+				if (yych <= 0xF3) goto yy15;
+				if (yych <= 0xF4) goto yy16;
+				goto yy1;
 			}
 		}
 	}
@@ -101,37 +101,37 @@
 			*error = NULL;
 			return pcr_is_ok;
 		}
-yy4:
+yy1:
 	++YYCURSOR;
-yy5:
+yy2:
 	{
 			*error ="illegal character";
 			return pcr_err_illegal_char;
 		}
-yy6:
+yy3:
 	yych = *++YYCURSOR;
-	if (yych == '\n') goto yy4;
-	goto yy5;
-yy7:
+	if (yych == '\n') goto yy1;
+	goto yy2;
+yy4:
 	++YYCURSOR;
-yy8:
+yy5:
 	{
 			goto loop;
 		}
-yy9:
+yy6:
 	++YYCURSOR;
 	{
 			*error = "star";
 			return pcr_err_star;
 		}
-yy11:
+yy7:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '-') goto yy8;
-	if (yych <= '.') goto yy23;
-	if (yych <= '/') goto yy25;
-	goto yy8;
-yy12:
+	if (yych <= '-') goto yy5;
+	if (yych <= '.') goto yy17;
+	if (yych <= '/') goto yy19;
+	goto yy5;
+yy8:
 	++YYCURSOR;
 	{
 			if (**s == '/') {
@@ -141,93 +141,93 @@
 			*error = NULL;
 			return pcr_use_query;
 		}
-yy14:
+yy9:
 	++YYCURSOR;
 	{
 			*error = "back-slash";
 			return pcr_err_back_slash;
 		}
-yy16:
+yy10:
 	yych = *++YYCURSOR;
-	if (yych <= 0x7F) goto yy5;
-	if (yych <= 0xBF) goto yy7;
-	goto yy5;
-yy17:
+	if (yych <= 0x7F) goto yy2;
+	if (yych <= 0xBF) goto yy4;
+	goto yy2;
+yy11:
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 0x9F) goto yy5;
-	if (yych <= 0xBF) goto yy27;
-	goto yy5;
-yy18:
+	if (yych <= 0x9F) goto yy2;
+	if (yych <= 0xBF) goto yy20;
+	goto yy2;
+yy12:
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 0x7F) goto yy5;
-	if (yych <= 0xBF) goto yy27;
-	goto yy5;
-yy19:
+	if (yych <= 0x7F) goto yy2;
+	if (yych <= 0xBF) goto yy20;
+	goto yy2;
+yy13:
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 0x7F) goto yy5;
-	if (yych <= 0x9F) goto yy27;
-	goto yy5;
-yy20:
+	if (yych <= 0x7F) goto yy2;
+	if (yych <= 0x9F) goto yy20;
+	goto yy2;
+yy14:
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 0x8F) goto yy5;
-	if (yych <= 0xBF) goto yy28;
-	goto yy5;
-yy21:
+	if (yych <= 0x8F) goto yy2;
+	if (yych <= 0xBF) goto yy21;
+	goto yy2;
+yy15:
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 0x7F) goto yy5;
-	if (yych <= 0xBF) goto yy28;
-	goto yy5;
-yy22:
+	if (yych <= 0x7F) goto yy2;
+	if (yych <= 0xBF) goto yy21;
+	goto yy2;
+yy16:
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 0x7F) goto yy5;
-	if (yych <= 0x8F) goto yy28;
-	goto yy5;
-yy23:
+	if (yych <= 0x7F) goto yy2;
+	if (yych <= 0x8F) goto yy21;
+	goto yy2;
+yy17:
 	yych = *++YYCURSOR;
-	if (yych <= 0x00) goto yy29;
-	if (yych <= '-') goto yy24;
-	if (yych <= '.') goto yy31;
-	if (yych <= '/') goto yy29;
-yy24:
+	if (yych <= 0x00) goto yy22;
+	if (yych <= '-') goto yy18;
+	if (yych <= '.') goto yy23;
+	if (yych <= '/') goto yy22;
+yy18:
 	YYCURSOR = YYMARKER;
 	if (yyaccept == 0) {
-		goto yy8;
-	} else {
 		goto yy5;
+	} else {
+		goto yy2;
 	}
-yy25:
+yy19:
 	++YYCURSOR;
 	{
 			*error = "double slash";
 			return pcr_err_double_slash;
 		}
-yy27:
+yy20:
 	yych = *++YYCURSOR;
-	if (yych <= 0x7F) goto yy24;
-	if (yych <= 0xBF) goto yy7;
-	goto yy24;
-yy28:
+	if (yych <= 0x7F) goto yy18;
+	if (yych <= 0xBF) goto yy4;
+	goto yy18;
+yy21:
 	yych = *++YYCURSOR;
-	if (yych <= 0x7F) goto yy24;
-	if (yych <= 0xBF) goto yy27;
-	goto yy24;
-yy29:
+	if (yych <= 0x7F) goto yy18;
+	if (yych <= 0xBF) goto yy20;
+	goto yy18;
+yy22:
 	++YYCURSOR;
 	{
 			*error = "current directory reference";
 			return pcr_err_curr_dir;
 		}
-yy31:
+yy23:
 	yych = *++YYCURSOR;
-	if (yych <= 0x00) goto yy32;
-	if (yych != '/') goto yy24;
-yy32:
+	if (yych <= 0x00) goto yy24;
+	if (yych != '/') goto yy18;
+yy24:
 	++YYCURSOR;
 	{
 			*error = "upper directory reference";

php-8.3.7.tar.xz/ext/phar/stream.c -> php-8.3.21.tar.xz/ext/phar/stream.c Changed

php-8.3.7.tar.xz/ext/phar/tar.c -> php-8.3.21.tar.xz/ext/phar/tar.c Changed

php-8.3.7.tar.xz/ext/phar/tests/033.phpt -> php-8.3.21.tar.xz/ext/phar/tests/033.phpt Changed

php-8.3.7.tar.xz/ext/phar/tests/033a.phpt -> php-8.3.21.tar.xz/ext/phar/tests/033a.phpt Changed

php-8.3.21.tar.xz/ext/phar/tests/gh14603.phpt Added

php-8.3.21.tar.xz/ext/phar/tests/gh16406.phpt Added

php-8.3.21.tar.xz/ext/phar/tests/gh17137.phpt Added

php-8.3.21.tar.xz/ext/phar/tests/gh17518.phpt Added

php-8.3.21.tar.xz/ext/phar/tests/gh17808.phpt Added

php-8.3.7.tar.xz/ext/phar/tests/phar_oo_002.phpt -> php-8.3.21.tar.xz/ext/phar/tests/phar_oo_002.phpt Changed

php-8.3.7.tar.xz/ext/phar/tests/phar_oo_iswriteable.phpt -> php-8.3.21.tar.xz/ext/phar/tests/phar_oo_iswriteable.phpt Changed

php-8.3.7.tar.xz/ext/phar/tests/stat.phpt -> php-8.3.21.tar.xz/ext/phar/tests/stat.phpt Changed

php-8.3.7.tar.xz/ext/phar/tests/tar/033.phpt -> php-8.3.21.tar.xz/ext/phar/tests/tar/033.phpt Changed

php-8.3.7.tar.xz/ext/phar/tests/tar/033a.phpt -> php-8.3.21.tar.xz/ext/phar/tests/tar/033a.phpt Changed

php-8.3.21.tar.xz/ext/phar/tests/tar/gh16695_1.phpt Added

@@ -0,0 +1,28 @@
+--TEST--
+GH-16695 (phar:// tar parser and zero-length file header blocks)
+--CREDITS--
+hakre
+--EXTENSIONS--
+phar
+--INI--
+phar.require_hash=0
+--FILE--
+<?php
+
+$reportTar = __DIR__.'/gh16695_1.tmp';
+
+$length = file_put_contents($reportTar, base64_decode('dGxzAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAwMDA3MDAAMDAwMDAwMAAwMDAwMDAwADAwMDAwMDAwMDAwADAwMDAwMDAwMDAwADAwNzcxNgAgNQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB1c3RhcgAwMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwMDAwMDAwADAwMDAwMDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA='));
+var_dump($length);
+$buffer = file_get_contents("phar://$reportTar/tls");
+var_dump($buffer);
+
+?>
+--CLEAN--
+<?php
+@unlink(__DIR__.'/gh16695_1.tmp');
+?>
+--EXPECTF--
+int(512)
+
+Warning: file_get_contents(%stls): Failed to open stream: phar error: path "tls" is a directory in %s on line %d
+bool(false)

php-8.3.21.tar.xz/ext/phar/tests/tar/gh16695_2.phpt Added

@@ -0,0 +1,26 @@
+--TEST--
+GH-16695 (phar:// tar parser and zero-length file header blocks)
+--CREDITS--
+hakre
+--EXTENSIONS--
+phar
+--INI--
+phar.require_hash=0
+--FILE--
+<?php
+
+$reportTar = __DIR__.'/gh16695_2.tmp';
+
+$length = file_put_contents($reportTar, base64_decode('bWV0YS5qc29uAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAwMDA2NDQAMDAwMDAwMAAwMDAwMDAwADAwMDAwMDAwMTcyADAwMDAwMDAwMDAwADAxMTAyNgAgMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB1c3RhcgAwMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwMDAwMDAwADAwMDAwMDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB7Ik5hbWUiOiJkZWZhdWx0IiwiTWV0YWRhdGEiOnt9LCJFbmRwb2ludHMiOnsiZG9ja2VyIjp7Ikhvc3QiOiJ1bml4Oi8vL3J1bi91c2VyLzEwMDAvZG9ja2VyLnNvY2siLCJTa2lwVExTVmVyaWZ5IjpmYWxzZX19fQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=='));
+var_dump($length);
+$buffer = file_get_contents("phar://$reportTar/meta.json");
+var_dump($buffer);
+
+?>
+--CLEAN--
+<?php
+@unlink(__DIR__.'/gh16695_2.tmp');
+?>
+--EXPECT--
+int(1024)
+string(122) "{"Name":"default","Metadata":{},"Endpoints":{"docker":{"Host":"unix:///run/user/1000/docker.sock","SkipTLSVerify":false}}}"

php-8.3.21.tar.xz/ext/phar/tests/tar/gh16695_3.phpt Added

php-8.3.7.tar.xz/ext/phar/tests/zip/033.phpt -> php-8.3.21.tar.xz/ext/phar/tests/zip/033.phpt Changed

php-8.3.7.tar.xz/ext/phar/tests/zip/033a.phpt -> php-8.3.21.tar.xz/ext/phar/tests/zip/033a.phpt Changed

php-8.3.7.tar.xz/ext/phar/zip.c -> php-8.3.21.tar.xz/ext/phar/zip.c Changed

php-8.3.7.tar.xz/ext/posix/config.m4 -> php-8.3.21.tar.xz/ext/posix/config.m4 Changed

php-8.3.7.tar.xz/ext/posix/posix.c -> php-8.3.21.tar.xz/ext/posix/posix.c Changed

@@ -23,6 +23,7 @@
 #include "ext/standard/info.h"
 #include "ext/standard/php_string.h"
 #include "php_posix.h"
+#include "main/php_network.h"
 
 #ifdef HAVE_POSIX
 
@@ -417,7 +418,7 @@
 /* }}} */
 
 /* Checks if the provides resource is a stream and if it provides a file descriptor */
-static int php_posix_stream_get_fd(zval *zfp, zend_long *fd) /* {{{ */
+static int php_posix_stream_get_fd(zval *zfp, zend_long *ret) /* {{{ */
 {
 	php_stream *stream;
 
@@ -427,19 +428,21 @@
 		return 0;
 	}
 
-	/* get the fd.
+	/* get the fd. php_socket_t is used for FDs, and is shorter than zend_long.
 	 * NB: Most other code will NOT use the PHP_STREAM_CAST_INTERNAL flag when casting.
 	 * It is only used here so that the buffered data warning is not displayed.
 	 */
+	php_socket_t fd = -1;
 	if (php_stream_can_cast(stream, PHP_STREAM_AS_FD_FOR_SELECT | PHP_STREAM_CAST_INTERNAL) == SUCCESS) {
-		php_stream_cast(stream, PHP_STREAM_AS_FD_FOR_SELECT | PHP_STREAM_CAST_INTERNAL, (void*)fd, 0);
+		php_stream_cast(stream, PHP_STREAM_AS_FD_FOR_SELECT | PHP_STREAM_CAST_INTERNAL, (void**)&fd, 0);
 	} else if (php_stream_can_cast(stream, PHP_STREAM_AS_FD | PHP_STREAM_CAST_INTERNAL) == SUCCESS) {
-		php_stream_cast(stream, PHP_STREAM_AS_FD | PHP_STREAM_CAST_INTERNAL, (void*)fd, 0);
+		php_stream_cast(stream, PHP_STREAM_AS_FD | PHP_STREAM_CAST_INTERNAL, (void**)&fd, 0);
 	} else {
 		php_error_docref(NULL, E_WARNING, "Could not use stream of type '%s'",
 				stream->ops->label);
 		return 0;
 	}
+	*ret = fd;
 	return 1;
 }
 /* }}} */

php-8.3.7.tar.xz/ext/posix/tests/posix_getgrnam_basic.phpt -> php-8.3.21.tar.xz/ext/posix/tests/posix_getgrnam_basic.phpt Changed

php-8.3.7.tar.xz/ext/posix/tests/posix_getgroups_basic.phpt -> php-8.3.21.tar.xz/ext/posix/tests/posix_getgroups_basic.phpt Changed

php-8.3.7.tar.xz/ext/random/config.m4 -> php-8.3.21.tar.xz/ext/random/config.m4 Changed

php-8.3.7.tar.xz/ext/random/csprng.c -> php-8.3.21.tar.xz/ext/random/csprng.c Changed

@@ -46,7 +46,7 @@
 #if HAVE_SYS_PARAM_H
 # include <sys/param.h>
 # if (__FreeBSD__ && __FreeBSD_version > 1200000) || (__DragonFly__ && __DragonFly_version >= 500700) || \
-     defined(__sun) || (defined(__NetBSD__) && __NetBSD_Version__ >= 1000000000)
+     (defined(__sun) && defined(HAVE_GETRANDOM)) || (defined(__NetBSD__) && __NetBSD_Version__ >= 1000000000)
 #  include <sys/random.h>
 # endif
 #endif
@@ -98,7 +98,7 @@
 #else
 	size_t read_bytes = 0;
 # if (defined(__linux__) && defined(SYS_getrandom)) || (defined(__FreeBSD__) && __FreeBSD_version >= 1200000) || (defined(__DragonFly__) && __DragonFly_version >= 500700) || \
-  defined(__sun) || (defined(__NetBSD__) && __NetBSD_Version__ >= 1000000000)
+  (defined(__sun) && defined(HAVE_GETRANDOM)) || (defined(__NetBSD__) && __NetBSD_Version__ >= 1000000000)
 	/* Linux getrandom(2) syscall or FreeBSD/DragonFlyBSD/NetBSD getrandom(2) function
 	 * Being a syscall, implemented in the kernel, getrandom offers higher quality output
 	 * compared to the arc4random api albeit a fallback to /dev/urandom is considered.

php-8.3.7.tar.xz/ext/readline/readline.c -> php-8.3.21.tar.xz/ext/readline/readline.c Changed

php-8.3.7.tar.xz/ext/readline/readline_cli.c -> php-8.3.21.tar.xz/ext/readline/readline_cli.c Changed

php-8.3.7.tar.xz/ext/readline/tests/libedit_callback_handler_install_001.phpt -> php-8.3.21.tar.xz/ext/readline/tests/libedit_callback_handler_install_001.phpt Changed

php-8.3.7.tar.xz/ext/readline/tests/libedit_callback_handler_remove_001.phpt -> php-8.3.21.tar.xz/ext/readline/tests/libedit_callback_handler_remove_001.phpt Changed

php-8.3.7.tar.xz/ext/reflection/php_reflection.c -> php-8.3.21.tar.xz/ext/reflection/php_reflection.c Changed

@@ -217,18 +217,26 @@
 }
 /* }}} */
 
+static void reflection_free_property_reference(property_reference *reference)
+{
+	zend_string_release_ex(reference->unmangled_name, 0);
+	efree(reference);
+}
+
+static void reflection_free_parameter_reference(parameter_reference *reference)
+{
+	_free_function(reference->fptr);
+	efree(reference);
+}
+
 static void reflection_free_objects_storage(zend_object *object) /* {{{ */
 {
 	reflection_object *intern = reflection_object_from_obj(object);
-	parameter_reference *reference;
-	property_reference *prop_reference;
 
 	if (intern->ptr) {
 		switch (intern->ref_type) {
 		case REF_TYPE_PARAMETER:
-			reference = (parameter_reference*)intern->ptr;
-			_free_function(reference->fptr);
-			efree(intern->ptr);
+			reflection_free_parameter_reference(intern->ptr);
 			break;
 		case REF_TYPE_TYPE:
 		{
@@ -243,9 +251,7 @@
 			_free_function(intern->ptr);
 			break;
 		case REF_TYPE_PROPERTY:
-			prop_reference = (property_reference*)intern->ptr;
-			zend_string_release_ex(prop_reference->unmangled_name, 0);
-			efree(intern->ptr);
+			reflection_free_property_reference(intern->ptr);
 			break;
 		case REF_TYPE_ATTRIBUTE: {
 			attribute_reference *attr_ref = intern->ptr;
@@ -476,7 +482,7 @@
 
 		count = 0;
 		if (properties && zend_hash_num_elements(properties)) {
-			ZEND_HASH_MAP_FOREACH_STR_KEY(properties, prop_name) {
+			ZEND_HASH_FOREACH_STR_KEY(properties, prop_name) {
 				if (prop_name && ZSTR_LEN(prop_name) && ZSTR_VAL(prop_name)0) { /* skip all private and protected properties */
 					if (!zend_hash_exists(&ce->properties_info, prop_name)) {
 						count++;
@@ -643,13 +649,20 @@
 		} ZEND_HASH_FOREACH_END();
 		smart_str_appendc(str, '');
 	} else if (Z_TYPE_P(value) == IS_OBJECT) {
-		/* This branch may only be reached for default properties, which don't support arbitrary objects. */
+		/* This branch is reached if the constant AST was already evaluated and
+		 * resulted in an object; show enum names, or the type of non-enums
+		 * (GH-15902) */
 		zend_object *obj = Z_OBJ_P(value);
 		zend_class_entry *class = obj->ce;
-		ZEND_ASSERT(class->ce_flags & ZEND_ACC_ENUM);
-		smart_str_append(str, class->name);
-		smart_str_appends(str, "::");
-		smart_str_append(str, Z_STR_P(zend_enum_fetch_case_name(obj)));
+		if (class->ce_flags & ZEND_ACC_ENUM) {
+			smart_str_append(str, class->name);
+			smart_str_appends(str, "::");
+			smart_str_append(str, Z_STR_P(zend_enum_fetch_case_name(obj)));
+		} else {
+			smart_str_appends(str, "object(");
+			smart_str_append(str, class->name);
+			smart_str_appends(str, ")");
+		}
 	} else {
 		ZEND_ASSERT(Z_TYPE_P(value) == IS_CONSTANT_AST);
 		zend_string *ast_str = zend_ast_export("", Z_ASTVAL_P(value), "");
@@ -2521,6 +2534,10 @@
 		}
 	}
 
+	if (intern->ptr) {
+		reflection_free_parameter_reference(intern->ptr);
+	}
+
 	ref = (parameter_reference*) emalloc(sizeof(parameter_reference));
 	ref->arg_info = &arg_infoposition;
 	ref->offset = (uint32_t)position;
@@ -2530,11 +2547,15 @@
 	intern->ptr = ref;
 	intern->ref_type = REF_TYPE_PARAMETER;
 	intern->ce = ce;
+	zval_ptr_dtor(&intern->obj);
 	if (reference && is_closure) {
 		ZVAL_COPY_VALUE(&intern->obj, reference);
+	} else {
+		ZVAL_UNDEF(&intern->obj);
 	}
 
 	prop_name = reflection_prop_name(object);
+	zval_ptr_dtor(prop_name);
 	if (has_internal_arg_info(fptr)) {
 		ZVAL_STRING(prop_name, ((zend_internal_arg_info*)arg_info)position.name);
 	} else {
@@ -4032,10 +4053,12 @@
 	object = ZEND_THIS;
 	intern = Z_REFLECTION_P(object);
 
+	/* Note: class entry name is interned, no need to destroy them */
 	if (arg_obj) {
 		ZVAL_STR_COPY(reflection_prop_name(object), arg_obj->ce->name);
 		intern->ptr = arg_obj->ce;
 		if (is_object) {
+			zval_ptr_dtor(&intern->obj);
 			ZVAL_OBJ_COPY(&intern->obj, arg_obj);
 		}
 	} else {
@@ -5527,13 +5550,20 @@
 		}
 	}
 
-	ZVAL_STR_COPY(reflection_prop_name(object), name);
+	zval *prop_name = reflection_prop_name(object);
+	zval_ptr_dtor(prop_name);
+	ZVAL_STR_COPY(prop_name, name);
+	/* Note: class name are always interned, no need to destroy them */
 	if (dynam_prop == 0) {
 		ZVAL_STR_COPY(reflection_prop_class(object), property_info->ce->name);
 	} else {
 		ZVAL_STR_COPY(reflection_prop_class(object), ce->name);
 	}
 
+	if (intern->ptr) {
+		reflection_free_property_reference(intern->ptr);
+	}
+
 	reference = (property_reference*) emalloc(sizeof(property_reference));
 	reference->prop = dynam_prop ? NULL : property_info;
 	reference->unmangled_name = zend_string_copy(name);
@@ -5982,7 +6012,9 @@
 		RETURN_THROWS();
 	}
 	free_alloca(lcname, use_heap);
-	ZVAL_STRING(reflection_prop_name(object), module->name);
+	zval *prop_name = reflection_prop_name(object);
+	zval_ptr_dtor(prop_name);
+	ZVAL_STRING(prop_name, module->name);
 	intern->ptr = module;
 	intern->ref_type = REF_TYPE_OTHER;
 	intern->ce = NULL;
@@ -6772,16 +6804,9 @@
 	}
 
 	if (ce->type == ZEND_USER_CLASS) {
-		uint32_t flags = ZEND_ATTRIBUTE_TARGET_ALL;
-
-		if (marker->argc > 0) {
-			zval tmp;
-
-			if (FAILURE == zend_get_attribute_value(&tmp, marker, 0, ce)) {
-				RETURN_THROWS();
-			}
-
-			flags = (uint32_t) Z_LVAL(tmp);
+		uint32_t flags = zend_attribute_attribute_get_flags(marker, ce);
+		if (EG(exception)) {
+			RETURN_THROWS();
 		}
 
 		if (!(attr->target & flags)) {

php-8.3.21.tar.xz/ext/reflection/tests/ReflectionExtension_double_construct.phpt Added

php-8.3.21.tar.xz/ext/reflection/tests/ReflectionObject_double_construct.phpt Added

php-8.3.21.tar.xz/ext/reflection/tests/ReflectionParameter_double_construct.phpt Added

php-8.3.21.tar.xz/ext/reflection/tests/ReflectionProperty_double_construct.phpt Added

php-8.3.21.tar.xz/ext/reflection/tests/gh15902 Added

php-8.3.21.tar.xz/ext/reflection/tests/gh15902/ReflectionClass-callable.phpt Added

php-8.3.21.tar.xz/ext/reflection/tests/gh15902/ReflectionClass-class.phpt Added

php-8.3.21.tar.xz/ext/reflection/tests/gh15902/ReflectionProperty-callable.phpt Added

php-8.3.21.tar.xz/ext/reflection/tests/gh15902/ReflectionProperty-class.phpt Added

php-8.3.21.tar.xz/ext/reflection/tests/gh16187.phpt Added

php-8.3.7.tar.xz/ext/session/session.c -> php-8.3.21.tar.xz/ext/session/session.c Changed

@@ -94,6 +94,7 @@
 	}
 
 #define SESSION_FORBIDDEN_CHARS "=,;. \t\r\n\013\014"
+#define SESSION_FORBIDDEN_CHARS_FOR_ERROR_MSG "=,;. \\t\\r\\n\\013\\014"
 
 #define APPLY_TRANS_SID (PS(use_trans_sid) && !PS(use_only_cookies))
 
@@ -132,7 +133,7 @@
 /* }}} */
 
 /* Dispatched by RSHUTDOWN and by php_session_destroy */
-static inline void php_rshutdown_session_globals(void) /* {{{ */
+static void php_rshutdown_session_globals(void) /* {{{ */
 {
 	/* Do NOT destroy PS(mod_user_names) here! */
 	if (!Z_ISUNDEF(PS(http_session_vars))) {
@@ -683,7 +684,12 @@
 	SESSION_CHECK_OUTPUT_STATE;
 
 	/* Numeric session.name won't work at all */
-	if ((!ZSTR_LEN(new_value) || is_numeric_string(ZSTR_VAL(new_value), ZSTR_LEN(new_value), NULL, NULL, 0))) {
+	if (
+		ZSTR_LEN(new_value) == 0
+		|| zend_str_has_nul_byte(new_value)
+		|| is_numeric_str_function(new_value, NULL, NULL)
+		|| strpbrk(ZSTR_VAL(new_value), SESSION_FORBIDDEN_CHARS) != NULL
+	) {
 		int err_type;
 
 		if (stage == ZEND_INI_STAGE_RUNTIME || stage == ZEND_INI_STAGE_ACTIVATE || stage == ZEND_INI_STAGE_STARTUP) {
@@ -694,7 +700,7 @@
 
 		/* Do not output error when restoring ini options. */
 		if (stage != ZEND_INI_STAGE_DEACTIVATE) {
-			php_error_docref(NULL, err_type, "session.name \"%s\" cannot be numeric or empty", ZSTR_VAL(new_value));
+			php_error_docref(NULL, err_type, "session.name \"%s\" must not be numeric, empty, contain null bytes or any of the following characters \"" SESSION_FORBIDDEN_CHARS_FOR_ERROR_MSG "\"", ZSTR_VAL(new_value));
 		}
 		return FAILURE;
 	}
@@ -708,9 +714,18 @@
 {
 	SESSION_CHECK_ACTIVE_STATE;
 	SESSION_CHECK_OUTPUT_STATE;
-	if (atol(ZSTR_VAL(new_value)) < 0) {
+
+#ifdef ZEND_ENABLE_ZVAL_LONG64
+	const zend_long maxcookie = ZEND_LONG_MAX - INT_MAX - 1;
+#else
+	const zend_long maxcookie = ZEND_LONG_MAX / 2 - 1;
+#endif
+	zend_long v = (zend_long)atol(ZSTR_VAL(new_value));
+	if (v < 0) {
 		php_error_docref(NULL, E_WARNING, "CookieLifetime cannot be negative");
 		return FAILURE;
+	} else if (v > maxcookie) {
+		return SUCCESS;
 	}
 	return OnUpdateLongGEZero(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);
 }
@@ -1329,11 +1344,7 @@
 		return FAILURE;
 	}
 
-	/* Prevent broken Set-Cookie header, because the session_name might be user supplied */
-	if (strpbrk(PS(session_name), SESSION_FORBIDDEN_CHARS) != NULL) {   /* man isspace for \013 and \014 */
-		php_error_docref(NULL, E_WARNING, "session.name cannot contain any of the following '=,;. \\t\\r\\n\\013\\014'");
-		return FAILURE;
-	}
+	ZEND_ASSERT(strpbrk(PS(session_name), SESSION_FORBIDDEN_CHARS) == NULL);
 
 	/* URL encode id because it might be user supplied */
 	e_id = php_url_encode(ZSTR_VAL(PS(id)), ZSTR_LEN(PS(id)));
@@ -1453,7 +1464,10 @@
 	}
 
 	if (PS(use_cookies) && PS(send_cookie)) {
-		php_session_send_cookie();
+		zend_result cookies_sent = php_session_send_cookie();
+		if (UNEXPECTED(cookies_sent == FAILURE)) {
+			return FAILURE;
+		}
 		PS(send_cookie) = 0;
 	}
 
@@ -1470,7 +1484,7 @@
 		smart_str_appends(&var, ZSTR_VAL(PS(id)));
 		smart_str_0(&var);
 		if (sid) {
-			zval_ptr_dtor_str(sid);
+			zval_ptr_dtor(sid);
 			ZVAL_STR(sid, smart_str_extract(&var));
 		} else {
 			REGISTER_STRINGL_CONSTANT("SID", ZSTR_VAL(var.s), ZSTR_LEN(var.s), 0);
@@ -1478,7 +1492,7 @@
 		}
 	} else {
 		if (sid) {
-			zval_ptr_dtor_str(sid);
+			zval_ptr_dtor(sid);
 			ZVAL_EMPTY_STRING(sid);
 		} else {
 			REGISTER_STRINGL_CONSTANT("SID", "", 0, 0);
@@ -1690,10 +1704,6 @@
 	zend_result result;
 	int found = 0;
 
-	if (!PS(use_cookies)) {
-		return;
-	}
-
 	ZEND_PARSE_PARAMETERS_START(1, 5)
 		Z_PARAM_ARRAY_HT_OR_LONG(options_ht, lifetime_long)
 		Z_PARAM_OPTIONAL
@@ -1703,6 +1713,11 @@
 		Z_PARAM_BOOL_OR_NULL(httponly, httponly_null)
 	ZEND_PARSE_PARAMETERS_END();
 
+	if (!PS(use_cookies)) {
+		php_error_docref(NULL, E_WARNING, "Session cookies cannot be used when session.use_cookies is disabled");
+		RETURN_FALSE;
+	}
+
 	if (PS(session_status) == php_session_active) {
 		php_error_docref(NULL, E_WARNING, "Session cookie parameters cannot be changed when a session is active");
 		RETURN_FALSE;

php-8.3.21.tar.xz/ext/session/tests/SID_type_confusion.phpt Added

php-8.3.7.tar.xz/ext/session/tests/bug66481.phpt -> php-8.3.21.tar.xz/ext/session/tests/bug66481.phpt Changed

php-8.3.7.tar.xz/ext/session/tests/gh13856.phpt -> php-8.3.21.tar.xz/ext/session/tests/gh13856.phpt Changed

php-8.3.21.tar.xz/ext/session/tests/gh16290.phpt Added

php-8.3.21.tar.xz/ext/session/tests/gh16385.phpt Added

php-8.3.21.tar.xz/ext/session/tests/gh17541.phpt Added

php-8.3.7.tar.xz/ext/session/tests/session_get_cookie_params_basic.phpt -> php-8.3.21.tar.xz/ext/session/tests/session_get_cookie_params_basic.phpt Changed

php-8.3.7.tar.xz/ext/session/tests/session_name_variation1.phpt -> php-8.3.21.tar.xz/ext/session/tests/session_name_variation1.phpt Changed

@@ -38,25 +38,25 @@
 ?>
 --EXPECTF--
 *** Testing session_name() : variation ***
+
+Warning: session_name(): session.name "" must not be numeric, empty, contain null bytes or any of the following characters "=,;. \t\r\n\013\014" in %s on line %d
 string(9) "PHPSESSID"
 bool(true)
 string(9) "PHPSESSID"
 bool(true)
 string(9) "PHPSESSID"
-string(9) "PHPSESSID"
 
-Warning: session_start(): session.name cannot contain any of the following '=,;. \t\r\n\013\014' in %s on line %d
+Warning: session_name(): session.name "	" must not be numeric, empty, contain null bytes or any of the following characters "=,;. \t\r\n\013\014" in %s on line %d
+string(9) "PHPSESSID"
 bool(true)
-string(1) "	"
+string(9) "PHPSESSID"
 bool(true)
-string(1) "	"
-
-Warning: session_name(): session.name "" cannot be numeric or empty in %s on line %d
-string(1) "	"
+string(9) "PHPSESSID"
 
-Warning: session_start(): session.name cannot contain any of the following '=,;. \t\r\n\013\014' in %s on line %d
+Warning: session_name(): session.name "" must not be numeric, empty, contain null bytes or any of the following characters "=,;. \t\r\n\013\014" in %s on line %d
+string(9) "PHPSESSID"
 bool(true)
-string(1) "	"
+string(9) "PHPSESSID"
 bool(true)
-string(1) "	"
+string(9) "PHPSESSID"
 Done

php-8.3.21.tar.xz/ext/shmop/tests/gh14537.phpt Added

php-8.3.7.tar.xz/ext/simplexml/simplexml.c -> php-8.3.21.tar.xz/ext/simplexml/simplexml.c Changed

@@ -54,6 +54,16 @@
 static void php_sxe_iterator_rewind(zend_object_iterator *iter);
 static zend_result sxe_object_cast_ex(zend_object *readobj, zval *writeobj, int type);
 
+static void sxe_unlink_node(xmlNodePtr node)
+{
+	xmlUnlinkNode(node);
+	/* Only destroy the nodes if we have no objects using them anymore.
+	 * Don't assume simplexml owns these. */
+	if (!node->_private) {
+		php_libxml_node_free_resource(node);
+	}
+}
+
 /* {{{ _node_as_zval() */
 static void _node_as_zval(php_sxe_object *sxe, xmlNodePtr node, zval *value, SXE_ITER itertype, char *name, const xmlChar *nsprefix, int isprefix)
 {
@@ -554,8 +564,7 @@
 			}
 			if (value_str) {
 				while ((tempnode = (xmlNodePtr) newnode->children)) {
-					xmlUnlinkNode(tempnode);
-					php_libxml_node_free_resource((xmlNodePtr) tempnode);
+					sxe_unlink_node(tempnode);
 				}
 				change_node_zval(newnode, value_str);
 			}
@@ -567,7 +576,10 @@
 				if (!member || Z_TYPE_P(member) == IS_LONG) {
 					newnode = xmlNewTextChild(mynode->parent, mynode->ns, mynode->name, value_str ? (xmlChar *)ZSTR_VAL(value_str) : NULL);
 				} else {
-					newnode = xmlNewTextChild(mynode, mynode->ns, (xmlChar *)Z_STRVAL_P(member), value_str ? (xmlChar *)ZSTR_VAL(value_str) : NULL);
+					/* Note: we cannot set the namespace here unconditionally because the parent may be a document.
+					 * Passing NULL will let libxml decide to either inherit the namespace or not set one at all,
+					 * depending on whether the parent is an element. */
+					newnode = xmlNewTextChild(mynode, NULL, (xmlChar *)Z_STRVAL_P(member), value_str ? (xmlChar *)ZSTR_VAL(value_str) : NULL);
 				}
 			} else if (!member || Z_TYPE_P(member) == IS_LONG) {
 				if (member && cnt < Z_LVAL_P(member)) {
@@ -623,6 +635,10 @@
 	SXE_ITER        type;
 	zval            member;
 
+	if (cache_slot) {
+		cache_slot0 = cache_slot1 = cache_slot2 = NULL;
+	}
+
 	sxe = php_sxe_fetch_object(object);
 	GET_NODE(sxe, node);
 	if (UNEXPECTED(!node)) {
@@ -829,8 +845,7 @@
 				while (attr && nodendx <= Z_LVAL_P(member)) {
 					if ((!test || xmlStrEqual(attr->name, sxe->iter.name)) && match_ns(sxe, (xmlNodePtr) attr, sxe->iter.nsprefix, sxe->iter.isprefix)) {
 						if (nodendx == Z_LVAL_P(member)) {
-							xmlUnlinkNode((xmlNodePtr) attr);
-							php_libxml_node_free_resource((xmlNodePtr) attr);
+							sxe_unlink_node((xmlNodePtr) attr);
 							break;
 						}
 						nodendx++;
@@ -841,8 +856,7 @@
 				while (attr) {
 					anext = attr->next;
 					if ((!test || xmlStrEqual(attr->name, sxe->iter.name)) && xmlStrEqual(attr->name, (xmlChar *)Z_STRVAL_P(member)) && match_ns(sxe, (xmlNodePtr) attr, sxe->iter.nsprefix, sxe->iter.isprefix)) {
-						xmlUnlinkNode((xmlNodePtr) attr);
-						php_libxml_node_free_resource((xmlNodePtr) attr);
+						sxe_unlink_node((xmlNodePtr) attr);
 						break;
 					}
 					attr = anext;
@@ -857,8 +871,7 @@
 				}
 				node = sxe_get_element_by_offset(sxe, Z_LVAL_P(member), node, NULL);
 				if (node) {
-					xmlUnlinkNode(node);
-					php_libxml_node_free_resource(node);
+					sxe_unlink_node(node);
 				}
 			} else {
 				node = node->children;
@@ -868,8 +881,7 @@
 					SKIP_TEXT(node);
 
 					if (xmlStrEqual(node->name, (xmlChar *)Z_STRVAL_P(member)) && match_ns(sxe, node, sxe->iter.nsprefix, sxe->iter.isprefix)) {
-						xmlUnlinkNode(node);
-						php_libxml_node_free_resource(node);
+						sxe_unlink_node(node);
 					}
 
 next_iter:
@@ -1493,6 +1505,35 @@
 	}
 } /* }}} */
 
+static inline void sxe_object_free_iterxpath(php_sxe_object *sxe)
+{
+	if (!Z_ISUNDEF(sxe->iter.data)) {
+		zval_ptr_dtor(&sxe->iter.data);
+		ZVAL_UNDEF(&sxe->iter.data);
+	}
+
+	if (sxe->iter.name) {
+		efree(sxe->iter.name);
+		sxe->iter.name = NULL;
+	}
+	if (sxe->iter.nsprefix) {
+		efree(sxe->iter.nsprefix);
+		sxe->iter.nsprefix = NULL;
+	}
+	if (!Z_ISUNDEF(sxe->tmp)) {
+		zval_ptr_dtor(&sxe->tmp);
+		ZVAL_UNDEF(&sxe->tmp);
+	}
+
+	php_libxml_node_decrement_resource((php_libxml_node_object *)sxe);
+
+	if (sxe->xpath) {
+		xmlXPathFreeContext(sxe->xpath);
+		sxe->xpath = NULL;
+	}
+}
+
+
 /* {{{ Return all namespaces in use */
 PHP_METHOD(SimpleXMLElement, getNamespaces)
 {
@@ -2149,33 +2190,11 @@
 
 	zend_object_std_dtor(&sxe->zo);
 
-	if (!Z_ISUNDEF(sxe->iter.data)) {
-		zval_ptr_dtor(&sxe->iter.data);
-		ZVAL_UNDEF(&sxe->iter.data);
-	}
-
-	if (sxe->iter.name) {
-		efree(sxe->iter.name);
-		sxe->iter.name = NULL;
-	}
-	if (sxe->iter.nsprefix) {
-		efree(sxe->iter.nsprefix);
-		sxe->iter.nsprefix = NULL;
-	}
-	if (!Z_ISUNDEF(sxe->tmp)) {
-		zval_ptr_dtor(&sxe->tmp);
-		ZVAL_UNDEF(&sxe->tmp);
-	}
-
-	php_libxml_node_decrement_resource((php_libxml_node_object *)sxe);
-
-	if (sxe->xpath) {
-		xmlXPathFreeContext(sxe->xpath);
-	}
+	sxe_object_free_iterxpath(sxe);
 
 	if (sxe->properties) {
-		zend_hash_destroy(sxe->properties);
-		FREE_HASHTABLE(sxe->properties);
+		ZEND_ASSERT(!(GC_FLAGS(sxe->properties) & IS_ARRAY_IMMUTABLE));
+		zend_hash_release(sxe->properties);
 	}
 }
 /* }}} */
@@ -2371,11 +2390,12 @@
 	PHP_LIBXML_RESTORE_GLOBALS(read_file_or_memory);
 
 	if (!docp) {
-		((php_libxml_node_object *)sxe)->document = NULL;
 		zend_throw_exception(zend_ce_exception, "String could not be parsed as XML", 0);
 		RETURN_THROWS();
 	}
 
+	sxe_object_free_iterxpath(sxe);
+
 	sxe->iter.nsprefix = ns_len ? (xmlChar*)estrdup(ns) : NULL;
 	sxe->iter.isprefix = isprefix;
 	php_libxml_increment_doc_ref((php_libxml_node_object *)sxe, docp);
@@ -2524,7 +2544,11 @@
 {
 	php_sxe_iterator *iterator = (php_sxe_iterator *)iter;
 
-	return &iterator->sxe->iter.data;
+	zval *data = &iterator->sxe->iter.data;
+	if (Z_ISUNDEF_P(data)) {
+		return NULL;
+	}
+	return data;
 }
 /* }}} */
 
@@ -2532,6 +2556,11 @@
 {
 	php_sxe_iterator *iterator = (php_sxe_iterator *)iter;
 	zval *curobj = &iterator->sxe->iter.data;
+	if (Z_ISUNDEF_P(curobj)) {
+		ZVAL_NULL(key);
+		return;
+	}
+
 	php_sxe_object *intern = Z_SXEOBJ_P(curobj);
 
 	xmlNodePtr curnode = NULL;

php-8.3.7.tar.xz/ext/simplexml/tests/bug51615.phpt -> php-8.3.21.tar.xz/ext/simplexml/tests/bug51615.phpt Changed

php-8.3.7.tar.xz/ext/simplexml/tests/bug79971_1.phpt -> php-8.3.21.tar.xz/ext/simplexml/tests/bug79971_1.phpt Changed

php-8.3.21.tar.xz/ext/simplexml/tests/gh14638.phpt Added

php-8.3.21.tar.xz/ext/simplexml/tests/gh15837.phpt Added

php-8.3.21.tar.xz/ext/simplexml/tests/gh16808.phpt Added

php-8.3.21.tar.xz/ext/simplexml/tests/gh17040.phpt Added

php-8.3.21.tar.xz/ext/simplexml/tests/gh17153.phpt Added

php-8.3.21.tar.xz/ext/simplexml/tests/gh17409.phpt Added

php-8.3.21.tar.xz/ext/simplexml/tests/gh17736.phpt Added

php-8.3.21.tar.xz/ext/simplexml/tests/gh18304.phpt Added

php-8.3.7.tar.xz/ext/snmp/snmp.c -> php-8.3.21.tar.xz/ext/snmp/snmp.c Changed

@@ -624,6 +624,31 @@
 }
 /* }}} */
 
+static void php_snmp_zend_string_release_from_char_pointer(char *ptr) {
+	if (ptr) {
+		zend_string *pptr = (zend_string *)(ptr - XtOffsetOf(zend_string, val));
+		zend_string_release(pptr);
+	}
+}
+
+static void php_free_objid_query(struct objid_query *objid_query, HashTable* oid_ht, const HashTable *value_ht, int st) {
+	if (oid_ht) {
+		uint32_t count = zend_hash_num_elements(oid_ht);
+
+		for (uint32_t i = 0; i < count; i ++) {
+			snmpobjarg *arg = &objid_query->varsi;
+			if (!arg->oid) {
+				break;
+			}
+			if (value_ht) {
+				php_snmp_zend_string_release_from_char_pointer(arg->value);
+			}
+			php_snmp_zend_string_release_from_char_pointer(arg->oid);
+		}
+	}
+	efree(objid_query->vars);
+}
+
 /* {{{ php_snmp_parse_oid
 *
 * OID parser (and type, value for SNMP_SET command)
@@ -672,10 +697,15 @@
 			return false;
 		}
 		objid_query->vars = (snmpobjarg *)safe_emalloc(sizeof(snmpobjarg), zend_hash_num_elements(oid_ht), 0);
+		memset(objid_query->vars, 0, sizeof(snmpobjarg) * zend_hash_num_elements(oid_ht));
 		objid_query->array_output = (st & SNMP_CMD_SET) == 0;
 		ZEND_HASH_FOREACH_VAL(oid_ht, tmp_oid) {
-			convert_to_string(tmp_oid);
-			objid_query->varsobjid_query->count.oid = Z_STRVAL_P(tmp_oid);
+			zend_string *tmp = zval_try_get_string(tmp_oid);
+			if (!tmp) {
+				php_free_objid_query(objid_query, oid_ht, value_ht, st);
+				return false;
+			}
+			objid_query->varsobjid_query->count.oid = ZSTR_VAL(tmp);
 			if (st & SNMP_CMD_SET) {
 				if (type_str) {
 					pptr = ZSTR_VAL(type_str);
@@ -699,18 +729,24 @@
 						}
 					}
 					if (idx_type < type_ht->nNumUsed) {
-						convert_to_string(tmp_type);
-						if (Z_STRLEN_P(tmp_type) != 1) {
+						zend_string *type = zval_try_get_string(tmp_type);
+						if (!type) {
+							php_free_objid_query(objid_query, oid_ht, value_ht, st);
+							return false;
+						}
+						size_t len = ZSTR_LEN(type);
+						char ptype = *ZSTR_VAL(type);
+						zend_string_release(type);
+						if (len != 1) {
 							zend_value_error("Type must be a single character");
-							efree(objid_query->vars);
+							php_free_objid_query(objid_query, oid_ht, value_ht, st);
 							return false;
 						}
-						pptr = Z_STRVAL_P(tmp_type);
-						objid_query->varsobjid_query->count.type = *pptr;
+						objid_query->varsobjid_query->count.type = ptype;
 						idx_type++;
 					} else {
-						php_error_docref(NULL, E_WARNING, "'%s': no type set", Z_STRVAL_P(tmp_oid));
-						efree(objid_query->vars);
+						php_error_docref(NULL, E_WARNING, "'%s': no type set", ZSTR_VAL(tmp));
+						php_free_objid_query(objid_query, oid_ht, value_ht, st);
 						return false;
 					}
 				}
@@ -736,12 +772,16 @@
 						}
 					}
 					if (idx_value < value_ht->nNumUsed) {
-						convert_to_string(tmp_value);
-						objid_query->varsobjid_query->count.value = Z_STRVAL_P(tmp_value);
+						zend_string *tmp = zval_try_get_string(tmp_value);
+						if (!tmp) {
+							php_free_objid_query(objid_query, oid_ht, value_ht, st);
+							return false;
+						}
+						objid_query->varsobjid_query->count.value = ZSTR_VAL(tmp);
 						idx_value++;
 					} else {
-						php_error_docref(NULL, E_WARNING, "'%s': no value set", Z_STRVAL_P(tmp_oid));
-						efree(objid_query->vars);
+						php_error_docref(NULL, E_WARNING, "'%s': no value set", ZSTR_VAL(tmp));
+						php_free_objid_query(objid_query, oid_ht, value_ht, st);
 						return false;
 					}
 				}
@@ -754,14 +794,14 @@
 	if (st & SNMP_CMD_WALK) {
 		if (objid_query->count > 1) {
 			php_snmp_error(object, PHP_SNMP_ERRNO_OID_PARSING_ERROR, "Multi OID walks are not supported!");
-			efree(objid_query->vars);
+			php_free_objid_query(objid_query, oid_ht, value_ht, st);
 			return false;
 		}
 		objid_query->vars0.name_length = MAX_NAME_LEN;
 		if (strlen(objid_query->vars0.oid)) { /* on a walk, an empty string means top of tree - no error */
 			if (!snmp_parse_oid(objid_query->vars0.oid, objid_query->vars0.name, &(objid_query->vars0.name_length))) {
 				php_snmp_error(object, PHP_SNMP_ERRNO_OID_PARSING_ERROR, "Invalid object identifier: %s", objid_query->vars0.oid);
-				efree(objid_query->vars);
+				php_free_objid_query(objid_query, oid_ht, value_ht, st);
 				return false;
 			}
 		} else {
@@ -773,7 +813,7 @@
 			objid_query->varsobjid_query->offset.name_length = MAX_OID_LEN;
 			if (!snmp_parse_oid(objid_query->varsobjid_query->offset.oid, objid_query->varsobjid_query->offset.name, &(objid_query->varsobjid_query->offset.name_length))) {
 				php_snmp_error(object, PHP_SNMP_ERRNO_OID_PARSING_ERROR, "Invalid object identifier: %s", objid_query->varsobjid_query->offset.oid);
-				efree(objid_query->vars);
+				php_free_objid_query(objid_query, oid_ht, value_ht, st);
 				return false;
 			}
 		}
@@ -1250,12 +1290,12 @@
 
 	if (session_less_mode) {
 		if (!netsnmp_session_init(&session, version, a1, a2, timeout, retries)) {
-			efree(objid_query.vars);
+			php_free_objid_query(&objid_query, oid_ht, value_ht, st);
 			netsnmp_session_free(&session);
 			RETURN_FALSE;
 		}
 		if (version == SNMP_VERSION_3 && !netsnmp_session_set_security(session, a3, a4, a5, a6, a7, NULL, NULL)) {
-			efree(objid_query.vars);
+			php_free_objid_query(&objid_query, oid_ht, value_ht, st);
 			netsnmp_session_free(&session);
 			/* Warning message sent already, just bail out */
 			RETURN_FALSE;
@@ -1266,7 +1306,7 @@
 		session = snmp_object->session;
 		if (!session) {
 			zend_throw_error(NULL, "Invalid or uninitialized SNMP object");
-			efree(objid_query.vars);
+			php_free_objid_query(&objid_query, oid_ht, value_ht, st);
 			RETURN_THROWS();
 		}
 
@@ -1292,7 +1332,7 @@
 
 	php_snmp_internal(INTERNAL_FUNCTION_PARAM_PASSTHRU, st, session, &objid_query);
 
-	efree(objid_query.vars);
+	php_free_objid_query(&objid_query, oid_ht, value_ht, st);
 
 	if (session_less_mode) {
 		netsnmp_session_free(&session);
@@ -1620,6 +1660,10 @@
 	zend_string *a1 = NULL, *a2 = NULL, *a3 = NULL, *a4 = NULL, *a5 = NULL, *a6 = NULL, *a7 = NULL;
 
 	snmp_object = Z_SNMP_P(object);
+	if (!snmp_object->session) {
+		zend_throw_error(NULL, "Invalid or uninitialized SNMP object");
+		RETURN_THROWS();
+	}
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS(), "S|SSSSSS", &a1, &a2, &a3, &a4,&a5, &a6, &a7) == FAILURE) {
 		RETURN_THROWS();
@@ -1817,6 +1861,9 @@
 		return zend_std_get_property_ptr_ptr(object, name, type, cache_slot);
 	}
 
+	if (cache_slot) {
+		cache_slot0 = cache_slot1 = cache_slot2 = NULL;
+	}
 	return NULL;
 }

php-8.3.21.tar.xz/ext/snmp/tests/gh16959.phpt Added

@@ -0,0 +1,70 @@
+--TEST--
+snmpget() modifies object_id array source
+--EXTENSIONS--
+snmp
+--SKIPIF--
+<?php
+require_once(__DIR__.'/skipif.inc');
+if (getenv('SKIP_ASAN')) die('skip Causes timeout on asan');
+?>
+--FILE--
+<?php
+require_once(__DIR__.'/snmp_include.inc');
+
+$bad_object_ids = array (
+077 => 077, -066 => -066, -0345 => -0345, 0 => 0
+);
+var_dump($bad_object_ids);
+var_dump(snmpget($hostname, "", $bad_object_ids) === false);
+// The array should remain unmodified
+var_dump($bad_object_ids);
+try {
+	snmpget($hostname, "", 0 => new stdClass());
+} catch (Throwable $e) {
+	echo $e->getMessage() . PHP_EOL;
+}
+
+try {
+	snmp2_set($hostname, $communityWrite, $bad_object_ids, array(new stdClass()), array(null));
+} catch (Throwable $e) {
+	echo $e->getMessage() . PHP_EOL;
+}
+try {
+	snmp2_set($hostname, $communityWrite, $bad_object_ids, array("toolongtype"), array(null));
+} catch (Throwable $e) {
+	echo $e->getMessage() . PHP_EOL;
+}
+try {
+	snmp2_set($hostname, $communityWrite, $bad_object_ids, array(str_repeat("onetoomuch", random_int(1, 1))), array(null));
+} catch (Throwable $e) {
+	echo $e->getMessage();
+}
+?>
+--EXPECTF--
+array(4) {
+  63=>
+  int(63)
+  -54=>
+  int(-54)
+  -229=>
+  int(-229)
+  0=>
+  int(0)
+}
+
+Warning: snmpget(): Invalid object identifier: -54 in %s on line %d
+bool(true)
+array(4) {
+  63=>
+  int(63)
+  -54=>
+  int(-54)
+  -229=>
+  int(-229)
+  0=>
+  int(0)
+}
+Object of class stdClass could not be converted to string
+Object of class stdClass could not be converted to string
+Type must be a single character
+Type must be a single character

php-8.3.21.tar.xz/ext/snmp/tests/gh17330.phpt Added

php-8.3.21.tar.xz/ext/snmp/tests/gh18304.phpt Added

php-8.3.7.tar.xz/ext/soap/php_encoding.c -> php-8.3.21.tar.xz/ext/soap/php_encoding.c Changed

@@ -24,6 +24,7 @@
 #include <libxml/parserInternals.h>
 #include "zend_strtod.h"
 #include "zend_interfaces.h"
+#include "zend_enum.h"
 
 /* zval type decode */
 static zval *to_zval_double(zval* ret, encodeTypePtr type, xmlNodePtr data);
@@ -822,25 +823,60 @@
 	return ret;
 }
 
+static zend_string *get_serialization_string_from_zval(zval *data)
+{
+	switch (Z_TYPE_P(data)) {
+		case IS_OBJECT:
+			if (Z_OBJCE_P(data)->ce_flags & ZEND_ACC_ENUM) {
+				if (UNEXPECTED(Z_OBJCE_P(data)->enum_backing_type == IS_UNDEF)) {
+					zend_value_error("Non-backed enums have no default serialization");
+					return zend_empty_string;
+				} else {
+					zval *value = zend_enum_fetch_case_value(Z_OBJ_P(data));
+					return zval_get_string_func(value);
+				}
+			}
+			ZEND_FALLTHROUGH;
+		default:
+			return zval_get_string_func(data);
+	}
+}
+
+static zend_long get_serialization_long_from_zval(zval *data)
+{
+	switch (Z_TYPE_P(data)) {
+		case IS_OBJECT:
+			if (Z_OBJCE_P(data)->ce_flags & ZEND_ACC_ENUM) {
+				if (UNEXPECTED(Z_OBJCE_P(data)->enum_backing_type != IS_LONG)) {
+					if (Z_OBJCE_P(data)->enum_backing_type == IS_UNDEF) {
+						zend_value_error("Non-backed enums have no default serialization");
+					} else {
+						zend_value_error("String-backed enum cannot be serialized as int");
+					}
+					return 0;
+				} else {
+					zval *value = zend_enum_fetch_case_value(Z_OBJ_P(data));
+					ZEND_ASSERT(Z_TYPE_P(value) == IS_LONG);
+					return Z_LVAL_P(value);
+				}
+			}
+			ZEND_FALLTHROUGH;
+		default:
+			return zval_get_long(data);
+	}
+}
+
 static xmlNodePtr to_xml_string(encodeTypePtr type, zval *data, int style, xmlNodePtr parent)
 {
 	xmlNodePtr ret, text;
-	char *str;
-	int new_len;
 
 	ret = xmlNewNode(NULL, BAD_CAST("BOGUS"));
 	xmlAddChild(parent, ret);
 	FIND_ZVAL_NULL(data, ret, style);
 
-	if (Z_TYPE_P(data) == IS_STRING) {
-		str = estrndup(Z_STRVAL_P(data), Z_STRLEN_P(data));
-		new_len = Z_STRLEN_P(data);
-	} else {
-		zend_string *tmp = zval_get_string_func(data);
-		str = estrndup(ZSTR_VAL(tmp), ZSTR_LEN(tmp));
-		new_len = ZSTR_LEN(tmp);
-		zend_string_release_ex(tmp, 0);
-	}
+	zend_string *serialization = get_serialization_string_from_zval(data);
+	char *str = ZSTR_VAL(serialization);
+	size_t new_len = ZSTR_LEN(serialization);
 
 	if (SOAP_GLOBAL(encoding) != NULL) {
 		xmlBufferPtr in  = xmlBufferCreateStatic(str, new_len);
@@ -848,7 +884,8 @@
 		int n = xmlCharEncInFunc(SOAP_GLOBAL(encoding), out, in);
 
 		if (n >= 0) {
-			efree(str);
+			zend_string_release(serialization);
+			serialization = NULL;
 			str = estrdup((char*)xmlBufferContent(out));
 			new_len = n;
 		}
@@ -899,7 +936,11 @@
 
 	text = xmlNewTextLen(BAD_CAST(str), new_len);
 	xmlAddChild(ret, text);
-	efree(str);
+	if (serialization) {
+		zend_string_release(serialization);
+	} else {
+		efree(str);
+	}
 
 	if (style == SOAP_ENCODED) {
 		set_ns_and_type(ret, type);
@@ -910,19 +951,14 @@
 static xmlNodePtr to_xml_base64(encodeTypePtr type, zval *data, int style, xmlNodePtr parent)
 {
 	xmlNodePtr ret, text;
-	zend_string *str;
 
 	ret = xmlNewNode(NULL, BAD_CAST("BOGUS"));
 	xmlAddChild(parent, ret);
 	FIND_ZVAL_NULL(data, ret, style);
 
-	if (Z_TYPE_P(data) == IS_STRING) {
-		str = php_base64_encode((unsigned char*)Z_STRVAL_P(data), Z_STRLEN_P(data));
-	} else {
-		zend_string *tmp = zval_get_string_func(data);
-		str = php_base64_encode((unsigned char*) ZSTR_VAL(tmp), ZSTR_LEN(tmp));
-		zend_string_release_ex(tmp, 0);
-	}
+	zend_string *serialization = get_serialization_string_from_zval(data);
+	zend_string *str = php_base64_encode((unsigned char *) ZSTR_VAL(serialization), ZSTR_LEN(serialization));
+	zend_string_release(serialization);
 
 	text = xmlNewTextLen(BAD_CAST(ZSTR_VAL(str)), ZSTR_LEN(str));
 	xmlAddChild(ret, text);
@@ -947,7 +983,7 @@
 	FIND_ZVAL_NULL(data, ret, style);
 
 	if (Z_TYPE_P(data) != IS_STRING) {
-		ZVAL_STR(&tmp, zval_get_string_func(data));
+		ZVAL_STR(&tmp, get_serialization_string_from_zval(data));
 		data = &tmp;
 	}
 	str = (unsigned char *) safe_emalloc(Z_STRLEN_P(data) * 2, sizeof(char), 1);
@@ -1055,7 +1091,7 @@
 		snprintf(s, sizeof(s), "%0.0F",floor(Z_DVAL_P(data)));
 		xmlNodeSetContent(ret, BAD_CAST(s));
 	} else {
-		zend_string *str = zend_long_to_str(zval_get_long(data));
+		zend_string *str = zend_long_to_str(get_serialization_long_from_zval(data));
 		xmlNodeSetContentLen(ret, BAD_CAST(ZSTR_VAL(str)), ZSTR_LEN(str));
 		zend_string_release_ex(str, 0);
 	}
@@ -1408,7 +1444,9 @@
 					return ret;
 				}
 
-				object_init_ex(ret, ce);
+				if (object_init_ex(ret, ce) != SUCCESS) {
+					return ret;
+				}
 				master_to_zval_int(&base, enc, data);
 				set_zval_property(ret, "_", &base);
 			} else {
@@ -1417,7 +1455,9 @@
 				if (soap_check_xml_ref(ret, data)) {
 					return ret;
 				}
-				object_init_ex(ret, ce);
+				if (object_init_ex(ret, ce) != SUCCESS) {
+					return ret;
+				}
 				soap_add_xml_ref(ret, data);
 			}
 		} else if (sdlType->kind == XSD_TYPEKIND_EXTENSION &&
@@ -1462,7 +1502,9 @@
 					return ret;
 				}
 
-				object_init_ex(ret, ce);
+				if (object_init_ex(ret, ce) != SUCCESS) {
+					return ret;
+				}
 				soap_add_xml_ref(ret, data);
 				master_to_zval_int(&base, sdlType->encode, data);
 				set_zval_property(ret, "_", &base);
@@ -1473,7 +1515,9 @@
 			if (soap_check_xml_ref(ret, data)) {
 				return ret;
 			}
-			object_init_ex(ret, ce);
+			if (object_init_ex(ret, ce) != SUCCESS) {
+				return ret;
+			}
 			soap_add_xml_ref(ret, data);
 		}
 		if (sdlType->model) {
@@ -1533,7 +1577,9 @@
 			return ret;
 		}
 
-		object_init_ex(ret, ce);
+		if (object_init_ex(ret, ce) != SUCCESS) {
+			return ret;
+		}
 		soap_add_xml_ref(ret, data);
 		trav = data->children;
 
@@ -2090,6 +2136,13 @@
 	xmlNodePtr xparam;
 
 	if (data && Z_TYPE_P(data) == IS_ARRAY) {
+		if (UNEXPECTED(Z_IS_RECURSIVE_P(data))) {
+			zend_value_error("Recursive array cannot be encoded");
+			return;
+		}
+
+		GC_TRY_PROTECT_RECURSION(Z_ARRVAL_P(data));
+
 		ZEND_HASH_FOREACH_VAL_IND(Z_ARRVAL_P(data), zdata) {
 	 		if (j >= dims0) {
 	 			break;
@@ -2138,6 +2191,8 @@
 				j++;
 			}
 		}
+
+		GC_TRY_UNPROTECT_RECURSION(Z_ARRVAL_P(data));
 	} else {
 		for (j=0; j<dims0; j++) {
 			if (dimension == 1) {
@@ -2200,8 +2255,8 @@
 
 		iter = ce->get_iterator(ce, data, 0);
 
-		if (EG(exception)) {
-			goto iterator_done;
+		if (!iter) {
+			goto iterator_failed_to_get;
 		}
 
 		if (iter->funcs->rewind) {
@@ -2241,6 +2296,7 @@
 		}
 iterator_done:
 		OBJ_RELEASE(&iter->std);
+iterator_failed_to_get:
 		if (EG(exception)) {
 			zval_ptr_dtor(&array_copy);
 			ZVAL_UNDEF(&array_copy);
@@ -2655,6 +2711,13 @@
 	FIND_ZVAL_NULL(data, xmlParam, style);
 
 	if (Z_TYPE_P(data) == IS_ARRAY) {
+		if (UNEXPECTED(Z_IS_RECURSIVE_P(data))) {
+			zend_value_error("Recursive array cannot be encoded");
+			return NULL;
+		}
+
+		GC_TRY_PROTECT_RECURSION(Z_ARRVAL_P(data));
+
 		ZEND_HASH_FOREACH_KEY_VAL_IND(Z_ARRVAL_P(data), int_val, key_val, temp_data) {
 			item = xmlNewNode(NULL, BAD_CAST("item"));
 			xmlAddChild(xmlParam, item);
@@ -2682,6 +2745,8 @@
 			xparam = master_to_xml(get_conversion(Z_TYPE_P(temp_data)), temp_data, style, item);
 			xmlNodeSetName(xparam, BAD_CAST("value"));
 		} ZEND_HASH_FOREACH_END();
+
+		GC_TRY_UNPROTECT_RECURSION(Z_ARRVAL_P(data));
 	}
 	if (style == SOAP_ENCODED) {
 		set_ns_and_type(xmlParam, type);
@@ -3000,7 +3065,7 @@
 		smart_str list = {0};
 
 		if (Z_TYPE_P(data) != IS_STRING) {
-			ZVAL_STR(&tmp, zval_get_string_func(data));
+			ZVAL_STR(&tmp, get_serialization_string_from_zval(data));
 			data = &tmp;
 		}
 		str = estrndup(Z_STRVAL_P(data), Z_STRLEN_P(data));
@@ -3109,13 +3174,10 @@
 		} ZEND_HASH_FOREACH_END();
 		return ret;
 	}
-	if (Z_TYPE_P(data) == IS_STRING) {
-		ret = xmlNewTextLen(BAD_CAST(Z_STRVAL_P(data)), Z_STRLEN_P(data));
-	} else {
-		zend_string *tmp = zval_get_string_func(data);
-		ret = xmlNewTextLen(BAD_CAST(ZSTR_VAL(tmp)), ZSTR_LEN(tmp));
-		zend_string_release_ex(tmp, 0);
-	}
+
+	zend_string *serialization = get_serialization_string_from_zval(data);
+	ret = xmlNewTextLen(BAD_CAST(ZSTR_VAL(serialization)), ZSTR_LEN(serialization));
+	zend_string_release_ex(serialization, false);
 
 	ret->name = xmlStringTextNoenc;
 	ret->parent = parent;
@@ -3385,7 +3447,6 @@
 		} else {
 			smart_str prefix = {0};
 			int num = ++SOAP_GLOBAL(cur_uniq_ns);
-			xmlChar *enc_ns;
 
 			while (1) {
 				smart_str_appendl(&prefix, "ns", 2);
@@ -3399,9 +3460,15 @@
 				num = ++SOAP_GLOBAL(cur_uniq_ns);
 			}
 
-			enc_ns = xmlEncodeSpecialChars(node->doc, BAD_CAST(ns));
+			/* Starting with libxml 2.13, we don't have to do this workaround anymore, otherwise we get double-encoded
+			 * entities. See libxml2 commit f506ec66547ef9bac97a2bf306d368ecea8c0c9e. */
+#if LIBXML_VERSION < 21300
+			xmlChar *enc_ns = xmlEncodeSpecialChars(node->doc, BAD_CAST(ns));
 			xmlns = xmlNewNs(node->doc->children, enc_ns, BAD_CAST(prefix.s ? ZSTR_VAL(prefix.s) : ""));
 			xmlFree(enc_ns);
+#else
+			xmlns = xmlNewNs(node->doc->children, BAD_CAST(ns), BAD_CAST(prefix.s ? ZSTR_VAL(prefix.s) : ""));
+#endif
 			smart_str_free(&prefix);
 		}
 	}

php-8.3.7.tar.xz/ext/soap/php_http.c -> php-8.3.21.tar.xz/ext/soap/php_http.c Changed

@@ -81,6 +81,68 @@
 	return 0;
 }
 
+static void http_context_add_header(const char *s,
+									bool has_authorization,
+									bool has_proxy_authorization,
+									bool has_cookies,
+									smart_str *soap_headers)
+{
+	const char *p;
+	int name_len;
+
+	while (*s) {
+		/* skip leading newlines and spaces */
+		while (*s == ' ' || *s == '\t' || *s == '\r' || *s == '\n') {
+			s++;
+		}
+		/* extract header name */
+		p = s;
+		name_len = -1;
+		while (*p) {
+			if (*p == ':') {
+				if (name_len < 0) name_len = p - s;
+				break;
+			} else if (*p == ' ' || *p == '\t') {
+				if (name_len < 0) name_len = p - s;
+			} else if (*p == '\r' || *p == '\n') {
+				break;
+			}
+			p++;
+		}
+		if (*p == ':') {
+			/* extract header value */
+			while (*p && *p != '\r' && *p != '\n') {
+				p++;
+			}
+			/* skip some predefined headers */
+			if ((name_len != sizeof("host")-1 ||
+				 strncasecmp(s, "host", sizeof("host")-1) != 0) &&
+				(name_len != sizeof("connection")-1 ||
+				 strncasecmp(s, "connection", sizeof("connection")-1) != 0) &&
+				(name_len != sizeof("user-agent")-1 ||
+				 strncasecmp(s, "user-agent", sizeof("user-agent")-1) != 0) &&
+				(name_len != sizeof("content-length")-1 ||
+				 strncasecmp(s, "content-length", sizeof("content-length")-1) != 0) &&
+				(name_len != sizeof("content-type")-1 ||
+				 strncasecmp(s, "content-type", sizeof("content-type")-1) != 0) &&
+				(!has_cookies ||
+				 name_len != sizeof("cookie")-1 ||
+				 strncasecmp(s, "cookie", sizeof("cookie")-1) != 0) &&
+				(!has_authorization ||
+				 name_len != sizeof("authorization")-1 ||
+				 strncasecmp(s, "authorization", sizeof("authorization")-1) != 0) &&
+				(!has_proxy_authorization ||
+				 name_len != sizeof("proxy-authorization")-1 ||
+				 strncasecmp(s, "proxy-authorization", sizeof("proxy-authorization")-1) != 0)) {
+				/* add header */
+				smart_str_appendl(soap_headers, s, p-s);
+				smart_str_append_const(soap_headers, "\r\n");
+			}
+		}
+		s = (*p) ? (p + 1) : p;
+	}
+}
+
 /* Additional HTTP headers */
 void http_context_headers(php_stream_context* context,
                           bool has_authorization,
@@ -89,64 +151,16 @@
                           smart_str* soap_headers)
 {
 	zval *tmp;
-
-	if (context &&
-		(tmp = php_stream_context_get_option(context, "http", "header")) != NULL &&
-		Z_TYPE_P(tmp) == IS_STRING && Z_STRLEN_P(tmp)) {
-		char *s = Z_STRVAL_P(tmp);
-		char *p;
-		int name_len;
-
-		while (*s) {
-			/* skip leading newlines and spaces */
-			while (*s == ' ' || *s == '\t' || *s == '\r' || *s == '\n') {
-				s++;
-			}
-			/* extract header name */
-			p = s;
-			name_len = -1;
-			while (*p) {
-				if (*p == ':') {
-					if (name_len < 0) name_len = p - s;
-					break;
-				} else if (*p == ' ' || *p == '\t') {
-					if (name_len < 0) name_len = p - s;
-				} else if (*p == '\r' || *p == '\n') {
-					break;
+	if (context && (tmp = php_stream_context_get_option(context, "http", "header")) != NULL) {
+		if (Z_TYPE_P(tmp) == IS_STRING && Z_STRLEN_P(tmp)) {
+			http_context_add_header(Z_STRVAL_P(tmp), has_authorization, has_proxy_authorization, has_cookies, soap_headers);
+		} else if (Z_TYPE_P(tmp) == IS_ARRAY) {
+			zval *value;
+			ZEND_HASH_FOREACH_VAL(Z_ARR_P(tmp), value) {
+				if (Z_TYPE_P(value) == IS_STRING && Z_STRLEN_P(value)) {
+					http_context_add_header(Z_STRVAL_P(value), has_authorization, has_proxy_authorization, has_cookies, soap_headers);
 				}
-				p++;
-			}
-			if (*p == ':') {
-				/* extract header value */
-				while (*p && *p != '\r' && *p != '\n') {
-					p++;
-				}
-				/* skip some predefined headers */
-				if ((name_len != sizeof("host")-1 ||
-				     strncasecmp(s, "host", sizeof("host")-1) != 0) &&
-				    (name_len != sizeof("connection")-1 ||
-				     strncasecmp(s, "connection", sizeof("connection")-1) != 0) &&
-				    (name_len != sizeof("user-agent")-1 ||
-				     strncasecmp(s, "user-agent", sizeof("user-agent")-1) != 0) &&
-				    (name_len != sizeof("content-length")-1 ||
-				     strncasecmp(s, "content-length", sizeof("content-length")-1) != 0) &&
-				    (name_len != sizeof("content-type")-1 ||
-				     strncasecmp(s, "content-type", sizeof("content-type")-1) != 0) &&
-				    (!has_cookies ||
-				     name_len != sizeof("cookie")-1 ||
-				     strncasecmp(s, "cookie", sizeof("cookie")-1) != 0) &&
-				    (!has_authorization ||
-				     name_len != sizeof("authorization")-1 ||
-				     strncasecmp(s, "authorization", sizeof("authorization")-1) != 0) &&
-				    (!has_proxy_authorization ||
-				     name_len != sizeof("proxy-authorization")-1 ||
-				     strncasecmp(s, "proxy-authorization", sizeof("proxy-authorization")-1) != 0)) {
-				    /* add header */
-					smart_str_appendl(soap_headers, s, p-s);
-					smart_str_append_const(soap_headers, "\r\n");
-				}
-			}
-			s = (*p) ? (p + 1) : p;
+			} ZEND_HASH_FOREACH_END();
 		}
 	}
 }
@@ -447,6 +461,7 @@
 		}
 		add_soap_fault(this_ptr, "HTTP", "Unable to parse URL", NULL, NULL);
 		smart_str_free(&soap_headers_z);
+		efree(http_msg);
 		return FALSE;
 	}
 
@@ -460,6 +475,7 @@
 		}
 		add_soap_fault(this_ptr, "HTTP", "Unknown protocol. Only http and https are allowed.", NULL, NULL);
 		smart_str_free(&soap_headers_z);
+		efree(http_msg);
 		return FALSE;
 	}
 
@@ -473,6 +489,7 @@
 		add_soap_fault(this_ptr, "HTTP", "SSL support is not available in this build", NULL, NULL);
 		PG(allow_url_fopen) = old_allow_url_fopen;
 		smart_str_free(&soap_headers_z);
+		efree(http_msg);
 		return FALSE;
 	}
 
@@ -527,6 +544,7 @@
 			add_soap_fault(this_ptr, "HTTP", "Could not connect to host", NULL, NULL);
 			PG(allow_url_fopen) = old_allow_url_fopen;
 			smart_str_free(&soap_headers_z);
+			efree(http_msg);
 			return FALSE;
 		}
 	}
@@ -670,6 +688,7 @@
 					convert_to_null(Z_CLIENT_USE_PROXY_P(this_ptr));
 					smart_str_free(&soap_headers_z);
 					smart_str_free(&soap_headers);
+					efree(http_msg);
 					return FALSE;
 				}
 
@@ -745,7 +764,7 @@
 					PHP_MD5Update(&md5ctx, (unsigned char*)":", 1);
 					PHP_MD5Update(&md5ctx, (unsigned char*)cnonce, 8);
 					PHP_MD5Update(&md5ctx, (unsigned char*)":", 1);
-					/* TODO: Support for qop="auth-int" */
+					/* TODO: Support for qop=auth-int */
 					PHP_MD5Update(&md5ctx, (unsigned char*)"auth", sizeof("auth")-1);
 					PHP_MD5Update(&md5ctx, (unsigned char*)":", 1);
 				}
@@ -781,11 +800,11 @@
 				}
 				if ((tmp = zend_hash_str_find(Z_ARRVAL_P(digest), "qop", sizeof("qop")-1)) != NULL &&
 					Z_TYPE_P(tmp) == IS_STRING) {
-				/* TODO: Support for qop="auth-int" */
-					smart_str_append_const(&soap_headers, "\", qop=\"auth");
-					smart_str_append_const(&soap_headers, "\", nc=\"");
+					/* TODO: Support for qop=auth-int */
+					smart_str_append_const(&soap_headers, "\", qop=auth");
+					smart_str_append_const(&soap_headers, ", nc=");
 					smart_str_appendl(&soap_headers, nc, 8);
-					smart_str_append_const(&soap_headers, "\", cnonce=\"");
+					smart_str_append_const(&soap_headers, ", cnonce=\"");
 					smart_str_appendl(&soap_headers, cnonce, 8);
 				}
 				smart_str_append_const(&soap_headers, "\", response=\"");
@@ -833,6 +852,7 @@
 			zval *data;
 			zend_string *key;
 			has_cookies = 1;
+			bool first_cookie = true;
 			smart_str_append_const(&soap_headers, "Cookie: ");
 			ZEND_HASH_MAP_FOREACH_STR_KEY_VAL(Z_ARRVAL_P(cookies), key, data) {
 				if (key && Z_TYPE_P(data) == IS_ARRAY) {
@@ -848,10 +868,13 @@
 						   Z_TYPE_P(tmp) != IS_STRING ||
 						   in_domain(ZSTR_VAL(phpurl->host),Z_STRVAL_P(tmp))) &&
 						  (use_ssl || (tmp = zend_hash_index_find(Z_ARRVAL_P(data), 3)) == NULL)) {
+							if (!first_cookie) {
+								smart_str_appends(&soap_headers, "; ");
+							}
+							first_cookie = false;
 							smart_str_append(&soap_headers, key);
 							smart_str_appendc(&soap_headers, '=');
 							smart_str_append(&soap_headers, Z_STR_P(value));
-							smart_str_appendc(&soap_headers, ';');
 						}
 					}
 				}
@@ -883,12 +906,14 @@
 			convert_to_null(Z_CLIENT_USE_PROXY_P(this_ptr));
 			add_soap_fault(this_ptr, "HTTP", "Failed Sending HTTP SOAP request", NULL, NULL);
 			smart_str_free(&soap_headers_z);
+			efree(http_msg);
 			return FALSE;
 		}
 		smart_str_free(&soap_headers);
 	} else {
 		add_soap_fault(this_ptr, "HTTP", "Failed to create stream??", NULL, NULL);
 		smart_str_free(&soap_headers_z);
+		efree(http_msg);
 		return FALSE;
 	}
 
@@ -897,6 +922,7 @@
 		convert_to_null(Z_CLIENT_HTTPSOCKET_P(this_ptr));
 		convert_to_null(Z_CLIENT_USE_PROXY_P(this_ptr));
 		smart_str_free(&soap_headers_z);
+		efree(http_msg);
 		return TRUE;
 	}
 
@@ -911,6 +937,7 @@
 			convert_to_null(Z_CLIENT_USE_PROXY_P(this_ptr));
 			add_soap_fault(this_ptr, "HTTP", "Error Fetching http headers", NULL, NULL);
 			smart_str_free(&soap_headers_z);
+			efree(http_msg);
 			return FALSE;
 		}
 
@@ -1139,6 +1166,7 @@
 				if (--redirect_max < 1) {
 					add_soap_fault(this_ptr, "HTTP", "Redirection limit reached, aborting", NULL, NULL);
 					smart_str_free(&soap_headers_z);
+					efree(http_msg);
 					return FALSE;
 				}
 
@@ -1256,11 +1284,13 @@
 		zval retval;
 		zval params1;
 
+		/* Warning: the zlib function names are chosen in an unfortunate manner.
+		 * Check zlib.c to see how a function corresponds with a particular format. */
 		if ((strcmp(content_encoding,"gzip") == 0 ||
 		     strcmp(content_encoding,"x-gzip") == 0) &&
-		     zend_hash_str_exists(EG(function_table), "gzinflate", sizeof("gzinflate")-1)) {
-			ZVAL_STRING(&func, "gzinflate");
-			ZVAL_STRINGL(&params0, http_body->val+10, http_body->len-10);
+		     zend_hash_str_exists(EG(function_table), "gzdecode", sizeof("gzdecode")-1)) {
+			ZVAL_STRING(&func, "gzdecode");
+			ZVAL_STR_COPY(&params0, http_body);
 		} else if (strcmp(content_encoding,"deflate") == 0 &&
 		           zend_hash_str_exists(EG(function_table), "gzuncompress", sizeof("gzuncompress")-1)) {
 			ZVAL_STRING(&func, "gzuncompress");

php-8.3.7.tar.xz/ext/soap/php_packet_soap.c -> php-8.3.21.tar.xz/ext/soap/php_packet_soap.c Changed

php-8.3.7.tar.xz/ext/soap/php_schema.c -> php-8.3.21.tar.xz/ext/soap/php_schema.c Changed

@@ -92,6 +92,13 @@
 	return enc;
 }
 
+/* Necessary for some error paths to avoid leaking persistent memory. */
+static void requestify_string(xmlChar **str) {
+	xmlChar *copy = (xmlChar *) estrdup((const char *) *str);
+	xmlFree(*str);
+	*str = copy;
+}
+
 static void schema_load_file(sdlCtx *ctx, xmlAttrPtr ns, xmlChar *location, xmlAttrPtr tns, int import) {
 	if (location != NULL &&
 	    !zend_hash_str_exists(&ctx->docs, (char*)location, xmlStrlen(location))) {
@@ -104,22 +111,35 @@
 		sdl_restore_uri_credentials(ctx);
 
 		if (doc == NULL) {
+			requestify_string(&location);
 			soap_error1(E_ERROR, "Parsing Schema: can't import schema from '%s'", location);
 		}
 		schema = get_node(doc->children, "schema");
 		if (schema == NULL) {
+			requestify_string(&location);
 			xmlFreeDoc(doc);
 			soap_error1(E_ERROR, "Parsing Schema: can't import schema from '%s'", location);
 		}
 		new_tns = get_attribute(schema->properties, "targetNamespace");
 		if (import) {
 			if (ns != NULL && (new_tns == NULL || xmlStrcmp(ns->children->content, new_tns->children->content) != 0)) {
-				xmlFreeDoc(doc);
-				soap_error2(E_ERROR, "Parsing Schema: can't import schema from '%s', unexpected 'targetNamespace'='%s'", location, ns->children->content);
+				requestify_string(&location);
+				if (new_tns == NULL) {
+					xmlFreeDoc(doc);
+					soap_error2(E_ERROR, "Parsing Schema: can't import schema from '%s', missing 'targetNamespace', expected '%s'", location, ns->children->content);
+				} else {
+					/* Have to make a copy to avoid a UAF after freeing `doc` */
+					const char *target_ns_copy = estrdup((const char *) new_tns->children->content);
+					xmlFreeDoc(doc);
+					soap_error3(E_ERROR, "Parsing Schema: can't import schema from '%s', unexpected 'targetNamespace'='%s', expected '%s'", location, target_ns_copy, ns->children->content);
+				}
 			}
 			if (ns == NULL && new_tns != NULL) {
+				requestify_string(&location);
+				/* Have to make a copy to avoid a UAF after freeing `doc` */
+				const char *target_ns_copy = estrdup((const char *) new_tns->children->content);
 				xmlFreeDoc(doc);
-				soap_error2(E_ERROR, "Parsing Schema: can't import schema from '%s', unexpected 'targetNamespace'='%s'", location, new_tns->children->content);
+				soap_error2(E_ERROR, "Parsing Schema: can't import schema from '%s', unexpected 'targetNamespace'='%s', expected no 'targetNamespace'", location, target_ns_copy);
 			}
 		} else {
 			new_tns = get_attribute(schema->properties, "targetNamespace");
@@ -128,6 +148,7 @@
 					xmlSetProp(schema, BAD_CAST("targetNamespace"), tns->children->content);
 				}
 			} else if (tns != NULL && xmlStrcmp(tns->children->content, new_tns->children->content) != 0) {
+				requestify_string(&location);
 				xmlFreeDoc(doc);
 				soap_error1(E_ERROR, "Parsing Schema: can't include schema from '%s', different 'targetNamespace'", location);
 			}

php-8.3.7.tar.xz/ext/soap/php_sdl.c -> php-8.3.21.tar.xz/ext/soap/php_sdl.c Changed

php-8.3.7.tar.xz/ext/soap/php_xml.c -> php-8.3.21.tar.xz/ext/soap/php_xml.c Changed

@@ -92,13 +92,16 @@
 		bool old;
 
 		php_libxml_sanitize_parse_ctxt_options(ctxt);
+		/* TODO: In libxml2 2.14.0 change this to the new options API so we don't rely on deprecated APIs. */
+		PHP_LIBXML_IGNORE_DEPRECATIONS_START
 		ctxt->keepBlanks = 0;
+		ctxt->options |= XML_PARSE_HUGE;
+		PHP_LIBXML_IGNORE_DEPRECATIONS_END
 		ctxt->sax->ignorableWhitespace = soap_ignorableWhitespace;
 		ctxt->sax->comment = soap_Comment;
 		ctxt->sax->warning = NULL;
 		ctxt->sax->error = NULL;
 		/*ctxt->sax->fatalError = NULL;*/
-		ctxt->options |= XML_PARSE_HUGE;
 		old = php_libxml_disable_entity_loader(1);
 		xmlParseDocument(ctxt);
 		php_libxml_disable_entity_loader(old);
@@ -146,7 +149,10 @@
 		ctxt->sax->warning = NULL;
 		ctxt->sax->error = NULL;
 		/*ctxt->sax->fatalError = NULL;*/
+		/* TODO: In libxml2 2.14.0 change this to the new options API so we don't rely on deprecated APIs. */
+		PHP_LIBXML_IGNORE_DEPRECATIONS_START
 		ctxt->options |= XML_PARSE_HUGE;
+		PHP_LIBXML_IGNORE_DEPRECATIONS_END
 		old = php_libxml_disable_entity_loader(1);
 		xmlParseDocument(ctxt);
 		php_libxml_disable_entity_loader(old);

php-8.3.7.tar.xz/ext/soap/soap.c -> php-8.3.21.tar.xz/ext/soap/soap.c Changed

@@ -66,6 +66,7 @@
 static void delete_service(void *service);
 static void delete_url(void *handle);
 static void delete_hashtable(void *hashtable);
+static void delete_argv(struct _soap_class *class);
 
 static void soap_error_handler(int error_num, zend_string *error_filename, const uint32_t error_lineno, zend_string *message);
 
@@ -411,6 +412,7 @@
 	memcpy(&soap_server_object_handlers, &std_object_handlers, sizeof(zend_object_handlers));
 	soap_server_object_handlers.offset = XtOffsetOf(soap_server_object, std);
 	soap_server_object_handlers.free_obj = soap_server_object_free;
+	soap_server_object_handlers.clone_obj = NULL;
 
 	/* Register SoapFault class */
 	soap_fault_class_entry = register_class_SoapFault(zend_ce_exception);
@@ -519,6 +521,24 @@
 }
 /* }}} */
 
+static void soap_fault_dtor_properties(zval *obj)
+{
+	zval_ptr_dtor(Z_FAULT_STRING_P(obj));
+	zval_ptr_dtor(Z_FAULT_CODE_P(obj));
+	zval_ptr_dtor(Z_FAULT_CODENS_P(obj));
+	zval_ptr_dtor(Z_FAULT_ACTOR_P(obj));
+	zval_ptr_dtor(Z_FAULT_DETAIL_P(obj));
+	zval_ptr_dtor(Z_FAULT_NAME_P(obj));
+	zval_ptr_dtor(Z_FAULT_HEADERFAULT_P(obj));
+	ZVAL_EMPTY_STRING(Z_FAULT_STRING_P(obj));
+	ZVAL_NULL(Z_FAULT_CODE_P(obj));
+	ZVAL_NULL(Z_FAULT_CODENS_P(obj));
+	ZVAL_NULL(Z_FAULT_ACTOR_P(obj));
+	ZVAL_NULL(Z_FAULT_DETAIL_P(obj));
+	ZVAL_NULL(Z_FAULT_NAME_P(obj));
+	ZVAL_NULL(Z_FAULT_HEADERFAULT_P(obj));
+}
+
 /* {{{ SoapFault constructor */
 PHP_METHOD(SoapFault, __construct)
 {
@@ -556,6 +576,9 @@
 		RETURN_THROWS();
 	}
 
+	/* Delete previously set properties */
+	soap_fault_dtor_properties(ZEND_THIS);
+
 	if (name != NULL && name_len == 0) {
 		name = NULL;
 	}
@@ -815,6 +838,9 @@
 
 		if ((tmp = zend_hash_str_find(ht, "classmap", sizeof("classmap")-1)) != NULL &&
 			Z_TYPE_P(tmp) == IS_ARRAY) {
+			if (HT_IS_PACKED(Z_ARRVAL_P(tmp))) {
+				php_error_docref(NULL, E_ERROR, "'classmap' option must be an associative array");
+			}
 			service->class_map = zend_array_dup(Z_ARRVAL_P(tmp));
 		}
 
@@ -899,11 +925,9 @@
 			zend_argument_value_error(
 				1, "must be either SOAP_PERSISTENCE_SESSION or SOAP_PERSISTENCE_REQUEST when the SOAP server is used in class mode"
 			);
-			RETURN_THROWS();
 		}
 	} else {
 		zend_throw_error(NULL, "SoapServer::setPersistence(): Persistence cannot be set when the SOAP server is used in function mode");
-		RETURN_THROWS();
 	}
 
 	SOAP_SERVER_END_CODE();
@@ -930,6 +954,8 @@
 	service->type = SOAP_CLASS;
 	service->soap_class.ce = ce;
 
+	delete_argv(&service->soap_class);
+
 	service->soap_class.persistence = SOAP_PERSISTENCE_REQUEST;
 	service->soap_class.argc = num_args;
 	if (service->soap_class.argc > 0) {
@@ -961,6 +987,7 @@
 
 	service->type = SOAP_OBJECT;
 
+	zval_ptr_dtor(&service->soap_object);
 	ZVAL_OBJ_COPY(&service->soap_object, Z_OBJ_P(obj));
 
 	SOAP_SERVER_END_CODE();
@@ -1042,13 +1069,16 @@
 
 				if (Z_TYPE_P(tmp_function) != IS_STRING) {
 					zend_argument_type_error(1, "must contain only strings");
+					SOAP_SERVER_END_CODE();
 					RETURN_THROWS();
 				}
 
 				key = zend_string_tolower(Z_STR_P(tmp_function));
 
 				if ((f = zend_hash_find_ptr(EG(function_table), key)) == NULL) {
+					zend_string_release_ex(key, false);
 					zend_type_error("SoapServer::addFunction(): Function \"%s\" not found", Z_STRVAL_P(tmp_function));
+					SOAP_SERVER_END_CODE();
 					RETURN_THROWS();
 				}
 
@@ -1065,7 +1095,9 @@
 		key = zend_string_tolower(Z_STR_P(function_name));
 
 		if ((f = zend_hash_find_ptr(EG(function_table), key)) == NULL) {
+			zend_string_release_ex(key, false);
 			zend_argument_type_error(1, "must be a valid function name, function \"%s\" not found", Z_STRVAL_P(function_name));
+			SOAP_SERVER_END_CODE();
 			RETURN_THROWS();
 		}
 		if (service->soap_functions.ft == NULL) {
@@ -1086,11 +1118,9 @@
 			service->soap_functions.functions_all = TRUE;
 		} else {
 			zend_argument_value_error(1, "must be SOAP_FUNCTIONS_ALL when an integer is passed");
-			RETURN_THROWS();
 		}
 	} else {
 		zend_argument_type_error(1, "must be of type array|string|int, %s given", zend_zval_value_name(function_name));
-		RETURN_THROWS();
 	}
 
 	SOAP_SERVER_END_CODE();
@@ -1150,6 +1180,7 @@
 
 	if (arg && ZEND_SIZE_T_INT_OVFL(arg_len)) {
 		soap_server_fault("Server", "Input string is too long", NULL, NULL, NULL);
+		SOAP_SERVER_END_CODE();
 		return;
 	}
 
@@ -1231,10 +1262,12 @@
 						php_stream_filter_append(&SG(request_info).request_body->readfilters, zf);
 					} else {
 						php_error_docref(NULL, E_WARNING,"Can't uncompress compressed request");
+						SOAP_SERVER_END_CODE();
 						return;
 					}
 				} else {
 					php_error_docref(NULL, E_WARNING,"Request is compressed with unknown compression '%s'",Z_STRVAL_P(encoding));
+					SOAP_SERVER_END_CODE();
 					return;
 				}
 			}
@@ -1246,6 +1279,7 @@
 			}
 		} else {
 			zval_ptr_dtor(&retval);
+			SOAP_SERVER_END_CODE();
 			return;
 		}
 	} else {
@@ -1388,8 +1422,7 @@
 				}
 			}
 #endif
-			zend_string *fn_name = zend_string_tolower(Z_STR(h->function_name));
-			if (zend_hash_exists(function_table, fn_name) ||
+			if (zend_hash_find_ptr_lc(function_table, Z_STR(h->function_name)) != NULL ||
 			    ((service->type == SOAP_CLASS || service->type == SOAP_OBJECT) &&
 			     zend_hash_str_exists(function_table, ZEND_CALL_FUNC_NAME, sizeof(ZEND_CALL_FUNC_NAME)-1))) {
 				if (service->type == SOAP_CLASS || service->type == SOAP_OBJECT) {
@@ -1405,25 +1438,21 @@
 				    instanceof_function(Z_OBJCE(h->retval), soap_fault_class_entry)) {
 					php_output_discard();
 					soap_server_fault_ex(function, &h->retval, h);
-					zend_string_release(fn_name);
 					if (service->type == SOAP_CLASS && soap_obj) {zval_ptr_dtor(soap_obj);}
 					goto fail;
 				} else if (EG(exception)) {
 					php_output_discard();
 					_soap_server_exception(service, function, ZEND_THIS);
-					zend_string_release(fn_name);
 					if (service->type == SOAP_CLASS && soap_obj) {zval_ptr_dtor(soap_obj);}
 					goto fail;
 				}
 			} else if (h->mustUnderstand) {
 				soap_server_fault("MustUnderstand","Header not understood", NULL, NULL, NULL);
 			}
-			zend_string_release(fn_name);
 		}
 	}
 
-	zend_string *fn_name = zend_string_tolower(Z_STR(function_name));
-	if (zend_hash_exists(function_table, fn_name) ||
+	if (zend_hash_find_ptr_lc(function_table, Z_STR(function_name)) != NULL ||
 	    ((service->type == SOAP_CLASS || service->type == SOAP_OBJECT) &&
 	     zend_hash_str_exists(function_table, ZEND_CALL_FUNC_NAME, sizeof(ZEND_CALL_FUNC_NAME)-1))) {
 		if (service->type == SOAP_CLASS || service->type == SOAP_OBJECT) {
@@ -1445,7 +1474,6 @@
 	} else {
 		php_error(E_ERROR, "Function '%s' doesn't exist", Z_STRVAL(function_name));
 	}
-	zend_string_release(fn_name);
 
 	if (EG(exception)) {
 		if (!zend_is_unwind_exit(EG(exception))) {
@@ -1520,7 +1548,7 @@
 			sapi_add_header("Content-Type: text/xml; charset=utf-8", sizeof("Content-Type: text/xml; charset=utf-8")-1, 1);
 		}
 
-		if (zend_ini_long("zlib.output_compression", sizeof("zlib.output_compression"), 0)) {
+		if (INI_INT("zlib.output_compression")) {
 			sapi_add_header("Connection: close", sizeof("Connection: close")-1, 1);
 		} else {
 			snprintf(cont_len, sizeof(cont_len), "Content-Length: %d", size);
@@ -1622,6 +1650,7 @@
 
 	if (!service || !service->soap_headers_ptr) {
 		zend_throw_error(NULL, "SoapServer::addSoapHeader() may be called only during SOAP request processing");
+		SOAP_SERVER_END_CODE();
 		RETURN_THROWS();
 	}
 
@@ -1668,7 +1697,7 @@
 	if (use_http_error_status) {
 		sapi_add_header("HTTP/1.1 500 Internal Server Error", sizeof("HTTP/1.1 500 Internal Server Error")-1, 1);
 	}
-	if (zend_ini_long("zlib.output_compression", sizeof("zlib.output_compression"), 0)) {
+	if (INI_INT("zlib.output_compression")) {
 		sapi_add_header("Connection: close", sizeof("Connection: close")-1, 1);
 	} else {
 		snprintf(cont_len, sizeof(cont_len), "Content-Length: %d", size);
@@ -1978,6 +2007,9 @@
 		}
 		if ((tmp = zend_hash_str_find(ht, "classmap", sizeof("classmap")-1)) != NULL &&
 			Z_TYPE_P(tmp) == IS_ARRAY) {
+			if (HT_IS_PACKED(Z_ARRVAL_P(tmp))) {
+				php_error_docref(NULL, E_ERROR, "'classmap' option must be an associative array");
+			}
 			ZVAL_COPY(Z_CLIENT_CLASSMAP_P(this_ptr), tmp);
 		}
 
@@ -4342,6 +4374,16 @@
 }
 /* }}} */
 
+static void delete_argv(struct _soap_class *class)
+{
+	if (class->argc) {
+		for (int i = 0; i < class->argc; i++) {
+			zval_ptr_dtor(&class->argvi);
+		}
+		efree(class->argv);
+	}
+}
+
 static void delete_service(void *data) /* {{{ */
 {
 	soapServicePtr service = (soapServicePtr)data;
@@ -4356,13 +4398,7 @@
 		efree(service->typemap);
 	}
 
-	if (service->soap_class.argc) {
-		int i;
-		for (i = 0; i < service->soap_class.argc;i++) {
-			zval_ptr_dtor(&service->soap_class.argvi);
-		}
-		efree(service->soap_class.argv);
-	}
+	delete_argv(&service->soap_class);
 
 	if (service->actor) {
 		efree(service->actor);

php-8.3.21.tar.xz/ext/soap/tests/SoapFault Added

php-8.3.21.tar.xz/ext/soap/tests/SoapFault/gh14586.phpt Added

php-8.3.7.tar.xz/ext/soap/tests/bug68996.phpt -> php-8.3.21.tar.xz/ext/soap/tests/bug68996.phpt Changed

@@ -18,6 +18,18 @@
 }
 $s->addFunction("foo");
 
+function handleFormatted($s, $input) {
+  ob_start();
+  $s->handle($input);
+  $response = ob_get_clean();
+
+  // libxml2 2.13 has different formatting behaviour: it outputs <faultcode/> instead of <faultcode></faultcode>
+  // this normalizes the output to <faultcode/>
+  $response = str_replace('<faultcode></faultcode>', '<faultcode/>', $response);
+  $response = str_replace('<env:Value></env:Value>', '<env:Value/>', $response);
+  echo $response;
+}
+
 // soap 1.1
 $HTTP_RAW_POST_DATA = <<<EOF
 <?xml version="1.0" encoding="UTF-8"?>
@@ -27,7 +39,7 @@
   </SOAP-ENV:Body>
 </SOAP-ENV:Envelope>
 EOF;
-$s->handle($HTTP_RAW_POST_DATA);
+handleFormatted($s, $HTTP_RAW_POST_DATA);
 
 // soap 1.2
 $HTTP_RAW_POST_DATA = <<<EOF
@@ -38,10 +50,10 @@
   </env:Body>
 </env:Envelope>
 EOF;
-$s->handle($HTTP_RAW_POST_DATA);
+handleFormatted($s, $HTTP_RAW_POST_DATA);
 ?>
 --EXPECT--
 <?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode></faultcode><faultstring>some msg</faultstring></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>
+<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode/><faultstring>some msg</faultstring></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>
 <?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"><env:Body><env:Fault><env:Code><env:Value></env:Value></env:Code><env:Reason><env:Text>some msg</env:Text></env:Reason></env:Fault></env:Body></env:Envelope>
+<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"><env:Body><env:Fault><env:Code><env:Value/></env:Code><env:Reason><env:Text>some msg</env:Text></env:Reason></env:Fault></env:Body></env:Envelope>

php-8.3.7.tar.xz/ext/soap/tests/bug71610.phpt -> php-8.3.21.tar.xz/ext/soap/tests/bug71610.phpt Changed

php-8.3.7.tar.xz/ext/soap/tests/bugs/bug27722.phpt -> php-8.3.21.tar.xz/ext/soap/tests/bugs/bug27722.phpt Changed

php-8.3.7.tar.xz/ext/soap/tests/bugs/bug27742.phpt -> php-8.3.21.tar.xz/ext/soap/tests/bugs/bug27742.phpt Changed

php-8.3.7.tar.xz/ext/soap/tests/bugs/bug42151.phpt -> php-8.3.21.tar.xz/ext/soap/tests/bugs/bug42151.phpt Changed

php-8.3.21.tar.xz/ext/soap/tests/bugs/bug47925.phpt Added

@@ -0,0 +1,40 @@
+--TEST--
+Bug #47925 (PHPClient can't decompress response (transposed uncompress methods?))
+--EXTENSIONS--
+soap
+zlib
+--SKIPIF--
+<?php
+if (@!include __DIR__."/../../../standard/tests/http/server.inc") die('skip server.inc not available');
+http_server_skipif();
+?>
+--FILE--
+<?php
+require __DIR__."/../../../standard/tests/http/server.inc";
+
+$plain_response = <<<XML
+<?xml version="1.0" encoding="UTF-8"?>
+<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://testuri.org" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">
+    <SOAP-ENV:Body>
+        <ns1:AddResponse>
+            <return xsi:type="xsd:int">7</return>
+        </ns1:AddResponse>
+    </SOAP-ENV:Body>
+</SOAP-ENV:Envelope>
+XML;
+
+function test($compressed_response, $compression_name) {
+    $length = strlen($compressed_response);
+    $server_response = "data://text/xml;base64," . base64_encode("HTTP/1.1 200 OK\r\nConnection: close\r\nContent-Encoding: $compression_name\r\nContent-Length: $length\r\n\r\n$compressed_response");
+    'pid' => $pid, 'uri' => $uri = http_server($server_response);
+    $client = new SoapClient(NULL, 'location' => $uri, 'uri' => $uri);
+    var_dump($client->Add(3, 4));
+    http_server_kill($pid);
+}
+
+test(gzencode($plain_response), "gzip");
+test(gzcompress($plain_response), "deflate");
+?>
+--EXPECT--
+int(7)
+int(7)

php-8.3.21.tar.xz/ext/soap/tests/bugs/bug55639.phpt Added

@@ -0,0 +1,65 @@
+--TEST--
+Bug #55639 (Digest authentication dont work)
+--INI--
+soap.wsdl_cache_enabled=0
+--EXTENSIONS--
+soap
+--SKIPIF--
+<?php
+if (!file_exists(__DIR__ . "/../../../../sapi/cli/tests/php_cli_server.inc")) {
+    echo "skip sapi/cli/tests/php_cli_server.inc required but not found";
+}
+?>
+--FILE--
+<?php
+
+include __DIR__ . "/../../../../sapi/cli/tests/php_cli_server.inc";
+
+$args = "-d", "extension_dir=" . ini_get("extension_dir"), "-d", "extension=" . (substr(PHP_OS, 0, 3) == "WIN" ? "php_" : "") . "soap." . PHP_SHLIB_SUFFIX;
+if (php_ini_loaded_file()) {
+  // Necessary such that it works from a development directory in which case extension_dir might not be the real extension dir
+  $args = "-c";
+  $args = php_ini_loaded_file();
+}
+
+$code = <<<'PHP'
+/* Receive */
+header('HTTP/1.0 401 Unauthorized');
+header('WWW-Authenticate: Digest realm="realm", qop="auth,auth-int", nonce="aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", opaque="bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"');
+file_get_contents("php://input");
+PHP;
+
+php_cli_server_start($code, null, $args);
+
+$client = new soapclient(NULL, 
+  'location' => 'http://' . PHP_CLI_SERVER_ADDRESS,
+  'uri' => 'misc-uri',
+  'authentication' => SOAP_AUTHENTICATION_DIGEST,
+  'realm' => 'myrealm',
+  'login' => 'user',
+  'password' => 'pass',
+  'trace' => true,
+);
+
+try {
+    $client->__soapCall("foo", );
+} catch (Throwable $e) {
+    echo $e->getMessage(), "\n";
+}
+
+$headers = $client->__getLastRequestHeaders();
+var_dump($headers);
+
+?>
+--EXPECTF--
+Unauthorized
+string(%d) "POST / HTTP/1.1
+Host: %s
+Connection: Keep-Alive
+User-Agent: %s
+Content-Type: text/xml; charset=utf-8
+SOAPAction: "misc-uri#foo"
+Content-Length: %d
+Authorization: Digest username="user", realm="realm", nonce="aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", uri="/", qop=auth, nc=00000001, cnonce="%s", response="%s", opaque="bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"
+
+"

php-8.3.21.tar.xz/ext/soap/tests/bugs/bug62900.phpt Added

@@ -0,0 +1,95 @@
+--TEST--
+Bug #62900 (Wrong namespace on xsd import error message)
+--EXTENSIONS--
+soap
+--INI--
+soap.wsdl_cache_enabled=0
+--FILE--
+<?php
+
+$wsdl_with_ns = <<<XML
+<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://test-uri">
+	<types>
+		<xs:schema targetNamespace="http://test-uri" elementFormDefault="qualified">
+			<import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="bug62900.xsd" />
+		</xs:schema>
+	</types>
+</definitions>
+XML;
+
+$wsdl_without_ns = <<<XML
+<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://test-uri">
+	<types>
+		<xs:schema elementFormDefault="qualified">
+			<import schemaLocation="bug62900.xsd" />
+		</xs:schema>
+	</types>
+</definitions>
+XML;
+
+$xsd_with_wrong_ns = <<<XML
+<!DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "XMLSchema.dtd">
+<xs:schema targetNamespace="http://www.w3.org/XML/1998/namespacex" xmlns:xs="http://www.w3.org/2001/XMLSchema" xml:lang="en"/>
+XML;
+
+$xsd_without_ns = <<<XML
+<!DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "XMLSchema.dtd">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xml:lang="en"/>
+XML;
+
+$combinations = 
+    $wsdl_with_ns, $xsd_with_wrong_ns,
+    $wsdl_with_ns, $xsd_without_ns,
+    $wsdl_without_ns, $xsd_with_wrong_ns,
+    $wsdl_without_ns, $xsd_without_ns,
+;
+
+chdir(__DIR__);
+
+$args = "-d", "display_startup_errors=0", "-d", "extension_dir=" . ini_get("extension_dir"), "-d", "extension=" . (substr(PHP_OS, 0, 3) == "WIN" ? "php_" : "") . "soap." . PHP_SHLIB_SUFFIX;
+if (php_ini_loaded_file()) {
+    // Necessary such that it works from a development directory in which case extension_dir might not be the real extension dir
+    $args = "-c";
+    $args = php_ini_loaded_file();
+}
+
+foreach ($combinations as list($wsdl, $xsd)) {
+    file_put_contents(__DIR__."/bug62900.wsdl", $wsdl);
+    file_put_contents(__DIR__."/bug62900.xsd", $xsd);
+
+    $proc = proc_open(PHP_BINARY, ...$args, __DIR__.'/bug62900_run', 1 => "pipe", "w", 2 => "pipe", "w", $pipes);
+    echo stream_get_contents($pipes1);
+    fclose($pipes1);
+    proc_close($proc);
+}
+
+?>
+--CLEAN--
+<?php
+@unlink(__DIR__."/bug62900.wsdl");
+@unlink(__DIR__."/bug62900.xsd");
+?>
+--EXPECTF--
+Fatal error: Uncaught SoapFault exception: WSDL SOAP-ERROR: Parsing Schema: can't import schema from '%sbug62900.xsd', unexpected 'targetNamespace'='http://www.w3.org/XML/1998/namespacex', expected 'http://www.w3.org/XML/1998/namespace' in %s:%d
+Stack trace:
+#0 %s(%d): SoapClient->__construct(%s)
+#1 {main}
+  thrown in %s on line %d
+
+Fatal error: Uncaught SoapFault exception: WSDL SOAP-ERROR: Parsing Schema: can't import schema from '%sbug62900.xsd', missing 'targetNamespace', expected 'http://www.w3.org/XML/1998/namespace' in %s:%d
+Stack trace:
+#0 %s(%d): SoapClient->__construct(%s)
+#1 {main}
+  thrown in %s on line %d
+
+Fatal error: Uncaught SoapFault exception: WSDL SOAP-ERROR: Parsing Schema: can't import schema from '%sbug62900.xsd', unexpected 'targetNamespace'='http://www.w3.org/XML/1998/namespacex', expected no 'targetNamespace' in %s:%d
+Stack trace:
+#0 %s(%d): SoapClient->__construct(%s)
+#1 {main}
+  thrown in %s on line %d
+
+Fatal error: Uncaught SoapFault exception: WSDL SOAP-ERROR: Parsing WSDL: Couldn't bind to service in %s:%d
+Stack trace:
+#0 %s(%d): SoapClient->__construct(%s)
+#1 {main}
+  thrown in %s on line %d

php-8.3.21.tar.xz/ext/soap/tests/bugs/bug62900_run Added

php-8.3.21.tar.xz/ext/soap/tests/bugs/bug66049.phpt Added

@@ -0,0 +1,48 @@
+--TEST--
+Fix #66049 Typemap can break parsing in parse_packet_soap leading to a segfault
+--EXTENSIONS--
+soap
+--INI--
+soap.wsdl_cache_enabled=0
+--FILE--
+<?php
+function soap_string_from_xml($str)
+    { 
+    echo "soap_string_from_xml\n";
+
+	// Should return an string
+    return 2.3; 
+    }
+
+class TestSoapClient extends SoapClient {
+    function __doRequest($request, $location, $action, $version, $one_way = 0): ?string {
+        $res='<?xml version="1.0" encoding="UTF-8"?>
+            <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/">
+            <SOAP-ENV:Body>
+            <SOAP-ENV:Fault><faultcode>SOAP-ENV:Server</faultcode><faultstring>not present</faultstring>
+            </SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>';
+        return $res;
+    }
+}
+
+try {
+    $client=new TestSoapClient(null, 
+        'uri' => 'test://',
+        'location' => 'test://',
+        'typemap' => 
+            "type_ns" => "http://www.w3.org/2001/XMLSchema",
+            "type_name" => "string",
+            "from_xml" => "soap_string_from_xml"
+         );
+    $client->Mist("");
+} catch (SoapFault $e) {
+    var_dump($e->faultstring);
+    var_dump($e->faultcode);
+}
+?>
+Done
+--EXPECT--
+soap_string_from_xml
+string(3) "2.3"
+string(15) "SOAP-ENV:Server"
+Done

php-8.3.21.tar.xz/ext/soap/tests/bugs/bug73182.phpt Added

@@ -0,0 +1,62 @@
+--TEST--
+Bug #73182 (PHP SOAPClient does not support stream context HTTP headers in array form)
+--EXTENSIONS--
+soap
+--SKIPIF--
+<?php
+    if (!file_exists(__DIR__ . "/../../../../sapi/cli/tests/php_cli_server.inc")) {
+        echo "skip sapi/cli/tests/php_cli_server.inc required but not found";
+    }
+?>
+--FILE--
+<?php
+
+include __DIR__ . "/../../../../sapi/cli/tests/php_cli_server.inc";
+
+$args = "-d", "extension_dir=" . ini_get("extension_dir"), "-d", "extension=" . (substr(PHP_OS, 0, 3) == "WIN" ? "php_" : "") . "soap." . PHP_SHLIB_SUFFIX;
+if (php_ini_loaded_file()) {
+  // Necessary such that it works from a development directory in which case extension_dir might not be the real extension dir
+  $args = "-c";
+  $args = php_ini_loaded_file();
+}
+$code = <<<'PHP'
+/* Receive */
+$content = trim(file_get_contents("php://input")) . PHP_EOL;
+PHP;
+
+php_cli_server_start($code, null, $args);
+
+$client = new soapclient(NULL, 
+  'location' => 'http://' . PHP_CLI_SERVER_ADDRESS,
+  'uri' => 'misc-uri',
+  'trace' => true,
+  'stream_context' => stream_context_create(
+    'http' => 
+      'header' => 
+        // These 2 must be ignored because the soap http client sets them up
+        'Connection: close',
+        'User-Agent: bar',
+        // The following 2 must be included
+        'X-custom: foo',
+        'Content-Description: Foo',
+        '  X-custom2: trim me  ',
+      ,
+    ,
+  ),
+);
+
+$client->__soapCall("foo", );
+echo $client->__getLastRequestHeaders();
+
+?>
+--EXPECTF--
+POST / HTTP/1.1
+Host: localhost:%d
+Connection: Keep-Alive
+User-Agent: PHP-SOAP/%s
+Content-Type: text/xml; charset=utf-8
+SOAPAction: "misc-uri#foo"
+Content-Length: %d
+X-custom: foo
+Content-Description: Foo
+X-custom2: trim me

php-8.3.21.tar.xz/ext/soap/tests/bugs/bug76232.phpt Added

@@ -0,0 +1,67 @@
+--TEST--
+Bug #76232 (SoapClient Cookie Header Semicolon)
+--EXTENSIONS--
+soap
+--SKIPIF--
+<?php
+    if (!file_exists(__DIR__ . "/../../../../sapi/cli/tests/php_cli_server.inc")) {
+        echo "skip sapi/cli/tests/php_cli_server.inc required but not found";
+    }
+?>
+--FILE--
+<?php
+
+include __DIR__ . "/../../../../sapi/cli/tests/php_cli_server.inc";
+
+$args = "-d", "extension_dir=" . ini_get("extension_dir"), "-d", "extension=" . (substr(PHP_OS, 0, 3) == "WIN" ? "php_" : "") . "soap." . PHP_SHLIB_SUFFIX;
+if (php_ini_loaded_file()) {
+  // Necessary such that it works from a development directory in which case extension_dir might not be the real extension dir
+  $args = "-c";
+  $args = php_ini_loaded_file();
+}
+$code = <<<'PHP'
+/* Receive */
+$content = trim(file_get_contents("php://input")) . PHP_EOL;
+PHP;
+
+php_cli_server_start($code, null, $args);
+
+$client = new soapclient(NULL, 
+  'location' => 'http://' . PHP_CLI_SERVER_ADDRESS,
+  'uri' => 'misc-uri',
+  'trace' => true,
+);
+
+echo "=== Request with one cookie ===\n";
+
+$client->__setCookie('testcookie1', 'true');
+$client->__soapCall("foo", );
+echo $client->__getLastRequestHeaders();
+
+echo "=== Request with two cookies ===\n";
+
+$client->__setCookie('testcookie2', 'true');
+$client->__soapCall("foo", );
+
+echo $client->__getLastRequestHeaders();
+?>
+--EXPECTF--
+=== Request with one cookie ===
+POST / HTTP/1.1
+Host: %s
+Connection: Keep-Alive
+User-Agent: PHP-SOAP/%s
+Content-Type: text/xml; charset=utf-8
+SOAPAction: "misc-uri#foo"
+Content-Length: %d
+Cookie: testcookie1=true
+
+=== Request with two cookies ===
+POST / HTTP/1.1
+Host: %s
+Connection: Keep-Alive
+User-Agent: PHP-SOAP/%s
+Content-Type: text/xml; charset=utf-8
+SOAPAction: "misc-uri#foo"
+Content-Length: %d
+Cookie: testcookie1=true; testcookie2=true

php-8.3.21.tar.xz/ext/soap/tests/bugs/gh16237.phpt Added

php-8.3.21.tar.xz/ext/soap/tests/bugs/gh16256.phpt Added

php-8.3.21.tar.xz/ext/soap/tests/bugs/gh16259.phpt Added

php-8.3.21.tar.xz/ext/soap/tests/bugs/gh16429.phpt Added

php-8.3.21.tar.xz/ext/soap/tests/bugs/setClass_twice.phpt Added

php-8.3.21.tar.xz/ext/soap/tests/bugs/setObject_twice.phpt Added

php-8.3.21.tar.xz/ext/soap/tests/gh15711.phpt Added

@@ -0,0 +1,88 @@
+--TEST--
+GH-15711 (SoapClient can't convert BackedEnum to scalar value)
+--EXTENSIONS--
+soap
+--INI--
+soap.wsdl_cache_enabled=0
+--FILE--
+<?php
+
+enum StringBackedEnum: string
+{
+    case First = 'BackingValue1';
+    case Second = 'BackingValue2';
+    case Third = 'BackingValue3';
+    case Fourth = 'BackingValue4';
+    case Fifth = 'BackingValue5';
+}
+
+enum IntBackedEnum: int
+{
+    case First = 1;
+    case Second = 2;
+}
+
+enum NonBackedEnum
+{
+    case First;
+}
+
+class TestSoapClient extends SoapClient {
+    function __doRequest($request, $location, $action, $version, $one_way = 0): ?string {
+        echo $request;
+    }
+}
+
+$client = new TestSoapClient(__DIR__ . '/gh15711.wsdl', 'classmap' => 'book' => 'book');
+
+echo "--- Test with backed enum ---\n";
+
+$book = new stdClass();
+$book->base64 = StringBackedEnum::First;
+$book->string = StringBackedEnum::Second;
+$book->any = StringBackedEnum::Third;
+$book->hexbin = StringBackedEnum::Fourth;
+$book->nmtokens = StringBackedEnum::Fifth;
+$book->integer = IntBackedEnum::First;
+$book->short = IntBackedEnum::Second;
+
+try {
+    $client->dotest($book);
+} catch (Throwable) {}
+
+echo "--- Test with non-backed enum ---\n";
+
+$book = new stdClass();
+$book->base64 = NonBackedEnum::First;
+$book->string = NonBackedEnum::First;
+$book->any = NonBackedEnum::First;
+$book->hexbin = NonBackedEnum::First;
+$book->nmtokens = NonBackedEnum::First;
+$book->integer = NonBackedEnum::First;
+$book->short = NonBackedEnum::First;
+
+try {
+    $client->dotest($book);
+} catch (ValueError $e) {
+    echo "ValueError: ", $e->getMessage(), "\n";
+}
+
+echo "--- Test with mismatched enum backing type ---\n";
+
+$book->integer = StringBackedEnum::First;
+$book->short = StringBackedEnum::First;
+try {
+    $client->dotest($book);
+} catch (ValueError $e) {
+    echo "ValueError: ", $e->getMessage(), "\n";
+}
+
+?>
+--EXPECT--
+--- Test with backed enum ---
+<?xml version="1.0" encoding="UTF-8"?>
+<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://schemas.nothing.com" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:dotest><dotestReturn xsi:type="ns1:book"><base64 xsi:type="xsd:base64Binary">QmFja2luZ1ZhbHVlMQ==</base64><string xsi:type="xsd:string">BackingValue2</string><any xsi:type="xsd:any"><name xsi:type="xsd:string">Third</name><value xsi:type="xsd:string">BackingValue3</value></any><hexbin xsi:type="xsd:hexBinary">4261636B696E6756616C756534</hexbin><nmtokens>BackingValue5</nmtokens><integer xsi:type="xsd:integer">1</integer><short xsi:type="xsd:short">2</short></dotestReturn></ns1:dotest></SOAP-ENV:Body></SOAP-ENV:Envelope>
+--- Test with non-backed enum ---
+ValueError: Non-backed enums have no default serialization
+--- Test with mismatched enum backing type ---
+ValueError: String-backed enum cannot be serialized as int

php-8.3.21.tar.xz/ext/soap/tests/gh15711.wsdl Added

@@ -0,0 +1,39 @@
+<wsdl:definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://schemas.nothing.com" targetNamespace="http://schemas.nothing.com">
+	<wsdl:types>
+		<xsd:schema targetNamespace="http://schemas.nothing.com">
+			<xsd:complexType name="book">
+				<xsd:all>
+					<xsd:element name="base64" type="xsd:base64Binary"/>
+					<xsd:element name="string" type="xsd:string"/>
+                    <xsd:element name="any" type="xsd:any"/>
+                    <xsd:element name="hexbin" type="xsd:hexBinary"/>
+                    <xsd:element name="nmtokens" type="xsd:NMTOKENS"/>
+                    <xsd:element name="integer" type="xsd:integer"/>
+                    <xsd:element name="short" type="xsd:short"/>
+				</xsd:all>
+			</xsd:complexType>
+  </xsd:schema>
+	</wsdl:types>
+	<message name="dotestRequest">
+		<part name="dotestReturn" type="tns:book"/>
+  </message>
+	<portType name="testPortType">
+		<operation name="dotest">
+			<input message="tns:dotestRequest"/>
+		</operation>
+	</portType>
+	<binding name="testBinding" type="tns:testPortType">
+		<soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
+		<operation name="dotest">
+			<soap:operation soapAction="http://localhost:81/test/interface.php?class=test/dotest" style="rpc"/>
+			<input>
+				<soap:body use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://schemas.nothing.com"/>
+			</input>
+		</operation>
+	</binding>
+	<service name="test">
+		<port name="testPort" binding="tns:testBinding">
+			<soap:address location="http://localhost:81/test/interface.php?class=test"/>
+		</port>
+	</service>
+</wsdl:definitions>

php-8.3.21.tar.xz/ext/soap/tests/gh16318.phpt Added

php-8.3.7.tar.xz/ext/soap/tests/server011.phpt -> php-8.3.21.tar.xz/ext/soap/tests/server011.phpt Changed

php-8.3.7.tar.xz/ext/soap/tests/server012.phpt -> php-8.3.21.tar.xz/ext/soap/tests/server012.phpt Changed

php-8.3.7.tar.xz/ext/sockets/sockets.c -> php-8.3.21.tar.xz/ext/sockets/sockets.c Changed

@@ -354,7 +354,11 @@
 
 #ifndef PHP_WIN32
 	if (error < -10000) {
-		error = -error - 10000;
+		if (error == INT_MIN) {
+			error = 2147473648;
+		} else {
+			error = -error - 10000;
+		}
 
 #ifdef HAVE_HSTRERROR
 		buf = hstrerror(error);
@@ -880,7 +884,7 @@
 	ENSURE_SOCKET_VALID(php_sock);
 
 	/* overflow check */
-	if ((length + 1) < 2) {
+	if (length <= 0 || length == ZEND_LONG_MAX) {
 		RETURN_FALSE;
 	}
 
@@ -1215,6 +1219,11 @@
 		RETURN_THROWS();
 	}
 
+	if (ZEND_LONG_EXCEEDS_INT(arg1)) {
+		zend_argument_value_error(1, "must be between %d and %d", INT_MIN, INT_MAX);
+		RETURN_THROWS();
+	}
+
 	RETURN_STRING(sockets_strerror(arg1));
 }
 /* }}} */
@@ -1317,7 +1326,7 @@
 	ENSURE_SOCKET_VALID(php_sock);
 
 	/* overflow check */
-	if ((len + 1) < 2) {
+	if (len <= 0 || len == ZEND_LONG_MAX) {
 		RETURN_FALSE;
 	}
 
@@ -1401,7 +1410,8 @@
 
 	/* overflow check */
 	/* Shouldthrow ? */
-	if ((arg3 + 2) < 3) {
+
+	if (arg3 <= 0 || arg3 > ZEND_LONG_MAX - 1) {
 		RETURN_FALSE;
 	}
 
@@ -1861,8 +1871,16 @@
 			const char l_onoff_key = "l_onoff";
 			const char l_linger_key = "l_linger";
 
-			convert_to_array(arg4);
-			opt_ht = Z_ARRVAL_P(arg4);
+			if (Z_TYPE_P(arg4) != IS_ARRAY) {
+				if (UNEXPECTED(Z_TYPE_P(arg4) != IS_OBJECT)) {
+					zend_argument_type_error(4, "must be of type array when argument #3 ($option) is SO_LINGER, %s given", zend_zval_value_name(arg4));
+					RETURN_THROWS();
+				} else {
+					opt_ht = Z_OBJPROP_P(arg4);
+				}
+			} else {
+				opt_ht = Z_ARRVAL_P(arg4);
+			}
 
 			if ((l_onoff = zend_hash_str_find(opt_ht, l_onoff_key, sizeof(l_onoff_key) - 1)) == NULL) {
 				zend_argument_value_error(4, "must have key \"%s\"", l_onoff_key);
@@ -1873,11 +1891,21 @@
 				RETURN_THROWS();
 			}
 
-			convert_to_long(l_onoff);
-			convert_to_long(l_linger);
+			zend_long val_lonoff = zval_get_long(l_onoff);
+			zend_long val_linger = zval_get_long(l_linger);
 
-			lv.l_onoff = (unsigned short)Z_LVAL_P(l_onoff);
-			lv.l_linger = (unsigned short)Z_LVAL_P(l_linger);
+			if (val_lonoff < 0 || val_lonoff > USHRT_MAX) {
+				zend_argument_value_error(4, "\"%s\" must be between 0 and %u", l_onoff_key, USHRT_MAX);
+				RETURN_THROWS();
+			}
+
+			if (val_linger < 0 || val_linger > USHRT_MAX) {
+				zend_argument_value_error(4, "\"%s\" must be between 0 and %d", l_linger, USHRT_MAX);
+				RETURN_THROWS();
+			}
+
+			lv.l_onoff = (unsigned short)val_lonoff;
+			lv.l_linger = (unsigned short)val_linger;
 
 			optlen = sizeof(lv);
 			opt_ptr = &lv;
@@ -1889,8 +1917,18 @@
 			const char sec_key = "sec";
 			const char usec_key = "usec";
 
-			convert_to_array(arg4);
-			opt_ht = Z_ARRVAL_P(arg4);
+			if (Z_TYPE_P(arg4) != IS_ARRAY) {
+				if (UNEXPECTED(Z_TYPE_P(arg4) != IS_OBJECT)) {
+					zend_argument_type_error(4, "must be of type array when argument #3 ($option) is %s, %s given",
+							optname == SO_RCVTIMEO ? "SO_RCVTIMEO" : "SO_SNDTIMEO",
+							zend_zval_value_name(arg4));
+					RETURN_THROWS();
+				} else {
+					opt_ht = Z_OBJPROP_P(arg4);
+				}
+			} else {
+				opt_ht = Z_ARRVAL_P(arg4);
+			}
 
 			if ((sec = zend_hash_str_find(opt_ht, sec_key, sizeof(sec_key) - 1)) == NULL) {
 				zend_argument_value_error(4, "must have key \"%s\"", sec_key);
@@ -1901,15 +1939,16 @@
 				RETURN_THROWS();
 			}
 
-			convert_to_long(sec);
-			convert_to_long(usec);
+			zend_long valsec = zval_get_long(sec);
+			zend_long valusec = zval_get_long(usec);
 #ifndef PHP_WIN32
-			tv.tv_sec = Z_LVAL_P(sec);
-			tv.tv_usec = Z_LVAL_P(usec);
+			tv.tv_sec = valsec;
+			tv.tv_usec = valusec;
 			optlen = sizeof(tv);
 			opt_ptr = &tv;
 #else
-			timeout = Z_LVAL_P(sec) * 1000 + Z_LVAL_P(usec) / 1000;
+			timeout = valsec * 1000 + valusec / 1000;
+	
 			optlen = sizeof(int);
 			opt_ptr = &timeout;
 #endif
@@ -1961,15 +2000,15 @@
 
 #ifdef SO_ATTACH_REUSEPORT_CBPF
 		case SO_ATTACH_REUSEPORT_CBPF: {
-			convert_to_long(arg4);
+			zend_long cbpf_val = zval_get_long(arg4);
 
-			if (!Z_LVAL_P(arg4)) {
+			if (!cbpf_val) {
 				ov = 1;
 				optlen = sizeof(ov);
 				opt_ptr = &ov;
 				optname = SO_DETACH_BPF;
 			} else {
-				uint32_t k = (uint32_t)Z_LVAL_P(arg4);
+				uint32_t k = (uint32_t)cbpf_val;
 				static struct sock_filter cbpf8 = {0};
 				static struct sock_fprog bpfprog;
 
@@ -1996,8 +2035,7 @@
 
 		default:
 default_case:
-			convert_to_long(arg4);
-			ov = Z_LVAL_P(arg4);
+			ov = zval_get_long(arg4);
 
 			optlen = sizeof(ov);
 			opt_ptr = &ov;

php-8.3.21.tar.xz/ext/sockets/tests/gh16267.phpt Added

php-8.3.21.tar.xz/ext/sockets/tests/gh17921.phpt Added

php-8.3.21.tar.xz/ext/sockets/tests/socket_recv_overflow.phpt Added

php-8.3.7.tar.xz/ext/sockets/tests/socket_reuseport_cbpf.phpt -> php-8.3.21.tar.xz/ext/sockets/tests/socket_reuseport_cbpf.phpt Changed

php-8.3.21.tar.xz/ext/sockets/tests/socket_set_option_timeo_error.phpt Added

@@ -0,0 +1,66 @@
+--TEST--
+socket_set_option() with SO_RCVTIMEO/SO_SNDTIMEO/SO_LINGER
+--EXTENSIONS--
+sockets
+--FILE--
+<?php
+$socket = socket_create(AF_INET, SOCK_STREAM, SOL_TCP);
+if (!$socket) {
+        die('Unable to create AF_INET socket socket');
+}
+$options_1 = array("sec" => 1, "usec" => "aaaaa");
+$options_2 = array("sec" => new stdClass(), "usec" => "1");
+$options_3 = array("l_onoff" => "aaaa", "l_linger" => "1");
+$options_4 = array("l_onoff" => "1", "l_linger" => );
+$options_5 = array("l_onoff" => PHP_INT_MAX, "l_linger" => "1");
+
+try {
+	socket_set_option( $socket, SOL_SOCKET, SO_RCVTIMEO, new stdClass);
+} catch (\ValueError $e) {
+	echo $e->getMessage() . PHP_EOL;
+}
+
+try {
+	socket_set_option( $socket, SOL_SOCKET, SO_RCVTIMEO, $options_1);
+} catch (\TypeError $e) {
+	echo $e->getMessage() . PHP_EOL;
+}
+
+try {
+	socket_set_option( $socket, SOL_SOCKET, SO_SNDTIMEO, $options_2);
+} catch (\TypeError $e) {
+	echo $e->getMessage() . PHP_EOL;
+}
+try {
+	socket_set_option( $socket, SOL_SOCKET, SO_RCVTIMEO, "not good");
+} catch (\TypeError $e) {
+	echo $e->getMessage() . PHP_EOL;
+}
+try {
+	socket_set_option( $socket, SOL_SOCKET, SO_LINGER, "not good neither");
+} catch (\TypeError $e) {
+	echo $e->getMessage() . PHP_EOL;
+}
+try {
+	socket_set_option( $socket, SOL_SOCKET, SO_LINGER, $options_3);
+} catch (\TypeError $e) {
+	echo $e->getMessage() . PHP_EOL;
+}
+try {
+	socket_set_option( $socket, SOL_SOCKET, SO_LINGER, $options_4);
+} catch (\TypeError $e) {
+	echo $e->getMessage() . PHP_EOL;
+}
+try {
+	socket_set_option( $socket, SOL_SOCKET, SO_LINGER, $options_5);
+} catch (\ValueError $e) {
+	echo $e->getMessage() . PHP_EOL;
+}
+?>
+--EXPECTF--
+socket_set_option(): Argument #4 ($value) must have key "sec"
+
+Warning: Object of class stdClass could not be converted to int in %s on line %d
+socket_set_option(): Argument #4 ($value) must be of type array when argument #3 ($option) is SO_RCVTIMEO, string given
+socket_set_option(): Argument #4 ($value) must be of type array when argument #3 ($option) is SO_LINGER, string given
+socket_set_option(): Argument #4 ($value) "l_onoff" must be between 0 and %d

php-8.3.7.tar.xz/ext/sodium/libsodium.c -> php-8.3.21.tar.xz/ext/sodium/libsodium.c Changed

@@ -992,6 +992,7 @@
 
 	if (crypto_sign_ed25519_sk_to_pk((unsigned char *) ZSTR_VAL(publickey),
 									 (const unsigned char *) secretkey) != 0) {
+		zend_string_efree(publickey);
 		zend_throw_exception(sodium_exception_ce,
 				   "internal error", 0);
 		RETURN_THROWS();
@@ -2475,6 +2476,7 @@
 	crypto_generichash(sk, crypto_kx_SECRETKEYBYTES,
 					   seed, crypto_kx_SEEDBYTES, NULL, 0);
 	if (crypto_scalarmult_base(pk, sk) != 0) {
+		zend_string_efree(keypair);
 		zend_throw_exception(sodium_exception_ce, "internal error", 0);
 		RETURN_THROWS();
 	}
@@ -2496,6 +2498,7 @@
 	pk = sk + crypto_kx_SECRETKEYBYTES;
 	randombytes_buf(sk, crypto_kx_SECRETKEYBYTES);
 	if (crypto_scalarmult_base(pk, sk) != 0) {
+		zend_string_efree(keypair);
 		zend_throw_exception(sodium_exception_ce, "internal error", 0);
 		RETURN_THROWS();
 	}
@@ -2672,6 +2675,7 @@
 	if (crypto_auth((unsigned char *) ZSTR_VAL(mac),
 					(const unsigned char *) msg, msg_len,
 					(const unsigned char *) key) != 0) {
+		zend_string_efree(mac);
 		zend_throw_exception(sodium_exception_ce, "internal error", 0);
 		RETURN_THROWS();
 	}
@@ -2731,6 +2735,7 @@
 
 	if (crypto_sign_ed25519_sk_to_curve25519((unsigned char *) ZSTR_VAL(ecdhkey),
 											 (const unsigned char *) eddsakey) != 0) {
+		zend_string_efree(ecdhkey);
 		zend_throw_exception(sodium_exception_ce, "conversion failed", 0);
 		RETURN_THROWS();
 	}
@@ -2758,6 +2763,7 @@
 
 	if (crypto_sign_ed25519_pk_to_curve25519((unsigned char *) ZSTR_VAL(ecdhkey),
 											 (const unsigned char *) eddsakey) != 0) {
+		zend_string_efree(ecdhkey);
 		zend_throw_exception(sodium_exception_ce, "conversion failed", 0);
 		RETURN_THROWS();
 	}
@@ -3036,6 +3042,7 @@
 #if SODIUM_LIBRARY_VERSION_MAJOR > 9 || (SODIUM_LIBRARY_VERSION_MAJOR == 9 && SODIUM_LIBRARY_VERSION_MINOR >= 6)
 	if (sodium_pad(NULL, (unsigned char *) ZSTR_VAL(padded), unpadded_len,
 				   (size_t) blocksize, xpadded_len + 1U) != 0) {
+		zend_string_efree(padded);
 		zend_throw_exception(sodium_exception_ce, "internal error", 0);
 		RETURN_THROWS();
 	}

php-8.3.21.tar.xz/ext/sodium/tests/sodium_crypto_sign_ed25519_pk_to_curve25519_failure_leak.phpt Added

php-8.3.7.tar.xz/ext/spl/spl_array.c -> php-8.3.21.tar.xz/ext/spl/spl_array.c Changed

@@ -554,13 +554,15 @@
 			if (Z_TYPE_P(data) == IS_INDIRECT) {
 				data = Z_INDIRECT_P(data);
 				if (Z_TYPE_P(data) != IS_UNDEF) {
-					zval_ptr_dtor(data);
+					zval garbage;
+					ZVAL_COPY_VALUE(&garbage, data);
 					ZVAL_UNDEF(data);
 					HT_FLAGS(ht) |= HASH_FLAG_HAS_EMPTY_IND;
 					zend_hash_move_forward_ex(ht, spl_array_get_pos_ptr(ht, intern));
 					if (spl_array_is_object(intern)) {
 						spl_array_skip_protected(intern, ht);
 					}
+					zval_ptr_dtor(&garbage);
 				}
 			} else {
 				zend_hash_del(ht, key.key);
@@ -639,12 +641,14 @@
 		}
 	}
 
+	/* empty() check the value is not falsy, isset() only check it is not null */
+	bool result = check_empty ? zend_is_true(value) : Z_TYPE_P(value) != IS_NULL;
+
 	if (value == &rv) {
 		zval_ptr_dtor(&rv);
 	}
 
-	/* empty() check the value is not falsy, isset() only check it is not null */
-	return check_empty ? zend_is_true(value) : Z_TYPE_P(value) != IS_NULL;
+	return result;
 } /* }}} */
 
 static int spl_array_has_dimension(zend_object *object, zval *offset, int check_empty) /* {{{ */
@@ -842,6 +846,10 @@
 
 	if ((intern->ar_flags & SPL_ARRAY_ARRAY_AS_PROPS) != 0
 		&& !zend_std_has_property(object, name, ZEND_PROPERTY_EXISTS, NULL)) {
+		if (cache_slot) {
+			cache_slot0 = cache_slot1 = cache_slot2 = NULL;
+		}
+
 		/* If object has offsetGet() overridden, then fallback to read_property,
 		 * which will call offsetGet(). */
 		zval member;
@@ -1051,8 +1059,10 @@
 static void spl_array_set_array(zval *object, spl_array_object *intern, zval *array, zend_long ar_flags, bool just_array) {
 	/* Handled by ZPP prior to this, or for __unserialize() before passing to here */
 	ZEND_ASSERT(Z_TYPE_P(array) == IS_ARRAY || Z_TYPE_P(array) == IS_OBJECT);
+	zval garbage;
+	ZVAL_UNDEF(&garbage);
 	if (Z_TYPE_P(array) == IS_ARRAY) {
-		zval_ptr_dtor(&intern->array);
+		ZVAL_COPY_VALUE(&garbage, &intern->array);
 		if (Z_REFCOUNT_P(array) == 1) {
 			ZVAL_COPY(&intern->array, array);
 		} else {
@@ -1070,7 +1080,7 @@
 		}
 	} else {
 		if (Z_OBJ_HT_P(array) == &spl_handler_ArrayObject || Z_OBJ_HT_P(array) == &spl_handler_ArrayIterator) {
-			zval_ptr_dtor(&intern->array);
+			ZVAL_COPY_VALUE(&garbage, &intern->array);
 			if (just_array)	{
 				spl_array_object *other = Z_SPLARRAY_P(array);
 				ar_flags = other->ar_flags & ~SPL_ARRAY_INT_MASK;
@@ -1084,13 +1094,14 @@
 			}
 		} else {
 			zend_object_get_properties_t handler = Z_OBJ_HANDLER_P(array, get_properties);
-			if (handler != zend_std_get_properties) {
+			if (handler != zend_std_get_properties || Z_OBJ_HANDLER_P(array, get_properties_for)) {
 				zend_throw_exception_ex(spl_ce_InvalidArgumentException, 0,
 					"Overloaded object of type %s is not compatible with %s",
 					ZSTR_VAL(Z_OBJCE_P(array)->name), ZSTR_VAL(intern->std.ce->name));
+				ZEND_ASSERT(Z_TYPE(garbage) == IS_UNDEF);
 				return;
 			}
-			zval_ptr_dtor(&intern->array);
+			ZVAL_COPY_VALUE(&garbage, &intern->array);
 			ZVAL_COPY(&intern->array, array);
 		}
 	}
@@ -1101,6 +1112,8 @@
 		zend_hash_iterator_del(intern->ht_iter);
 		intern->ht_iter = (uint32_t)-1;
 	}
+
+	zval_ptr_dtor(&garbage);
 }
 /* }}} */

php-8.3.7.tar.xz/ext/spl/spl_directory.c -> php-8.3.21.tar.xz/ext/spl/spl_directory.c Changed

@@ -212,10 +212,16 @@
 }
 /* }}} */
 
+static inline bool spl_intern_is_glob(const spl_filesystem_object *intern)
+{
+	/* NULL check on `dirp` is necessary as destructors may interfere. */
+	return intern->u.dir.dirp && php_stream_is(intern->u.dir.dirp, &php_glob_stream_ops);
+}
+
 PHPAPI zend_string *spl_filesystem_object_get_path(spl_filesystem_object *intern) /* {{{ */
 {
 #ifdef HAVE_GLOB
-	if (intern->type == SPL_FS_DIR && php_stream_is(intern->u.dir.dirp, &php_glob_stream_ops)) {
+	if (intern->type == SPL_FS_DIR && spl_intern_is_glob(intern)) {
 		size_t len = 0;
 		char *tmp = php_glob_stream_get_path(intern->u.dir.dirp, &len);
 		if (len == 0) {
@@ -230,7 +236,7 @@
 	return zend_string_copy(intern->path);
 } /* }}} */
 
-static inline zend_result spl_filesystem_object_get_file_name(spl_filesystem_object *intern) /* {{{ */
+static zend_result spl_filesystem_object_get_file_name(spl_filesystem_object *intern) /* {{{ */
 {
 	if (intern->file_name) {
 		/* already known */
@@ -658,7 +664,7 @@
 	if (intern->type == SPL_FS_DIR) {
 #ifdef HAVE_GLOB
 		pnstr = spl_gen_private_prop_name(spl_ce_DirectoryIterator, "glob", sizeof("glob")-1);
-		if (php_stream_is(intern->u.dir.dirp ,&php_glob_stream_ops)) {
+		if (spl_intern_is_glob(intern)) {
 			ZVAL_STR_COPY(&tmp, intern->path);
 		} else {
 			ZVAL_FALSE(&tmp);
@@ -1614,11 +1620,11 @@
 		RETURN_THROWS();
 	}
 
-	if (intern->u.dir.dirp && php_stream_is(intern->u.dir.dirp ,&php_glob_stream_ops)) {
+	if (spl_intern_is_glob(intern)) {
 		RETURN_LONG(php_glob_stream_get_count(intern->u.dir.dirp, NULL));
 	} else {
-		/* should not happen */
-		// TODO ZEND_ASSERT ?
+		/* This can happen by abusing destructors. */
+		/* TODO: relax this from E_ERROR to an exception */
 		php_error_docref(NULL, E_ERROR, "GlobIterator lost glob state");
 	}
 }
@@ -2035,22 +2041,27 @@
 PHP_METHOD(SplFileObject, __construct)
 {
 	spl_filesystem_object *intern = spl_filesystem_from_obj(Z_OBJ_P(ZEND_THIS));
+	zend_string *file_name = NULL;
 	zend_string *open_mode = ZSTR_CHAR('r');
+	zval *stream_context = NULL;
 	bool use_include_path = 0;
 	size_t path_len;
 	zend_error_handling error_handling;
 
-	intern->u.file.open_mode = ZSTR_CHAR('r');
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "P|Sbr!", &file_name, &open_mode, &use_include_path, &stream_context) == FAILURE) {
+		RETURN_THROWS();
+	}
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "P|Sbr!",
-			&intern->file_name, &open_mode,
-			&use_include_path, &intern->u.file.zcontext) == FAILURE) {
-		intern->u.file.open_mode = NULL;
-		intern->file_name = NULL;
+	/* Prevent reinitialization of Object */
+	if (UNEXPECTED(intern->u.file.stream)) {
+		zend_throw_error(NULL, "Cannot call constructor twice");
 		RETURN_THROWS();
 	}
 
 	intern->u.file.open_mode = zend_string_copy(open_mode);
+	/* file_name and zcontext are copied by spl_filesystem_file_open() */
+	intern->file_name = file_name;
+	intern->u.file.zcontext = stream_context;
 
 	/* spl_filesystem_file_open() can generate E_WARNINGs which we want to promote to exceptions */
 	zend_replace_error_handling(EH_THROW, spl_ce_RuntimeException, &error_handling);
@@ -2089,6 +2100,12 @@
 		RETURN_THROWS();
 	}
 
+	/* Prevent reinitialization of Object */
+	if (UNEXPECTED(intern->u.file.stream)) {
+		zend_throw_error(NULL, "Cannot call constructor twice");
+		RETURN_THROWS();
+	}
+
 	if (max_memory < 0) {
 		file_name = ZSTR_INIT_LITERAL("php://memory", 0);
 	} else if (ZEND_NUM_ARGS()) {
@@ -2691,6 +2708,12 @@
 
 	CHECK_SPL_FILE_OBJECT_IS_INITIALIZED(intern);
 
+	if (size < 0) {
+		zend_argument_value_error(1, "must be greater than or equal to 0");
+		RETURN_THROWS();
+	}
+
+
 	if (!php_stream_truncate_supported(intern->u.file.stream)) {
 		zend_throw_exception_ex(spl_ce_LogicException, 0, "Can't truncate file %s", ZSTR_VAL(intern->file_name));
 		RETURN_THROWS();

php-8.3.7.tar.xz/ext/spl/spl_dllist.c -> php-8.3.21.tar.xz/ext/spl/spl_dllist.c Changed

@@ -44,10 +44,13 @@
 	efree(elem); \
 }
 
-#define SPL_LLIST_CHECK_DELREF(elem) if ((elem) && !--SPL_LLIST_RC(elem)) { \
+#define SPL_LLIST_CHECK_DELREF_EX(elem, on_free) if ((elem) && !--SPL_LLIST_RC(elem)) { \
 	efree(elem); \
+	on_free \
 }
 
+#define SPL_LLIST_CHECK_DELREF(elem) SPL_LLIST_CHECK_DELREF_EX(elem, ;)
+
 #define SPL_LLIST_ADDREF(elem) SPL_LLIST_RC(elem)++
 #define SPL_LLIST_CHECK_ADDREF(elem) if (elem) SPL_LLIST_RC(elem)++
 
@@ -736,8 +739,10 @@
 		if (element != NULL) {
 			/* the element is replaced, delref the old one as in
 			 * SplDoublyLinkedList::pop() */
-			zval_ptr_dtor(&element->data);
+			zval garbage;
+			ZVAL_COPY_VALUE(&garbage, &element->data);
 			ZVAL_COPY(&element->data, value);
+			zval_ptr_dtor(&garbage);
 		} else {
 			zval_ptr_dtor(value);
 			zend_argument_error(spl_ce_OutOfRangeException, 1, "is an invalid offset");
@@ -1021,8 +1026,12 @@
 		smart_str_appendc(&buf, ':');
 		next = current->next;
 
+		SPL_LLIST_CHECK_ADDREF(next);
+
 		php_var_serialize(&buf, &current->data, &var_hash);
 
+		SPL_LLIST_CHECK_DELREF_EX(next, break;);
+
 		current = next;
 	}

php-8.3.7.tar.xz/ext/spl/spl_fixedarray.c -> php-8.3.21.tar.xz/ext/spl/spl_fixedarray.c Changed

php-8.3.7.tar.xz/ext/spl/spl_heap.c -> php-8.3.21.tar.xz/ext/spl/spl_heap.c Changed

@@ -32,6 +32,7 @@
 #define PTR_HEAP_BLOCK_SIZE 64
 
 #define SPL_HEAP_CORRUPTED       0x00000001
+#define SPL_HEAP_WRITE_LOCKED    0x00000002
 
 zend_object_handlers spl_handler_SplHeap;
 zend_object_handlers spl_handler_SplPriorityQueue;
@@ -278,12 +279,16 @@
 		heap->max_size *= 2;
 	}
 
+	heap->flags |= SPL_HEAP_WRITE_LOCKED;
+
 	/* sifting up */
 	for (i = heap->count; i > 0 && heap->cmp(spl_heap_elem(heap, (i-1)/2), elem, cmp_userdata) < 0; i = (i-1)/2) {
 		spl_heap_elem_copy(heap, spl_heap_elem(heap, i), spl_heap_elem(heap, (i-1)/2));
 	}
 	heap->count++;
 
+	heap->flags &= ~SPL_HEAP_WRITE_LOCKED;
+
 	if (EG(exception)) {
 		/* exception thrown during comparison */
 		heap->flags |= SPL_HEAP_CORRUPTED;
@@ -311,6 +316,8 @@
 		return FAILURE;
 	}
 
+	heap->flags |= SPL_HEAP_WRITE_LOCKED;
+
 	if (elem) {
 		spl_heap_elem_copy(heap, elem, spl_heap_elem(heap, 0));
 	} else {
@@ -334,6 +341,8 @@
 		}
 	}
 
+	heap->flags &= ~SPL_HEAP_WRITE_LOCKED;
+
 	if (EG(exception)) {
 		/* exception thrown during comparison */
 		heap->flags |= SPL_HEAP_CORRUPTED;
@@ -379,10 +388,14 @@
 
 	int i;
 
+	heap->flags |= SPL_HEAP_WRITE_LOCKED;
+
 	for (i = 0; i < heap->count; ++i) {
 		heap->dtor(spl_heap_elem(heap, i));
 	}
 
+	heap->flags &= ~SPL_HEAP_WRITE_LOCKED;
+
 	efree(heap->elements);
 	efree(heap);
 }
@@ -505,7 +518,7 @@
 }
 /* }}} */
 
-static inline HashTable* spl_heap_object_get_debug_info(zend_class_entry *ce, zend_object *obj) { /* {{{ */
+static HashTable* spl_heap_object_get_debug_info(zend_class_entry *ce, zend_object *obj) { /* {{{ */
 	spl_heap_object *intern = spl_heap_from_obj(obj);
 	zval tmp, heap_array;
 	zend_string *pnstr;
@@ -601,6 +614,21 @@
 }
 /* }}} */
 
+static zend_result spl_heap_consistency_validations(const spl_heap_object *intern, bool write)
+{
+	if (intern->heap->flags & SPL_HEAP_CORRUPTED) {
+		zend_throw_exception(spl_ce_RuntimeException, "Heap is corrupted, heap properties are no longer ensured.", 0);
+		return FAILURE;
+	}
+
+	if (write && (intern->heap->flags & SPL_HEAP_WRITE_LOCKED)) {
+		zend_throw_exception(spl_ce_RuntimeException, "Heap cannot be changed when it is already being modified.", 0);
+		return FAILURE;
+	}
+
+	return SUCCESS;
+}
+
 /* {{{ Push $value on the heap */
 PHP_METHOD(SplHeap, insert)
 {
@@ -613,8 +641,7 @@
 
 	intern = Z_SPLHEAP_P(ZEND_THIS);
 
-	if (intern->heap->flags & SPL_HEAP_CORRUPTED) {
-		zend_throw_exception(spl_ce_RuntimeException, "Heap is corrupted, heap properties are no longer ensured.", 0);
+	if (UNEXPECTED(spl_heap_consistency_validations(intern, true) != SUCCESS)) {
 		RETURN_THROWS();
 	}
 
@@ -636,8 +663,7 @@
 
 	intern = Z_SPLHEAP_P(ZEND_THIS);
 
-	if (intern->heap->flags & SPL_HEAP_CORRUPTED) {
-		zend_throw_exception(spl_ce_RuntimeException, "Heap is corrupted, heap properties are no longer ensured.", 0);
+	if (UNEXPECTED(spl_heap_consistency_validations(intern, true) != SUCCESS)) {
 		RETURN_THROWS();
 	}
 
@@ -662,8 +688,7 @@
 
 	intern = Z_SPLHEAP_P(ZEND_THIS);
 
-	if (intern->heap->flags & SPL_HEAP_CORRUPTED) {
-		zend_throw_exception(spl_ce_RuntimeException, "Heap is corrupted, heap properties are no longer ensured.", 0);
+	if (UNEXPECTED(spl_heap_consistency_validations(intern, true) != SUCCESS)) {
 		RETURN_THROWS();
 	}
 
@@ -703,8 +728,7 @@
 
 	intern = Z_SPLHEAP_P(ZEND_THIS);
 
-	if (intern->heap->flags & SPL_HEAP_CORRUPTED) {
-		zend_throw_exception(spl_ce_RuntimeException, "Heap is corrupted, heap properties are no longer ensured.", 0);
+	if (UNEXPECTED(spl_heap_consistency_validations(intern, true) != SUCCESS)) {
 		RETURN_THROWS();
 	}
 
@@ -730,8 +754,7 @@
 
 	intern = Z_SPLHEAP_P(ZEND_THIS);
 
-	if (intern->heap->flags & SPL_HEAP_CORRUPTED) {
-		zend_throw_exception(spl_ce_RuntimeException, "Heap is corrupted, heap properties are no longer ensured.", 0);
+	if (UNEXPECTED(spl_heap_consistency_validations(intern, false) != SUCCESS)) {
 		RETURN_THROWS();
 	}
 
@@ -841,8 +864,7 @@
 
 	intern = Z_SPLHEAP_P(ZEND_THIS);
 
-	if (intern->heap->flags & SPL_HEAP_CORRUPTED) {
-		zend_throw_exception(spl_ce_RuntimeException, "Heap is corrupted, heap properties are no longer ensured.", 0);
+	if (UNEXPECTED(spl_heap_consistency_validations(intern, false) != SUCCESS)) {
 		RETURN_THROWS();
 	}
 
@@ -906,8 +928,7 @@
 {
 	spl_heap_object *object = Z_SPLHEAP_P(&iter->data);
 
-	if (object->heap->flags & SPL_HEAP_CORRUPTED) {
-		zend_throw_exception(spl_ce_RuntimeException, "Heap is corrupted, heap properties are no longer ensured.", 0);
+	if (UNEXPECTED(spl_heap_consistency_validations(object, false) != SUCCESS)) {
 		return NULL;
 	}
 
@@ -924,8 +945,7 @@
 	zend_user_iterator *user_it = (zend_user_iterator *) iter;
 	spl_heap_object *object = Z_SPLHEAP_P(&iter->data);
 
-	if (object->heap->flags & SPL_HEAP_CORRUPTED) {
-		zend_throw_exception(spl_ce_RuntimeException, "Heap is corrupted, heap properties are no longer ensured.", 0);
+	if (UNEXPECTED(spl_heap_consistency_validations(object, false) != SUCCESS)) {
 		return NULL;
 	}
 
@@ -953,8 +973,7 @@
 {
 	spl_heap_object *object = Z_SPLHEAP_P(&iter->data);
 
-	if (object->heap->flags & SPL_HEAP_CORRUPTED) {
-		zend_throw_exception(spl_ce_RuntimeException, "Heap is corrupted, heap properties are no longer ensured.", 0);
+	if (UNEXPECTED(spl_heap_consistency_validations(object, false) != SUCCESS)) {
 		return;
 	}

php-8.3.7.tar.xz/ext/spl/spl_iterators.c -> php-8.3.21.tar.xz/ext/spl/spl_iterators.c Changed

@@ -532,6 +532,20 @@
 	return SUCCESS;
 }
 
+static void spl_RecursiveIteratorIterator_free_iterators(spl_recursive_it_object *object)
+{
+	if (object->iterators) {
+		while (object->level >= 0) {
+			zend_object_iterator *sub_iter = object->iteratorsobject->level.iterator;
+			zend_iterator_dtor(sub_iter);
+			zval_ptr_dtor(&object->iteratorsobject->level.zobject);
+			object->level--;
+		}
+		efree(object->iterators);
+		object->iterators = NULL;
+	}
+}
+
 static void spl_recursive_it_it_construct(INTERNAL_FUNCTION_PARAMETERS, zend_class_entry *ce_base, zend_class_entry *ce_inner, recursive_it_it_type rit_type)
 {
 	zval *object = ZEND_THIS;
@@ -598,6 +612,7 @@
 	}
 
 	intern = Z_SPLRECURSIVE_IT_P(object);
+	spl_RecursiveIteratorIterator_free_iterators(intern);
 	intern->iterators = emalloc(sizeof(spl_sub_iterator));
 	intern->level = 0;
 	intern->mode = mode;
@@ -644,6 +659,7 @@
 	intern->iterators0.getchildren = NULL;
 
 	if (EG(exception)) {
+		// TODO: use spl_RecursiveIteratorIterator_free_iterators
 		zend_object_iterator *sub_iter;
 
 		while (intern->level >= 0) {
@@ -952,16 +968,7 @@
 {
 	spl_recursive_it_object *object = spl_recursive_it_from_obj(_object);
 
-	if (object->iterators) {
-		while (object->level >= 0) {
-			zend_object_iterator *sub_iter = object->iteratorsobject->level.iterator;
-			zend_iterator_dtor(sub_iter);
-			zval_ptr_dtor(&object->iteratorsobject->level.zobject);
-			object->level--;
-		}
-		efree(object->iterators);
-		object->iterators = NULL;
-	}
+	spl_RecursiveIteratorIterator_free_iterators(object);
 
 	zend_object_std_dtor(&object->std);
 	for (size_t i = 0; i < 6; i++) {
@@ -1898,12 +1905,17 @@
 			zval *replacement = zend_read_property(intern->std.ce, Z_OBJ_P(ZEND_THIS), "replacement", sizeof("replacement")-1, 1, &rv);
 			zend_string *replacement_str = zval_try_get_string(replacement);
 
-			if (UNEXPECTED(!replacement_str)) {
-				RETURN_THROWS();
-			}
+			/* Property type is ?string, so this should always succeed. */
+			ZEND_ASSERT(replacement_str != NULL);
 
 			result = php_pcre_replace_impl(intern->u.regex.pce, subject, ZSTR_VAL(subject), ZSTR_LEN(subject), replacement_str, -1, &count);
 
+			if (UNEXPECTED(!result)) {
+				zend_string_release(replacement_str);
+				zend_string_release_ex(subject, false);
+				RETURN_FALSE;
+			}
+
 			if (intern->u.regex.flags & REGIT_USE_KEY) {
 				zval_ptr_dtor(&intern->current.key);
 				ZVAL_STR(&intern->current.key, result);
@@ -1920,7 +1932,7 @@
 	if (intern->u.regex.flags & REGIT_INVERTED) {
 		RETVAL_BOOL(Z_TYPE_P(return_value) != IS_TRUE);
 	}
-	zend_string_release_ex(subject, 0);
+	zend_string_release_ex(subject, false);
 } /* }}} */
 
 /* {{{ Returns current regular expression */

php-8.3.7.tar.xz/ext/spl/spl_observer.c -> php-8.3.21.tar.xz/ext/spl/spl_observer.c Changed

@@ -118,9 +118,11 @@
 static void spl_object_storage_dtor(zval *element) /* {{{ */
 {
 	spl_SplObjectStorageElement *el = Z_PTR_P(element);
-	zend_object_release(el->obj);
-	zval_ptr_dtor(&el->inf);
-	efree(el);
+	if (el) {
+		zend_object_release(el->obj);
+		zval_ptr_dtor(&el->inf);
+		efree(el);
+	}
 } /* }}} */
 
 static spl_SplObjectStorageElement* spl_object_storage_get(spl_SplObjectStorage *intern, zend_hash_key *key) /* {{{ */
@@ -168,8 +170,10 @@
 		return pelement;
 	}
 
+	/* NULL initialization necessary because `spl_object_storage_create_element` could bail out due to OOM. */
+	ZVAL_PTR(entry_zv, NULL);
 	pelement = spl_object_storage_create_element(obj, inf);
-	ZVAL_PTR(entry_zv, pelement);
+	Z_PTR_P(entry_zv) = pelement;
 	return pelement;
 } /* }}} */
 
@@ -336,12 +340,10 @@
 
 	ZEND_HASH_FOREACH_PTR(&intern->storage, element) {
 		array_init(&tmp);
-		/* Incrementing the refcount of obj and inf would confuse the garbage collector.
-		 * Prefer to null the destructor */
-		Z_ARRVAL_P(&tmp)->pDestructor = NULL;
 		zval obj;
-		ZVAL_OBJ(&obj, element->obj);
+		ZVAL_OBJ_COPY(&obj, element->obj);
 		add_assoc_zval_ex(&tmp, "obj", sizeof("obj") - 1, &obj);
+		Z_TRY_ADDREF(element->inf);
 		add_assoc_zval_ex(&tmp, "inf", sizeof("inf") - 1, &element->inf);
 		zend_hash_next_index_insert(Z_ARRVAL(storage), &tmp);
 	} ZEND_HASH_FOREACH_END();
@@ -740,8 +742,10 @@
 	if ((element = zend_hash_get_current_data_ptr_ex(&intern->storage, &intern->pos)) == NULL) {
 		RETURN_NULL();
 	}
-	zval_ptr_dtor(&element->inf);
+	zval garbage;
+	ZVAL_COPY_VALUE(&garbage, &element->inf);
 	ZVAL_COPY(&element->inf, inf);
+	zval_ptr_dtor(&garbage);
 } /* }}} */
 
 /* {{{ Moves position forward */
@@ -789,11 +793,18 @@
 			RETURN_NULL();
 		}
 		ZVAL_OBJ(&obj, element->obj);
+
+		/* Protect against modification; we need a full copy because the data may be refcounted. */
+		zval inf_copy;
+		ZVAL_COPY(&inf_copy, &element->inf);
+
 		php_var_serialize(&buf, &obj, &var_hash);
 		smart_str_appendc(&buf, ',');
-		php_var_serialize(&buf, &element->inf, &var_hash);
+		php_var_serialize(&buf, &inf_copy, &var_hash);
 		smart_str_appendc(&buf, ';');
 		zend_hash_move_forward_ex(&intern->storage, &pos);
+
+		zval_ptr_dtor(&inf_copy);
 	}
 
 	/* members */

php-8.3.7.tar.xz/ext/spl/tests/ArrayObject_overloaded_SplFixedArray.phpt -> php-8.3.21.tar.xz/ext/spl/tests/ArrayObject_overloaded_SplFixedArray.phpt Changed

php-8.3.21.tar.xz/ext/spl/tests/gh14290.phpt Added

php-8.3.21.tar.xz/ext/spl/tests/gh14639.phpt Added

php-8.3.21.tar.xz/ext/spl/tests/gh14687.phpt Added

@@ -0,0 +1,49 @@
+--TEST--
+GH-14687 segfault on debugging SplObjectStorage instance after __destruct.
+--CREDITS--
+YuanchengJiang
+--EXTENSIONS--
+phar
+--INI--
+phar.require_hash=0
+phar.readonly=0
+--FILE--
+<?php
+$fname = __DIR__ . '/gh14687.phar.zip';
+$phar = new Phar($fname);
+class HasDestructor {
+  public function __destruct() {
+    var_dump($GLOBALS's');
+  }
+}
+$s = new SplObjectStorage();
+$s$phar = new HasDestructor();
+register_shutdown_function(function() {
+	global $s;
+});
+?>
+--CLEAN--
+<?php
+@unlink(__DIR__ . '/gh14687.phar.zip');
+?>
+--EXPECT--
+object(SplObjectStorage)#2 (1) {
+  "storage":"SplObjectStorage":private=>
+  array(1) {
+    0=>
+    array(2) {
+      "obj"=>
+      object(Phar)#1 (3) {
+        "pathName":"SplFileInfo":private=>
+        string(0) ""
+        "glob":"DirectoryIterator":private=>
+        bool(false)
+        "subPathName":"RecursiveDirectoryIterator":private=>
+        string(0) ""
+      }
+      "inf"=>
+      object(HasDestructor)#3 (0) {
+      }
+    }
+  }
+}

php-8.3.21.tar.xz/ext/spl/tests/gh15918.phpt Added

php-8.3.21.tar.xz/ext/spl/tests/gh16054.phpt Added

php-8.3.21.tar.xz/ext/spl/tests/gh16337.phpt Added

@@ -0,0 +1,49 @@
+--TEST--
+GH-16337 (Use-after-free in SplHeap)
+--FILE--
+<?php
+
+class C {
+    function __toString() {
+        global $heap;
+        try {
+            $heap->extract();
+        } catch (Throwable $e) {
+            echo $e->getMessage(), "\n";
+        }
+        try {
+            $heap->insert(1);
+        } catch (Throwable $e) {
+            echo $e->getMessage(), "\n";
+        }
+        echo $heap->top(), "\n";
+        return "0";
+    }
+}
+
+$heap = new SplMinHeap;
+for ($i = 0; $i < 100; $i++) {
+    $heap->insert((string) $i);
+}
+$heap->insert(new C);
+
+?>
+--EXPECT--
+Heap cannot be changed when it is already being modified.
+Heap cannot be changed when it is already being modified.
+0
+Heap cannot be changed when it is already being modified.
+Heap cannot be changed when it is already being modified.
+0
+Heap cannot be changed when it is already being modified.
+Heap cannot be changed when it is already being modified.
+0
+Heap cannot be changed when it is already being modified.
+Heap cannot be changed when it is already being modified.
+0
+Heap cannot be changed when it is already being modified.
+Heap cannot be changed when it is already being modified.
+0
+Heap cannot be changed when it is already being modified.
+Heap cannot be changed when it is already being modified.
+0

php-8.3.21.tar.xz/ext/spl/tests/gh16464.phpt Added

php-8.3.21.tar.xz/ext/spl/tests/gh16477-2.phpt Added

php-8.3.21.tar.xz/ext/spl/tests/gh16477.phpt Added

php-8.3.21.tar.xz/ext/spl/tests/gh16478.phpt Added

php-8.3.21.tar.xz/ext/spl/tests/gh16479.phpt Added

php-8.3.21.tar.xz/ext/spl/tests/gh16588.phpt Added

php-8.3.21.tar.xz/ext/spl/tests/gh16589.phpt Added

php-8.3.21.tar.xz/ext/spl/tests/gh16604_1.phpt Added

php-8.3.21.tar.xz/ext/spl/tests/gh16604_2.phpt Added

php-8.3.21.tar.xz/ext/spl/tests/gh16646.phpt Added

php-8.3.21.tar.xz/ext/spl/tests/gh16646_2.phpt Added

php-8.3.21.tar.xz/ext/spl/tests/gh17225.phpt Added

@@ -0,0 +1,52 @@
+--TEST--
+GH-17225 (NULL deref in spl_directory.c)
+--CREDITS--
+YuanchengJiang
+--EXTENSIONS--
+phar
+--INI--
+phar.readonly=0
+--FILE--
+<?php
+$fname = __DIR__ . '/gh17225.phar.zip';
+$phar = new Phar($fname);
+class HasDestructor {
+    public function __destruct() {
+        var_dump($GLOBALS's');
+    }
+}
+$s = new SplObjectStorage();
+$s$phar = new HasDestructor();
+register_shutdown_function(function() {
+    global $s;
+});
+var_dump($phar->isLink());
+?>
+--CLEAN--
+<?php
+@unlink(__DIR__ . '/gh17225.phar.zip');
+?>
+--EXPECTF--
+bool(false)
+object(SplObjectStorage)#%d (1) {
+  "storage":"SplObjectStorage":private=>
+  array(1) {
+    0=>
+    array(2) {
+      "obj"=>
+      object(Phar)#%d (4) {
+        "pathName":"SplFileInfo":private=>
+        string(0) ""
+        "fileName":"SplFileInfo":private=>
+        string(0) ""
+        "glob":"DirectoryIterator":private=>
+        bool(false)
+        "subPathName":"RecursiveDirectoryIterator":private=>
+        string(0) ""
+      }
+      "inf"=>
+      object(HasDestructor)#%d (0) {
+      }
+    }
+  }
+}

php-8.3.21.tar.xz/ext/spl/tests/gh17463.phpt Added

php-8.3.21.tar.xz/ext/spl/tests/gh18018.phpt Added

php-8.3.21.tar.xz/ext/spl/tests/gh18304.phpt Added

php-8.3.21.tar.xz/ext/spl/tests/gh18322.phpt Added

php-8.3.7.tar.xz/ext/sqlite3/sqlite3.c -> php-8.3.21.tar.xz/ext/sqlite3/sqlite3.c Changed

php-8.3.21.tar.xz/ext/sqlite3/tests/setauthorizer_cycle_leak.phpt Added

php-8.3.7.tar.xz/ext/standard/Makefile.frag.w32 -> php-8.3.21.tar.xz/ext/standard/Makefile.frag.w32 Changed

php-8.3.7.tar.xz/ext/standard/array.c -> php-8.3.21.tar.xz/ext/standard/array.c Changed

@@ -705,9 +705,9 @@
 	ZEND_PARSE_PARAMETERS_END();
 
 	if (fold_case) {
-		zend_hash_sort(Z_ARRVAL_P(array), php_array_natural_case_compare, 0);
+		zend_array_sort(Z_ARRVAL_P(array), php_array_natural_case_compare, 0);
 	} else {
-		zend_hash_sort(Z_ARRVAL_P(array), php_array_natural_compare, 0);
+		zend_array_sort(Z_ARRVAL_P(array), php_array_natural_compare, 0);
 	}
 
 	RETURN_TRUE;
@@ -743,7 +743,7 @@
 
 	cmp = php_get_data_compare_func(sort_type, 0);
 
-	zend_hash_sort(Z_ARRVAL_P(array), cmp, 0);
+	zend_array_sort(Z_ARRVAL_P(array), cmp, 0);
 
 	RETURN_TRUE;
 }
@@ -764,7 +764,7 @@
 
 	cmp = php_get_data_compare_func(sort_type, 1);
 
-	zend_hash_sort(Z_ARRVAL_P(array), cmp, 0);
+	zend_array_sort(Z_ARRVAL_P(array), cmp, 0);
 
 	RETURN_TRUE;
 }
@@ -785,7 +785,7 @@
 
 	cmp = php_get_data_compare_func(sort_type, 0);
 
-	zend_hash_sort(Z_ARRVAL_P(array), cmp, 1);
+	zend_array_sort(Z_ARRVAL_P(array), cmp, 1);
 
 	RETURN_TRUE;
 }
@@ -806,7 +806,7 @@
 
 	cmp = php_get_data_compare_func(sort_type, 1);
 
-	zend_hash_sort(Z_ARRVAL_P(array), cmp, 1);
+	zend_array_sort(Z_ARRVAL_P(array), cmp, 1);
 
 	RETURN_TRUE;
 }
@@ -904,7 +904,7 @@
 	/* Copy array, so the in-place modifications will not be visible to the callback function */
 	arr = zend_array_dup(arr);
 
-	zend_hash_sort(arr, compare_func, renumber);
+	zend_array_sort(arr, compare_func, renumber);
 
 	zval garbage;
 	ZVAL_COPY_VALUE(&garbage, array);
@@ -1029,11 +1029,50 @@
 	return zobj->handlers->get_properties(zobj);
 }
 
+static zval *php_array_iter_seek_current(HashTable *array, bool forward_direction)
+{
+	zval *entry;
+
+	while (true) {
+		if ((entry = zend_hash_get_current_data(array)) == NULL) {
+			return NULL;
+		}
+
+		ZVAL_DEINDIRECT(entry);
+
+		/* Possible with an uninitialized typed property */
+		if (UNEXPECTED(Z_TYPE_P(entry) == IS_UNDEF)) {
+			zend_result result;
+			if (forward_direction) {
+				result = zend_hash_move_forward(array);
+			} else {
+				result = zend_hash_move_backwards(array);
+			}
+			if (result != SUCCESS) {
+				return NULL;
+			}
+		} else {
+			break;
+		}
+	}
+
+	return entry;
+}
+
+static void php_array_iter_return_current(zval *return_value, HashTable *array, bool forward_direction)
+{
+	zval *entry = php_array_iter_seek_current(array, forward_direction);
+	if (EXPECTED(entry)) {
+		RETURN_COPY_DEREF(entry);
+	} else {
+		RETURN_FALSE;
+	}
+}
+
 /* {{{ Advances array argument's internal pointer to the last element and return it */
 PHP_FUNCTION(end)
 {
 	zval *array_zv;
-	zval *entry;
 
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ARRAY_OR_OBJECT_EX(array_zv, 0, 1)
@@ -1047,15 +1086,7 @@
 	zend_hash_internal_pointer_end(array);
 
 	if (USED_RET()) {
-		if ((entry = zend_hash_get_current_data(array)) == NULL) {
-			RETURN_FALSE;
-		}
-
-		if (Z_TYPE_P(entry) == IS_INDIRECT) {
-			entry = Z_INDIRECT_P(entry);
-		}
-
-		RETURN_COPY_DEREF(entry);
+		php_array_iter_return_current(return_value, array, false);
 	}
 }
 /* }}} */
@@ -1064,7 +1095,6 @@
 PHP_FUNCTION(prev)
 {
 	zval *array_zv;
-	zval *entry;
 
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ARRAY_OR_OBJECT_EX(array_zv, 0, 1)
@@ -1078,15 +1108,7 @@
 	zend_hash_move_backwards(array);
 
 	if (USED_RET()) {
-		if ((entry = zend_hash_get_current_data(array)) == NULL) {
-			RETURN_FALSE;
-		}
-
-		if (Z_TYPE_P(entry) == IS_INDIRECT) {
-			entry = Z_INDIRECT_P(entry);
-		}
-
-		RETURN_COPY_DEREF(entry);
+		php_array_iter_return_current(return_value, array, false);
 	}
 }
 /* }}} */
@@ -1095,7 +1117,6 @@
 PHP_FUNCTION(next)
 {
 	zval *array_zv;
-	zval *entry;
 
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ARRAY_OR_OBJECT_EX(array_zv, 0, 1)
@@ -1109,15 +1130,7 @@
 	zend_hash_move_forward(array);
 
 	if (USED_RET()) {
-		if ((entry = zend_hash_get_current_data(array)) == NULL) {
-			RETURN_FALSE;
-		}
-
-		if (Z_TYPE_P(entry) == IS_INDIRECT) {
-			entry = Z_INDIRECT_P(entry);
-		}
-
-		RETURN_COPY_DEREF(entry);
+		php_array_iter_return_current(return_value, array, true);
 	}
 }
 /* }}} */
@@ -1126,7 +1139,6 @@
 PHP_FUNCTION(reset)
 {
 	zval *array_zv;
-	zval *entry;
 
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ARRAY_OR_OBJECT_EX(array_zv, 0, 1)
@@ -1140,15 +1152,7 @@
 	zend_hash_internal_pointer_reset(array);
 
 	if (USED_RET()) {
-		if ((entry = zend_hash_get_current_data(array)) == NULL) {
-			RETURN_FALSE;
-		}
-
-		if (Z_TYPE_P(entry) == IS_INDIRECT) {
-			entry = Z_INDIRECT_P(entry);
-		}
-
-		RETURN_COPY_DEREF(entry);
+		php_array_iter_return_current(return_value, array, true);
 	}
 }
 /* }}} */
@@ -1157,22 +1161,13 @@
 PHP_FUNCTION(current)
 {
 	zval *array_zv;
-	zval *entry;
 
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ARRAY_OR_OBJECT(array_zv)
 	ZEND_PARSE_PARAMETERS_END();
 
 	HashTable *array = get_ht_for_iap(array_zv, /* separate */ false);
-	if ((entry = zend_hash_get_current_data(array)) == NULL) {
-		RETURN_FALSE;
-	}
-
-	if (Z_TYPE_P(entry) == IS_INDIRECT) {
-		entry = Z_INDIRECT_P(entry);
-	}
-
-	RETURN_COPY_DEREF(entry);
+	php_array_iter_return_current(return_value, array, true);
 }
 /* }}} */
 
@@ -1186,7 +1181,10 @@
 	ZEND_PARSE_PARAMETERS_END();
 
 	HashTable *array = get_ht_for_iap(array_zv, /* separate */ false);
-	zend_hash_get_current_key_zval(array, return_value);
+	zval *entry = php_array_iter_seek_current(array, true);
+	if (EXPECTED(entry)) {
+		zend_hash_get_current_key_zval(array, return_value);
+	}
 }
 /* }}} */
 
@@ -1865,8 +1863,10 @@
 			} else {
 				ZVAL_MAKE_REF_EX(entry, 2);
 			}
-			zval_ptr_dtor(orig_var);
+			zval garbage;
+			ZVAL_COPY_VALUE(&garbage, orig_var);
 			ZVAL_REF(orig_var, Z_REF_P(entry));
+			zval_ptr_dtor(&garbage);
 		} else {
 			if (Z_ISREF_P(entry)) {
 				Z_ADDREF_P(entry);
@@ -2887,6 +2887,10 @@
 			step = Z_LVAL_P(user_step);
 			/* We only want positive step values. */
 			if (step < 0) {
+				if (UNEXPECTED(step == ZEND_LONG_MIN)) {
+					zend_argument_value_error(3, "must be greater than " ZEND_LONG_FMT, step);
+					RETURN_THROWS();
+				}
 				is_step_negative = true;
 				step *= -1;
 			}
@@ -3509,7 +3513,8 @@
 			}
 			idx++;
 		}
-		RETVAL_COPY_DEREF(val);
+		RETVAL_COPY_VALUE(val);
+		ZVAL_UNDEF(val);
 
 		/* Delete the first value */
 		zend_hash_packed_del_val(Z_ARRVAL_P(stack), val);
@@ -3563,7 +3568,8 @@
 			}
 			idx++;
 		}
-		RETVAL_COPY_DEREF(val);
+		RETVAL_COPY_VALUE(val);
+		ZVAL_UNDEF(val);
 
 		/* Delete the first value */
 		zend_hash_del_bucket(Z_ARRVAL_P(stack), p);
@@ -3587,6 +3593,10 @@
 	}
 
 	zend_hash_internal_pointer_reset(Z_ARRVAL_P(stack));
+
+	if (Z_ISREF_P(return_value)) {
+		zend_unwrap_reference(return_value);
+	}
 }
 /* }}} */
 
@@ -3912,7 +3922,6 @@
 				}
 
 				ZEND_ASSERT(!Z_ISREF_P(dest_entry) || Z_REFCOUNT_P(dest_entry) > 1);
-				SEPARATE_ZVAL(dest_entry);
 				dest_zval = dest_entry;
 
 				if (Z_TYPE_P(dest_zval) == IS_NULL) {
@@ -3921,6 +3930,8 @@
 				} else {
 					convert_to_array(dest_zval);
 				}
+				SEPARATE_ZVAL(dest_zval);
+
 				ZVAL_UNDEF(&tmp);
 				if (Z_TYPE_P(src_zval) == IS_OBJECT) {
 					ZVAL_COPY(&tmp, src_zval);

php-8.3.7.tar.xz/ext/standard/assert.c -> php-8.3.21.tar.xz/ext/standard/assert.c Changed

php-8.3.7.tar.xz/ext/standard/basic_functions.c -> php-8.3.21.tar.xz/ext/standard/basic_functions.c Changed

@@ -117,6 +117,10 @@
 #include "streamsfuncs.h"
 #include "basic_functions_arginfo.h"
 
+#if __has_feature(memory_sanitizer)
+# include <sanitizer/msan_interface.h>
+#endif
+
 typedef struct _user_tick_function_entry {
 	zend_fcall_info fci;
 	zend_fcall_info_cache fci_cache;
@@ -211,31 +215,16 @@
 
 static void basic_globals_ctor(php_basic_globals *basic_globals_p) /* {{{ */
 {
-	BG(umask) = -1;
-	BG(user_tick_functions) = NULL;
-	BG(user_filter_map) = NULL;
-	BG(serialize_lock) = 0;
-
-	memset(&BG(serialize), 0, sizeof(BG(serialize)));
-	memset(&BG(unserialize), 0, sizeof(BG(unserialize)));
-
-	memset(&BG(url_adapt_session_ex), 0, sizeof(BG(url_adapt_session_ex)));
-	memset(&BG(url_adapt_output_ex), 0, sizeof(BG(url_adapt_output_ex)));
-
-	BG(url_adapt_session_ex).type = 1;
-	BG(url_adapt_output_ex).type  = 0;
+	memset(basic_globals_p, 0, sizeof(php_basic_globals));
 
-	zend_hash_init(&BG(url_adapt_session_hosts_ht), 0, NULL, NULL, 1);
-	zend_hash_init(&BG(url_adapt_output_hosts_ht), 0, NULL, NULL, 1);
+	basic_globals_p->umask = -1;
+	basic_globals_p->url_adapt_session_ex.type = 1;
 
-#if defined(_REENTRANT)
-	memset(&BG(mblen_state), 0, sizeof(BG(mblen_state)));
-#endif
-
-	BG(page_uid) = -1;
-	BG(page_gid) = -1;
+	zend_hash_init(&basic_globals_p->url_adapt_session_hosts_ht, 0, NULL, NULL, 1);
+	zend_hash_init(&basic_globals_p->url_adapt_output_hosts_ht, 0, NULL, NULL, 1);
 
-	BG(syslog_device) = NULL;
+	basic_globals_p->page_uid = -1;
+	basic_globals_p->page_gid = -1;
 }
 /* }}} */
 
@@ -1220,6 +1209,7 @@
 	struct timespec php_req, php_rem;
 	uint64_t current_ns, target_ns, diff_ns;
 	const uint64_t ns_per_sec = 1000000000;
+	const double top_target_sec = (double)(UINT64_MAX / ns_per_sec);
 
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_DOUBLE(target_secs)
@@ -1229,6 +1219,11 @@
 		RETURN_FALSE;
 	}
 
+	if (UNEXPECTED(!(target_secs >= 0 && target_secs <= top_target_sec))) {
+		zend_argument_value_error(1, "must be between 0 and %" PRIu64, (uint64_t)top_target_sec);
+		RETURN_THROWS();
+	}
+
 	target_ns = (uint64_t) (target_secs * ns_per_sec);
 	current_ns = ((uint64_t) tm.tv_sec) * ns_per_sec + ((uint64_t) tm.tv_usec) * 1000;
 	if (target_ns < current_ns) {
@@ -2249,6 +2244,10 @@
 		RETURN_FALSE;
 	}
 
+	/* MSAN false positive, getservbyport() is not properly intercepted. */
+#if __has_feature(memory_sanitizer)
+	__msan_unpoison_string(serv->s_name);
+#endif
 	RETURN_STRING(serv->s_name);
 }
 /* }}} */

php-8.3.7.tar.xz/ext/standard/basic_functions.stub.php -> php-8.3.21.tar.xz/ext/standard/basic_functions.stub.php Changed

php-8.3.7.tar.xz/ext/standard/basic_functions_arginfo.h -> php-8.3.21.tar.xz/ext/standard/basic_functions_arginfo.h Changed

php-8.3.7.tar.xz/ext/standard/file.c -> php-8.3.21.tar.xz/ext/standard/file.c Changed

php-8.3.7.tar.xz/ext/standard/file.h -> php-8.3.21.tar.xz/ext/standard/file.h Changed

php-8.3.7.tar.xz/ext/standard/filestat.c -> php-8.3.21.tar.xz/ext/standard/filestat.c Changed

@@ -279,13 +279,25 @@
 		struct group *retgrptr;
 		long grbuflen = sysconf(_SC_GETGR_R_SIZE_MAX);
 		char *grbuf;
+		int err;
 
 		if (grbuflen < 1) {
-			return FAILURE;
+			grbuflen = 1024;
 		}
-
+# if ZEND_DEBUG
+		/* Test retry logic */
+		grbuflen = 1;
+# endif
 		grbuf = emalloc(grbuflen);
-		if (getgrnam_r(name, &gr, grbuf, grbuflen, &retgrptr) != 0 || retgrptr == NULL) {
+
+try_again:
+		err = getgrnam_r(name, &gr, grbuf, grbuflen, &retgrptr);
+		if (err != 0 || retgrptr == NULL) {
+			if (err == ERANGE) {
+				grbuflen *= 2;
+				grbuf = erealloc(grbuf, grbuflen);
+				goto try_again;
+			}
 			efree(grbuf);
 			return FAILURE;
 		}
@@ -376,6 +388,9 @@
 		php_error_docref(NULL, E_WARNING, "%s", strerror(errno));
 		RETURN_FALSE;
 	}
+
+	php_clear_stat_cache(0, NULL, 0);
+
 	RETURN_TRUE;
 #endif
 }
@@ -405,13 +420,25 @@
 		struct passwd *retpwptr = NULL;
 		long pwbuflen = sysconf(_SC_GETPW_R_SIZE_MAX);
 		char *pwbuf;
+		int err;
 
 		if (pwbuflen < 1) {
-			return FAILURE;
+			pwbuflen = 1024;
 		}
-
+# if ZEND_DEBUG
+		/* Test retry logic */
+		pwbuflen = 1;
+# endif
 		pwbuf = emalloc(pwbuflen);
-		if (getpwnam_r(name, &pw, pwbuf, pwbuflen, &retpwptr) != 0 || retpwptr == NULL) {
+
+try_again:
+		err = getpwnam_r(name, &pw, pwbuf, pwbuflen, &retpwptr);
+		if (err != 0 || retpwptr == NULL) {
+			if (err == EAGAIN) {
+				pwbuflen *= 2;
+				pwbuf = erealloc(pwbuf, pwbuflen);
+				goto try_again;
+			}
 			efree(pwbuf);
 			return FAILURE;
 		}
@@ -503,6 +530,9 @@
 		php_error_docref(NULL, E_WARNING, "%s", strerror(errno));
 		RETURN_FALSE;
 	}
+
+	php_clear_stat_cache(0, NULL, 0);
+
 	RETURN_TRUE;
 #endif
 }
@@ -567,6 +597,9 @@
 		php_error_docref(NULL, E_WARNING, "%s", strerror(errno));
 		RETURN_FALSE;
 	}
+
+	php_clear_stat_cache(0, NULL, 0);
+
 	RETURN_TRUE;
 }
 /* }}} */
@@ -652,6 +685,9 @@
 		php_error_docref(NULL, E_WARNING, "Utime failed: %s", strerror(errno));
 		RETURN_FALSE;
 	}
+
+	php_clear_stat_cache(0, NULL, 0);
+
 	RETURN_TRUE;
 }
 /* }}} */

php-8.3.7.tar.xz/ext/standard/filters.c -> php-8.3.21.tar.xz/ext/standard/filters.c Changed

php-8.3.7.tar.xz/ext/standard/fsock.c -> php-8.3.21.tar.xz/ext/standard/fsock.c Changed

php-8.3.7.tar.xz/ext/standard/http_fopen_wrapper.c -> php-8.3.21.tar.xz/ext/standard/http_fopen_wrapper.c Changed

@@ -67,15 +67,16 @@
 
 #include "php_fopen_wrappers.h"
 
-#define HTTP_HEADER_BLOCK_SIZE		1024
-#define PHP_URL_REDIRECT_MAX		20
-#define HTTP_HEADER_USER_AGENT		1
-#define HTTP_HEADER_HOST			2
-#define HTTP_HEADER_AUTH			4
-#define HTTP_HEADER_FROM			8
-#define HTTP_HEADER_CONTENT_LENGTH	16
-#define HTTP_HEADER_TYPE			32
-#define HTTP_HEADER_CONNECTION		64
+#define HTTP_HEADER_BLOCK_SIZE			1024
+#define HTTP_HEADER_MAX_LOCATION_SIZE	8182 /* 8192 - 10 (size of "Location: ") */
+#define PHP_URL_REDIRECT_MAX			20
+#define HTTP_HEADER_USER_AGENT			1
+#define HTTP_HEADER_HOST				2
+#define HTTP_HEADER_AUTH				4
+#define HTTP_HEADER_FROM				8
+#define HTTP_HEADER_CONTENT_LENGTH		16
+#define HTTP_HEADER_TYPE				32
+#define HTTP_HEADER_CONNECTION			64
 
 #define HTTP_WRAPPER_HEADER_INIT    1
 #define HTTP_WRAPPER_REDIRECTED     2
@@ -107,7 +108,7 @@
 static bool check_has_header(const char *headers, const char *header) {
 	const char *s = headers;
 	while ((s = strstr(s, header))) {
-		if (s == headers || *(s-1) == '\n') {
+		if (s == headers || (*(s-1) == '\n' && *(s-2) == '\r')) {
 			return 1;
 		}
 		s++;
@@ -115,6 +116,214 @@
 	return 0;
 }
 
+typedef struct _php_stream_http_response_header_info {
+	php_stream_filter *transfer_encoding;
+	size_t file_size;
+	bool error;
+	bool follow_location;
+	char *location;
+	size_t location_len;
+} php_stream_http_response_header_info;
+
+static void php_stream_http_response_header_info_init(
+		php_stream_http_response_header_info *header_info)
+{
+	memset(header_info, 0, sizeof(php_stream_http_response_header_info));
+	header_info->follow_location = 1;
+}
+
+/* Trim white spaces from response header line and update its length */
+static bool php_stream_http_response_header_trim(char *http_header_line,
+		size_t *http_header_line_length)
+{
+	char *http_header_line_end = http_header_line + *http_header_line_length - 1;
+	while (http_header_line_end >= http_header_line && 
+			(*http_header_line_end == '\n' || *http_header_line_end == '\r')) {
+		http_header_line_end--;
+	}
+
+	/* The primary definition of an HTTP header in RFC 7230 states:
+	* > Each header field consists of a case-insensitive field name followed
+	* > by a colon (":"), optional leading whitespace, the field value, and
+	* > optional trailing whitespace. */
+
+	/* Strip trailing whitespace */
+	bool space_trim = (*http_header_line_end == ' ' || *http_header_line_end == '\t');
+	if (space_trim) {
+		do {
+			http_header_line_end--;
+		} while (http_header_line_end >= http_header_line &&
+				(*http_header_line_end == ' ' || *http_header_line_end == '\t'));
+	}
+	http_header_line_end++;
+	*http_header_line_end = '\0';
+	*http_header_line_length = http_header_line_end - http_header_line;
+
+	return space_trim;
+}
+
+/* Process folding headers of the current line and if there are none, parse last full response
+ * header line. It returns NULL if the last header is finished, otherwise it returns updated
+ * last header line.  */
+static zend_string *php_stream_http_response_headers_parse(php_stream_wrapper *wrapper,
+		php_stream *stream, php_stream_context *context, int options,
+		zend_string *last_header_line_str, char *header_line, size_t *header_line_length,
+		int response_code, zval *response_header,
+		php_stream_http_response_header_info *header_info)
+{
+	char *last_header_line = ZSTR_VAL(last_header_line_str);
+	size_t last_header_line_length = ZSTR_LEN(last_header_line_str);
+	char *last_header_line_end = ZSTR_VAL(last_header_line_str) + ZSTR_LEN(last_header_line_str) - 1;
+
+	/* Process non empty header line. */
+	if (header_line && (*header_line != '\n' && *header_line != '\r')) {
+		/* Removing trailing white spaces. */
+		if (php_stream_http_response_header_trim(header_line, header_line_length) &&
+				*header_line_length == 0) {
+			/* Only spaces so treat as an empty folding header. */
+			return last_header_line_str;
+		}
+
+		/* Process folding headers if starting with a space or a tab. */
+		if (header_line && (*header_line == ' ' || *header_line == '\t')) {
+			char *http_folded_header_line = header_line;
+			size_t http_folded_header_line_length = *header_line_length;
+			/* Remove the leading white spaces. */
+			while (*http_folded_header_line == ' ' || *http_folded_header_line == '\t') {
+				http_folded_header_line++;
+				http_folded_header_line_length--;
+			}
+			/* It has to have some characters because it would get returned after the call
+			 * php_stream_http_response_header_trim above. */
+			ZEND_ASSERT(http_folded_header_line_length > 0);
+			/* Concatenate last header line, space and current header line. */
+			zend_string *extended_header_str = zend_string_concat3(
+					last_header_line, last_header_line_length,
+					" ", 1,
+					http_folded_header_line, http_folded_header_line_length);
+			zend_string_efree(last_header_line_str);
+			last_header_line_str = extended_header_str;
+			/* Return new header line. */
+			return last_header_line_str;
+		}
+	}
+
+	/* Find header separator position. */
+	char *last_header_value = memchr(last_header_line, ':', last_header_line_length);
+	if (last_header_value) {
+		/* Verify there is no space in header name */
+		char *last_header_name = last_header_line + 1;
+		while (last_header_name < last_header_value) {
+			if (*last_header_name == ' ' || *last_header_name == '\t') {
+				header_info->error = true;
+				php_stream_wrapper_log_error(wrapper, options,
+					"HTTP invalid response format (space in header name)!");
+				zend_string_efree(last_header_line_str);
+				return NULL;
+			}
+			++last_header_name;
+		}
+
+		last_header_value++; /* Skip ':'. */
+
+		/* Strip leading whitespace. */
+		while (last_header_value < last_header_line_end
+				&& (*last_header_value == ' ' || *last_header_value == '\t')) {
+			last_header_value++;
+		}
+	} else {
+		/* There is no colon which means invalid response so error. */
+		header_info->error = true;
+		php_stream_wrapper_log_error(wrapper, options,
+				"HTTP invalid response format (no colon in header line)!");
+		zend_string_efree(last_header_line_str);
+		return NULL;
+	}
+
+	bool store_header = true;
+	zval *tmpzval = NULL;
+
+	if (!strncasecmp(last_header_line, "Location:", sizeof("Location:")-1)) {
+		/* Check if the location should be followed. */
+		if (context && (tmpzval = php_stream_context_get_option(context, "http", "follow_location")) != NULL) {
+			header_info->follow_location = zval_is_true(tmpzval);
+		} else if (!((response_code >= 300 && response_code < 304)
+				|| 307 == response_code || 308 == response_code)) {
+			/* The redirection should not be automatic if follow_location is not set and
+			 * response_code not in (300, 301, 302, 303 and 307)
+			 * see http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html#sec10.3.1
+			 * RFC 7238 defines 308: http://tools.ietf.org/html/rfc7238 */
+			header_info->follow_location = 0;
+		}
+		size_t last_header_value_len = strlen(last_header_value);
+		if (last_header_value_len > HTTP_HEADER_MAX_LOCATION_SIZE) {
+			header_info->error = true;
+			php_stream_wrapper_log_error(wrapper, options,
+					"HTTP Location header size is over the limit of %d bytes",
+					HTTP_HEADER_MAX_LOCATION_SIZE);
+			zend_string_efree(last_header_line_str);
+			return NULL;
+		}
+		if (header_info->location_len == 0) {
+			header_info->location = emalloc(last_header_value_len + 1);
+		} else if (header_info->location_len <= last_header_value_len) {
+			header_info->location = erealloc(header_info->location, last_header_value_len + 1);
+		}
+		header_info->location_len = last_header_value_len;
+		memcpy(header_info->location, last_header_value, last_header_value_len + 1);
+	} else if (!strncasecmp(last_header_line, "Content-Type:", sizeof("Content-Type:")-1)) {
+		php_stream_notify_info(context, PHP_STREAM_NOTIFY_MIME_TYPE_IS, last_header_value, 0);
+	} else if (!strncasecmp(last_header_line, "Content-Length:", sizeof("Content-Length:")-1)) {
+		/* https://www.rfc-editor.org/rfc/rfc9110.html#name-content-length */
+		const char *ptr = last_header_value;
+		/* must contain only digits, no + or - symbols */
+		if (*ptr >= '0' && *ptr <= '9') {
+			char *endptr = NULL;
+			size_t parsed = ZEND_STRTOUL(ptr, &endptr, 10);
+			/* check whether there was no garbage in the header value and the conversion was successful */
+			if (endptr && !*endptr) {
+				/* truncate for 32-bit such that no negative file sizes occur */
+				header_info->file_size = MIN(parsed, ZEND_LONG_MAX);
+				php_stream_notify_file_size(context, header_info->file_size, last_header_line, 0);
+			}
+		}
+	} else if (
+		!strncasecmp(last_header_line, "Transfer-Encoding:", sizeof("Transfer-Encoding:")-1)
+		&& !strncasecmp(last_header_value, "Chunked", sizeof("Chunked")-1)
+	) {
+		/* Create filter to decode response body. */
+		if (!(options & STREAM_ONLY_GET_HEADERS)) {
+			zend_long decode = 1;
+
+			if (context && (tmpzval = php_stream_context_get_option(context, "http", "auto_decode")) != NULL) {
+				decode = zend_is_true(tmpzval);
+			}
+			if (decode) {
+				if (header_info->transfer_encoding != NULL) {
+					/* Prevent a memory leak in case there are more transfer-encoding headers. */
+					php_stream_filter_free(header_info->transfer_encoding);
+				}
+				header_info->transfer_encoding = php_stream_filter_create(
+						"dechunk", NULL, php_stream_is_persistent(stream));
+				if (header_info->transfer_encoding != NULL) {
+					/* Do not store transfer-encoding header. */
+					store_header = false;
+				}
+			}
+		}
+	}
+
+	if (store_header) {
+		zval http_header;
+		ZVAL_NEW_STR(&http_header, last_header_line_str);
+		zend_hash_next_index_insert(Z_ARRVAL_P(response_header), &http_header);
+	} else {
+		zend_string_efree(last_header_line_str);
+	}
+
+	return NULL;
+}
+
 static php_stream *php_stream_url_wrap_http_ex(php_stream_wrapper *wrapper,
 		const char *path, const char *mode, int options, zend_string **opened_path,
 		php_stream_context *context, int redirect_max, int flags,
@@ -127,11 +336,12 @@
 	zend_string *tmp = NULL;
 	char *ua_str = NULL;
 	zval *ua_zval = NULL, *tmpzval = NULL, ssl_proxy_peer_name;
-	char locationHTTP_HEADER_BLOCK_SIZE;
 	int reqok = 0;
 	char *http_header_line = NULL;
+	zend_string *last_header_line_str = NULL;
+	php_stream_http_response_header_info header_info;
 	char tmp_line128;
-	size_t chunk_size = 0, file_size = 0;
+	size_t chunk_size = 0;
 	int eol_detect = 0;
 	zend_string *transport_string;
 	zend_string *errstr = NULL;
@@ -142,8 +352,6 @@
 	int header_init = ((flags & HTTP_WRAPPER_HEADER_INIT) != 0);
 	int redirected = ((flags & HTTP_WRAPPER_REDIRECTED) != 0);
 	int redirect_keep_method = ((flags & HTTP_WRAPPER_KEEP_METHOD) != 0);
-	bool follow_location = 1;
-	php_stream_filter *transfer_encoding = NULL;
 	int response_code;
 	smart_str req_buf = {0};
 	bool custom_request_method;
@@ -184,6 +392,11 @@
 			return NULL;
 		}
 
+		/* Should we send the entire path in the request line, default to no. */
+		if (context && (tmpzval = php_stream_context_get_option(context, "http", "request_fulluri")) != NULL) {
+			request_fulluri = zend_is_true(tmpzval);
+		}
+
 		use_ssl = (ZSTR_LEN(resource->scheme) > 4) && ZSTR_VAL(resource->scheme)4 == 's';
 		/* choose default ports */
 		if (use_ssl && resource->port == 0)
@@ -202,9 +415,28 @@
 		}
 	}
 
+	if (request_fulluri && (strchr(path, '\n') != NULL || strchr(path, '\r') != NULL)) {
+		php_stream_wrapper_log_error(wrapper, options, "HTTP wrapper full URI path does not allow CR or LF characters");
+		php_url_free(resource);
+		zend_string_release(transport_string);
+		return NULL;
+	}
+
 	if (context && (tmpzval = php_stream_context_get_option(context, wrapper->wops->label, "timeout")) != NULL) {
 		double d = zval_get_double(tmpzval);
 #ifndef PHP_WIN32
+		const double timeoutmax = (double) PHP_TIMEOUT_ULL_MAX / 1000000.0;
+#else
+		const double timeoutmax = (double) LONG_MAX / 1000000.0;
+#endif
+
+		if (d > timeoutmax) {
+			php_stream_wrapper_log_error(wrapper, options, "timeout must be lower than " ZEND_ULONG_FMT, (zend_ulong)timeoutmax);
+			zend_string_release(transport_string);
+			php_url_free(resource);
+			return NULL;
+		}
+#ifndef PHP_WIN32
 		timeout.tv_sec = (time_t) d;
 		timeout.tv_usec = (size_t) ((d - timeout.tv_sec) * 1000000);
 #else
@@ -342,6 +574,8 @@
 		}
 	}
 
+	php_stream_http_response_header_info_init(&header_info);
+
 	if (stream == NULL)
 		goto out;
 
@@ -382,12 +616,6 @@
 		smart_str_appends(&req_buf, "GET ");
 	}
 
-	/* Should we send the entire path in the request line, default to no. */
-	if (!request_fulluri && context &&
-		(tmpzval = php_stream_context_get_option(context, "http", "request_fulluri")) != NULL) {
-		request_fulluri = zend_is_true(tmpzval);
-	}
-
 	if (request_fulluri) {
 		/* Ask for everything */
 		smart_str_appends(&req_buf, path);
@@ -648,8 +876,6 @@
 	/* send it */
 	php_stream_write(stream, ZSTR_VAL(req_buf.s), ZSTR_LEN(req_buf.s));
 
-	location0 = '\0';
-
 	if (Z_ISUNDEF_P(response_header)) {
 		array_init(response_header);
 	}
@@ -732,129 +958,103 @@
 	}
 
 	/* read past HTTP headers */
-
 	while (!php_stream_eof(stream)) {
 		size_t http_header_line_length;
 
 		if (http_header_line != NULL) {
 			efree(http_header_line);
 		}
-		if ((http_header_line = php_stream_get_line(stream, NULL, 0, &http_header_line_length)) && *http_header_line != '\n' && *http_header_line != '\r') {
-			char *e = http_header_line + http_header_line_length - 1;
-			char *http_header_value;
-
-			while (e >= http_header_line && (*e == '\n' || *e == '\r')) {
-				e--;
-			}
-
-			/* The primary definition of an HTTP header in RFC 7230 states:
-			 * > Each header field consists of a case-insensitive field name followed
-			 * > by a colon (":"), optional leading whitespace, the field value, and
-			 * > optional trailing whitespace. */
-
-			/* Strip trailing whitespace */
-			while (e >= http_header_line && (*e == ' ' || *e == '\t')) {
-				e--;
-			}
-
-			/* Terminate header line */
-			e++;
-			*e = '\0';
-			http_header_line_length = e - http_header_line;
-
-			http_header_value = memchr(http_header_line, ':', http_header_line_length);
-			if (http_header_value) {
-				http_header_value++; /* Skip ':' */
-
-				/* Strip leading whitespace */
-				while (http_header_value < e
-						&& (*http_header_value == ' ' || *http_header_value == '\t')) {
-					http_header_value++;
+		if ((http_header_line = php_stream_get_line(stream, NULL, 0, &http_header_line_length))) {
+			bool last_line;
+			if (*http_header_line == '\r') {
+				if (http_header_line1 != '\n') {
+					php_stream_close(stream);
+					stream = NULL;
+					php_stream_wrapper_log_error(wrapper, options,
+							"HTTP invalid header name (cannot start with CR character)!");
+					goto out;
 				}
+				last_line = true;
+			} else if (*http_header_line == '\n') {
+				last_line = true;
 			} else {
-				/* There is no colon. Set the value to the end of the header line, which is
-				 * effectively an empty string. */
-				http_header_value = e;
+				last_line = false;
 			}
-
-			if (!strncasecmp(http_header_line, "Location:", sizeof("Location:")-1)) {
-				if (context && (tmpzval = php_stream_context_get_option(context, "http", "follow_location")) != NULL) {
-					follow_location = zval_is_true(tmpzval);
-				} else if (!((response_code >= 300 && response_code < 304)
-						|| 307 == response_code || 308 == response_code)) {
-					/* we shouldn't redirect automatically
-					if follow_location isn't set and response_code not in (300, 301, 302, 303 and 307)
-					see http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html#sec10.3.1
-					RFC 7238 defines 308: http://tools.ietf.org/html/rfc7238 */
-					follow_location = 0;
-				}
-				strlcpy(location, http_header_value, sizeof(location));
-			} else if (!strncasecmp(http_header_line, "Content-Type:", sizeof("Content-Type:")-1)) {
-				php_stream_notify_info(context, PHP_STREAM_NOTIFY_MIME_TYPE_IS, http_header_value, 0);
-			} else if (!strncasecmp(http_header_line, "Content-Length:", sizeof("Content-Length:")-1)) {
-				file_size = atoi(http_header_value);
-				php_stream_notify_file_size(context, file_size, http_header_line, 0);
-			} else if (
-				!strncasecmp(http_header_line, "Transfer-Encoding:", sizeof("Transfer-Encoding:")-1)
-				&& !strncasecmp(http_header_value, "Chunked", sizeof("Chunked")-1)
-			) {
-
-				/* create filter to decode response body */
-				if (!(options & STREAM_ONLY_GET_HEADERS)) {
-					zend_long decode = 1;
-
-					if (context && (tmpzval = php_stream_context_get_option(context, "http", "auto_decode")) != NULL) {
-						decode = zend_is_true(tmpzval);
-					}
-					if (decode) {
-						transfer_encoding = php_stream_filter_create("dechunk", NULL, php_stream_is_persistent(stream));
-						if (transfer_encoding) {
-							/* don't store transfer-encodeing header */
-							continue;
-						}
+			
+			if (last_header_line_str != NULL) {
+				/* Parse last header line. */
+				last_header_line_str = php_stream_http_response_headers_parse(wrapper, stream,
+						context, options, last_header_line_str, http_header_line,
+						&http_header_line_length, response_code, response_header, &header_info);
+				if (EXPECTED(last_header_line_str == NULL)) {
+					if (UNEXPECTED(header_info.error)) {
+						php_stream_close(stream);
+						stream = NULL;
+						goto out;
 					}
+				} else {
+					/* Folding header present so continue. */
+					continue;
 				}
+			} else if (!last_line) {
+				/* The first line cannot start with spaces. */
+				if (*http_header_line == ' ' || *http_header_line == '\t') {
+					php_stream_close(stream);
+					stream = NULL;
+					php_stream_wrapper_log_error(wrapper, options,
+							"HTTP invalid response format (folding header at the start)!");
+					goto out;
+				}
+				/* Trim the first line if it is not the last line. */
+				php_stream_http_response_header_trim(http_header_line, &http_header_line_length);
 			}
-
-			{
-				zval http_header;
-				ZVAL_STRINGL(&http_header, http_header_line, http_header_line_length);
-				zend_hash_next_index_insert(Z_ARRVAL_P(response_header), &http_header);
+			if (last_line) {
+				/* For the last line the last header line must be NULL. */
+				ZEND_ASSERT(last_header_line_str == NULL);
+				break;
 			}
+			/* Save current line as the last line so it gets parsed in the next round. */
+			last_header_line_str = zend_string_init(http_header_line, http_header_line_length, 0);
 		} else {
 			break;
 		}
 	}
 
-	if (!reqok || (location0 != '\0' && follow_location)) {
-		if (!follow_location || (((options & STREAM_ONLY_GET_HEADERS) || ignore_errors) && redirect_max <= 1)) {
+	/* If the stream was closed early, we still want to process the last line to keep BC. */
+	if (last_header_line_str != NULL) {
+		php_stream_http_response_headers_parse(wrapper, stream, context, options,
+				last_header_line_str, NULL, NULL, response_code, response_header, &header_info);
+	}
+
+	if (!reqok || (header_info.location != NULL && header_info.follow_location)) {
+		if (!header_info.follow_location || (((options & STREAM_ONLY_GET_HEADERS) || ignore_errors) && redirect_max <= 1)) {
 			goto out;
 		}
 
-		if (location0 != '\0')
-			php_stream_notify_info(context, PHP_STREAM_NOTIFY_REDIRECTED, location, 0);
+		if (header_info.location != NULL)
+			php_stream_notify_info(context, PHP_STREAM_NOTIFY_REDIRECTED, header_info.location, 0);
 
 		php_stream_close(stream);
 		stream = NULL;
 
-		if (transfer_encoding) {
-			php_stream_filter_free(transfer_encoding);
-			transfer_encoding = NULL;
+		if (header_info.transfer_encoding) {
+			php_stream_filter_free(header_info.transfer_encoding);
+			header_info.transfer_encoding = NULL;
 		}
 
-		if (location0 != '\0') {
+		if (header_info.location != NULL) {
 
-			char new_pathHTTP_HEADER_BLOCK_SIZE;
-			char loc_pathHTTP_HEADER_BLOCK_SIZE;
+			char *new_path = NULL;
 
-			*new_path='\0';
-			if (strlen(location)<8 || (strncasecmp(location, "http://", sizeof("http://")-1) &&
-							strncasecmp(location, "https://", sizeof("https://")-1) &&
-							strncasecmp(location, "ftp://", sizeof("ftp://")-1) &&
-							strncasecmp(location, "ftps://", sizeof("ftps://")-1)))
+			if (strlen(header_info.location) < 8 ||
+					(strncasecmp(header_info.location, "http://", sizeof("http://")-1) &&
+							strncasecmp(header_info.location, "https://", sizeof("https://")-1) &&
+							strncasecmp(header_info.location, "ftp://", sizeof("ftp://")-1) &&
+							strncasecmp(header_info.location, "ftps://", sizeof("ftps://")-1)))
 			{
-				if (*location != '/') {
-					if (*(location+1) != '\0' && resource->path) {
+				char *loc_path = NULL;
+				if (*header_info.location != '/') {
+					if (*(header_info.location+1) != '\0' && resource->path) {
 						char *s = strrchr(ZSTR_VAL(resource->path), '/');
 						if (!s) {
 							s = ZSTR_VAL(resource->path);
@@ -870,29 +1070,35 @@
 						if (resource->path &&
 							ZSTR_VAL(resource->path)0 == '/' &&
 							ZSTR_VAL(resource->path)1 == '\0') {
-							snprintf(loc_path, sizeof(loc_path) - 1, "%s%s", ZSTR_VAL(resource->path), location);
+							spprintf(&loc_path, 0, "%s%s", ZSTR_VAL(resource->path), header_info.location);
 						} else {
-							snprintf(loc_path, sizeof(loc_path) - 1, "%s/%s", ZSTR_VAL(resource->path), location);
+							spprintf(&loc_path, 0, "%s/%s", ZSTR_VAL(resource->path), header_info.location);
 						}
 					} else {
-						snprintf(loc_path, sizeof(loc_path) - 1, "/%s", location);
+						spprintf(&loc_path, 0, "/%s", header_info.location);
 					}
 				} else {
-					strlcpy(loc_path, location, sizeof(loc_path));
+					loc_path = header_info.location;
+					header_info.location = NULL;
 				}
 				if ((use_ssl && resource->port != 443) || (!use_ssl && resource->port != 80)) {
-					snprintf(new_path, sizeof(new_path) - 1, "%s://%s:%d%s", ZSTR_VAL(resource->scheme), ZSTR_VAL(resource->host), resource->port, loc_path);
+					spprintf(&new_path, 0, "%s://%s:%d%s", ZSTR_VAL(resource->scheme),
+							ZSTR_VAL(resource->host), resource->port, loc_path);
 				} else {
-					snprintf(new_path, sizeof(new_path) - 1, "%s://%s%s", ZSTR_VAL(resource->scheme), ZSTR_VAL(resource->host), loc_path);
+					spprintf(&new_path, 0, "%s://%s%s", ZSTR_VAL(resource->scheme),
+							ZSTR_VAL(resource->host), loc_path);
 				}
+				efree(loc_path);
 			} else {
-				strlcpy(new_path, location, sizeof(new_path));
+				new_path = header_info.location;
+				header_info.location = NULL;
 			}
 
 			php_url_free(resource);
 			/* check for invalid redirection URLs */
 			if ((resource = php_url_parse(new_path)) == NULL) {
 				php_stream_wrapper_log_error(wrapper, options, "Invalid redirect URL! %s", new_path);
+				efree(new_path);
 				goto out;
 			}
 
@@ -904,6 +1110,7 @@
 		while (s < e) { \
 			if (iscntrl(*s)) { \
 				php_stream_wrapper_log_error(wrapper, options, "Invalid redirect URL! %s", new_path); \
+				efree(new_path); \
 				goto out; \
 			} \
 			s++; \
@@ -926,6 +1133,7 @@
 			stream = php_stream_url_wrap_http_ex(
 				wrapper, new_path, mode, options, opened_path, context,
 				--redirect_max, new_flags, response_header STREAMS_CC);
+			efree(new_path);
 		} else {
 			php_stream_wrapper_log_error(wrapper, options, "HTTP request failed! %s", tmp_line);
 		}
@@ -938,6 +1146,10 @@
 		efree(http_header_line);
 	}
 
+	if (header_info.location != NULL) {
+		efree(header_info.location);
+	}
+
 	if (resource) {
 		php_url_free(resource);
 	}
@@ -946,7 +1158,7 @@
 		if (header_init) {
 			ZVAL_COPY(&stream->wrapperdata, response_header);
 		}
-		php_stream_notify_progress_init(context, 0, file_size);
+		php_stream_notify_progress_init(context, 0, header_info.file_size);
 
 		/* Restore original chunk size now that we're done with headers */
 		if (options & STREAM_WILL_CAST)
@@ -962,8 +1174,8 @@
 		/* restore mode */
 		strlcpy(stream->mode, mode, sizeof(stream->mode));
 
-		if (transfer_encoding) {
-			php_stream_filter_append(&stream->readfilters, transfer_encoding);
+		if (header_info.transfer_encoding) {
+			php_stream_filter_append(&stream->readfilters, header_info.transfer_encoding);
 		}
 
 		/* It's possible that the server already sent in more data than just the headers.

php-8.3.7.tar.xz/ext/standard/image.c -> php-8.3.21.tar.xz/ext/standard/image.c Changed

php-8.3.7.tar.xz/ext/standard/iptc.c -> php-8.3.21.tar.xz/ext/standard/iptc.c Changed

php-8.3.7.tar.xz/ext/standard/pack.c -> php-8.3.21.tar.xz/ext/standard/pack.c Changed

php-8.3.7.tar.xz/ext/standard/proc_open.c -> php-8.3.21.tar.xz/ext/standard/proc_open.c Changed

@@ -592,48 +592,39 @@
 	smart_str_appendc(str, '"');
 }
 
-static inline int stricmp_end(const char* suffix, const char* str) {
-    size_t suffix_len = strlen(suffix);
-    size_t str_len = strlen(str);
+static bool is_executed_by_cmd(const char *prog_name, size_t prog_name_length)
+{
+    size_t out_len;
+    WCHAR long_nameMAX_PATH;
+    WCHAR full_nameMAX_PATH;
+    LPWSTR file_part = NULL;
+
+    wchar_t *prog_name_wide = php_win32_cp_conv_any_to_w(prog_name, prog_name_length, &out_len);
 
-    if (suffix_len > str_len) {
-        return -1; /* Suffix is longer than string, cannot match. */
+    if (GetLongPathNameW(prog_name_wide, long_name, MAX_PATH) == 0) {
+        /* This can fail for example with ERROR_FILE_NOT_FOUND (short path resolution only works for existing files)
+         * in which case we'll pass the path verbatim to the FullPath transformation. */
+        lstrcpynW(long_name, prog_name_wide, MAX_PATH);
     }
 
-    /* Compare the end of the string with the suffix, ignoring case. */
-    return _stricmp(str + (str_len - suffix_len), suffix);
-}
+    free(prog_name_wide);
+    prog_name_wide = NULL;
 
-static bool is_executed_by_cmd(const char *prog_name)
-{
-	/* If program name is cmd.exe, then return true. */
-	if (_stricmp("cmd.exe", prog_name) == 0 || _stricmp("cmd", prog_name) == 0
-			|| stricmp_end("\\cmd.exe", prog_name) == 0 || stricmp_end("\\cmd", prog_name) == 0) {
-		return true;
-	}
-
-    /* Find the last occurrence of the directory separator (backslash or forward slash). */
-    char *last_separator = strrchr(prog_name, '\\');
-    char *last_separator_fwd = strrchr(prog_name, '/');
-    if (last_separator_fwd && (!last_separator || last_separator < last_separator_fwd)) {
-        last_separator = last_separator_fwd;
+    if (GetFullPathNameW(long_name, MAX_PATH, full_name, &file_part) == 0 || file_part == NULL) {
+        return false;
     }
 
-    /* Find the last dot in the filename after the last directory separator. */
-    char *extension = NULL;
-    if (last_separator != NULL) {
-        extension = strrchr(last_separator, '.');
+    bool uses_cmd = false;
+    if (_wcsicmp(file_part, L"cmd.exe") == 0 || _wcsicmp(file_part, L"cmd") == 0) {
+        uses_cmd = true;
     } else {
-        extension = strrchr(prog_name, '.');
+        const WCHAR *extension_dot = wcsrchr(file_part, L'.');
+        if (extension_dot && (_wcsicmp(extension_dot, L".bat") == 0 || _wcsicmp(extension_dot, L".cmd") == 0)) {
+            uses_cmd = true;
+        }
     }
 
-    if (extension == NULL || extension == prog_name) {
-        /* No file extension found, it is not batch file. */
-        return false;
-    }
-
-    /* Check if the file extension is ".bat" or ".cmd" which is always executed by cmd.exe. */
-    return _stricmp(extension, ".bat") == 0 || _stricmp(extension, ".cmd") == 0;
+    return uses_cmd;
 }
 
 static zend_string *create_win_command_from_args(HashTable *args)
@@ -652,7 +643,7 @@
 		}
 
 		if (is_prog_name) {
-			is_cmd_execution = is_executed_by_cmd(ZSTR_VAL(arg_str));
+			is_cmd_execution = is_executed_by_cmd(ZSTR_VAL(arg_str), ZSTR_LEN(arg_str));
 		} else {
 			smart_str_appendc(&str, ' ');
 		}
@@ -710,22 +701,77 @@
 	memset(&pi, 0, sizeof(pi));
 }
 
+/* on success, returns length of *comspec, which then needs to be efree'd by caller */
+static size_t find_comspec_nt(wchar_t **comspec)
+{
+	zend_string *path = NULL;
+	wchar_t *pathw = NULL;
+	wchar_t *bufp = NULL;
+	DWORD buflen = MAX_PATH, len = 0;
+
+	path = php_getenv("PATH", 4);
+	if (path == NULL) {
+		goto out;
+	}
+	pathw = php_win32_cp_any_to_w(ZSTR_VAL(path));
+	if (pathw == NULL) {
+		goto out;
+	}
+	bufp = emalloc(buflen * sizeof(wchar_t));
+	do {
+		/* the first call to SearchPathW() fails if the buffer is too small,
+		 * what is unlikely but possible; to avoid an explicit second call to
+		 * SeachPathW() and the error handling, we're looping */
+		len = SearchPathW(pathw, L"cmd.exe", NULL, buflen, bufp, NULL);
+		if (len == 0) {
+			goto out;
+		}
+		if (len < buflen) {
+			break;
+		}
+		buflen = len;
+		bufp = erealloc(bufp, buflen * sizeof(wchar_t));
+	} while (1);
+	*comspec = bufp;
+
+out:
+	if (path != NULL) {
+		zend_string_release(path);
+	}
+	if (pathw != NULL) {
+		free(pathw);
+	}
+	if (bufp != NULL && bufp != *comspec) {
+		efree(bufp);
+	}
+	return len;
+}
+
 static zend_result convert_command_to_use_shell(wchar_t **cmdw, size_t cmdw_len)
 {
-	size_t len = sizeof(COMSPEC_NT) + sizeof(" /s /c ") + cmdw_len + 3;
+	wchar_t *comspec;
+	size_t len = find_comspec_nt(&comspec);
+	if (len == 0) {
+		php_error_docref(NULL, E_WARNING, "Command conversion failed");
+		return FAILURE;
+	}
+	len += sizeof(" /s /c ") + cmdw_len + 3;
 	wchar_t *cmdw_shell = (wchar_t *)malloc(len * sizeof(wchar_t));
 
 	if (cmdw_shell == NULL) {
+		efree(comspec);
 		php_error_docref(NULL, E_WARNING, "Command conversion failed");
 		return FAILURE;
 	}
 
-	if (_snwprintf(cmdw_shell, len, L"%hs /s /c \"%s\"", COMSPEC_NT, *cmdw) == -1) {
+	if (_snwprintf(cmdw_shell, len, L"%s /s /c \"%s\"", comspec, *cmdw) == -1) {
+		efree(comspec);
 		free(cmdw_shell);
 		php_error_docref(NULL, E_WARNING, "Command conversion failed");
 		return FAILURE;
 	}
 
+	efree(comspec);
 	free(*cmdw);
 	*cmdw = cmdw_shell;

php-8.3.7.tar.xz/ext/standard/scanf.c -> php-8.3.21.tar.xz/ext/standard/scanf.c Changed

php-8.3.7.tar.xz/ext/standard/streamsfuncs.c -> php-8.3.21.tar.xz/ext/standard/streamsfuncs.c Changed

@@ -33,13 +33,11 @@
 #ifndef PHP_WIN32
 #define php_select(m, r, w, e, t)	select(m, r, w, e, t)
 typedef unsigned long long php_timeout_ull;
-#define PHP_TIMEOUT_ULL_MAX ULLONG_MAX
 #else
 #include "win32/select.h"
 #include "win32/sockets.h"
 #include "win32/console.h"
 typedef unsigned __int64 php_timeout_ull;
-#define PHP_TIMEOUT_ULL_MAX UINT64_MAX
 #endif
 
 #define GET_CTX_OPT(stream, wrapper, name, val) (PHP_STREAM_CONTEXT(stream) && NULL != (val = php_stream_context_get_option(PHP_STREAM_CONTEXT(stream), wrapper, name)))
@@ -127,6 +125,9 @@
 
 	if (timeout_is_null) {
 		timeout = (double)FG(default_socket_timeout);
+	} else if (!zend_finite(timeout)) {
+		zend_argument_value_error(4, "must be a finite value");
+		RETURN_THROWS();
 	}
 
 	context = php_stream_context_from_zval(zcontext, flags & PHP_FILE_NO_DEFAULT_CONTEXT);
@@ -279,6 +280,9 @@
 
 	if (timeout_is_null) {
 		timeout = (double)FG(default_socket_timeout);
+	} else if (!zend_finite(timeout)) {
+		zend_argument_value_error(2, "must be a finite value");
+		RETURN_THROWS();
 	}
 
 	php_stream_from_zval(stream, zstream);

php-8.3.7.tar.xz/ext/standard/string.c -> php-8.3.21.tar.xz/ext/standard/string.c Changed

php-8.3.21.tar.xz/ext/standard/tests/array/gh14140.phpt Added

php-8.3.21.tar.xz/ext/standard/tests/array/gh14775.phpt Added

php-8.3.21.tar.xz/ext/standard/tests/array/gh16053.phpt Added

php-8.3.21.tar.xz/ext/standard/tests/array/gh16905.phpt Added

@@ -0,0 +1,92 @@
+--TEST--
+GH-16905 (Internal iterator functions can't handle UNDEF properties)
+--FILE--
+<?php
+
+class TestSomeUndef {
+	public int $a;
+	public int $b;
+	public int $c;
+	public int $d;
+}
+
+class TestAllUndef {
+	public int $a;
+}
+
+$x = new TestSomeUndef;
+$x->b = 1;
+$x->c = 2;
+
+var_dump(reset($x));
+var_dump(current($x));
+var_dump(end($x));
+
+var_dump(reset($x));
+var_dump(next($x));
+
+var_dump(end($x));
+var_dump(prev($x));
+
+var_dump(key($x));
+var_dump(current($x));
+
+$x = new TestAllUndef;
+var_dump(key($x));
+var_dump(current($x));
+
+$x->a = 1;
+var_dump(key($x));
+var_dump(current($x));
+reset($x);
+var_dump(key($x));
+var_dump(current($x));
+
+?>
+--EXPECTF--
+Deprecated: reset(): Calling reset() on an object is deprecated in %s on line %d
+int(1)
+
+Deprecated: current(): Calling current() on an object is deprecated in %s on line %d
+int(1)
+
+Deprecated: end(): Calling end() on an object is deprecated in %s on line %d
+int(2)
+
+Deprecated: reset(): Calling reset() on an object is deprecated in %s on line %d
+int(1)
+
+Deprecated: next(): Calling next() on an object is deprecated in %s on line %d
+int(2)
+
+Deprecated: end(): Calling end() on an object is deprecated in %s on line %d
+int(2)
+
+Deprecated: prev(): Calling prev() on an object is deprecated in %s on line %d
+int(1)
+
+Deprecated: key(): Calling key() on an object is deprecated in %s on line %d
+string(1) "b"
+
+Deprecated: current(): Calling current() on an object is deprecated in %s on line %d
+int(1)
+
+Deprecated: key(): Calling key() on an object is deprecated in %s on line %d
+NULL
+
+Deprecated: current(): Calling current() on an object is deprecated in %s on line %d
+bool(false)
+
+Deprecated: key(): Calling key() on an object is deprecated in %s on line %d
+NULL
+
+Deprecated: current(): Calling current() on an object is deprecated in %s on line %d
+bool(false)
+
+Deprecated: reset(): Calling reset() on an object is deprecated in %s on line %d
+
+Deprecated: key(): Calling key() on an object is deprecated in %s on line %d
+string(1) "a"
+
+Deprecated: current(): Calling current() on an object is deprecated in %s on line %d
+int(1)

php-8.3.21.tar.xz/ext/standard/tests/array/gh16957.phpt Added

php-8.3.7.tar.xz/ext/standard/tests/file/bug52820.phpt -> php-8.3.21.tar.xz/ext/standard/tests/file/bug52820.phpt Changed

php-8.3.21.tar.xz/ext/standard/tests/file/bug72666_variation1.phpt Added

php-8.3.21.tar.xz/ext/standard/tests/file/bug72666_variation2.phpt Added

php-8.3.21.tar.xz/ext/standard/tests/file/bug72666_variation3.phpt Added

php-8.3.21.tar.xz/ext/standard/tests/file/bug72666_variation4.phpt Added

php-8.3.7.tar.xz/ext/standard/tests/file/copy_variation5-win32.phpt -> php-8.3.21.tar.xz/ext/standard/tests/file/copy_variation5-win32.phpt Changed

@@ -22,9 +22,9 @@
 $dest_files = array(
 
   /* Checking case sensitiveness */
-  "COPY.tmp",
-  "COPY.TMP",
-  "CopY.TMP"
+  "COPY5.tmp",
+  "COPY5.TMP",
+  "CopY5.TMP"
 );
 
 echo "Size of the source file before copy operation => ";
@@ -80,25 +80,25 @@
 -- Iteration 1 --
 Copy operation => bool(true)
 Existence of destination file => bool(true)
-Destination file name => %s/COPY.tmp
+Destination file name => %s/COPY5.tmp
 Size of source file => int(1500)
 Size of destination file => int(1500)
 
 -- Iteration 2 --
 Copy operation => bool(true)
 Existence of destination file => bool(true)
-Destination file name => %s/COPY.TMP
+Destination file name => %s/COPY5.TMP
 Size of source file => int(1500)
 Size of destination file => int(1500)
 
 -- Iteration 3 --
 Copy operation => bool(true)
 Existence of destination file => bool(true)
-Destination file name => %s/CopY.TMP
+Destination file name => %s/CopY5.TMP
 Size of source file => int(1500)
 Size of destination file => int(1500)
 
-Warning: unlink(%s/COPY.TMP): No such file or directory in %s on line %d
+Warning: unlink(%s/COPY5.TMP): No such file or directory in %s on line %d
 
-Warning: unlink(%s/CopY.TMP): No such file or directory in %s on line %d
+Warning: unlink(%s/CopY5.TMP): No such file or directory in %s on line %d
 *** Done ***

php-8.3.7.tar.xz/ext/standard/tests/file/fgetcsv_error_conditions.phpt -> php-8.3.21.tar.xz/ext/standard/tests/file/fgetcsv_error_conditions.phpt Changed

php-8.3.7.tar.xz/ext/standard/tests/file/file_get_contents_basic.phpt -> php-8.3.21.tar.xz/ext/standard/tests/file/file_get_contents_basic.phpt Changed

php-8.3.7.tar.xz/ext/standard/tests/file/file_get_contents_error.phpt -> php-8.3.21.tar.xz/ext/standard/tests/file/file_get_contents_error.phpt Changed

php-8.3.7.tar.xz/ext/standard/tests/file/file_put_contents_variation7.phpt -> php-8.3.21.tar.xz/ext/standard/tests/file/file_put_contents_variation7.phpt Changed

php-8.3.21.tar.xz/ext/standard/tests/file/gh15653.phpt Added

php-8.3.21.tar.xz/ext/standard/tests/file/gh18212.phpt Added

php-8.3.7.tar.xz/ext/standard/tests/file/parse_ini_file_variation6.phpt -> php-8.3.21.tar.xz/ext/standard/tests/file/parse_ini_file_variation6.phpt Changed

php-8.3.7.tar.xz/ext/standard/tests/file/readfile_variation9.phpt -> php-8.3.21.tar.xz/ext/standard/tests/file/readfile_variation9.phpt Changed

@@ -5,8 +5,8 @@
 --FILE--
 <?php
 echo "*** Testing readfile() : variation ***\n";
-$mainDir = "readfileVar8";
-$subDir = "readfileVar8Sub";
+$mainDir = "readfileVar9";
+$subDir = "readfileVar9Sub";
 $absMainDir = __DIR__."/".$mainDir;
 mkdir($absMainDir);
 $absSubDir = $absMainDir."/".$subDir;
@@ -72,11 +72,11 @@
 The File Contents
 -- Iteration 5 --
 
-Warning: readfile(%sreadfileVar8Sub/..///readfileVar8Sub//..//../readfileVar8Sub/fileToRead.tmp): Failed to open stream: No such file or directory in %s on line %d
+Warning: readfile(%sreadfileVar9Sub/..///readfileVar9Sub//..//../readfileVar9Sub/fileToRead.tmp): Failed to open stream: No such file or directory in %s on line %d
 
 -- Iteration 6 --
 
-Warning: readfile(%sreadfileVar8Sub/BADDIR/fileToRead.tmp): Failed to open stream: No such file or directory in %s on line %d
+Warning: readfile(%sreadfileVar9Sub/BADDIR/fileToRead.tmp): Failed to open stream: No such file or directory in %s on line %d
 
 -- Iteration 7 --
 The File Contents

php-8.3.7.tar.xz/ext/standard/tests/file/rename_variation-win32.phpt -> php-8.3.21.tar.xz/ext/standard/tests/file/rename_variation-win32.phpt Changed

@@ -12,19 +12,19 @@
 
 /* create directory */
 $file_path = __DIR__;
-mkdir("$file_path/rename_variation");
+mkdir("$file_path/rename_variation-win32");
 
 /* rename files across directories */
 echo "*** Testing rename() : rename files across directories ***\n";
 $src_filenames = array(
-  "$file_path/rename_variation/rename_variation.tmp",
+  "$file_path/rename_variation-win32/rename_variation.tmp",
 
   /* Testing a file trailing slash */
-  "$file_path/rename_variation/rename_variation.tmp/",
+  "$file_path/rename_variation-win32/rename_variation.tmp/",
 
   /* Testing file with double slashes */
-  "$file_path/rename_variation//rename_variation.tmp",
-  "$file_path//rename_variation//rename_variation.tmp",
+  "$file_path/rename_variation-win32//rename_variation.tmp",
+  "$file_path//rename_variation-win32//rename_variation.tmp",
 );
 
 $counter = 1;
@@ -32,7 +32,7 @@
 /* loop through each $file and rename it to rename_variation2.tmp */
 foreach($src_filenames as $src_filename) {
   echo "-- Iteration $counter --\n";
-  $fp = fopen("$file_path/rename_variation/rename_variation.tmp", "w");
+  $fp = fopen("$file_path/rename_variation-win32/rename_variation.tmp", "w");
   fclose($fp);
   $dest_filename = "$file_path/rename_variation2.tmp";
   var_dump( rename($src_filename, $dest_filename) );
@@ -51,7 +51,7 @@
 --CLEAN--
 <?php
 $file_path = __DIR__;
-rmdir($file_path."/rename_variation");
+rmdir($file_path."/rename_variation-win32");
 ?>
 --EXPECTF--
 *** Testing rename() : rename files across directories ***
@@ -61,7 +61,7 @@
 bool(true)
 -- Iteration 2 --
 
-Warning: rename(%s/rename_variation/rename_variation.tmp/,%s/rename_variation2.tmp): The filename, directory name, or volume label syntax is incorrect (code: 123) in %s on line %d
+Warning: rename(%s/rename_variation-win32/rename_variation.tmp/,%s/rename_variation2.tmp): %rThe filename, directory name, or volume label syntax is incorrect|The directory name is invalid%r (code: %r123|267%r) in %s on line %d
 bool(false)
 bool(false)
 bool(false)

php-8.3.7.tar.xz/ext/standard/tests/file/rename_variation1-win32.phpt -> php-8.3.21.tar.xz/ext/standard/tests/file/rename_variation1-win32.phpt Changed

@@ -17,16 +17,16 @@
 echo "\n*** Testing rename() : renaming directory across directories ***\n";
 $src_dirs = array (
   /* Testing simple directory tree */
-  "$file_path/rename_variation/",
+  "$file_path/rename_variation1-win32/",
 
   /* Testing a dir with trailing slash */
-  "$file_path/rename_variation/",
+  "$file_path/rename_variation1-win32/",
 
   /* Testing dir with double trailing slashes */
-  "$file_path//rename_variation//",
+  "$file_path//rename_variation1-win32//",
 );
 
-$dest_dir = "$file_path/rename_variation_dir";
+$dest_dir = "$file_path/rename_variation1-win32_dir";
 
 // create the $dest_dir
 mkdir($dest_dir);
@@ -38,7 +38,7 @@
   echo "-- Iteration $counter --\n";
 
   // create the src dir
-  mkdir("$file_path/rename_variation/");
+  mkdir("$file_path/rename_variation1-win32/");
   // rename the src dir to a new dir in dest dir
   var_dump( rename($src_dir, $dest_dir."/new_dir") );
   // ensure that dir was renamed
@@ -55,7 +55,7 @@
 --CLEAN--
 <?php
 $file_path = __DIR__;
-rmdir($file_path."/rename_variation_dir");
+rmdir($file_path."/rename_variation1-win32_dir");
 ?>
 --EXPECT--
 *** Testing rename() : renaming directory across directories ***

php-8.3.7.tar.xz/ext/standard/tests/file/rename_variation12-win32.phpt -> php-8.3.21.tar.xz/ext/standard/tests/file/rename_variation12-win32.phpt Changed

@@ -11,8 +11,8 @@
 /* Creating unique files in various dirs by passing relative paths to $dir arg */
 
 echo "*** Testing rename() with absolute and relative paths ***\n";
-$mainDir = "renameVar11";
-$subDir = "renameVar11Sub";
+$mainDir = "renameVar12";
+$subDir = "renameVar12Sub";
 $absMainDir = __DIR__."/".$mainDir;
 mkdir($absMainDir);
 $absSubDir = $absMainDir."/".$subDir;
@@ -83,12 +83,12 @@
 
 -- Iteration 5 --
 
-Warning: rename(%s/renameVar11/renameVar11Sub/..///renameVar11Sub//..//../renameVar11Sub/renameMe.tmp,%s/renameVar11/renameVar11Sub/..///renameVar11Sub//..//../renameVar11Sub/IwasRenamed.tmp): The system cannot find the path specified (code: 3) in %s on line %d
+Warning: rename(%s/renameVar12/renameVar12Sub/..///renameVar12Sub//..//../renameVar12Sub/renameMe.tmp,%s/renameVar12/renameVar12Sub/..///renameVar12Sub//..//../renameVar12Sub/IwasRenamed.tmp): The system cannot find the path specified (code: 3) in %s on line %d
 bool(false)
 
 -- Iteration 6 --
 
-Warning: rename(%s/renameVar11/renameVar11Sub/BADDIR/renameMe.tmp,%s/renameVar11/renameVar11Sub/BADDIR/IwasRenamed.tmp): The system cannot find the path specified (code: 3) in %s on line %d
+Warning: rename(%s/renameVar12/renameVar12Sub/BADDIR/renameMe.tmp,%s/renameVar12/renameVar12Sub/BADDIR/IwasRenamed.tmp): The system cannot find the path specified (code: 3) in %s on line %d
 bool(false)
 
 -- Iteration 7 --

php-8.3.7.tar.xz/ext/standard/tests/file/rename_variation12.phpt -> php-8.3.21.tar.xz/ext/standard/tests/file/rename_variation12.phpt Changed

@@ -11,8 +11,8 @@
 /* Creating unique files in various dirs by passing relative paths to $dir arg */
 
 echo "*** Testing rename() with absolute and relative paths ***\n";
-$mainDir = "renameVar11";
-$subDir = "renameVar11Sub";
+$mainDir = "renameVar12";
+$subDir = "renameVar12Sub";
 $absMainDir = __DIR__."/".$mainDir;
 mkdir($absMainDir);
 $absSubDir = $absMainDir."/".$subDir;
@@ -83,12 +83,12 @@
 
 -- Iteration 5 --
 
-Warning: rename(%s/renameVar11/renameVar11Sub/..///renameVar11Sub//..//../renameVar11Sub/renameMe.tmp,%s/renameVar11/renameVar11Sub/..///renameVar11Sub//..//../renameVar11Sub/IwasRenamed.tmp): %s in %s on line %d
+Warning: rename(%s/renameVar12/renameVar12Sub/..///renameVar12Sub//..//../renameVar12Sub/renameMe.tmp,%s/renameVar12/renameVar12Sub/..///renameVar12Sub//..//../renameVar12Sub/IwasRenamed.tmp): %s in %s on line %d
 bool(false)
 
 -- Iteration 6 --
 
-Warning: rename(%s/renameVar11/renameVar11Sub/BADDIR/renameMe.tmp,%s/renameVar11/renameVar11Sub/BADDIR/IwasRenamed.tmp): %s in %s on line %d
+Warning: rename(%s/renameVar12/renameVar12Sub/BADDIR/renameMe.tmp,%s/renameVar12/renameVar12Sub/BADDIR/IwasRenamed.tmp): %s in %s on line %d
 bool(false)
 
 -- Iteration 7 --

php-8.3.7.tar.xz/ext/standard/tests/file/stream_rfc2397_007.phpt -> php-8.3.21.tar.xz/ext/standard/tests/file/stream_rfc2397_007.phpt Changed

php-8.3.7.tar.xz/ext/standard/tests/file/unlink_variation8-win32.phpt -> php-8.3.21.tar.xz/ext/standard/tests/file/unlink_variation8-win32.phpt Changed

php-8.3.7.tar.xz/ext/standard/tests/file/unlink_variation9-win32.phpt -> php-8.3.21.tar.xz/ext/standard/tests/file/unlink_variation9-win32.phpt Changed

php-8.3.7.tar.xz/ext/standard/tests/filters/gh13264.phpt -> php-8.3.21.tar.xz/ext/standard/tests/filters/gh13264.phpt Changed

php-8.3.21.tar.xz/ext/standard/tests/filters/gh17037.phpt Added

php-8.3.21.tar.xz/ext/standard/tests/filters/ghsa-r977-prxv-hc43.phpt Added

@@ -0,0 +1,12 @@
+--TEST--
+GHSA-r977-prxv-hc43: Single byte overread with convert.quoted-printable-decode filter
+--FILE--
+<?php
+
+$input_data = str_repeat('A', 8189)."X=\r";
+$filter_url = "php://filter/convert.quoted-printable-decode/resource=data:," . urlencode($input_data);
+var_dump(file_get_contents($filter_url));
+
+?>
+--EXPECT--
+string(8190) "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAX"

php-8.3.7.tar.xz/ext/standard/tests/filters/stream_filter_remove_basic.phpt -> php-8.3.21.tar.xz/ext/standard/tests/filters/stream_filter_remove_basic.phpt Changed

php-8.3.7.tar.xz/ext/standard/tests/filters/stream_filter_remove_error.phpt -> php-8.3.21.tar.xz/ext/standard/tests/filters/stream_filter_remove_error.phpt Changed

php-8.3.21.tar.xz/ext/standard/tests/general_functions/gh17211.phpt Added

php-8.3.21.tar.xz/ext/standard/tests/general_functions/ghsa-9fcc-425m-g385_001.phpt Added

@@ -0,0 +1,56 @@
+--TEST--
+GHSA-9fcc-425m-g385 - bypass CVE-2024-1874 - batch file variation
+--SKIPIF--
+<?php
+if( substr(PHP_OS, 0, 3) != "WIN" )
+  die('skip Run only on Windows');
+if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
+?>
+--FILE--
+<?php
+
+$batch_file_content = <<<EOT
+@echo off
+powershell -Command "Write-Output '%0%'"
+powershell -Command "Write-Output '%1%'"
+EOT;
+$batch_file_path = __DIR__ . '/ghsa-9fcc-425m-g385_001.bat';
+
+file_put_contents($batch_file_path, $batch_file_content);
+
+$descriptorspec = STDIN, STDOUT, STDOUT;
+
+$proc = proc_open($batch_file_path . ".", "\"&notepad.exe", $descriptorspec, $pipes);
+proc_close($proc);
+$proc = proc_open($batch_file_path . "  ", "\"&notepad.exe", $descriptorspec, $pipes);
+proc_close($proc);
+$proc = proc_open($batch_file_path . ".  ", "\"&notepad.exe", $descriptorspec, $pipes);
+proc_close($proc);
+$proc = proc_open($batch_file_path . ". ...  ", "\"&notepad.exe", $descriptorspec, $pipes);
+proc_close($proc);
+$proc = proc_open($batch_file_path . ". ... . ", "\"&notepad.exe", $descriptorspec, $pipes);
+proc_close($proc);
+$proc = proc_open($batch_file_path . ". ... . .", "\"&notepad.exe", $descriptorspec, $pipes);
+proc_close($proc);
+proc_open($batch_file_path . ". .\\.. . .", "\"&notepad.exe", $descriptorspec, $pipes);
+
+?>
+--EXPECTF--
+'"%sghsa-9fcc-425m-g385_001.bat."' is not recognized as an internal or external command,
+operable program or batch file.
+%sghsa-9fcc-425m-g385_001.bat 
+"&notepad.exe
+%sghsa-9fcc-425m-g385_001.bat. 
+"&notepad.exe
+%sghsa-9fcc-425m-g385_001.bat. ... 
+"&notepad.exe
+%sghsa-9fcc-425m-g385_001.bat. ... . 
+"&notepad.exe
+'"%sghsa-9fcc-425m-g385_001.bat. ... . ."' is not recognized as an internal or external command,
+operable program or batch file.
+
+Warning: proc_open(): CreateProcess failed, error code: 2 in %s on line %d
+--CLEAN--
+<?php
+@unlink(__DIR__ . '/ghsa-9fcc-425m-g385_001.bat');
+?>

php-8.3.21.tar.xz/ext/standard/tests/general_functions/ghsa-9fcc-425m-g385_002.phpt Added

@@ -0,0 +1,66 @@
+--TEST--
+GHSA-9fcc-425m-g385 - bypass CVE-2024-1874 - cmd.exe variation
+--SKIPIF--
+<?php
+if( substr(PHP_OS, 0, 3) != "WIN" )
+  die('skip Run only on Windows');
+if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
+?>
+--FILE--
+<?php
+
+$batch_file_content = <<<EOT
+@echo off
+powershell -Command "Write-Output '%0%'"
+powershell -Command "Write-Output '%1%'"
+EOT;
+$batch_file_path = __DIR__ . '/ghsa-9fcc-425m-g385_002.bat';
+
+file_put_contents($batch_file_path, $batch_file_content);
+
+$descriptorspec = STDIN, STDOUT, STDOUT;
+
+$proc = proc_open("cmd.exe", "/c", $batch_file_path, "\"&notepad.exe", $descriptorspec, $pipes);
+proc_close($proc);
+$proc = proc_open("cmd.exe   ", "/c", $batch_file_path, "\"&notepad.exe", $descriptorspec, $pipes);
+proc_close($proc);
+$proc = proc_open("cmd.exe.   ", "/c", $batch_file_path, "\"&notepad.exe", $descriptorspec, $pipes);
+proc_close($proc);
+$proc = proc_open("cmd.exe. ...  ", "/c", $batch_file_path, "\"&notepad.exe", $descriptorspec, $pipes);
+proc_close($proc);
+$proc = proc_open("\\cmd.exe. ...  ", "/c", $batch_file_path, "\"&notepad.exe", $descriptorspec, $pipes);
+
+$proc = proc_open("cmd", "/c", $batch_file_path, "\"&notepad.exe", $descriptorspec, $pipes);
+proc_close($proc);
+$proc = proc_open("cmd   ", "/c", $batch_file_path, "\"&notepad.exe", $descriptorspec, $pipes);
+proc_close($proc);
+$proc = proc_open("cmd.   ", "/c", $batch_file_path, "\"&notepad.exe", $descriptorspec, $pipes);
+$proc = proc_open("cmd. ...  ", "/c", $batch_file_path, "\"&notepad.exe", $descriptorspec, $pipes);
+$proc = proc_open("\\cmd. ...  ", "/c", $batch_file_path, "\"&notepad.exe", $descriptorspec, $pipes);
+
+?>
+--EXPECTF--
+%sghsa-9fcc-425m-g385_002.bat
+"&notepad.exe
+%sghsa-9fcc-425m-g385_002.bat
+"&notepad.exe
+%sghsa-9fcc-425m-g385_002.bat
+"&notepad.exe
+%sghsa-9fcc-425m-g385_002.bat
+"&notepad.exe
+
+Warning: proc_open(): CreateProcess failed, error code: 2 in %s on line %d
+%sghsa-9fcc-425m-g385_002.bat
+"&notepad.exe
+%sghsa-9fcc-425m-g385_002.bat
+"&notepad.exe
+
+Warning: proc_open(): CreateProcess failed, error code: 2 in %s on line %d
+
+Warning: proc_open(): CreateProcess failed, error code: 2 in %s on line %d
+
+Warning: proc_open(): CreateProcess failed, error code: 2 in %s on line %d
+--CLEAN--
+<?php
+@unlink(__DIR__ . '/ghsa-9fcc-425m-g385_002.bat');
+?>

php-8.3.21.tar.xz/ext/standard/tests/general_functions/ghsa-9fcc-425m-g385_003.phpt Added

@@ -0,0 +1,550 @@
+--TEST--
+GHSA-9fcc-425m-g385 - bypass CVE-2024-1874 - exhaustive suffix test
+--SKIPIF--
+<?php
+if( substr(PHP_OS, 0, 3) != "WIN" )
+  die('skip Run only on Windows');
+?>
+--FILE--
+<?php
+
+$batch_file_content = <<<EOT
+@echo off
+powershell -Command "Write-Output '%0%'"
+powershell -Command "Write-Output '%1%'"
+EOT;
+$batch_file_path = __DIR__ . '/ghsa-9fcc-425m-g385_003.bat';
+
+file_put_contents($batch_file_path, $batch_file_content);
+
+$descriptorspec = STDIN, STDOUT, STDOUT;
+
+for ($i = 1; $i <= 255; $i++) {
+  echo "Testing $i\n";
+  try {
+    $proc = @proc_open($batch_file_path . chr($i), "\"&notepad.exe", $descriptorspec, $pipes, null, null, array("bypass_shell" => true));
+    var_dump($proc);
+    proc_close($proc);
+  } catch (Error) {}
+}
+
+?>
+--EXPECTF--
+Testing 1
+bool(false)
+Testing 2
+bool(false)
+Testing 3
+bool(false)
+Testing 4
+bool(false)
+Testing 5
+bool(false)
+Testing 6
+bool(false)
+Testing 7
+bool(false)
+Testing 8
+bool(false)
+Testing 9
+bool(false)
+Testing 10
+bool(false)
+Testing 11
+bool(false)
+Testing 12
+bool(false)
+Testing 13
+bool(false)
+Testing 14
+bool(false)
+Testing 15
+bool(false)
+Testing 16
+bool(false)
+Testing 17
+bool(false)
+Testing 18
+bool(false)
+Testing 19
+bool(false)
+Testing 20
+bool(false)
+Testing 21
+bool(false)
+Testing 22
+bool(false)
+Testing 23
+bool(false)
+Testing 24
+bool(false)
+Testing 25
+bool(false)
+Testing 26
+bool(false)
+Testing 27
+bool(false)
+Testing 28
+bool(false)
+Testing 29
+bool(false)
+Testing 30
+bool(false)
+Testing 31
+bool(false)
+Testing 32
+resource(%d) of type (process)
+%s.bat 
+"&notepad.exe
+Testing 33
+bool(false)
+Testing 34
+bool(false)
+Testing 35
+bool(false)
+Testing 36
+bool(false)
+Testing 37
+bool(false)
+Testing 38
+bool(false)
+Testing 39
+bool(false)
+Testing 40
+bool(false)
+Testing 41
+bool(false)
+Testing 42
+bool(false)
+Testing 43
+bool(false)
+Testing 44
+bool(false)
+Testing 45
+bool(false)
+Testing 46
+resource(%d) of type (process)
+'"%s.bat."' is not recognized as an internal or external command,
+operable program or batch file.
+Testing 47
+bool(false)
+Testing 48
+bool(false)
+Testing 49
+bool(false)
+Testing 50
+bool(false)
+Testing 51
+bool(false)
+Testing 52
+bool(false)
+Testing 53
+bool(false)
+Testing 54
+bool(false)
+Testing 55
+bool(false)
+Testing 56
+bool(false)
+Testing 57
+bool(false)
+Testing 58
+bool(false)
+Testing 59
+bool(false)
+Testing 60
+bool(false)
+Testing 61
+bool(false)
+Testing 62
+bool(false)
+Testing 63
+bool(false)
+Testing 64
+bool(false)
+Testing 65
+bool(false)
+Testing 66
+bool(false)
+Testing 67
+bool(false)
+Testing 68
+bool(false)
+Testing 69
+bool(false)
+Testing 70
+bool(false)
+Testing 71
+bool(false)
+Testing 72
+bool(false)
+Testing 73
+bool(false)
+Testing 74
+bool(false)
+Testing 75
+bool(false)
+Testing 76
+bool(false)
+Testing 77
+bool(false)
+Testing 78
+bool(false)
+Testing 79
+bool(false)
+Testing 80
+bool(false)
+Testing 81
+bool(false)
+Testing 82
+bool(false)
+Testing 83
+bool(false)
+Testing 84
+bool(false)
+Testing 85
+bool(false)
+Testing 86
+bool(false)
+Testing 87
+bool(false)
+Testing 88
+bool(false)
+Testing 89
+bool(false)
+Testing 90
+bool(false)
+Testing 91
+bool(false)
+Testing 92
+bool(false)
+Testing 93
+bool(false)
+Testing 94
+bool(false)
+Testing 95
+bool(false)
+Testing 96
+bool(false)
+Testing 97
+bool(false)
+Testing 98
+bool(false)
+Testing 99
+bool(false)
+Testing 100
+bool(false)
+Testing 101
+bool(false)
+Testing 102
+bool(false)
+Testing 103
+bool(false)
+Testing 104
+bool(false)
+Testing 105
+bool(false)
+Testing 106
+bool(false)
+Testing 107
+bool(false)
+Testing 108
+bool(false)
+Testing 109
+bool(false)
+Testing 110
+bool(false)
+Testing 111
+bool(false)
+Testing 112
+bool(false)
+Testing 113
+bool(false)
+Testing 114
+bool(false)
+Testing 115
+bool(false)
+Testing 116
+bool(false)
+Testing 117
+bool(false)
+Testing 118
+bool(false)
+Testing 119
+bool(false)
+Testing 120
+bool(false)
+Testing 121
+bool(false)
+Testing 122
+bool(false)
+Testing 123
+bool(false)
+Testing 124
+bool(false)
+Testing 125
+bool(false)
+Testing 126
+bool(false)
+Testing 127
+bool(false)
+Testing 128
+bool(false)
+Testing 129
+bool(false)
+Testing 130
+bool(false)
+Testing 131
+bool(false)
+Testing 132
+bool(false)
+Testing 133
+bool(false)
+Testing 134
+bool(false)
+Testing 135
+bool(false)
+Testing 136
+bool(false)
+Testing 137
+bool(false)
+Testing 138
+bool(false)
+Testing 139
+bool(false)
+Testing 140
+bool(false)
+Testing 141
+bool(false)
+Testing 142
+bool(false)
+Testing 143
+bool(false)
+Testing 144
+bool(false)
+Testing 145
+bool(false)
+Testing 146
+bool(false)
+Testing 147
+bool(false)
+Testing 148
+bool(false)
+Testing 149
+bool(false)
+Testing 150
+bool(false)
+Testing 151
+bool(false)
+Testing 152
+bool(false)
+Testing 153
+bool(false)
+Testing 154
+bool(false)
+Testing 155
+bool(false)
+Testing 156
+bool(false)
+Testing 157
+bool(false)
+Testing 158
+bool(false)
+Testing 159
+bool(false)
+Testing 160
+bool(false)
+Testing 161
+bool(false)
+Testing 162
+bool(false)
+Testing 163
+bool(false)
+Testing 164
+bool(false)
+Testing 165
+bool(false)
+Testing 166
+bool(false)
+Testing 167
+bool(false)
+Testing 168
+bool(false)
+Testing 169
+bool(false)
+Testing 170
+bool(false)
+Testing 171
+bool(false)
+Testing 172
+bool(false)
+Testing 173
+bool(false)
+Testing 174
+bool(false)
+Testing 175
+bool(false)
+Testing 176
+bool(false)
+Testing 177
+bool(false)
+Testing 178
+bool(false)
+Testing 179
+bool(false)
+Testing 180
+bool(false)
+Testing 181
+bool(false)
+Testing 182
+bool(false)
+Testing 183
+bool(false)
+Testing 184
+bool(false)
+Testing 185
+bool(false)
+Testing 186
+bool(false)
+Testing 187
+bool(false)
+Testing 188
+bool(false)
+Testing 189
+bool(false)
+Testing 190
+bool(false)
+Testing 191
+bool(false)
+Testing 192
+bool(false)
+Testing 193
+bool(false)
+Testing 194
+bool(false)
+Testing 195
+bool(false)
+Testing 196
+bool(false)
+Testing 197
+bool(false)
+Testing 198
+bool(false)
+Testing 199
+bool(false)
+Testing 200
+bool(false)
+Testing 201
+bool(false)
+Testing 202
+bool(false)
+Testing 203
+bool(false)
+Testing 204
+bool(false)
+Testing 205
+bool(false)
+Testing 206
+bool(false)
+Testing 207
+bool(false)
+Testing 208
+bool(false)
+Testing 209
+bool(false)
+Testing 210
+bool(false)
+Testing 211
+bool(false)
+Testing 212
+bool(false)
+Testing 213
+bool(false)
+Testing 214
+bool(false)
+Testing 215
+bool(false)
+Testing 216
+bool(false)
+Testing 217
+bool(false)
+Testing 218
+bool(false)
+Testing 219
+bool(false)
+Testing 220
+bool(false)
+Testing 221
+bool(false)
+Testing 222
+bool(false)
+Testing 223
+bool(false)
+Testing 224
+bool(false)
+Testing 225
+bool(false)
+Testing 226
+bool(false)
+Testing 227
+bool(false)
+Testing 228
+bool(false)
+Testing 229
+bool(false)
+Testing 230
+bool(false)
+Testing 231
+bool(false)
+Testing 232
+bool(false)
+Testing 233
+bool(false)
+Testing 234
+bool(false)
+Testing 235
+bool(false)
+Testing 236
+bool(false)
+Testing 237
+bool(false)
+Testing 238
+bool(false)
+Testing 239
+bool(false)
+Testing 240
+bool(false)
+Testing 241
+bool(false)
+Testing 242
+bool(false)
+Testing 243
+bool(false)
+Testing 244
+bool(false)
+Testing 245
+bool(false)
+Testing 246
+bool(false)
+Testing 247
+bool(false)
+Testing 248
+bool(false)
+Testing 249
+bool(false)
+Testing 250
+bool(false)
+Testing 251
+bool(false)
+Testing 252
+bool(false)
+Testing 253
+bool(false)
+Testing 254
+bool(false)
+Testing 255
+bool(false)
+--CLEAN--
+<?php
+@unlink(__DIR__ . '/ghsa-9fcc-425m-g385_003.bat');
+?>

php-8.3.7.tar.xz/ext/standard/tests/general_functions/ghsa-pc52-254m-w9w7_1.phpt -> php-8.3.21.tar.xz/ext/standard/tests/general_functions/ghsa-pc52-254m-w9w7_1.phpt Changed

php-8.3.7.tar.xz/ext/standard/tests/general_functions/ghsa-pc52-254m-w9w7_2.phpt -> php-8.3.21.tar.xz/ext/standard/tests/general_functions/ghsa-pc52-254m-w9w7_2.phpt Changed

php-8.3.7.tar.xz/ext/standard/tests/general_functions/ghsa-pc52-254m-w9w7_3.phpt -> php-8.3.21.tar.xz/ext/standard/tests/general_functions/ghsa-pc52-254m-w9w7_3.phpt Changed

php-8.3.7.tar.xz/ext/standard/tests/general_functions/phpinfo.phpt -> php-8.3.21.tar.xz/ext/standard/tests/general_functions/phpinfo.phpt Changed

@@ -16,21 +16,21 @@
 PHP Version => %s
 
 System => %s
-Build Date => %s%a
+Build Date => %r(.+?)%r
 Configure Command => %s
 Server API => Command Line Interface
 Virtual Directory Support => %s
 Configuration File (php.ini) Path => %s
-Loaded Configuration File => %a
-Scan this dir for additional .ini files => %a
-Additional .ini files parsed => %a
+Loaded Configuration File => %r(.+?)%r
+Scan this dir for additional .ini files => %r(.+?)%r
+Additional .ini files parsed => %r(.+?)%r
 PHP API => %d
 PHP Extension => %d
 Zend Extension => %d
 Zend Extension Build => API%s
 PHP Extension Build => API%s
 Debug Build => %s
-Thread Safety => %s%A
+Thread Safety => %r(.+?)%r
 Zend Signal Handling => %s
 Zend Memory Manager => %s
 Zend Multibyte Support => %s
@@ -42,22 +42,22 @@
 Registered Stream Socket Transports => %s
 Registered Stream Filters => %s
 
-%a
+%r(.+?)%r
  _______________________________________________________________________
 
 
 Configuration
-%A
+%r(.*?)%r
 Core
-%A
+%r(.*?)%r
 Additional Modules
-%A
+%r(.*?)%r
 Environment
-%A
+%r(.*?)%r
 PHP Variables
-%A
+%r(.*?)%r
 PHP License
-%A
+%r(.*?)%r
 bool(true)
 --
 phpinfo()
@@ -66,5 +66,5 @@
 phpinfo()
 
 PHP License
-%a
+%r(.+?)%r
 bool(true)

php-8.3.21.tar.xz/ext/standard/tests/general_functions/proc_open_cmd.phpt Added

php-8.3.21.tar.xz/ext/standard/tests/gh18209.phpt Added

php-8.3.21.tar.xz/ext/standard/tests/helpers Added

php-8.3.21.tar.xz/ext/standard/tests/helpers/bad_cmd.c Added

php-8.3.7.tar.xz/ext/standard/tests/http/bug47021.phpt -> php-8.3.21.tar.xz/ext/standard/tests/http/bug47021.phpt Changed

php-8.3.7.tar.xz/ext/standard/tests/http/bug75535.phpt -> php-8.3.21.tar.xz/ext/standard/tests/http/bug75535.phpt Changed

php-8.3.21.tar.xz/ext/standard/tests/http/gh15034.phpt Added

php-8.3.21.tar.xz/ext/standard/tests/http/gh16810.phpt Added

php-8.3.21.tar.xz/ext/standard/tests/http/ghsa-52jp-hrpf-2jff-001.phpt Added

@@ -0,0 +1,58 @@
+--TEST--
+GHSA-52jp-hrpf-2jff: HTTP stream wrapper truncate redirect location to 1024 bytes (success)
+--FILE--
+<?php
+$serverCode = <<<'CODE'
+$ctxt = stream_context_create(
+     "socket" => 
+         "tcp_nodelay" => true
+     
+ );
+
+ $server = stream_socket_server(
+     "tcp://127.0.0.1:0", $errno, $errstr, STREAM_SERVER_BIND | STREAM_SERVER_LISTEN, $ctxt);
+ phpt_notify_server_start($server);
+
+ $conn = stream_socket_accept($server);
+
+ phpt_notify(message:"server-accepted");
+
+ $loc = str_repeat("y", 8000);
+ fwrite($conn, "HTTP/1.0 301 Ok\r\nContent-Type: text/html;\r\nLocation: $loc\r\n\r\nbody\r\n");
+CODE;
+
+$clientCode = <<<'CODE'
+ function stream_notification_callback($notification_code, $severity, $message, $message_code, $bytes_transferred, $bytes_max) {
+ switch($notification_code) {
+     case STREAM_NOTIFY_MIME_TYPE_IS:
+         echo "Found the mime-type: ", $message, PHP_EOL;
+         break;
+     case STREAM_NOTIFY_REDIRECTED:
+         echo "Redirected: ";
+         var_dump($message);
+     }
+ }
+
+ $ctx = stream_context_create();
+ stream_context_set_params($ctx, array("notification" => "stream_notification_callback"));
+ var_dump(trim(file_get_contents("http://{{ ADDR }}", false, $ctx)));
+ var_dump($http_response_header);
+CODE;
+
+include sprintf("%s/../../../openssl/tests/ServerClientTestCase.inc", __DIR__);
+ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
+?>
+--EXPECTF--
+Found the mime-type: text/html;
+Redirected: string(8000) "%s"
+
+Warning: file_get_contents(http://127.0.0.1:%d): Failed to open stream: %s
+string(0) ""
+array(3) {
+  0=>
+  string(15) "HTTP/1.0 301 Ok"
+  1=>
+  string(24) "Content-Type: text/html;"
+  2=>
+  string(8010) "Location: %s"
+}

php-8.3.21.tar.xz/ext/standard/tests/http/ghsa-52jp-hrpf-2jff-002.phpt Added

@@ -0,0 +1,55 @@
+--TEST--
+GHSA-52jp-hrpf-2jff: HTTP stream wrapper truncate redirect location to 1024 bytes (over limit)
+--FILE--
+<?php
+$serverCode = <<<'CODE'
+$ctxt = stream_context_create(
+     "socket" => 
+         "tcp_nodelay" => true
+     
+ );
+
+ $server = stream_socket_server(
+     "tcp://127.0.0.1:0", $errno, $errstr, STREAM_SERVER_BIND | STREAM_SERVER_LISTEN, $ctxt);
+ phpt_notify_server_start($server);
+
+ $conn = stream_socket_accept($server);
+
+ phpt_notify(message:"server-accepted");
+
+ $loc = str_repeat("y", 9000);
+ fwrite($conn, "HTTP/1.0 301 Ok\r\nContent-Type: text/html;\r\nLocation: $loc\r\n\r\nbody\r\n");
+CODE;
+
+$clientCode = <<<'CODE'
+ function stream_notification_callback($notification_code, $severity, $message, $message_code, $bytes_transferred, $bytes_max) {
+ switch($notification_code) {
+     case STREAM_NOTIFY_MIME_TYPE_IS:
+         echo "Found the mime-type: ", $message, PHP_EOL;
+         break;
+     case STREAM_NOTIFY_REDIRECTED:
+         echo "Redirected: ";
+         var_dump($message);
+     }
+ }
+
+ $ctx = stream_context_create();
+ stream_context_set_params($ctx, array("notification" => "stream_notification_callback"));
+ var_dump(trim(file_get_contents("http://{{ ADDR }}", false, $ctx)));
+ var_dump($http_response_header);
+CODE;
+
+include sprintf("%s/../../../openssl/tests/ServerClientTestCase.inc", __DIR__);
+ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
+?>
+--EXPECTF--
+Found the mime-type: text/html;
+
+Warning: file_get_contents(http://127.0.0.1:%d): Failed to open stream: HTTP Location header size is over the limit of 8182 bytes in %s
+string(0) ""
+array(2) {
+  0=>
+  string(15) "HTTP/1.0 301 Ok"
+  1=>
+  string(24) "Content-Type: text/html;"
+}

php-8.3.21.tar.xz/ext/standard/tests/http/ghsa-c5f2-jwm7-mmq2.phpt Added

php-8.3.21.tar.xz/ext/standard/tests/http/ghsa-hgf5-96fm-v528-001.phpt Added

@@ -0,0 +1,65 @@
+--TEST--
+GHSA-hgf5-96fm-v528: Stream HTTP wrapper header check might omit basic auth header (incorrect inside pos)
+--FILE--
+<?php
+$serverCode = <<<'CODE'
+   $ctxt = stream_context_create(
+        "socket" => 
+            "tcp_nodelay" => true
+        
+    );
+
+    $server = stream_socket_server(
+        "tcp://127.0.0.1:0", $errno, $errstr, STREAM_SERVER_BIND | STREAM_SERVER_LISTEN, $ctxt);
+    phpt_notify_server_start($server);
+
+    $conn = stream_socket_accept($server);
+
+    phpt_notify(message:"server-accepted");
+
+    $result = fread($conn, 1024);
+    $encoded_result = base64_encode($result);
+
+    fwrite($conn, "HTTP/1.0 200 Ok\r\nContent-Type: text/html; charset=utf-8\r\n\r\n$encoded_result\r\n");
+
+CODE;
+
+$clientCode = <<<'CODE'
+    $opts = 
+        "http" => 
+            "method" => "GET",
+            "header" => "Cookie: foo=bar\nauthorization:x\r\n"
+        
+    ;
+    $ctx = stream_context_create($opts);
+    var_dump(explode("\r\n", base64_decode(file_get_contents("http://user:pwd@{{ ADDR }}", false, $ctx))));
+    var_dump($http_response_header);
+CODE;
+
+include sprintf("%s/../../../openssl/tests/ServerClientTestCase.inc", __DIR__);
+ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
+?>
+--EXPECTF--
+array(7) {
+  0=>
+  string(14) "GET / HTTP/1.1"
+  1=>
+  string(33) "Authorization: Basic dXNlcjpwd2Q="
+  2=>
+  string(21) "Host: 127.0.0.1:%d"
+  3=>
+  string(17) "Connection: close"
+  4=>
+  string(31) "Cookie: foo=bar
+authorization:x"
+  5=>
+  string(0) ""
+  6=>
+  string(0) ""
+}
+array(2) {
+  0=>
+  string(15) "HTTP/1.0 200 Ok"
+  1=>
+  string(38) "Content-Type: text/html; charset=utf-8"
+}

php-8.3.21.tar.xz/ext/standard/tests/http/ghsa-hgf5-96fm-v528-002.phpt Added

@@ -0,0 +1,62 @@
+--TEST--
+GHSA-hgf5-96fm-v528: Header parser of http stream wrapper does not handle folded headers (correct start pos)
+--FILE--
+<?php
+$serverCode = <<<'CODE'
+   $ctxt = stream_context_create(
+        "socket" => 
+            "tcp_nodelay" => true
+        
+    );
+
+    $server = stream_socket_server(
+        "tcp://127.0.0.1:0", $errno, $errstr, STREAM_SERVER_BIND | STREAM_SERVER_LISTEN, $ctxt);
+    phpt_notify_server_start($server);
+
+    $conn = stream_socket_accept($server);
+
+    phpt_notify(message:"server-accepted");
+
+    $result = fread($conn, 1024);
+    $encoded_result = base64_encode($result);
+
+    fwrite($conn, "HTTP/1.0 200 Ok\r\nContent-Type: text/html; charset=utf-8\r\n\r\n$encoded_result\r\n");
+
+CODE;
+
+$clientCode = <<<'CODE'
+    $opts = 
+        "http" => 
+            "method" => "GET",
+            "header" => "Authorization: Bearer x\r\n"
+        
+    ;
+    $ctx = stream_context_create($opts);
+    var_dump(explode("\r\n", base64_decode(file_get_contents("http://user:pwd@{{ ADDR }}", false, $ctx))));
+    var_dump($http_response_header);
+CODE;
+
+include sprintf("%s/../../../openssl/tests/ServerClientTestCase.inc", __DIR__);
+ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
+?>
+--EXPECTF--
+array(6) {
+  0=>
+  string(14) "GET / HTTP/1.1"
+  1=>
+  string(21) "Host: 127.0.0.1:%d"
+  2=>
+  string(17) "Connection: close"
+  3=>
+  string(23) "Authorization: Bearer x"
+  4=>
+  string(0) ""
+  5=>
+  string(0) ""
+}
+array(2) {
+  0=>
+  string(15) "HTTP/1.0 200 Ok"
+  1=>
+  string(38) "Content-Type: text/html; charset=utf-8"
+}

php-8.3.21.tar.xz/ext/standard/tests/http/ghsa-hgf5-96fm-v528-003.phpt Added

@@ -0,0 +1,64 @@
+--TEST--
+GHSA-hgf5-96fm-v528: Header parser of http stream wrapper does not handle folded headers (correct middle pos)
+--FILE--
+<?php
+$serverCode = <<<'CODE'
+   $ctxt = stream_context_create(
+        "socket" => 
+            "tcp_nodelay" => true
+        
+    );
+
+    $server = stream_socket_server(
+        "tcp://127.0.0.1:0", $errno, $errstr, STREAM_SERVER_BIND | STREAM_SERVER_LISTEN, $ctxt);
+    phpt_notify_server_start($server);
+
+    $conn = stream_socket_accept($server);
+
+    phpt_notify(message:"server-accepted");
+
+    $result = fread($conn, 1024);
+    $encoded_result = base64_encode($result);
+
+    fwrite($conn, "HTTP/1.0 200 Ok\r\nContent-Type: text/html; charset=utf-8\r\n\r\n$encoded_result\r\n");
+
+CODE;
+
+$clientCode = <<<'CODE'
+    $opts = 
+        "http" => 
+            "method" => "GET",
+            "header" => "Cookie: x=y\r\nAuthorization: Bearer x\r\n"
+        
+    ;
+    $ctx = stream_context_create($opts);
+    var_dump(explode("\r\n", base64_decode(file_get_contents("http://user:pwd@{{ ADDR }}", false, $ctx))));
+    var_dump($http_response_header);
+CODE;
+
+include sprintf("%s/../../../openssl/tests/ServerClientTestCase.inc", __DIR__);
+ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
+?>
+--EXPECTF--
+array(7) {
+  0=>
+  string(14) "GET / HTTP/1.1"
+  1=>
+  string(21) "Host: 127.0.0.1:%d"
+  2=>
+  string(17) "Connection: close"
+  3=>
+  string(11) "Cookie: x=y"
+  4=>
+  string(23) "Authorization: Bearer x"
+  5=>
+  string(0) ""
+  6=>
+  string(0) ""
+}
+array(2) {
+  0=>
+  string(15) "HTTP/1.0 200 Ok"
+  1=>
+  string(38) "Content-Type: text/html; charset=utf-8"
+}

php-8.3.21.tar.xz/ext/standard/tests/http/ghsa-pcmh-g36c-qc44-001.phpt Added

@@ -0,0 +1,51 @@
+--TEST--
+GHSA-pcmh-g36c-qc44: Header parser of http stream wrapper does not verify header name and colon (colon)
+--FILE--
+<?php
+$serverCode = <<<'CODE'
+   $ctxt = stream_context_create(
+        "socket" => 
+            "tcp_nodelay" => true
+        
+    );
+
+    $server = stream_socket_server(
+        "tcp://127.0.0.1:0", $errno, $errstr, STREAM_SERVER_BIND | STREAM_SERVER_LISTEN, $ctxt);
+    phpt_notify_server_start($server);
+
+    $conn = stream_socket_accept($server);
+
+    phpt_notify(message:"server-accepted");
+
+    fwrite($conn, "HTTP/1.0 200 Ok\r\nContent-Type: text/html\r\nWrong-Header\r\nGood-Header: test\r\n\r\nbody\r\n");
+CODE;
+
+$clientCode = <<<'CODE'
+    function stream_notification_callback($notification_code, $severity, $message, $message_code, $bytes_transferred, $bytes_max) {
+    switch($notification_code) {
+        case STREAM_NOTIFY_MIME_TYPE_IS:
+            echo "Found the mime-type: ", $message, PHP_EOL;
+            break;
+        }
+    }
+
+    $ctx = stream_context_create();
+    stream_context_set_params($ctx, array("notification" => "stream_notification_callback"));
+    var_dump(file_get_contents("http://{{ ADDR }}", false, $ctx));
+    var_dump($http_response_header);
+CODE;
+
+include sprintf("%s/../../../openssl/tests/ServerClientTestCase.inc", __DIR__);
+ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
+?>
+--EXPECTF--
+Found the mime-type: text/html
+
+Warning: file_get_contents(http://127.0.0.1:%d): Failed to open stream: HTTP invalid response format (no colon in header line)! in %s
+bool(false)
+array(2) {
+  0=>
+  string(15) "HTTP/1.0 200 Ok"
+  1=>
+  string(23) "Content-Type: text/html"
+}

php-8.3.21.tar.xz/ext/standard/tests/http/ghsa-pcmh-g36c-qc44-002.phpt Added

@@ -0,0 +1,51 @@
+--TEST--
+GHSA-pcmh-g36c-qc44: Header parser of http stream wrapper does not verify header name and colon (name)
+--FILE--
+<?php
+$serverCode = <<<'CODE'
+   $ctxt = stream_context_create(
+        "socket" => 
+            "tcp_nodelay" => true
+        
+    );
+
+    $server = stream_socket_server(
+        "tcp://127.0.0.1:0", $errno, $errstr, STREAM_SERVER_BIND | STREAM_SERVER_LISTEN, $ctxt);
+    phpt_notify_server_start($server);
+
+    $conn = stream_socket_accept($server);
+
+    phpt_notify(message:"server-accepted");
+
+    fwrite($conn, "HTTP/1.0 200 Ok\r\nContent-Type: text/html\r\nWrong-Header : test\r\nGood-Header: test\r\n\r\nbody\r\n");
+CODE;
+
+$clientCode = <<<'CODE'
+    function stream_notification_callback($notification_code, $severity, $message, $message_code, $bytes_transferred, $bytes_max) {
+    switch($notification_code) {
+        case STREAM_NOTIFY_MIME_TYPE_IS:
+            echo "Found the mime-type: ", $message, PHP_EOL;
+            break;
+        }
+    }
+
+    $ctx = stream_context_create();
+    stream_context_set_params($ctx, array("notification" => "stream_notification_callback"));
+    var_dump(file_get_contents("http://{{ ADDR }}", false, $ctx));
+    var_dump($http_response_header);
+CODE;
+
+include sprintf("%s/../../../openssl/tests/ServerClientTestCase.inc", __DIR__);
+ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
+?>
+--EXPECTF--
+Found the mime-type: text/html
+
+Warning: file_get_contents(http://127.0.0.1:%d): Failed to open stream: HTTP invalid response format (space in header name)! in %s
+bool(false)
+array(2) {
+  0=>
+  string(15) "HTTP/1.0 200 Ok"
+  1=>
+  string(23) "Content-Type: text/html"
+}

php-8.3.21.tar.xz/ext/standard/tests/http/ghsa-v8xr-gpvj-cx9g-001.phpt Added

@@ -0,0 +1,49 @@
+--TEST--
+GHSA-v8xr-gpvj-cx9g: Header parser of http stream wrapper does not handle folded headers (single)
+--FILE--
+<?php
+$serverCode = <<<'CODE'
+   $ctxt = stream_context_create(
+        "socket" => 
+            "tcp_nodelay" => true
+        
+    );
+
+    $server = stream_socket_server(
+        "tcp://127.0.0.1:0", $errno, $errstr, STREAM_SERVER_BIND | STREAM_SERVER_LISTEN, $ctxt);
+    phpt_notify_server_start($server);
+
+    $conn = stream_socket_accept($server);
+
+    phpt_notify(message:"server-accepted");
+
+    fwrite($conn, "HTTP/1.0 200 Ok\r\nContent-Type: text/html;\r\n    charset=utf-8\r\n\r\nbody\r\n");
+CODE;
+
+$clientCode = <<<'CODE'
+    function stream_notification_callback($notification_code, $severity, $message, $message_code, $bytes_transferred, $bytes_max) {
+    switch($notification_code) {
+        case STREAM_NOTIFY_MIME_TYPE_IS:
+            echo "Found the mime-type: ", $message, PHP_EOL;
+            break;
+        }
+    }
+
+    $ctx = stream_context_create();
+    stream_context_set_params($ctx, array("notification" => "stream_notification_callback"));
+    var_dump(trim(file_get_contents("http://{{ ADDR }}", false, $ctx)));
+    var_dump($http_response_header);
+CODE;
+
+include sprintf("%s/../../../openssl/tests/ServerClientTestCase.inc", __DIR__);
+ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
+?>
+--EXPECTF--
+Found the mime-type: text/html; charset=utf-8
+string(4) "body"
+array(2) {
+  0=>
+  string(15) "HTTP/1.0 200 Ok"
+  1=>
+  string(38) "Content-Type: text/html; charset=utf-8"
+}

php-8.3.21.tar.xz/ext/standard/tests/http/ghsa-v8xr-gpvj-cx9g-002.phpt Added

@@ -0,0 +1,51 @@
+--TEST--
+GHSA-v8xr-gpvj-cx9g: Header parser of http stream wrapper does not handle folded headers (multiple)
+--FILE--
+<?php
+$serverCode = <<<'CODE'
+   $ctxt = stream_context_create(
+        "socket" => 
+            "tcp_nodelay" => true
+        
+    );
+
+    $server = stream_socket_server(
+        "tcp://127.0.0.1:0", $errno, $errstr, STREAM_SERVER_BIND | STREAM_SERVER_LISTEN, $ctxt);
+    phpt_notify_server_start($server);
+
+    $conn = stream_socket_accept($server);
+
+    phpt_notify(message:"server-accepted");
+
+    fwrite($conn, "HTTP/1.0 200 Ok\r\nContent-Type: text/html;\r\nCustom-Header: somevalue;\r\n  param1=value1; \r\n    param2=value2\r\n\r\nbody\r\n");
+CODE;
+
+$clientCode = <<<'CODE'
+    function stream_notification_callback($notification_code, $severity, $message, $message_code, $bytes_transferred, $bytes_max) {
+    switch($notification_code) {
+        case STREAM_NOTIFY_MIME_TYPE_IS:
+            echo "Found the mime-type: ", $message, PHP_EOL;
+            break;
+        }
+    }
+
+    $ctx = stream_context_create();
+    stream_context_set_params($ctx, array("notification" => "stream_notification_callback"));
+    var_dump(trim(file_get_contents("http://{{ ADDR }}", false, $ctx)));
+    var_dump($http_response_header);
+CODE;
+
+include sprintf("%s/../../../openssl/tests/ServerClientTestCase.inc", __DIR__);
+ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
+?>
+--EXPECTF--
+Found the mime-type: text/html;
+string(4) "body"
+array(3) {
+  0=>
+  string(15) "HTTP/1.0 200 Ok"
+  1=>
+  string(24) "Content-Type: text/html;"
+  2=>
+  string(54) "Custom-Header: somevalue; param1=value1; param2=value2"
+}

php-8.3.21.tar.xz/ext/standard/tests/http/ghsa-v8xr-gpvj-cx9g-003.phpt Added

@@ -0,0 +1,49 @@
+--TEST--
+GHSA-v8xr-gpvj-cx9g: Header parser of http stream wrapper does not handle folded headers (empty)
+--FILE--
+<?php
+$serverCode = <<<'CODE'
+   $ctxt = stream_context_create(
+        "socket" => 
+            "tcp_nodelay" => true
+        
+    );
+
+    $server = stream_socket_server(
+        "tcp://127.0.0.1:0", $errno, $errstr, STREAM_SERVER_BIND | STREAM_SERVER_LISTEN, $ctxt);
+    phpt_notify_server_start($server);
+
+    $conn = stream_socket_accept($server);
+
+    phpt_notify(message:"server-accepted");
+
+    fwrite($conn, "HTTP/1.0 200 Ok\r\nContent-Type: text/html;\r\n    \r\n charset=utf-8\r\n\r\nbody\r\n");
+CODE;
+
+$clientCode = <<<'CODE'
+    function stream_notification_callback($notification_code, $severity, $message, $message_code, $bytes_transferred, $bytes_max) {
+    switch($notification_code) {
+        case STREAM_NOTIFY_MIME_TYPE_IS:
+            echo "Found the mime-type: ", $message, PHP_EOL;
+            break;
+        }
+    }
+
+    $ctx = stream_context_create();
+    stream_context_set_params($ctx, array("notification" => "stream_notification_callback"));
+    var_dump(trim(file_get_contents("http://{{ ADDR }}", false, $ctx)));
+    var_dump($http_response_header);
+CODE;
+
+include sprintf("%s/../../../openssl/tests/ServerClientTestCase.inc", __DIR__);
+ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
+?>
+--EXPECTF--
+Found the mime-type: text/html; charset=utf-8
+string(4) "body"
+array(2) {
+  0=>
+  string(15) "HTTP/1.0 200 Ok"
+  1=>
+  string(38) "Content-Type: text/html; charset=utf-8"
+}

php-8.3.21.tar.xz/ext/standard/tests/http/ghsa-v8xr-gpvj-cx9g-004.phpt Added

@@ -0,0 +1,48 @@
+--TEST--
+GHSA-v8xr-gpvj-cx9g: Header parser of http stream wrapper does not handle folded headers (first line)
+--FILE--
+<?php
+$serverCode = <<<'CODE'
+   $ctxt = stream_context_create(
+        "socket" => 
+            "tcp_nodelay" => true
+        
+    );
+
+    $server = stream_socket_server(
+        "tcp://127.0.0.1:0", $errno, $errstr, STREAM_SERVER_BIND | STREAM_SERVER_LISTEN, $ctxt);
+    phpt_notify_server_start($server);
+
+    $conn = stream_socket_accept($server);
+
+    phpt_notify(message:"server-accepted");
+
+    fwrite($conn, "HTTP/1.0 200 Ok\r\n   Content-Type: text/html;\r\n    \r\n charset=utf-8\r\n\r\nbody\r\n");
+CODE;
+
+$clientCode = <<<'CODE'
+    function stream_notification_callback($notification_code, $severity, $message, $message_code, $bytes_transferred, $bytes_max) {
+    switch($notification_code) {
+        case STREAM_NOTIFY_MIME_TYPE_IS:
+            echo "Found the mime-type: ", $message, PHP_EOL;
+            break;
+        }
+    }
+
+    $ctx = stream_context_create();
+    stream_context_set_params($ctx, array("notification" => "stream_notification_callback"));
+    var_dump(file_get_contents("http://{{ ADDR }}", false, $ctx));
+    var_dump($http_response_header);
+CODE;
+
+include sprintf("%s/../../../openssl/tests/ServerClientTestCase.inc", __DIR__);
+ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
+?>
+--EXPECTF--
+
+Warning: file_get_contents(http://127.0.0.1:%d): Failed to open stream: HTTP invalid response format (folding header at the start)! in %s
+bool(false)
+array(1) {
+  0=>
+  string(15) "HTTP/1.0 200 Ok"
+}

php-8.3.21.tar.xz/ext/standard/tests/http/ghsa-v8xr-gpvj-cx9g-005.phpt Added

@@ -0,0 +1,48 @@
+--TEST--
+GHSA-v8xr-gpvj-cx9g: Header parser of http stream wrapper does not handle folded headers (CR before header name)
+--FILE--
+<?php
+$serverCode = <<<'CODE'
+   $ctxt = stream_context_create(
+        "socket" => 
+            "tcp_nodelay" => true
+        
+    );
+
+    $server = stream_socket_server(
+        "tcp://127.0.0.1:0", $errno, $errstr, STREAM_SERVER_BIND | STREAM_SERVER_LISTEN, $ctxt);
+    phpt_notify_server_start($server);
+
+    $conn = stream_socket_accept($server);
+
+    phpt_notify(message:"server-accepted");
+
+    fwrite($conn, "HTTP/1.0 200 Ok\r\n\rIgnored: ignored\r\n\r\nbody\r\n");
+CODE;
+
+$clientCode = <<<'CODE'
+    function stream_notification_callback($notification_code, $severity, $message, $message_code, $bytes_transferred, $bytes_max) {
+    switch($notification_code) {
+        case STREAM_NOTIFY_MIME_TYPE_IS:
+            echo "Found the mime-type: ", $message, PHP_EOL;
+            break;
+        }
+    }
+
+    $ctx = stream_context_create();
+    stream_context_set_params($ctx, array("notification" => "stream_notification_callback"));
+    var_dump(file_get_contents("http://{{ ADDR }}", false, $ctx));
+    var_dump($http_response_header);
+CODE;
+
+include sprintf("%s/../../../openssl/tests/ServerClientTestCase.inc", __DIR__);
+ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
+?>
+--EXPECTF--
+
+Warning: file_get_contents(http://127.0.0.1:%d): Failed to open stream: HTTP invalid header name (cannot start with CR character)! in %s
+bool(false)
+array(1) {
+  0=>
+  string(15) "HTTP/1.0 200 Ok"
+}

php-8.3.21.tar.xz/ext/standard/tests/misc/gh14774.phpt Added

php-8.3.7.tar.xz/ext/standard/tests/network/bug20134.phpt -> php-8.3.21.tar.xz/ext/standard/tests/network/bug20134.phpt Changed

php-8.3.21.tar.xz/ext/standard/tests/serialize/gh15169.phpt Added

php-8.3.7.tar.xz/ext/standard/tests/streams/bug51056.phpt -> php-8.3.21.tar.xz/ext/standard/tests/streams/bug51056.phpt Changed

php-8.3.21.tar.xz/ext/standard/tests/streams/bug60106-001.phpt Added

php-8.3.21.tar.xz/ext/standard/tests/streams/bug60106-002.phpt Added

@@ -0,0 +1,40 @@
+--TEST--
+Bug #60106 (stream_socket_server with abstract unix socket paths)
+--SKIPIF--
+<?php
+if (PHP_OS != "Linux") die("skip Only for Linux systems");
+?>
+--FILE--
+<?php
+error_reporting(E_ALL | E_NOTICE);
+
+/* This figures out the max length for normal sockets */
+$socket_file = "/tmp/" . str_repeat("a", 512);
+function get_truncated_socket_filename($errno, $errmsg, $file, $line) {
+    global $socket_file, $max_normal_length;
+    echo $errmsg, "\n";
+    preg_match("#maximum allowed length of (\d+) bytes#", $errmsg, $matches);
+    $max_normal_length = intval($matches1);
+    $socket_file = substr($socket_file, 0, $max_normal_length);
+}
+set_error_handler("get_truncated_socket_filename", E_NOTICE);
+
+stream_socket_server("unix://" . $socket_file);
+unlink($socket_file);
+
+/* No we create an abstract one, prefixed with \0 so this should now work */
+$abstract_socket = "\0" . $socket_file;
+stream_socket_server("unix://" . $abstract_socket);
+
+$old_max_length = $max_normal_length;
+
+/* And now one longer, which should fail again */
+$abstract_socket_long = "\0" . $abstract_socket . 'X';
+stream_socket_server("unix://" . $abstract_socket_long);
+
+echo "Allowed length is now one more: ", $max_normal_length == $old_max_length + 1 ? "yes" : "no", "\n";
+?>
+--EXPECTF--
+stream_socket_server(): socket path exceeded the maximum allowed length of %d bytes and was truncated
+stream_socket_server(): socket path exceeded the maximum allowed length of %d bytes and was truncated
+Allowed length is now one more: yes

php-8.3.7.tar.xz/ext/standard/tests/streams/bug74090.phpt -> php-8.3.21.tar.xz/ext/standard/tests/streams/bug74090.phpt Changed

php-8.3.7.tar.xz/ext/standard/tests/streams/gh11418.phpt -> php-8.3.21.tar.xz/ext/standard/tests/streams/gh11418.phpt Changed

php-8.3.21.tar.xz/ext/standard/tests/streams/gh14780.phpt Added

@@ -0,0 +1,38 @@
+--TEST--
+GH-14780: p(f)sockopen overflow on timeout.
+--SKIPIF--
+<?php
+if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
+?>
+--FILE--
+<?php
+$code = null;
+$err = null;
+try {
+	pfsockopen('udp://127.0.0.1', '63844', $code, $err, (PHP_INT_MAX/100000)+1);
+} catch (\ValueError $e) {
+	echo $e->getMessage() . PHP_EOL;
+}
+try {
+	pfsockopen('udp://127.0.0.1', '63844', $code, $err, (PHP_INT_MIN/100000)-1);
+} catch (\ValueError $e) {
+	echo $e->getMessage() . PHP_EOL;
+}
+var_dump(pfsockopen('udp://127.0.0.1', '63844', $code, $err, -1));
+try {
+	pfsockopen('udp://127.0.0.1', '63844', $code, $err, NAN);
+} catch (\ValueError $e) {
+	echo $e->getMessage() . PHP_EOL;
+}
+try {
+	pfsockopen('udp://127.0.0.1', '63844', $code, $err, INF);
+} catch (\ValueError $e) {
+	echo $e->getMessage();
+}
+?>
+--EXPECTF--
+pfsockopen(): Argument #6 must be -1 or between 0 and %s
+pfsockopen(): Argument #6 must be -1 or between 0 and %s
+resource(%d) of type (persistent stream)
+pfsockopen(): Argument #6 must be -1 or between 0 and %s
+pfsockopen(): Argument #6 must be -1 or between 0 and %s

php-8.3.21.tar.xz/ext/standard/tests/streams/gh14930.phpt Added

@@ -0,0 +1,31 @@
+--TEST--
+GH-14930: Custom stream wrapper dir_readdir output truncated to 255 characters in PHP 8.3
+--SKIPIF--
+<?php
+if (PHP_OS_FAMILY !== "Windows") die("xfail Fix is an ABI break so reverted from 8.3");
+?>
+--FILE--
+<?php
+
+class DummyWrapper
+{
+    public $context;
+
+    public function dir_opendir($url, $options)
+    {
+        return true;
+    }
+
+    public function dir_readdir()
+    {
+        return 'very-long-filename-ieNoquiaC6ijeiy9beejaiphoriejo2cheehooGou8uhoh7eh0gefahyuQuohd7eec9auso9eeFah2Maedohsemi1eetoo5fo5biePh5eephai7SiuguipouLeemequ2oope9aigoQu5efak2aLeri9ithaiJ9eew3dianaiHoo1aexaighiitee6geghiequ5nohhiikahwee8ohk2Soip2Aikeithohdeitiedeiku7DiTh2eep3deitiedeiku7DiTh2ee.txt';
+    }
+}
+
+stream_wrapper_register('dummy', DummyWrapper::class);
+
+$dh = opendir('dummy://', stream_context_create());
+var_dump(readdir($dh));
+?>
+--EXPECT--
+string(288) "very-long-filename-ieNoquiaC6ijeiy9beejaiphoriejo2cheehooGou8uhoh7eh0gefahyuQuohd7eec9auso9eeFah2Maedohsemi1eetoo5fo5biePh5eephai7SiuguipouLeemequ2oope9aigoQu5efak2aLeri9ithaiJ9eew3dianaiHoo1aexaighiitee6geghiequ5nohhiikahwee8ohk2Soip2Aikeithohdeitiedeiku7DiTh2eep3deitiedeiku7DiTh2ee.txt"

php-8.3.21.tar.xz/ext/standard/tests/streams/gh15908.phpt Added

php-8.3.21.tar.xz/ext/standard/tests/streams/gh15980.phpt Added

php-8.3.21.tar.xz/ext/standard/tests/streams/gh17067.phpt Added

php-8.3.21.tar.xz/ext/standard/tests/streams/gh17650.phpt Added

php-8.3.21.tar.xz/ext/standard/tests/streams/non_finite_values.phpt Added

@@ -0,0 +1,31 @@
+--TEST--
+Non-finite timeout values in stream functions
+--FILE--
+<?php
+$socket = stream_socket_server("tcp://0.0.0.0:14781", $errno, $errstr);
+foreach (NAN, -NAN, INF, -INF as $value) {
+    try {
+        stream_socket_accept($socket, $value);
+    } catch (ValueError $e) {
+        echo $e->getMessage(), "\n";
+    }
+}
+fclose($socket);
+
+foreach (NAN, -NAN, INF, -INF as $value) {
+    try {
+        stream_socket_client("tcp://0.0.0.0:14781", timeout: $value);
+    } catch (ValueError $e) {
+        echo $e->getMessage(), "\n";
+    }
+}
+?>
+--EXPECT--
+stream_socket_accept(): Argument #2 ($timeout) must be a finite value
+stream_socket_accept(): Argument #2 ($timeout) must be a finite value
+stream_socket_accept(): Argument #2 ($timeout) must be a finite value
+stream_socket_accept(): Argument #2 ($timeout) must be a finite value
+stream_socket_client(): Argument #4 ($timeout) must be a finite value
+stream_socket_client(): Argument #4 ($timeout) must be a finite value
+stream_socket_client(): Argument #4 ($timeout) must be a finite value
+stream_socket_client(): Argument #4 ($timeout) must be a finite value

php-8.3.7.tar.xz/ext/standard/tests/streams/stream_context_tcp_nodelay_server.phpt -> php-8.3.21.tar.xz/ext/standard/tests/streams/stream_context_tcp_nodelay_server.phpt Changed

@@ -2,6 +2,10 @@
 stream context tcp_nodelay server
 --EXTENSIONS--
 sockets
+--SKIPIF--
+<?php
+if (!function_exists("proc_open")) die("skip no proc_open");
+?>
 --FILE--
 <?php
 $serverCode = <<<'CODE'
@@ -12,36 +16,25 @@
     );
 
     $server = stream_socket_server(
-        "tcp://127.0.0.1:9099", $errno, $errstr, STREAM_SERVER_BIND | STREAM_SERVER_LISTEN, $ctxt);
-
-    $client = stream_socket_accept($server);
+        "tcp://127.0.0.1:0", $errno, $errstr, STREAM_SERVER_BIND | STREAM_SERVER_LISTEN, $ctxt);
+    phpt_notify_server_start($server);
 
-    var_dump(socket_get_option(
-                socket_import_stream($server),
-                    SOL_TCP, TCP_NODELAY) > 0);
+    $conn = stream_socket_accept($server);
 
-    var_dump(socket_get_option(
-                socket_import_stream($client),
-                    SOL_TCP, TCP_NODELAY) > 0);
+    $si = socket_get_option(socket_import_stream($server), SOL_TCP, TCP_NODELAY) > 0 ? "nodelay": "delay";
+    $ci = socket_get_option(socket_import_stream($conn), SOL_TCP, TCP_NODELAY) > 0 ? "nodelay": "delay";
 
-    fclose($client);
-    fclose($server);
+    phpt_notify(message:"server-$si:conn-$ci");
 CODE;
 
 $clientCode = <<<'CODE'
-    $test = stream_socket_client(
-        "tcp://127.0.0.1:9099", $errno, $errstr, 10);
-
-    sleep(1);
-
-    fclose($test);
+    $test = stream_socket_client("tcp://{{ ADDR }}", $errno, $errstr, 10);
+    echo phpt_wait();
 CODE;
 
-include sprintf(
-    "%s/../../../openssl/tests/ServerClientTestCase.inc",
-    __DIR__);
-ServerClientTestCase::getInstance()->run($serverCode, $clientCode);
+include sprintf("%s/../../../openssl/tests/ServerClientTestCase.inc", __DIR__);
+ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
 ?>
---EXPECT--
-bool(false)
-bool(true)
+--EXPECTF--
+server-delay:conn-nodelay
+

php-8.3.7.tar.xz/ext/standard/tests/strings/chunk_split_variation1_32bit.phpt -> php-8.3.21.tar.xz/ext/standard/tests/strings/chunk_split_variation1_32bit.phpt Changed

php-8.3.21.tar.xz/ext/standard/tests/strings/gh15552.phpt Added

php-8.3.21.tar.xz/ext/standard/tests/strings/gh15613.phpt Added

php-8.3.7.tar.xz/ext/standard/tests/strings/setlocale_variation3.phpt -> php-8.3.21.tar.xz/ext/standard/tests/strings/setlocale_variation3.phpt Changed

php-8.3.7.tar.xz/ext/standard/tests/strings/setlocale_variation4.phpt -> php-8.3.21.tar.xz/ext/standard/tests/strings/setlocale_variation4.phpt Changed

php-8.3.7.tar.xz/ext/standard/tests/strings/setlocale_variation5.phpt -> php-8.3.21.tar.xz/ext/standard/tests/strings/setlocale_variation5.phpt Changed

php-8.3.7.tar.xz/ext/standard/tests/strings/wordwrap_memory_limit.phpt -> php-8.3.21.tar.xz/ext/standard/tests/strings/wordwrap_memory_limit.phpt Changed

php-8.3.21.tar.xz/ext/standard/tests/strings/wordwrap_memory_limit_32bit.phpt Added

php-8.3.7.tar.xz/ext/standard/url_scanner_ex.c -> php-8.3.21.tar.xz/ext/standard/url_scanner_ex.c Changed

@@ -1,4 +1,4 @@
-/* Generated by re2c 1.3 */
+/* Generated by re2c 3.0 */
 /*
   +----------------------------------------------------------------------+
   | Copyright (c) The PHP Group                                          |
@@ -555,18 +555,18 @@
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if (yybm0+yych & 128) {
-		goto yy2;
+		goto yy1;
 	}
-	goto yy5;
-yy2:
+	goto yy2;
+yy1:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if (yybm0+yych & 128) {
-		goto yy2;
+		goto yy1;
 	}
 	{ passthru(STD_ARGS); goto state_plain; }
-yy5:
+yy2:
 	++YYCURSOR;
 	{ passthru(STD_ARGS); STATE = STATE_TAG; goto state_tag; }
 }
@@ -614,16 +614,16 @@
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if (yybm0+yych & 128) {
-		goto yy11;
+		goto yy4;
 	}
 	++YYCURSOR;
 	{ passthru(STD_ARGS); goto state_plain_begin; }
-yy11:
+yy4:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if (yybm0+yych & 128) {
-		goto yy11;
+		goto yy4;
 	}
 	{ handle_tag(STD_ARGS); /* Sets STATE */; passthru(STD_ARGS); if (STATE == STATE_PLAIN) goto state_plain; else goto state_next_arg; }
 }
@@ -674,38 +674,38 @@
 	if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
 	yych = *YYCURSOR;
 	if (yybm0+yych & 128) {
-		goto yy18;
+		goto yy8;
 	}
 	if (yych <= '>') {
-		if (yych == '/') goto yy21;
-		if (yych >= '>') goto yy22;
+		if (yych == '/') goto yy9;
+		if (yych >= '>') goto yy10;
 	} else {
 		if (yych <= 'Z') {
-			if (yych >= 'A') goto yy24;
+			if (yych >= 'A') goto yy11;
 		} else {
-			if (yych <= '`') goto yy16;
-			if (yych <= 'z') goto yy24;
+			if (yych <= '`') goto yy6;
+			if (yych <= 'z') goto yy11;
 		}
 	}
-yy16:
+yy6:
 	++YYCURSOR;
-yy17:
+yy7:
 	{ passthru(STD_ARGS); goto state_plain_begin; }
-yy18:
+yy8:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if (yybm0+yych & 128) {
-		goto yy18;
+		goto yy8;
 	}
 	{ passthru(STD_ARGS); goto state_next_arg; }
-yy21:
+yy9:
 	yych = *++YYCURSOR;
-	if (yych != '>') goto yy17;
-yy22:
+	if (yych != '>') goto yy7;
+yy10:
 	++YYCURSOR;
 	{ passthru(STD_ARGS); handle_form(STD_ARGS); goto state_plain_begin; }
-yy24:
+yy11:
 	++YYCURSOR;
 	{ --YYCURSOR; STATE = STATE_ARG; goto state_arg; }
 }
@@ -752,19 +752,19 @@
 	};
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	if (yych <= '@') goto yy28;
-	if (yych <= 'Z') goto yy30;
-	if (yych <= '`') goto yy28;
-	if (yych <= 'z') goto yy30;
-yy28:
+	if (yych <= '@') goto yy13;
+	if (yych <= 'Z') goto yy14;
+	if (yych <= '`') goto yy13;
+	if (yych <= 'z') goto yy14;
+yy13:
 	++YYCURSOR;
 	{ passthru(STD_ARGS); STATE = STATE_NEXT_ARG; goto state_next_arg; }
-yy30:
+yy14:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if (yybm0+yych & 128) {
-		goto yy30;
+		goto yy14;
 	}
 	{ passthru(STD_ARGS); handle_arg(STD_ARGS); STATE = STATE_BEFORE_VAL; goto state_before_val; }
 }
@@ -811,31 +811,31 @@
 	};
 	if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
 	yych = *YYCURSOR;
-	if (yych == ' ') goto yy37;
-	if (yych == '=') goto yy38;
+	if (yych == ' ') goto yy17;
+	if (yych == '=') goto yy18;
 	++YYCURSOR;
-yy36:
+yy16:
 	{ --YYCURSOR; goto state_next_arg_begin; }
-yy37:
+yy17:
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == ' ') goto yy41;
-	if (yych != '=') goto yy36;
-yy38:
+	if (yych == ' ') goto yy19;
+	if (yych != '=') goto yy16;
+yy18:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if (yybm0+yych & 128) {
-		goto yy38;
+		goto yy18;
 	}
 	{ passthru(STD_ARGS); STATE = STATE_VAL; goto state_val; }
-yy41:
+yy19:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	if (yych == ' ') goto yy41;
-	if (yych == '=') goto yy38;
+	if (yych == ' ') goto yy19;
+	if (yych == '=') goto yy18;
 	YYCURSOR = YYMARKER;
-	goto yy36;
+	goto yy16;
 }
 
 
@@ -882,56 +882,56 @@
 	if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
 	yych = *YYCURSOR;
 	if (yybm0+yych & 32) {
-		goto yy46;
+		goto yy21;
 	}
-	if (yych <= ' ') goto yy49;
-	if (yych <= '"') goto yy51;
-	if (yych <= '\'') goto yy52;
-	goto yy49;
-yy46:
+	if (yych <= ' ') goto yy22;
+	if (yych <= '"') goto yy24;
+	if (yych <= '\'') goto yy25;
+	goto yy22;
+yy21:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if (yybm0+yych & 32) {
-		goto yy46;
+		goto yy21;
 	}
 	{ handle_val(STD_ARGS, 0, ' '); goto state_next_arg_begin; }
-yy49:
+yy22:
 	++YYCURSOR;
-yy50:
+yy23:
 	{ passthru(STD_ARGS); goto state_next_arg_begin; }
-yy51:
+yy24:
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '>') goto yy50;
-	goto yy54;
-yy52:
+	if (yych == '>') goto yy23;
+	goto yy27;
+yy25:
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '>') goto yy50;
-	goto yy59;
-yy53:
+	if (yych == '>') goto yy23;
+	goto yy31;
+yy26:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-yy54:
+yy27:
 	if (yybm0+yych & 64) {
-		goto yy53;
+		goto yy26;
 	}
-	if (yych <= '"') goto yy56;
-yy55:
+	if (yych <= '"') goto yy29;
+yy28:
 	YYCURSOR = YYMARKER;
-	goto yy50;
-yy56:
+	goto yy23;
+yy29:
 	++YYCURSOR;
 	{ handle_val(STD_ARGS, 1, '"'); goto state_next_arg_begin; }
-yy58:
+yy30:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-yy59:
+yy31:
 	if (yybm0+yych & 128) {
-		goto yy58;
+		goto yy30;
 	}
-	if (yych >= '(') goto yy55;
+	if (yych >= '(') goto yy28;
 	++YYCURSOR;
 	{ handle_val(STD_ARGS, 1, '\''); goto state_next_arg_begin; }
 }
@@ -1105,6 +1105,7 @@
 	zend_string *encoded;
 	url_adapt_state_ex_t *url_state;
 	php_output_handler_func_t handler;
+	bool should_start = false;
 
 	if (type) {
 		url_state = &BG(url_adapt_session_ex);
@@ -1116,7 +1117,7 @@
 
 	if (!url_state->active) {
 		php_url_scanner_ex_activate(type);
-		php_output_start_internal(ZEND_STRL("URL-Rewriter"), handler, 0, PHP_OUTPUT_HANDLER_STDFLAGS);
+		should_start = true;
 		url_state->active = 1;
 	}
 
@@ -1155,6 +1156,10 @@
 	smart_str_free(&hname);
 	smart_str_free(&hvalue);
 
+	if (should_start) {
+		php_output_start_internal(ZEND_STRL("URL-Rewriter"), handler, 0, PHP_OUTPUT_HANDLER_STDFLAGS);
+	}
+
 	return SUCCESS;
 }

php-8.3.7.tar.xz/ext/standard/url_scanner_ex.re -> php-8.3.21.tar.xz/ext/standard/url_scanner_ex.re Changed

php-8.3.7.tar.xz/ext/standard/user_filters.c -> php-8.3.21.tar.xz/ext/standard/user_filters.c Changed

@@ -398,7 +398,7 @@
 			bucket = php_stream_bucket_make_writeable(bucket);
 		}
 		if (bucket->buflen != Z_STRLEN_P(pzdata)) {
-			bucket->buf = perealloc(bucket->buf, Z_STRLEN_P(pzdata), bucket->is_persistent);
+			bucket->buf = perealloc(bucket->buf, MAX(Z_STRLEN_P(pzdata), 1), bucket->is_persistent);
 			bucket->buflen = Z_STRLEN_P(pzdata);
 		}
 		memcpy(bucket->buf, Z_STRVAL_P(pzdata), bucket->buflen);
@@ -516,13 +516,17 @@
 	fdat = ecalloc(1, sizeof(struct php_user_filter_data));
 	fdat->classname = zend_string_copy(classname);
 
-	if (zend_hash_add_ptr(BG(user_filter_map), filtername, fdat) != NULL &&
-			php_stream_filter_register_factory_volatile(filtername, &user_filter_factory) == SUCCESS) {
-		RETVAL_TRUE;
+	if (zend_hash_add_ptr(BG(user_filter_map), filtername, fdat) != NULL) {
+		if (php_stream_filter_register_factory_volatile(filtername, &user_filter_factory) == SUCCESS) {
+			RETURN_TRUE;
+		}
+
+		zend_hash_del(BG(user_filter_map), filtername);
 	} else {
 		zend_string_release_ex(classname, 0);
 		efree(fdat);
-		RETVAL_FALSE;
 	}
+
+	RETURN_FALSE;
 }
 /* }}} */

php-8.3.7.tar.xz/ext/standard/var.c -> php-8.3.21.tar.xz/ext/standard/var.c Changed

php-8.3.7.tar.xz/ext/standard/var_unserializer.c -> php-8.3.21.tar.xz/ext/standard/var_unserializer.c Changed

@@ -1,4 +1,4 @@
-/* Generated by re2c 1.3 */
+/* Generated by re2c 3.0 */
 /*
   +----------------------------------------------------------------------+
   | Copyright (c) The PHP Group                                          |
@@ -929,297 +929,297 @@
 	if ((YYLIMIT - YYCURSOR) < 7) YYFILL(7);
 	yych = *YYCURSOR;
 	switch (yych) {
-	case 'C':
-	case 'O':	goto yy4;
-	case 'E':	goto yy5;
-	case 'N':	goto yy6;
-	case 'R':	goto yy7;
-	case 'S':	goto yy8;
-	case 'a':	goto yy9;
-	case 'b':	goto yy10;
-	case 'd':	goto yy11;
-	case 'i':	goto yy12;
-	case 'r':	goto yy13;
-	case 's':	goto yy14;
-	case '}':	goto yy15;
-	default:	goto yy2;
-	}
-yy2:
+		case 'C':
+		case 'O': goto yy3;
+		case 'E': goto yy4;
+		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 yy12;
+		case 's': goto yy13;
+		case '}': goto yy14;
+		default: goto yy1;
+	}
+yy1:
 	++YYCURSOR;
-yy3:
+yy2:
 	{ return 0; }
+yy3:
+	yych = *(YYMARKER = ++YYCURSOR);
+	if (yych == ':') goto yy15;
+	goto yy2;
 yy4:
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych == ':') goto yy17;
-	goto yy3;
+	goto yy2;
 yy5:
+	yych = *++YYCURSOR;
+	if (yych == ';') goto yy18;
+	goto yy2;
+yy6:
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych == ':') goto yy19;
-	goto yy3;
-yy6:
-	yych = *++YYCURSOR;
-	if (yych == ';') goto yy20;
-	goto yy3;
+	goto yy2;
 yy7:
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == ':') goto yy22;
-	goto yy3;
+	if (yych == ':') goto yy20;
+	goto yy2;
 yy8:
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == ':') goto yy23;
-	goto yy3;
+	if (yych == ':') goto yy21;
+	goto yy2;
 yy9:
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == ':') goto yy24;
-	goto yy3;
+	if (yych == ':') goto yy22;
+	goto yy2;
 yy10:
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == ':') goto yy25;
-	goto yy3;
+	if (yych == ':') goto yy23;
+	goto yy2;
 yy11:
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == ':') goto yy26;
-	goto yy3;
+	if (yych == ':') goto yy24;
+	goto yy2;
 yy12:
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == ':') goto yy27;
-	goto yy3;
+	if (yych == ':') goto yy25;
+	goto yy2;
 yy13:
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == ':') goto yy28;
-	goto yy3;
+	if (yych == ':') goto yy26;
+	goto yy2;
 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_WARNING, "Unexpected end of serialized data");
 	return 0; /* not sure if it should be 0 or 1 here? */
 }
-yy17:
+yy15:
 	yych = *++YYCURSOR;
 	if (yybm0+yych & 128) {
-		goto yy30;
+		goto yy27;
 	}
-yy18:
+yy16:
 	YYCURSOR = YYMARKER;
-	goto yy3;
-yy19:
+	goto yy2;
+yy17:
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy18;
-	if (yych <= '9') goto yy32;
-	goto yy18;
-yy20:
+	if (yych <= '/') goto yy16;
+	if (yych <= '9') goto yy28;
+	goto yy16;
+yy18:
 	++YYCURSOR;
 	{
 	*p = YYCURSOR;
 	ZVAL_NULL(rval);
 	return 1;
 }
-yy22:
+yy19:
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy18;
-	if (yych <= '9') goto yy34;
-	goto yy18;
-yy23:
+	if (yych <= '/') goto yy16;
+	if (yych <= '9') goto yy29;
+	goto yy16;
+yy20:
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy18;
-	if (yych <= '9') goto yy36;
-	goto yy18;
-yy24:
+	if (yych <= '/') goto yy16;
+	if (yych <= '9') goto yy30;
+	goto yy16;
+yy21:
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy18;
-	if (yych <= '9') goto yy38;
-	goto yy18;
-yy25:
+	if (yych <= '/') goto yy16;
+	if (yych <= '9') goto yy31;
+	goto yy16;
+yy22:
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy18;
-	if (yych <= '0') goto yy40;
-	if (yych <= '1') goto yy41;
-	goto yy18;
-yy26:
+	if (yych <= '/') goto yy16;
+	if (yych <= '0') goto yy32;
+	if (yych <= '1') goto yy33;
+	goto yy16;
+yy23:
 	yych = *++YYCURSOR;
 	if (yych <= '/') {
 		if (yych <= ',') {
-			if (yych == '+') goto yy42;
-			goto yy18;
+			if (yych == '+') goto yy34;
+			goto yy16;
 		} else {
-			if (yych <= '-') goto yy43;
-			if (yych <= '.') goto yy44;
-			goto yy18;
+			if (yych <= '-') goto yy35;
+			if (yych <= '.') goto yy36;
+			goto yy16;
 		}
 	} else {
 		if (yych <= 'I') {
-			if (yych <= '9') goto yy45;
-			if (yych <= 'H') goto yy18;
-			goto yy47;
+			if (yych <= '9') goto yy37;
+			if (yych <= 'H') goto yy16;
+			goto yy38;
 		} else {
-			if (yych == 'N') goto yy48;
-			goto yy18;
+			if (yych == 'N') goto yy39;
+			goto yy16;
 		}
 	}
-yy27:
+yy24:
 	yych = *++YYCURSOR;
 	if (yych <= ',') {
-		if (yych == '+') goto yy49;
-		goto yy18;
+		if (yych == '+') goto yy40;
+		goto yy16;
 	} else {
-		if (yych <= '-') goto yy49;
-		if (yych <= '/') goto yy18;
-		if (yych <= '9') goto yy50;
-		goto yy18;
+		if (yych <= '-') goto yy40;
+		if (yych <= '/') goto yy16;
+		if (yych <= '9') goto yy41;
+		goto yy16;
 	}
-yy28:
+yy25:
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy18;
-	if (yych <= '9') goto yy52;
-	goto yy18;
-yy29:
+	if (yych <= '/') goto yy16;
+	if (yych <= '9') goto yy42;
+	goto yy16;
+yy26:
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy18;
-	if (yych <= '9') goto yy54;
-	goto yy18;
-yy30:
+	if (yych <= '/') goto yy16;
+	if (yych <= '9') goto yy43;
+	goto yy16;
+yy27:
 	++YYCURSOR;
 	if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
 	yych = *YYCURSOR;
 	if (yybm0+yych & 128) {
-		goto yy30;
+		goto yy27;
 	}
-	if (yych <= '/') goto yy18;
-	if (yych <= ':') goto yy56;
-	goto yy18;
-yy32:
+	if (yych <= '/') goto yy16;
+	if (yych <= ':') goto yy44;
+	goto yy16;
+yy28:
 	++YYCURSOR;
 	if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
 	yych = *YYCURSOR;
-	if (yych <= '/') goto yy18;
-	if (yych <= '9') goto yy32;
-	if (yych <= ':') goto yy57;
-	goto yy18;
-yy34:
+	if (yych <= '/') goto yy16;
+	if (yych <= '9') goto yy28;
+	if (yych <= ':') goto yy45;
+	goto yy16;
+yy29:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	if (yych <= '/') goto yy18;
-	if (yych <= '9') goto yy34;
-	if (yych == ';') goto yy58;
-	goto yy18;
-yy36:
+	if (yych <= '/') goto yy16;
+	if (yych <= '9') goto yy29;
+	if (yych == ';') goto yy46;
+	goto yy16;
+yy30:
 	++YYCURSOR;
 	if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
 	yych = *YYCURSOR;
-	if (yych <= '/') goto yy18;
-	if (yych <= '9') goto yy36;
-	if (yych <= ':') goto yy60;
-	goto yy18;
-yy38:
+	if (yych <= '/') goto yy16;
+	if (yych <= '9') goto yy30;
+	if (yych <= ':') goto yy47;
+	goto yy16;
+yy31:
 	++YYCURSOR;
 	if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
 	yych = *YYCURSOR;
-	if (yych <= '/') goto yy18;
-	if (yych <= '9') goto yy38;
-	if (yych <= ':') goto yy61;
-	goto yy18;
-yy40:
+	if (yych <= '/') goto yy16;
+	if (yych <= '9') goto yy31;
+	if (yych <= ':') goto yy48;
+	goto yy16;
+yy32:
 	yych = *++YYCURSOR;
-	if (yych == ';') goto yy62;
-	goto yy18;
-yy41:
+	if (yych == ';') goto yy49;
+	goto yy16;
+yy33:
 	yych = *++YYCURSOR;
-	if (yych == ';') goto yy64;
-	goto yy18;
-yy42:
+	if (yych == ';') goto yy50;
+	goto yy16;
+yy34:
 	yych = *++YYCURSOR;
-	if (yych == '.') goto yy44;
-	if (yych <= '/') goto yy18;
-	if (yych <= '9') goto yy45;
-	goto yy18;
-yy43:
+	if (yych == '.') goto yy36;
+	if (yych <= '/') goto yy16;
+	if (yych <= '9') goto yy37;
+	goto yy16;
+yy35:
 	yych = *++YYCURSOR;
 	if (yych <= '/') {
-		if (yych != '.') goto yy18;
+		if (yych != '.') goto yy16;
 	} else {
-		if (yych <= '9') goto yy45;
-		if (yych == 'I') goto yy47;
-		goto yy18;
+		if (yych <= '9') goto yy37;
+		if (yych == 'I') goto yy38;
+		goto yy16;
 	}
-yy44:
+yy36:
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy18;
-	if (yych <= '9') goto yy66;
-	goto yy18;
-yy45:
+	if (yych <= '/') goto yy16;
+	if (yych <= '9') goto yy51;
+	goto yy16;
+yy37:
 	++YYCURSOR;
 	if ((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
 	yych = *YYCURSOR;
 	if (yych <= ':') {
 		if (yych <= '.') {
-			if (yych <= '-') goto yy18;
-			goto yy66;
+			if (yych <= '-') goto yy16;
+			goto yy51;
 		} else {
-			if (yych <= '/') goto yy18;
-			if (yych <= '9') goto yy45;
-			goto yy18;
+			if (yych <= '/') goto yy16;
+			if (yych <= '9') goto yy37;
+			goto yy16;
 		}
 	} else {
 		if (yych <= 'E') {
-			if (yych <= ';') goto yy68;
-			if (yych <= 'D') goto yy18;
-			goto yy70;
+			if (yych <= ';') goto yy52;
+			if (yych <= 'D') goto yy16;
+			goto yy53;
 		} else {
-			if (yych == 'e') goto yy70;
-			goto yy18;
+			if (yych == 'e') goto yy53;
+			goto yy16;
 		}
 	}
-yy47:
+yy38:
 	yych = *++YYCURSOR;
-	if (yych == 'N') goto yy71;
-	goto yy18;
-yy48:
+	if (yych == 'N') goto yy54;
+	goto yy16;
+yy39:
 	yych = *++YYCURSOR;
-	if (yych == 'A') goto yy72;
-	goto yy18;
-yy49:
+	if (yych == 'A') goto yy55;
+	goto yy16;
+yy40:
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy18;
-	if (yych >= ':') goto yy18;
-yy50:
+	if (yych <= '/') goto yy16;
+	if (yych >= ':') goto yy16;
+yy41:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	if (yych <= '/') goto yy18;
-	if (yych <= '9') goto yy50;
-	if (yych == ';') goto yy73;
-	goto yy18;
-yy52:
+	if (yych <= '/') goto yy16;
+	if (yych <= '9') goto yy41;
+	if (yych == ';') goto yy56;
+	goto yy16;
+yy42:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	if (yych <= '/') goto yy18;
-	if (yych <= '9') goto yy52;
-	if (yych == ';') goto yy75;
-	goto yy18;
-yy54:
+	if (yych <= '/') goto yy16;
+	if (yych <= '9') goto yy42;
+	if (yych == ';') goto yy57;
+	goto yy16;
+yy43:
 	++YYCURSOR;
 	if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
 	yych = *YYCURSOR;
-	if (yych <= '/') goto yy18;
-	if (yych <= '9') goto yy54;
-	if (yych <= ':') goto yy77;
-	goto yy18;
-yy56:
+	if (yych <= '/') goto yy16;
+	if (yych <= '9') goto yy43;
+	if (yych <= ':') goto yy58;
+	goto yy16;
+yy44:
 	yych = *++YYCURSOR;
-	if (yych == '"') goto yy78;
-	goto yy18;
-yy57:
+	if (yych == '"') goto yy59;
+	goto yy16;
+yy45:
 	yych = *++YYCURSOR;
-	if (yych == '"') goto yy80;
-	goto yy18;
-yy58:
+	if (yych == '"') goto yy60;
+	goto yy16;
+yy46:
 	++YYCURSOR;
 	{
 	zend_long id;
@@ -1251,46 +1251,46 @@
 
 	return 1;
 }
-yy60:
+yy47:
 	yych = *++YYCURSOR;
-	if (yych == '"') goto yy82;
-	goto yy18;
-yy61:
+	if (yych == '"') goto yy61;
+	goto yy16;
+yy48:
 	yych = *++YYCURSOR;
-	if (yych == '{') goto yy84;
-	goto yy18;
-yy62:
+	if (yych == '{') goto yy62;
+	goto yy16;
+yy49:
 	++YYCURSOR;
 	{
 	*p = YYCURSOR;
 	ZVAL_FALSE(rval);
 	return 1;
 }
-yy64:
+yy50:
 	++YYCURSOR;
 	{
 	*p = YYCURSOR;
 	ZVAL_TRUE(rval);
 	return 1;
 }
-yy66:
+yy51:
 	++YYCURSOR;
 	if ((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
 	yych = *YYCURSOR;
 	if (yych <= ';') {
-		if (yych <= '/') goto yy18;
-		if (yych <= '9') goto yy66;
-		if (yych <= ':') goto yy18;
+		if (yych <= '/') goto yy16;
+		if (yych <= '9') goto yy51;
+		if (yych <= ':') goto yy16;
 	} else {
 		if (yych <= 'E') {
-			if (yych <= 'D') goto yy18;
-			goto yy70;
+			if (yych <= 'D') goto yy16;
+			goto yy53;
 		} else {
-			if (yych == 'e') goto yy70;
-			goto yy18;
+			if (yych == 'e') goto yy53;
+			goto yy16;
 		}
 	}
-yy68:
+yy52:
 	++YYCURSOR;
 	{
 #if SIZEOF_ZEND_LONG == 4
@@ -1300,26 +1300,26 @@
 	ZVAL_DOUBLE(rval, zend_strtod((const char *)start + 2, NULL));
 	return 1;
 }
-yy70:
+yy53:
 	yych = *++YYCURSOR;
 	if (yych <= ',') {
-		if (yych == '+') goto yy86;
-		goto yy18;
+		if (yych == '+') goto yy63;
+		goto yy16;
 	} else {
-		if (yych <= '-') goto yy86;
-		if (yych <= '/') goto yy18;
-		if (yych <= '9') goto yy87;
-		goto yy18;
+		if (yych <= '-') goto yy63;
+		if (yych <= '/') goto yy16;
+		if (yych <= '9') goto yy64;
+		goto yy16;
 	}
-yy71:
+yy54:
 	yych = *++YYCURSOR;
-	if (yych == 'F') goto yy89;
-	goto yy18;
-yy72:
+	if (yych == 'F') goto yy65;
+	goto yy16;
+yy55:
 	yych = *++YYCURSOR;
-	if (yych == 'N') goto yy89;
-	goto yy18;
-yy73:
+	if (yych == 'N') goto yy65;
+	goto yy16;
+yy56:
 	++YYCURSOR;
 	{
 #if SIZEOF_ZEND_LONG == 4
@@ -1346,7 +1346,7 @@
 	ZVAL_LONG(rval, parse_iv(start + 2));
 	return 1;
 }
-yy75:
+yy57:
 	++YYCURSOR;
 	{
 	zend_long id;
@@ -1372,11 +1372,11 @@
 
 	return 1;
 }
-yy77:
+yy58:
 	yych = *++YYCURSOR;
-	if (yych == '"') goto yy90;
-	goto yy18;
-yy78:
+	if (yych == '"') goto yy66;
+	goto yy16;
+yy59:
 	++YYCURSOR;
 	{
 	size_t len, maxlen;
@@ -1595,7 +1595,7 @@
 
 	return object_common(UNSERIALIZE_PASSTHRU, elements, has_unserialize);
 }
-yy80:
+yy60:
 	++YYCURSOR;
 	{
 	if (!var_hash) return 0;
@@ -1676,7 +1676,7 @@
 	zend_string_release_ex(case_name, 0);
 	return 0;
 }
-yy82:
+yy61:
 	++YYCURSOR;
 	{
 	size_t len, maxlen;
@@ -1711,7 +1711,7 @@
 	ZVAL_STR(rval, str);
 	return 1;
 }
-yy84:
+yy62:
 	++YYCURSOR;
 	{
 	zend_long elements = parse_iv(start + 2);
@@ -1745,23 +1745,23 @@
 
 	return finish_nested_data(UNSERIALIZE_PASSTHRU);
 }
-yy86:
+yy63:
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy18;
-	if (yych >= ':') goto yy18;
-yy87:
+	if (yych <= '/') goto yy16;
+	if (yych >= ':') goto yy16;
+yy64:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	if (yych <= '/') goto yy18;
-	if (yych <= '9') goto yy87;
-	if (yych == ';') goto yy68;
-	goto yy18;
-yy89:
+	if (yych <= '/') goto yy16;
+	if (yych <= '9') goto yy64;
+	if (yych == ';') goto yy52;
+	goto yy16;
+yy65:
 	yych = *++YYCURSOR;
-	if (yych == ';') goto yy92;
-	goto yy18;
-yy90:
+	if (yych == ';') goto yy67;
+	goto yy16;
+yy66:
 	++YYCURSOR;
 	{
 	size_t len, maxlen;
@@ -1799,7 +1799,7 @@
 	}
 	return 1;
 }
-yy92:
+yy67:
 	++YYCURSOR;
 	{
 	*p = YYCURSOR;

php-8.3.7.tar.xz/ext/sysvmsg/sysvmsg.c -> php-8.3.21.tar.xz/ext/sysvmsg/sysvmsg.c Changed

php-8.3.21.tar.xz/ext/sysvmsg/tests/gh16592.phpt Added

php-8.3.7.tar.xz/ext/sysvshm/sysvshm.c -> php-8.3.21.tar.xz/ext/sysvshm/sysvshm.c Changed

php-8.3.21.tar.xz/ext/sysvshm/tests/gh16591.phpt Added

php-8.3.21.tar.xz/ext/tidy/tests/open_basedir Added

php-8.3.21.tar.xz/ext/tidy/tests/open_basedir/test.html Added

php-8.3.21.tar.xz/ext/tidy/tests/open_basedir_failure_config.phpt Added

@@ -0,0 +1,48 @@
+--TEST--
+Tidy with basedir restriction failure on configuration file
+--EXTENSIONS--
+tidy
+--INI--
+open_basedir={PWD}/open_basedir
+--FILE--
+<?php
+echo "=== repairString ===\n";
+$tidy = new tidy;
+$tidy->repairString('my epic string', 'my_config_file.ini');
+
+echo "=== tidy_parse_string ===\n";
+tidy_parse_string('my epic string', 'my_config_file.ini');
+
+echo "=== tidy_parse_file ===\n";
+tidy_parse_file(__DIR__.'/open_basedir/test.html', 'my_config_file.ini');
+
+echo "=== __construct ===\n";
+$tidy = new tidy(__DIR__.'/open_basedir/test.html', 'my_config_file.ini');
+
+echo "=== parseFile ===\n";
+$tidy = new tidy;
+$tidy->parseFile(__DIR__.'/open_basedir/test.html', 'my_config_file.ini');
+
+echo "=== parseString ===\n";
+$tidy = new tidy;
+$tidy->parseString('my epic string', 'my_config_file.ini');
+?>
+--EXPECTF--
+=== repairString ===
+
+Warning: tidy::repairString(): open_basedir restriction in effect. File(my_config_file.ini) is not within the allowed path(s): (%sopen_basedir) in %s on line %d
+=== tidy_parse_string ===
+
+Warning: tidy_parse_string(): open_basedir restriction in effect. File(my_config_file.ini) is not within the allowed path(s): (%sopen_basedir) in %s on line %d
+=== tidy_parse_file ===
+
+Warning: tidy_parse_file(): open_basedir restriction in effect. File(my_config_file.ini) is not within the allowed path(s): (%sopen_basedir) in %s on line %d
+=== __construct ===
+
+Warning: tidy::__construct(): open_basedir restriction in effect. File(my_config_file.ini) is not within the allowed path(s): (%sopen_basedir) in %s on line %d
+=== parseFile ===
+
+Warning: tidy::parseFile(): open_basedir restriction in effect. File(my_config_file.ini) is not within the allowed path(s): (%sopen_basedir) in %s on line %d
+=== parseString ===
+
+Warning: tidy::parseString(): open_basedir restriction in effect. File(my_config_file.ini) is not within the allowed path(s): (%sopen_basedir) in %s on line %d

php-8.3.7.tar.xz/ext/tidy/tests/parsing_file_too_large.phpt -> php-8.3.21.tar.xz/ext/tidy/tests/parsing_file_too_large.phpt Changed

php-8.3.7.tar.xz/ext/tidy/tidy.c -> php-8.3.21.tar.xz/ext/tidy/tidy.c Changed

@@ -74,19 +74,6 @@
 	}	\
 	obj = Z_TIDY_P(object);	\
 
-#define TIDY_APPLY_CONFIG(_doc, _val_str, _val_ht) \
-	if (_val_ht) { \
-		_php_tidy_apply_config_array(_doc, _val_ht); \
-	} else if (_val_str) { \
-		TIDY_OPEN_BASE_DIR_CHECK(ZSTR_VAL(_val_str)); \
-		php_tidy_load_config(_doc, ZSTR_VAL(_val_str)); \
-	}
-
-#define TIDY_OPEN_BASE_DIR_CHECK(filename) \
-if (php_check_open_basedir(filename)) { \
-	RETURN_FALSE; \
-} \
-
 #define TIDY_SET_DEFAULT_CONFIG(_doc) \
 	if (TG(default_config) && TG(default_config)0) { \
 		php_tidy_load_config(_doc, TG(default_config)); \
@@ -221,6 +208,19 @@
 	}
 }
 
+static zend_result php_tidy_apply_config(TidyDoc doc, zend_string *str_string, HashTable *ht_options)
+{
+	if (ht_options) {
+		return _php_tidy_apply_config_array(doc, ht_options);
+	} else if (str_string) {
+		if (php_check_open_basedir(ZSTR_VAL(str_string))) {
+			return FAILURE;
+		}
+		php_tidy_load_config(doc, ZSTR_VAL(str_string));
+	}
+	return SUCCESS;
+}
+
 static int _php_tidy_set_tidy_opt(TidyDoc doc, char *optname, zval *value)
 {
 	TidyOption opt = tidyGetOptionByName(doc, optname);
@@ -304,7 +304,12 @@
 	}
 
 	if (ZEND_SIZE_T_UINT_OVFL(ZSTR_LEN(data))) {
-		zend_argument_value_error(1, "is too long");
+		if (is_file) {
+			zend_string_release_ex(data, false);
+			zend_argument_value_error(1, "Input string is too long");
+		} else {
+			zend_argument_value_error(1, "is too long");
+		}
 		RETURN_THROWS();
 	}
 
@@ -324,9 +329,9 @@
 
 	TIDY_SET_DEFAULT_CONFIG(doc);
 
-	TIDY_APPLY_CONFIG(doc, config_str, config_ht);
-
-	if(enc_len) {
+	if (php_tidy_apply_config(doc, config_str, config_ht) != SUCCESS) {
+		RETVAL_FALSE;
+	} else if (enc_len) {
 		if (tidySetCharEncoding(doc, enc) < 0) {
 			php_error_docref(NULL, E_WARNING, "Could not set encoding \"%s\"", enc);
 			RETVAL_FALSE;
@@ -1019,9 +1024,8 @@
 	tidy_instantiate(tidy_ce_doc, return_value);
 	obj = Z_TIDY_P(return_value);
 
-	TIDY_APPLY_CONFIG(obj->ptdoc->doc, options_str, options_ht);
-
-	if (php_tidy_parse_string(obj, ZSTR_VAL(input), (uint32_t)ZSTR_LEN(input), enc) == FAILURE) {
+	if (php_tidy_apply_config(obj->ptdoc->doc, options_str, options_ht) != SUCCESS
+	 || php_tidy_parse_string(obj, ZSTR_VAL(input), (uint32_t)ZSTR_LEN(input), enc) == FAILURE) {
 		zval_ptr_dtor(return_value);
 		RETURN_FALSE;
 	}
@@ -1088,9 +1092,8 @@
 	tidy_instantiate(tidy_ce_doc, return_value);
 	obj = Z_TIDY_P(return_value);
 
-	TIDY_APPLY_CONFIG(obj->ptdoc->doc, options_str, options_ht);
-
-	if (php_tidy_parse_string(obj, ZSTR_VAL(contents), (uint32_t)ZSTR_LEN(contents), enc) == FAILURE) {
+	if (php_tidy_apply_config(obj->ptdoc->doc, options_str, options_ht) != SUCCESS
+	 || php_tidy_parse_string(obj, ZSTR_VAL(contents), (uint32_t)ZSTR_LEN(contents), enc) == FAILURE) {
 		zval_ptr_dtor(return_value);
 		RETVAL_FALSE;
 	}
@@ -1383,7 +1386,11 @@
 			RETURN_THROWS();
 		}
 
-		TIDY_APPLY_CONFIG(obj->ptdoc->doc, options_str, options_ht);
+		if (php_tidy_apply_config(obj->ptdoc->doc, options_str, options_ht) != SUCCESS) {
+			/* TODO: this is the constructor, we should throw probably... */
+			zend_string_release_ex(contents, 0);
+			RETURN_FALSE;
+		}
 
 		php_tidy_parse_string(obj, ZSTR_VAL(contents), (uint32_t)ZSTR_LEN(contents), enc);
 
@@ -1422,9 +1429,8 @@
 		RETURN_THROWS();
 	}
 
-	TIDY_APPLY_CONFIG(obj->ptdoc->doc, options_str, options_ht);
-
-	if (php_tidy_parse_string(obj, ZSTR_VAL(contents), (uint32_t)ZSTR_LEN(contents), enc) == FAILURE) {
+	if (php_tidy_apply_config(obj->ptdoc->doc, options_str, options_ht) != SUCCESS
+	 || php_tidy_parse_string(obj, ZSTR_VAL(contents), (uint32_t)ZSTR_LEN(contents), enc) == FAILURE) {
 		RETVAL_FALSE;
 	} else {
 		RETVAL_TRUE;
@@ -1456,9 +1462,8 @@
 	TIDY_SET_CONTEXT;
 	obj = Z_TIDY_P(object);
 
-	TIDY_APPLY_CONFIG(obj->ptdoc->doc, options_str, options_ht);
-
-	if(php_tidy_parse_string(obj, ZSTR_VAL(input), (uint32_t)ZSTR_LEN(input), enc) == SUCCESS) {
+	if (php_tidy_apply_config(obj->ptdoc->doc, options_str, options_ht) == SUCCESS
+	 && php_tidy_parse_string(obj, ZSTR_VAL(input), (uint32_t)ZSTR_LEN(input), enc) == SUCCESS) {
 		RETURN_TRUE;
 	}

php-8.3.7.tar.xz/ext/xml/compat.c -> php-8.3.21.tar.xz/ext/xml/compat.c Changed

@@ -375,7 +375,7 @@
 		if (ret == NULL)
 			ret = xmlGetDocEntity(parser->parser->myDoc, name);
 
-		if (ret == NULL || (parser->parser->instate != XML_PARSER_ENTITY_VALUE && parser->parser->instate != XML_PARSER_ATTRIBUTE_VALUE)) {
+		if (ret == NULL || parser->parser->instate == XML_PARSER_CONTENT) {
 			if (ret == NULL || ret->etype == XML_INTERNAL_GENERAL_ENTITY || ret->etype == XML_INTERNAL_PARAMETER_ENTITY || ret->etype == XML_INTERNAL_PREDEFINED_ENTITY) {
 				/* Predefined entities will expand unless no cdata handler is present */
 				if (parser->h_default && ! (ret && ret->etype == XML_INTERNAL_PREDEFINED_ENTITY && parser->h_cdata)) {
@@ -471,13 +471,13 @@
 	}
 
 	php_libxml_sanitize_parse_ctxt_options(parser->parser);
-	xmlCtxtUseOptions(parser->parser, XML_PARSE_OLDSAX);
+	xmlCtxtUseOptions(parser->parser, XML_PARSE_OLDSAX | XML_PARSE_NOENT);
 
-	parser->parser->replaceEntities = 1;
 	parser->parser->wellFormed = 0;
 	if (sep != NULL) {
+		/* Note: sax2 flag will be set due to the magic number in `initialized` in php_xml_compat_handlers */
+		ZEND_ASSERT(parser->parser->sax->initialized == XML_SAX2_MAGIC);
 		parser->use_namespace = 1;
-		parser->parser->sax2 = 1;
 		parser->_ns_separator = xmlStrdup(sep);
 	} else {
 		/* Reset flag as XML_SAX2_MAGIC is needed for xmlCreatePushParserCtxt
@@ -563,10 +563,14 @@
 PHP_XML_API int
 XML_Parse(XML_Parser parser, const XML_Char *data, int data_len, int is_final)
 {
-	int error;
+	int error = xmlParseChunk(parser->parser, (char *) data, data_len, is_final);
 
-	error = xmlParseChunk(parser->parser, (char *) data, data_len, is_final);
-	return !error && parser->parser->lastError.level <= XML_ERR_WARNING;
+	if (!error) {
+		const xmlError *error_data = xmlCtxtGetLastError(parser->parser);
+		return !error_data || error_data->level <= XML_ERR_WARNING;
+	}
+
+	return 0;
 }
 
 PHP_XML_API int
@@ -705,8 +709,21 @@
 PHP_XML_API int
 XML_GetCurrentByteIndex(XML_Parser parser)
 {
-	return parser->parser->input->consumed +
-			(parser->parser->input->cur - parser->parser->input->base);
+	/* We have to temporarily disable the encoder to satisfy the note from the manual:
+	 * "This function returns byte index according to UTF-8 encoded text disregarding if input is in another encoding."
+	 * Although that should probably be corrected at one point? (TODO) */
+	xmlCharEncodingHandlerPtr encoder = NULL;
+	xmlParserInputPtr input = parser->parser->input;
+	if (input->buf) {
+		encoder = input->buf->encoder;
+		input->buf->encoder = NULL;
+	}
+	long result = xmlByteConsumed(parser->parser);
+	if (encoder) {
+		input->buf->encoder = encoder;
+	}
+	/* TODO: at one point this should return long probably to make sure that files greater than 2 GiB are handled correctly. */
+	return (int) result;
 }
 
 PHP_XML_API int
@@ -714,8 +731,7 @@
 {
 	/* WARNING: this is identical to ByteIndex; it should probably
 	 * be different */
-	return parser->parser->input->consumed +
-			(parser->parser->input->cur - parser->parser->input->base);
+	return XML_GetCurrentByteIndex(parser);
 }
 
 PHP_XML_API const XML_Char *XML_ExpatVersion(void)

php-8.3.21.tar.xz/ext/xml/tests/gh14834.phpt Added

php-8.3.21.tar.xz/ext/xml/tests/gh15868.phpt Added

@@ -0,0 +1,46 @@
+--TEST--
+GH-15868 (Assertion failure in xml_parse_into_struct after exception)
+--EXTENSIONS--
+xml
+--FILE--
+<?php
+$parser = xml_parser_create();
+xml_set_element_handler($parser,
+    function ($parser, $name, $attrs) {
+        throw new Error('stop 1');
+    }, function ($parser, $name) {
+    }
+);
+try {
+    xml_parse_into_struct($parser, "<container/>", $values, $tags);
+} catch (Error $e) {
+    echo $e->getMessage(), "\n";
+}
+
+$parser = xml_parser_create();
+xml_set_element_handler($parser,
+    function ($parser, $name, $attrs) {
+    }, function ($parser, $name) {
+        throw new Error('stop 2');
+    }
+);
+try {
+    xml_parse_into_struct($parser, "<container/>", $values, $tags);
+} catch (Error $e) {
+    echo $e->getMessage(), "\n";
+}
+
+$parser = xml_parser_create();
+xml_set_character_data_handler($parser, function() {
+    throw new Error('stop 3');
+});
+try {
+    xml_parse_into_struct($parser, "<root><!CDATAx></root>", $values, $tags);
+} catch (Error $e) {
+    echo $e->getMessage(), "\n";
+}
+?>
+--EXPECT--
+stop 1
+stop 2
+stop 3

php-8.3.21.tar.xz/ext/xml/tests/gh17187_1.phpt Added

@@ -0,0 +1,93 @@
+--TEST--
+GH-17187 (unreachable program point in zend_hash)
+--EXTENSIONS--
+xml
+--CREDITS--
+chongwick
+--FILE--
+<?php
+class ImmutableParser {
+    private $parser;
+    private $immutableData;
+    private $arrayCopy;
+
+    public function __construct() {
+        $this->parser = xml_parser_create();
+        xml_set_element_handler($this->parser, function ($parser, $name, $attrs) {
+            echo "open\n";
+            var_dump($name, $attrs);
+            $this->arrayCopy = $this; // Create cycle intentionally
+            $this->immutableData = $this->arrayCopy;
+        }, function ($parser, $name) {
+            echo "close\n";
+            var_dump($name);
+        });
+    }
+
+    public function parseXml($xml) {
+        $this->immutableData = array();
+        xml_parse_into_struct($this->parser, $xml, $this->immutableData, $this->immutableData);
+        return $this->immutableData;
+    }
+}
+$immutableParser = new ImmutableParser();
+$xml = "<container><child/></container>";
+$immutableData = $immutableParser->parseXml($xml);
+var_dump($immutableData);
+?>
+--EXPECT--
+open
+string(9) "CONTAINER"
+array(0) {
+}
+open
+string(5) "CHILD"
+array(0) {
+}
+close
+string(5) "CHILD"
+close
+string(9) "CONTAINER"
+array(5) {
+  0=>
+  object(ImmutableParser)#1 (3) {
+    "parser":"ImmutableParser":private=>
+    object(XMLParser)#2 (0) {
+    }
+    "immutableData":"ImmutableParser":private=>
+    *RECURSION*
+    "arrayCopy":"ImmutableParser":private=>
+    array(1) {
+      0=>
+      *RECURSION*
+    }
+  }
+  "CHILD"=>
+  array(1) {
+    0=>
+    int(1)
+  }
+  1=>
+  array(3) {
+    "tag"=>
+    string(5) "CHILD"
+    "type"=>
+    string(8) "complete"
+    "level"=>
+    int(2)
+  }
+  "CONTAINER"=>
+  array(1) {
+    0=>
+    int(2)
+  }
+  2=>
+  array(3) {
+    "tag"=>
+    string(9) "CONTAINER"
+    "type"=>
+    string(5) "close"
+    "level"=>
+    int(1)
+  }
+}

php-8.3.21.tar.xz/ext/xml/tests/gh17187_2.phpt Added

@@ -0,0 +1,53 @@
+--TEST--
+GH-17187 (unreachable program point in zend_hash)
+--EXTENSIONS--
+xml
+--CREDITS--
+chongwick
+--FILE--
+<?php
+class ImmutableParser {
+    public $parser;
+    public $immutableData1;
+    public $immutableData2;
+
+    public function __construct() {
+        $this->parser = xml_parser_create();
+        xml_set_element_handler($this->parser, function ($parser, $name, $attrs) {
+            echo "open\n";
+            var_dump($name, $attrs);
+            $this->immutableData1 = 0xdead;
+            $this->immutableData2 = 0xbeef;
+        }, function ($parser, $name) {
+            echo "close\n";
+            var_dump($name);
+        });
+    }
+
+    public function parseXml($xml) {
+        $this->immutableData1 = array();
+        $this->immutableData2 = array();
+        xml_parse_into_struct($this->parser, $xml, $this->immutableData1, $this->immutableData2);
+    }
+}
+$immutableParser = new ImmutableParser();
+$xml = "<container><child/></container>";
+$immutableParser->parseXml($xml);
+var_dump($immutableParser->immutableData1);
+var_dump($immutableParser->immutableData2);
+?>
+--EXPECT--
+open
+string(9) "CONTAINER"
+array(0) {
+}
+open
+string(5) "CHILD"
+array(0) {
+}
+close
+string(5) "CHILD"
+close
+string(9) "CONTAINER"
+int(57005)
+int(48879)

php-8.3.21.tar.xz/ext/xml/tests/toffset_bounds.phpt Added

php-8.3.7.tar.xz/ext/xml/xml.c -> php-8.3.21.tar.xz/ext/xml/xml.c Changed

@@ -72,7 +72,7 @@
 	/* We return a pointer to these zvals in get_gc(), so it's
 	 * important that a) they are adjacent b) object is the first
 	 * and c) the number of zvals is kept up to date. */
-#define XML_PARSER_NUM_ZVALS 12
+#define XML_PARSER_NUM_ZVALS 14
 	zval object;
 	zval startElementHandler;
 	zval endElementHandler;
@@ -85,6 +85,8 @@
 	zval unknownEncodingHandler;
 	zval startNamespaceDeclHandler;
 	zval endNamespaceDeclHandler;
+	zval data;
+	zval info;
 
 	zend_function *startElementPtr;
 	zend_function *endElementPtr;
@@ -98,12 +100,10 @@
 	zend_function *startNamespaceDeclPtr;
 	zend_function *endNamespaceDeclPtr;
 
-	zval data;
-	zval info;
 	int level;
 	int toffset;
 	int curtag;
-	zval *ctag;
+	zend_long ctag_index;
 	char **ltags;
 	int lastwasopen;
 	int skipwhite;
@@ -326,6 +326,8 @@
 {
 	xml_parser *parser = xml_parser_from_obj(object);
 
+	zval_ptr_dtor(&parser->info);
+	zval_ptr_dtor(&parser->data);
 	if (parser->parser) {
 		XML_ParserFree(parser->parser);
 	}
@@ -551,15 +553,18 @@
 {
 	zval *element;
 
-	if (Z_ISUNDEF(parser->info)) {
+	if (Z_ISUNDEF(parser->info) || UNEXPECTED(Z_TYPE_P(Z_REFVAL(parser->info)) != IS_ARRAY)) {
 		return;
 	}
 
+	SEPARATE_ARRAY(Z_REFVAL(parser->info));
+	zend_array *arr = Z_ARRVAL_P(Z_REFVAL(parser->info));
+
 	size_t name_len = strlen(name);
-	if ((element = zend_hash_str_find(Z_ARRVAL(parser->info), name, name_len)) == NULL) {
+	if ((element = zend_hash_str_find(arr, name, name_len)) == NULL) {
 		zval values;
 		array_init(&values);
-		element = zend_hash_str_update(Z_ARRVAL(parser->info), name, name_len, &values);
+		element = zend_hash_str_update(arr, name, name_len, &values);
 	}
 
 	add_next_index_long(element, parser->curtag);
@@ -583,6 +588,28 @@
 }
 /* }}} */
 
+static zval *xml_get_separated_data(xml_parser *parser)
+{
+	if (EXPECTED(Z_TYPE_P(Z_REFVAL(parser->data)) == IS_ARRAY)) {
+		SEPARATE_ARRAY(Z_REFVAL(parser->data));
+		return Z_REFVAL(parser->data);
+	}
+	return NULL;
+}
+
+static zval *xml_get_ctag(xml_parser *parser)
+{
+	zval *data = xml_get_separated_data(parser);
+	if (EXPECTED(data)) {
+		zval *zv = zend_hash_index_find_deref(Z_ARRVAL_P(data), parser->ctag_index);
+		if (EXPECTED(zv && Z_TYPE_P(zv) == IS_ARRAY)) {
+			SEPARATE_ARRAY(zv);
+			return zv;
+		}
+	}
+	return NULL;
+}
+
 /* {{{ _xml_startElementHandler() */
 void _xml_startElementHandler(void *userData, const XML_Char *name, const XML_Char **attributes)
 {
@@ -622,7 +649,7 @@
 		zval_ptr_dtor(&retval);
 	}
 
-	if (!Z_ISUNDEF(parser->data)) {
+	if (!Z_ISUNDEF(parser->data) && !EG(exception)) {
 		if (parser->level <= XML_MAXLEVEL)  {
 			zval tag, atr;
 			int atcnt = 0;
@@ -630,9 +657,11 @@
 			array_init(&tag);
 			array_init(&atr);
 
-			_xml_add_to_info(parser, ZSTR_VAL(tag_name) + parser->toffset);
+			char *skipped_tag_name = SKIP_TAGSTART(ZSTR_VAL(tag_name));
 
-			add_assoc_string(&tag, "tag", SKIP_TAGSTART(ZSTR_VAL(tag_name))); /* cast to avoid gcc-warning */
+			_xml_add_to_info(parser, skipped_tag_name);
+
+			add_assoc_string(&tag, "tag", skipped_tag_name);
 			add_assoc_string(&tag, "type", "open");
 			add_assoc_long(&tag, "level", parser->level);
 
@@ -662,7 +691,19 @@
 				zval_ptr_dtor(&atr);
 			}
 
-			parser->ctag = zend_hash_next_index_insert(Z_ARRVAL(parser->data), &tag);
+			zval *data = xml_get_separated_data(parser);
+			if (EXPECTED(data)) {
+				/* Note: due to array resizes or user interference,
+				 * we have to store an index instead of a zval into the array's memory. */
+				zend_array *arr = Z_ARRVAL_P(data);
+				if (EXPECTED(zend_hash_next_index_insert(arr, &tag))) {
+					parser->ctag_index = arr->nNextFreeElement - 1;
+				} else {
+					zval_ptr_dtor(&tag);
+				}
+			} else {
+				zval_ptr_dtor(&tag);
+			}
 		} else if (parser->level == (XML_MAXLEVEL + 1)) {
 						php_error_docref(NULL, E_WARNING, "Maximum depth exceeded - Results truncated");
 		}
@@ -693,21 +734,27 @@
 		zval_ptr_dtor(&retval);
 	}
 
-	if (!Z_ISUNDEF(parser->data)) {
+	if (!Z_ISUNDEF(parser->data) && !EG(exception)) {
 		zval tag;
 
 		if (parser->lastwasopen) {
-			add_assoc_string(parser->ctag, "type", "complete");
+			zval *zv = xml_get_ctag(parser);
+			if (EXPECTED(zv)) {
+				add_assoc_string(zv, "type", "complete");
+			}
 		} else {
-			array_init(&tag);
+			char *skipped_tag_name = SKIP_TAGSTART(ZSTR_VAL(tag_name));
 
-			_xml_add_to_info(parser, ZSTR_VAL(tag_name) + parser->toffset);
-
-			add_assoc_string(&tag, "tag", SKIP_TAGSTART(ZSTR_VAL(tag_name))); /* cast to avoid gcc-warning */
-			add_assoc_string(&tag, "type", "close");
-			add_assoc_long(&tag, "level", parser->level);
+			_xml_add_to_info(parser, skipped_tag_name);
 
-			zend_hash_next_index_insert(Z_ARRVAL(parser->data), &tag);
+			zval *data = xml_get_separated_data(parser);
+			if (EXPECTED(data)) {
+				array_init(&tag);
+				add_assoc_string(&tag, "tag", skipped_tag_name);
+				add_assoc_string(&tag, "type", "close");
+				add_assoc_long(&tag, "level", parser->level);
+				zend_hash_next_index_insert(Z_ARRVAL_P(data), &tag);
+			}
 		}
 
 		parser->lastwasopen = 0;
@@ -741,7 +788,7 @@
 		zval_ptr_dtor(&retval);
 	}
 
-	if (Z_ISUNDEF(parser->data)) {
+	if (Z_ISUNDEF(parser->data) || EG(exception)) {
 		return;
 	}
 
@@ -765,9 +812,15 @@
 		}
 	}
 	if (parser->lastwasopen) {
+		zval *ctag = xml_get_ctag(parser);
+		if (UNEXPECTED(!ctag)) {
+			zend_string_release_ex(decoded_value, false);
+			return;
+		}
+
 		zval *myval;
 		/* check if the current tag already has a value - if yes append to that! */
-		if ((myval = zend_hash_find(Z_ARRVAL_P(parser->ctag), ZSTR_KNOWN(ZEND_STR_VALUE)))) {
+		if ((myval = zend_hash_find(Z_ARRVAL_P(ctag), ZSTR_KNOWN(ZEND_STR_VALUE))) && Z_TYPE_P(myval) == IS_STRING) {
 			size_t newlen = Z_STRLEN_P(myval) + ZSTR_LEN(decoded_value);
 			Z_STR_P(myval) = zend_string_extend(Z_STR_P(myval), newlen, 0);
 			strncpy(Z_STRVAL_P(myval) + Z_STRLEN_P(myval) - ZSTR_LEN(decoded_value),
@@ -775,7 +828,7 @@
 			zend_string_release_ex(decoded_value, 0);
 		} else {
 			if (doprint || (! parser->skipwhite)) {
-				add_assoc_str(parser->ctag, "value", decoded_value);
+				add_assoc_str(ctag, "value", decoded_value);
 			} else {
 				zend_string_release_ex(decoded_value, 0);
 			}
@@ -783,9 +836,17 @@
 	} else {
 		zval tag;
 		zval *curtag, *mytype, *myval;
-		ZEND_HASH_REVERSE_FOREACH_VAL(Z_ARRVAL(parser->data), curtag) {
-			if ((mytype = zend_hash_str_find(Z_ARRVAL_P(curtag),"type", sizeof("type") - 1))) {
-				if (zend_string_equals_literal(Z_STR_P(mytype), "cdata")) {
+
+		zval *data = xml_get_separated_data(parser);
+		if (UNEXPECTED(!data)) {
+			zend_string_release_ex(decoded_value, false);
+			return;
+		}
+
+		ZEND_HASH_REVERSE_FOREACH_VAL(Z_ARRVAL_P(data), curtag) {
+			if (EXPECTED(Z_TYPE_P(curtag) == IS_ARRAY) && (mytype = zend_hash_str_find(Z_ARRVAL_P(curtag),"type", sizeof("type") - 1))) {
+				if (EXPECTED(Z_TYPE_P(mytype) == IS_STRING) && zend_string_equals_literal(Z_STR_P(mytype), "cdata")) {
+					SEPARATE_ARRAY(curtag);
 					if ((myval = zend_hash_find(Z_ARRVAL_P(curtag), ZSTR_KNOWN(ZEND_STR_VALUE)))) {
 						size_t newlen = Z_STRLEN_P(myval) + ZSTR_LEN(decoded_value);
 						Z_STR_P(myval) = zend_string_extend(Z_STR_P(myval), newlen, 0);
@@ -805,7 +866,7 @@
 			add_assoc_str(&tag, "value", decoded_value);
 			add_assoc_string(&tag, "type", "cdata");
 			add_assoc_long(&tag, "level", parser->level);
-			zend_hash_next_index_insert(Z_ARRVAL(parser->data), &tag);
+			zend_hash_next_index_insert(Z_ARRVAL_P(data), &tag);
 		} else if (parser->level == (XML_MAXLEVEL + 1)) {
 								php_error_docref(NULL, E_WARNING, "Maximum depth exceeded - Results truncated");
 		} else {
@@ -1266,26 +1327,27 @@
 	}
 
 	if (info) {
-		info = zend_try_array_init(info);
-		if (!info) {
+		if (!zend_try_array_init(info)) {
 			RETURN_THROWS();
 		}
 	}
 
-	xdata = zend_try_array_init(xdata);
-	if (!xdata) {
+	if (!zend_try_array_init(xdata)) {
 		RETURN_THROWS();
 	}
 
-	ZVAL_COPY_VALUE(&parser->data, xdata);
+	zval_ptr_dtor(&parser->data);
+	ZVAL_COPY(&parser->data, xdata);
 
 	if (info) {
-		ZVAL_COPY_VALUE(&parser->info, info);
+		zval_ptr_dtor(&parser->info);
+		ZVAL_COPY(&parser->info, info);
 	}
 
 	parser->level = 0;
 	xml_parser_free_ltags(parser);
 	parser->ltags = safe_emalloc(XML_MAXLEVEL, sizeof(char *), 0);
+	memset(parser->ltags, 0, XML_MAXLEVEL * sizeof(char *));
 
 	XML_SetElementHandler(parser->parser, _xml_startElementHandler, _xml_endElementHandler);
 	XML_SetCharacterDataHandler(parser->parser, _xml_characterDataHandler);

php-8.3.7.tar.xz/ext/xmlreader/php_xmlreader.c -> php-8.3.21.tar.xz/ext/xmlreader/php_xmlreader.c Changed

@@ -129,6 +129,8 @@
 
 	if (hnd == NULL) {
 		retval = zend_std_get_property_ptr_ptr(object, name, type, cache_slot);
+	} else if (cache_slot) {
+		cache_slot0 = cache_slot1 = cache_slot2 = NULL;
 	}
 
 	return retval;
@@ -186,19 +188,17 @@
 /* {{{ */
 static zend_function *xmlreader_get_method(zend_object **obj, zend_string *name, const zval *key)
 {
-	if (ZSTR_LEN(name) == sizeof("open") - 1
-			&& (ZSTR_VAL(name)0 == 'o' || ZSTR_VAL(name)0 == 'O')
-			&& (ZSTR_VAL(name)1 == 'p' || ZSTR_VAL(name)1 == 'P')
-			&& (ZSTR_VAL(name)2 == 'e' || ZSTR_VAL(name)2 == 'E')
-			&& (ZSTR_VAL(name)3 == 'n' || ZSTR_VAL(name)3 == 'N')) {
-		return (zend_function*)&xmlreader_open_fn;
-	} else if (ZSTR_LEN(name) == sizeof("xml") - 1
-			&& (ZSTR_VAL(name)0 == 'x' || ZSTR_VAL(name)0 == 'X')
-			&& (ZSTR_VAL(name)1 == 'm' || ZSTR_VAL(name)1 == 'M')
-			&& (ZSTR_VAL(name)2 == 'l' || ZSTR_VAL(name)2 == 'L')) {
-		return (zend_function*)&xmlreader_xml_fn;
-	}
-	return zend_std_get_method(obj, name, key);;
+	zend_function *method = zend_std_get_method(obj, name, key);
+	if (method && (method->common.fn_flags & ZEND_ACC_STATIC) && method->common.type == ZEND_INTERNAL_FUNCTION) {
+		/* There are only two static internal methods and they both have overrides. */
+		if (ZSTR_LEN(name) == sizeof("xml") - 1) {
+			return (zend_function *) &xmlreader_xml_fn;
+		} else {
+			ZEND_ASSERT(ZSTR_LEN(name) == sizeof("open") - 1);
+			return (zend_function *) &xmlreader_open_fn;
+		}
+	}
+	return method;
 }
 /* }}} */
 
@@ -1123,7 +1123,13 @@
 	}
 
 	if (basenode != NULL) {
-		NODE_GET_OBJ(node, basenode, xmlNodePtr, domobj);
+		/* Note: cannot use NODE_GET_OBJ here because of the wrong return type */
+		domobj = Z_LIBXML_NODE_P(basenode);
+		if (UNEXPECTED(domobj->node == NULL)) {
+			php_error_docref(NULL, E_WARNING, "Couldn't fetch %s", ZSTR_VAL(Z_OBJCE_P(basenode)->name));
+			RETURN_FALSE;
+		}
+		node = domobj->node->node;
 		docp = node->doc;
 	}

php-8.3.21.tar.xz/ext/xmlreader/tests/gh14183.phpt Added

php-8.3.21.tar.xz/ext/xmlreader/tests/gh16292.phpt Added

php-8.3.7.tar.xz/ext/xmlwriter/php_xmlwriter.c -> php-8.3.21.tar.xz/ext/xmlwriter/php_xmlwriter.c Changed

php-8.3.21.tar.xz/ext/xsl/tests/skip_upstream_issue113.inc Added

php-8.3.7.tar.xz/ext/xsl/tests/xslt010_gt10129.phpt -> php-8.3.21.tar.xz/ext/xsl/tests/xslt010_gt10129.phpt Changed

php-8.3.7.tar.xz/ext/zend_test/fiber.c -> php-8.3.21.tar.xz/ext/zend_test/fiber.c Changed

php-8.3.7.tar.xz/ext/zend_test/observer.c -> php-8.3.21.tar.xz/ext/zend_test/observer.c Changed

php-8.3.7.tar.xz/ext/zend_test/test.c -> php-8.3.21.tar.xz/ext/zend_test/test.c Changed

@@ -666,6 +666,15 @@
 	return _zend_mm_realloc(ZT_G(zend_orig_heap), ptr, len ZEND_FILE_LINE_EMPTY_CC ZEND_FILE_LINE_EMPTY_CC);
 }
 
+static void zend_test_reset_heap(zend_zend_test_globals *zend_test_globals)
+{
+	if (zend_test_globals->zend_test_heap) {
+		free(zend_test_globals->zend_test_heap);
+		zend_test_globals->zend_test_heap = NULL;
+		zend_mm_set_heap(zend_test_globals->zend_orig_heap);
+	}
+}
+
 static PHP_INI_MH(OnUpdateZendTestObserveOplineInZendMM)
 {
 	if (new_value == NULL) {
@@ -687,10 +696,8 @@
 		);
 		ZT_G(zend_orig_heap) = zend_mm_get_heap();
 		zend_mm_set_heap(ZT_G(zend_test_heap));
-	} else if (ZT_G(zend_test_heap))  {
-		free(ZT_G(zend_test_heap));
-		ZT_G(zend_test_heap) = NULL;
-		zend_mm_set_heap(ZT_G(zend_orig_heap));
+	} else {
+		zend_test_reset_heap(ZEND_MODULE_GLOBALS_BULK(zend_test));
 	}
 	return OnUpdateBool(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);
 }
@@ -738,6 +745,72 @@
 #endif
 }
 
+#ifdef PHP_WIN32
+static ZEND_FUNCTION(zend_test_set_fmode)
+{
+	bool binary;
+	ZEND_PARSE_PARAMETERS_START(1, 1)
+		Z_PARAM_BOOL(binary)
+	ZEND_PARSE_PARAMETERS_END();
+
+	_fmode = binary ? _O_BINARY : _O_TEXT;
+}
+#endif
+
+static ZEND_FUNCTION(zend_test_cast_fread)
+{
+	zval *stream_zv;
+	php_stream *stream;
+	FILE *fp;
+
+	ZEND_PARSE_PARAMETERS_START(1, 1)
+		Z_PARAM_RESOURCE(stream_zv);
+	ZEND_PARSE_PARAMETERS_END();
+
+	php_stream_from_zval(stream, stream_zv);
+
+	if (php_stream_cast(stream, PHP_STREAM_AS_STDIO, (void *) &fp, REPORT_ERRORS) == FAILURE) {
+		return;
+	}
+
+	size_t size = 10240; /* Must be large enough to trigger the issue */
+	char *buf = malloc(size);
+	bool bail = false;
+	zend_try {
+		(void) !fread(buf, 1, size, fp);
+	} zend_catch {
+		bail = true;
+	} zend_end_try();
+
+	free(buf);
+
+	if (bail) {
+		zend_bailout();
+	}
+}
+
+static ZEND_FUNCTION(zend_test_is_zend_ptr)
+{
+	zend_long addr;
+
+	ZEND_PARSE_PARAMETERS_START(1, 1)
+		Z_PARAM_LONG(addr);
+	ZEND_PARSE_PARAMETERS_END();
+
+	RETURN_BOOL(is_zend_ptr((void*)addr));
+}
+
+static ZEND_FUNCTION(zend_test_log_err_debug)
+{
+	zend_string *str;
+
+	ZEND_PARSE_PARAMETERS_START(1, 1)
+		Z_PARAM_STR(str);
+	ZEND_PARSE_PARAMETERS_END();
+
+	php_log_err_with_severity(ZSTR_VAL(str), LOG_DEBUG);
+}
+
 static zend_object *zend_test_class_new(zend_class_entry *class_type)
 {
 	zend_object *obj = zend_objects_new(class_type);
@@ -758,7 +831,7 @@
 	    }
 	    memset(fptr, 0, sizeof(zend_internal_function));
 	    fptr->type = ZEND_INTERNAL_FUNCTION;
-	    fptr->num_args = 1;
+	    fptr->num_args = 0;
 	    fptr->scope = (*object)->ce;
 	    fptr->fn_flags = ZEND_ACC_CALL_VIA_HANDLER;
 	    fptr->function_name = zend_string_copy(name);
@@ -781,7 +854,7 @@
 		}
 		memset(fptr, 0, sizeof(zend_internal_function));
 		fptr->type = ZEND_INTERNAL_FUNCTION;
-		fptr->num_args = 1;
+		fptr->num_args = 0;
 		fptr->scope = ce;
 		fptr->fn_flags = ZEND_ACC_CALL_VIA_HANDLER|ZEND_ACC_STATIC;
 		fptr->function_name = zend_string_copy(name);
@@ -984,6 +1057,26 @@
 	RETURN_ARR(zend_new_pair(&name_zv, arguments));
 }
 
+static ZEND_METHOD(_ZendTestMagicCallForward, __call)
+{
+	zend_string *name;
+	zval *arguments;
+
+	ZEND_PARSE_PARAMETERS_START(2, 2)
+		Z_PARAM_STR(name)
+		Z_PARAM_ARRAY(arguments)
+	ZEND_PARSE_PARAMETERS_END();
+
+	ZEND_IGNORE_VALUE(arguments);
+
+	zval func, rv;
+	ZVAL_STR(&func, name);
+	call_user_function(NULL, NULL, &func, &rv, 0, NULL);
+
+	ZVAL_COPY_DEREF(return_value, &rv);
+	zval_ptr_dtor(&rv);
+}
+
 PHP_INI_BEGIN()
 	STD_PHP_INI_BOOLEAN("zend_test.replace_zend_execute_ex", "0", PHP_INI_SYSTEM, OnUpdateBool, replace_zend_execute_ex, zend_zend_test_globals, zend_test_globals)
 	STD_PHP_INI_BOOLEAN("zend_test.register_passes", "0", PHP_INI_SYSTEM, OnUpdateBool, register_passes, zend_zend_test_globals, zend_test_globals)
@@ -1170,6 +1263,8 @@
 
 	zend_test_magic_call = register_class__ZendTestMagicCall();
 
+	register_class__ZendTestMagicCallForward();
+
 	zend_register_functions(NULL, ext_function_legacy, NULL, EG(current_module)->type);
 
 	// Loading via dl() not supported with the observer API
@@ -1251,6 +1346,7 @@
 static PHP_GSHUTDOWN_FUNCTION(zend_test)
 {
 	zend_test_observer_gshutdown(zend_test_globals);
+	zend_test_reset_heap(zend_test_globals);
 }
 
 PHP_MINFO_FUNCTION(zend_test)
@@ -1361,6 +1457,41 @@
 
 PHP_ZEND_TEST_API int gh11934b_ffi_var_test_cdata;
 
+enum bug_gh16013_enum {
+	BUG_GH16013_A = 1,
+	BUG_GH16013_B = 2,
+};
+
+struct bug_gh16013_int_struct {
+	int field;
+};
+
+PHP_ZEND_TEST_API char bug_gh16013_return_char(void) {
+	return 'A';
+}
+
+PHP_ZEND_TEST_API bool bug_gh16013_return_bool(void) {
+	return true;
+}
+
+PHP_ZEND_TEST_API short bug_gh16013_return_short(void) {
+	return 12345;
+}
+
+PHP_ZEND_TEST_API int bug_gh16013_return_int(void) {
+	return 123456789;
+}
+
+PHP_ZEND_TEST_API enum bug_gh16013_enum bug_gh16013_return_enum(void) {
+	return BUG_GH16013_B;
+}
+
+PHP_ZEND_TEST_API struct bug_gh16013_int_struct bug_gh16013_return_struct(void) {
+	struct bug_gh16013_int_struct ret;
+	ret.field = 123456789;
+	return ret;
+}
+
 #ifdef HAVE_COPY_FILE_RANGE
 /**
  * This function allows us to simulate early return of copy_file_range by setting the limit_copy_file_range ini setting.

php-8.3.7.tar.xz/ext/zend_test/test.stub.php -> php-8.3.21.tar.xz/ext/zend_test/test.stub.php Changed

php-8.3.7.tar.xz/ext/zend_test/test_arginfo.h -> php-8.3.21.tar.xz/ext/zend_test/test_arginfo.h Changed

@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 39a14fb061199171b0a0a08b821dabcba516ccf5 */
+ * Stub hash: 9ddaf4d659226c55d49221c71702fa373d42695e */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_zend_test_array_return, 0, 0, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
@@ -144,6 +144,24 @@
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_zend_test_is_pcre_bundled, 0, 0, _IS_BOOL, 0)
 ZEND_END_ARG_INFO()
 
+#if defined(PHP_WIN32)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_zend_test_set_fmode, 0, 1, IS_VOID, 0)
+	ZEND_ARG_TYPE_INFO(0, binary, _IS_BOOL, 0)
+ZEND_END_ARG_INFO()
+#endif
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_zend_test_cast_fread, 0, 1, IS_VOID, 0)
+	ZEND_ARG_INFO(0, stream)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_zend_test_is_zend_ptr, 0, 1, _IS_BOOL, 0)
+	ZEND_ARG_TYPE_INFO(0, addr, IS_LONG, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_zend_test_log_err_debug, 0, 1, IS_VOID, 0)
+	ZEND_ARG_TYPE_INFO(0, str, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
 #define arginfo_ZendTestNS2_namespaced_func arginfo_zend_test_is_pcre_bundled
 
 #define arginfo_ZendTestNS2_namespaced_deprecated_func arginfo_zend_test_void_return
@@ -183,6 +201,8 @@
 	ZEND_ARG_TYPE_INFO(0, args, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
 
+#define arginfo_class__ZendTestMagicCallForward___call arginfo_class__ZendTestMagicCall___call
+
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class__ZendTestChildClass_returnsThrowable, 0, 0, Exception, 0)
 ZEND_END_ARG_INFO()
 
@@ -266,6 +286,12 @@
 static ZEND_FUNCTION(zend_test_override_libxml_global_state);
 #endif
 static ZEND_FUNCTION(zend_test_is_pcre_bundled);
+#if defined(PHP_WIN32)
+static ZEND_FUNCTION(zend_test_set_fmode);
+#endif
+static ZEND_FUNCTION(zend_test_cast_fread);
+static ZEND_FUNCTION(zend_test_is_zend_ptr);
+static ZEND_FUNCTION(zend_test_log_err_debug);
 static ZEND_FUNCTION(ZendTestNS2_namespaced_func);
 static ZEND_FUNCTION(ZendTestNS2_namespaced_deprecated_func);
 static ZEND_FUNCTION(ZendTestNS2_ZendSubNS_namespaced_func);
@@ -277,6 +303,7 @@
 static ZEND_METHOD(_ZendTestClass, variadicTest);
 static ZEND_METHOD(_ZendTestClass, takesUnionType);
 static ZEND_METHOD(_ZendTestMagicCall, __call);
+static ZEND_METHOD(_ZendTestMagicCallForward, __call);
 static ZEND_METHOD(_ZendTestChildClass, returnsThrowable);
 static ZEND_METHOD(ZendAttributeTest, testMethod);
 static ZEND_METHOD(_ZendTestTrait, testMethod);
@@ -339,6 +366,12 @@
 	ZEND_FE(zend_test_override_libxml_global_state, arginfo_zend_test_override_libxml_global_state)
 #endif
 	ZEND_FE(zend_test_is_pcre_bundled, arginfo_zend_test_is_pcre_bundled)
+#if defined(PHP_WIN32)
+	ZEND_FE(zend_test_set_fmode, arginfo_zend_test_set_fmode)
+#endif
+	ZEND_FE(zend_test_cast_fread, arginfo_zend_test_cast_fread)
+	ZEND_FE(zend_test_is_zend_ptr, arginfo_zend_test_is_zend_ptr)
+	ZEND_FE(zend_test_log_err_debug, arginfo_zend_test_log_err_debug)
 	ZEND_NS_FALIAS("ZendTestNS2", namespaced_func, ZendTestNS2_namespaced_func, arginfo_ZendTestNS2_namespaced_func)
 	ZEND_NS_DEP_FALIAS("ZendTestNS2", namespaced_deprecated_func, ZendTestNS2_namespaced_deprecated_func, arginfo_ZendTestNS2_namespaced_deprecated_func)
 	ZEND_NS_FALIAS("ZendTestNS2", namespaced_aliased_func, zend_test_void_return, arginfo_ZendTestNS2_namespaced_aliased_func)
@@ -373,6 +406,12 @@
 };
 
 
+static const zend_function_entry class__ZendTestMagicCallForward_methods = {
+	ZEND_ME(_ZendTestMagicCallForward, __call, arginfo_class__ZendTestMagicCallForward___call, ZEND_ACC_PUBLIC)
+	ZEND_FE_END
+};
+
+
 static const zend_function_entry class__ZendTestChildClass_methods = {
 	ZEND_ME(_ZendTestChildClass, returnsThrowable, arginfo_class__ZendTestChildClass_returnsThrowable, ZEND_ACC_PUBLIC)
 	ZEND_FE_END
@@ -628,6 +667,16 @@
 	return class_entry;
 }
 
+static zend_class_entry *register_class__ZendTestMagicCallForward(void)
+{
+	zend_class_entry ce, *class_entry;
+
+	INIT_CLASS_ENTRY(ce, "_ZendTestMagicCallForward", class__ZendTestMagicCallForward_methods);
+	class_entry = zend_register_internal_class_ex(&ce, NULL);
+
+	return class_entry;
+}
+
 static zend_class_entry *register_class__ZendTestChildClass(zend_class_entry *class_entry__ZendTestClass)
 {
 	zend_class_entry ce, *class_entry;

php-8.3.21.tar.xz/ext/zend_test/tests/gh11078.phpt Added

php-8.3.21.tar.xz/ext/zend_test/tests/gh13970.phpt Added

php-8.3.21.tar.xz/ext/zend_test/tests/gh14109.phpt Added

php-8.3.21.tar.xz/ext/zend_test/tests/gh14741.phpt Added

php-8.3.21.tar.xz/ext/zend_test/tests/gh16230.phpt Added

php-8.3.21.tar.xz/ext/zend_test/tests/gh16233.phpt Added

php-8.3.21.tar.xz/ext/zend_test/tests/gh16266.phpt Added

php-8.3.21.tar.xz/ext/zend_test/tests/gh16294.phpt Added

php-8.3.21.tar.xz/ext/zend_test/tests/gh16388.phpt Added

php-8.3.21.tar.xz/ext/zend_test/tests/gh16514.phpt Added

php-8.3.21.tar.xz/ext/zend_test/tests/gh16908.phpt Added

php-8.3.21.tar.xz/ext/zend_test/tests/gh17408.phpt Added

php-8.3.21.tar.xz/ext/zend_test/tests/gh17797.phpt Added

php-8.3.21.tar.xz/ext/zend_test/tests/gh17899.phpt Added

php-8.3.7.tar.xz/ext/zend_test/tests/observer_error_04.phpt -> php-8.3.21.tar.xz/ext/zend_test/tests/observer_error_04.phpt Changed

php-8.3.7.tar.xz/ext/zend_test/tests/observer_fiber_functions_03.phpt -> php-8.3.21.tar.xz/ext/zend_test/tests/observer_fiber_functions_03.phpt Changed

php-8.3.7.tar.xz/ext/zip/php_zip.c -> php-8.3.21.tar.xz/ext/zip/php_zip.c Changed

@@ -354,13 +354,13 @@
 #endif
 } zip_options;
 
+/* Expects opts to be zero-initialized. */
 static int php_zip_parse_options(HashTable *options, zip_options *opts)
 /* {{{ */
 {
 	zval *option;
 
 	/* default values */
-	memset(opts, 0, sizeof(zip_options));
 	opts->flags = ZIP_FL_OVERWRITE;
 	opts->comp_method = -1; /* -1 to not change default */
 #ifdef HAVE_ENCRYPTION
@@ -898,6 +898,8 @@
 
 	if (hnd == NULL) {
 		retval = zend_std_get_property_ptr_ptr(object, name, type, cache_slot);
+	} else if (cache_slot) {
+		cache_slot0 = cache_slot1 = cache_slot2 = NULL;
 	}
 
 	return retval;
@@ -1255,6 +1257,7 @@
 			RETURN_FALSE;
 		}
 
+		zr_rsrc->zip_rsrc_handle = Z_RES_P(zip_dp)->handle;
 		zr_rsrc->zf = zip_fopen_index(rsrc_int->za, rsrc_int->index_current, 0);
 		if (zr_rsrc->zf) {
 			rsrc_int->index_current++;
@@ -1371,7 +1374,7 @@
 		RETURN_THROWS();
 	}
 
-	if (!zr_rsrc->zf) {
+	if (!zr_rsrc->zf || !zend_hash_index_exists(&EG(regular_list), zr_rsrc->zip_rsrc_handle)) {
 		RETURN_FALSE;
 	}
 
@@ -1729,7 +1732,7 @@
 	size_t  path_len = 1;
 	zend_long glob_flags = 0;
 	HashTable *options = NULL;
-	zip_options opts;
+	zip_options opts = {0};
 	int found;
 	zend_string *pattern;
 
@@ -1793,6 +1796,9 @@
 
 				if (opts.add_path) {
 					if ((opts.add_path_len + file_stripped_len) > MAXPATHLEN) {
+						if (basename) {
+							zend_string_release_ex(basename, 0);
+						}
 						php_error_docref(NULL, E_WARNING, "Entry name too long (max: %d, %zd given)",
 						MAXPATHLEN - 1, (opts.add_path_len + file_stripped_len));
 						zend_array_destroy(Z_ARR_P(return_value));

php-8.3.7.tar.xz/ext/zip/php_zip.h -> php-8.3.21.tar.xz/ext/zip/php_zip.h Changed

php-8.3.21.tar.xz/ext/zip/tests/addGlob_empty_options.phpt Added

php-8.3.21.tar.xz/ext/zip/tests/addGlob_too_long_add_path_option.phpt Added

php-8.3.21.tar.xz/ext/zip/tests/gh17319.phpt Added

php-8.3.21.tar.xz/ext/zlib/tests/gh16326.phpt Added

php-8.3.21.tar.xz/ext/zlib/tests/gh17745.phpt Added

php-8.3.7.tar.xz/ext/zlib/tests/gzfile_basic2.phpt -> php-8.3.21.tar.xz/ext/zlib/tests/gzfile_basic2.phpt Changed

php-8.3.21.tar.xz/ext/zlib/tests/leak_invalid_encoding_with_dict.phpt Added

php-8.3.7.tar.xz/ext/zlib/zlib.c -> php-8.3.21.tar.xz/ext/zlib/zlib.c Changed

@@ -790,6 +790,7 @@
 	zval *option_buffer;
 
 	if (options && (option_buffer = zend_hash_str_find(options, ZEND_STRL("dictionary"))) != NULL) {
+		ZVAL_DEINDIRECT(option_buffer);
 		ZVAL_DEREF(option_buffer);
 		switch (Z_TYPE_P(option_buffer)) {
 			case IS_STRING: {
@@ -805,35 +806,29 @@
 				if (zend_hash_num_elements(dictionary) > 0) {
 					char *dictptr;
 					zval *cur;
-					zend_string **strings = emalloc(sizeof(zend_string *) * zend_hash_num_elements(dictionary));
+					zend_string **strings = safe_emalloc(zend_hash_num_elements(dictionary), sizeof(zend_string *), 0);
 					zend_string **end, **ptr = strings - 1;
 
 					ZEND_HASH_FOREACH_VAL(dictionary, cur) {
-						size_t i;
-
 						*++ptr = zval_get_string(cur);
-						if (!*ptr || ZSTR_LEN(*ptr) == 0 || EG(exception)) {
-							if (*ptr) {
-								efree(*ptr);
-							}
-							while (--ptr >= strings) {
-								efree(ptr);
-							}
+						ZEND_ASSERT(*ptr);
+						if (ZSTR_LEN(*ptr) == 0 || EG(exception)) {
+							do {
+								zend_string_release(*ptr);
+							} while (--ptr >= strings);
 							efree(strings);
 							if (!EG(exception)) {
 								zend_argument_value_error(2, "must not contain empty strings");
 							}
 							return 0;
 						}
-						for (i = 0; i < ZSTR_LEN(*ptr); i++) {
-							if (ZSTR_VAL(*ptr)i == 0) {
-								do {
-									efree(ptr);
-								} while (--ptr >= strings);
-								efree(strings);
-								zend_argument_value_error(2, "must not contain strings with null bytes");
-								return 0;
-							}
+						if (zend_str_has_nul_byte(*ptr)) {
+							do {
+								zend_string_release(*ptr);
+							} while (--ptr >= strings);
+							efree(strings);
+							zend_argument_value_error(2, "must not contain strings with null bytes");
+							return 0;
 						}
 
 						*dictlen += ZSTR_LEN(*ptr) + 1;
@@ -876,6 +871,7 @@
 	}
 
 	if (options && (option_buffer = zend_hash_str_find(options, ZEND_STRL("window"))) != NULL) {
+		ZVAL_DEINDIRECT(option_buffer);
 		window = zval_get_long(option_buffer);
 	}
 	if (window < 8 || window > 15) {
@@ -883,10 +879,6 @@
 		RETURN_THROWS();
 	}
 
-	if (!zlib_create_dictionary_string(options, &dict, &dictlen)) {
-		RETURN_THROWS();
-	}
-
 	switch (encoding) {
 		case PHP_ZLIB_ENCODING_RAW:
 		case PHP_ZLIB_ENCODING_GZIP:
@@ -897,6 +889,10 @@
 			RETURN_THROWS();
 	}
 
+	if (!zlib_create_dictionary_string(options, &dict, &dictlen)) {
+		RETURN_THROWS();
+	}
+
 	object_init_ex(return_value, inflate_context_ce);
 	ctx = Z_INFLATE_CONTEXT_P(return_value);
 
@@ -1094,6 +1090,7 @@
 	}
 
 	if (options && (option_buffer = zend_hash_str_find(options, ZEND_STRL("level"))) != NULL) {
+		ZVAL_DEINDIRECT(option_buffer);
 		level = zval_get_long(option_buffer);
 	}
 	if (level < -1 || level > 9) {
@@ -1102,6 +1099,7 @@
 	}
 
 	if (options && (option_buffer = zend_hash_str_find(options, ZEND_STRL("memory"))) != NULL) {
+		ZVAL_DEINDIRECT(option_buffer);
 		memory = zval_get_long(option_buffer);
 	}
 	if (memory < 1 || memory > 9) {
@@ -1110,6 +1108,7 @@
 	}
 
 	if (options && (option_buffer = zend_hash_str_find(options, ZEND_STRL("window"))) != NULL) {
+		ZVAL_DEINDIRECT(option_buffer);
 		window = zval_get_long(option_buffer);
 	}
 	if (window < 8 || window > 15) {
@@ -1118,6 +1117,7 @@
 	}
 
 	if (options && (option_buffer = zend_hash_str_find(options, ZEND_STRL("strategy"))) != NULL) {
+		ZVAL_DEINDIRECT(option_buffer);
 		strategy = zval_get_long(option_buffer);
 	}
 	switch (strategy) {
@@ -1132,10 +1132,6 @@
 			RETURN_THROWS();
 	}
 
-	if (!zlib_create_dictionary_string(options, &dict, &dictlen)) {
-		RETURN_THROWS();
-	}
-
 	switch (encoding) {
 		case PHP_ZLIB_ENCODING_RAW:
 		case PHP_ZLIB_ENCODING_GZIP:
@@ -1146,6 +1142,10 @@
 			RETURN_THROWS();
 	}
 
+	if (!zlib_create_dictionary_string(options, &dict, &dictlen)) {
+		RETURN_THROWS();
+	}
+
 	object_init_ex(return_value, deflate_context_ce);
 	ctx = Z_DEFLATE_CONTEXT_P(return_value);

php-8.3.7.tar.xz/ext/zlib/zlib.stub.php -> php-8.3.21.tar.xz/ext/zlib/zlib.stub.php Changed

php-8.3.7.tar.xz/ext/zlib/zlib_arginfo.h -> php-8.3.21.tar.xz/ext/zlib/zlib_arginfo.h Changed

@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 3660ad3239f93c84b6909c36ddfcc92dd0773c70 */
+ * Stub hash: a86ccc292b5312e740a9d798bfcaf014513d5cce */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_ob_gzhandler, 0, 2, MAY_BE_STRING|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, data, IS_STRING, 0)
@@ -106,7 +106,7 @@
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_deflate_init, 0, 1, DeflateContext, MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, encoding, IS_LONG, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_ARRAY, 0, "")
+	ZEND_ARG_TYPE_MASK(0, options, MAY_BE_ARRAY|MAY_BE_OBJECT, "")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_deflate_add, 0, 2, MAY_BE_STRING|MAY_BE_FALSE)
@@ -117,7 +117,7 @@
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_inflate_init, 0, 1, InflateContext, MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, encoding, IS_LONG, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_ARRAY, 0, "")
+	ZEND_ARG_TYPE_MASK(0, options, MAY_BE_ARRAY|MAY_BE_OBJECT, "")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_inflate_add, 0, 2, MAY_BE_STRING|MAY_BE_FALSE)

php-8.3.7.tar.xz/ext/zlib/zlib_fopen_wrapper.c -> php-8.3.21.tar.xz/ext/zlib/zlib_fopen_wrapper.c Changed

@@ -33,24 +33,55 @@
 static ssize_t php_gziop_read(php_stream *stream, char *buf, size_t count)
 {
 	struct php_gz_stream_data_t *self = (struct php_gz_stream_data_t *) stream->abstract;
-	int read;
+	ssize_t total_read = 0;
+
+	/* Despite the count argument of gzread() being "unsigned int",
+	 * the return value is "int". Error returns are values < 0, otherwise the count is returned.
+	 * To properly distinguish error values from success value, we therefore need to cap at INT_MAX.
+	 */
+	do {
+		unsigned int chunk_size = MIN(count, INT_MAX);
+		int read = gzread(self->gz_file, buf, chunk_size);
+		count -= chunk_size;
+
+		if (gzeof(self->gz_file)) {
+			stream->eof = 1;
+		}
 
-	/* XXX this needs to be looped for the case count > UINT_MAX */
-	read = gzread(self->gz_file, buf, count);
+		if (UNEXPECTED(read < 0)) {
+			return read;
+		}
 
-	if (gzeof(self->gz_file)) {
-		stream->eof = 1;
-	}
+		total_read += read;
+		buf += read;
+	} while (count > 0 && !stream->eof);
 
-	return read;
+	return total_read;
 }
 
 static ssize_t php_gziop_write(php_stream *stream, const char *buf, size_t count)
 {
 	struct php_gz_stream_data_t *self = (struct php_gz_stream_data_t *) stream->abstract;
+	ssize_t total_written = 0;
+
+	/* Despite the count argument of gzread() being "unsigned int",
+	 * the return value is "int". Error returns are values < 0, otherwise the count is returned.
+	 * To properly distinguish error values from success value, we therefore need to cap at INT_MAX.
+	 */
+	do {
+		unsigned int chunk_size = MIN(count, INT_MAX);
+		int written = gzwrite(self->gz_file, buf, chunk_size);
+		count -= chunk_size;
+
+		if (UNEXPECTED(written < 0)) {
+			return written;
+		}
+
+		total_written += written;
+		buf += written;
+	} while (count > 0);
 
-	/* XXX this needs to be looped for the case count > UINT_MAX */
-	return gzwrite(self->gz_file, (char *) buf, count);
+    return total_written;
 }
 
 static int php_gziop_seek(php_stream *stream, zend_off_t offset, int whence, zend_off_t *newoffs)

php-8.3.7.tar.xz/main/SAPI.c -> php-8.3.21.tar.xz/main/SAPI.c Changed

php-8.3.7.tar.xz/main/fastcgi.c -> php-8.3.21.tar.xz/main/fastcgi.c Changed

php-8.3.7.tar.xz/main/fopen_wrappers.c -> php-8.3.21.tar.xz/main/fopen_wrappers.c Changed

@@ -374,26 +374,38 @@
 
 		if (s) {			/* if there is no path name after the file, do not bother */
 			char user32;			/* to try open the directory */
+
+			length = s - (path_info + 2);
+			if (length > sizeof(user) - 1) {
+				length = sizeof(user) - 1;
+			}
+			memcpy(user, path_info + 2, length);
+			userlength = '\0';
+
 			struct passwd *pw;
 #if defined(ZTS) && defined(HAVE_GETPWNAM_R) && defined(_SC_GETPW_R_SIZE_MAX)
 			struct passwd pwstruc;
 			long pwbuflen = sysconf(_SC_GETPW_R_SIZE_MAX);
 			char *pwbuf;
+			int err;
 
 			if (pwbuflen < 1) {
-				return FAILURE;
+				pwbuflen = 1024;
 			}
-
+# if ZEND_DEBUG
+			/* Test retry logic */
+			pwbuflen = 1;
+# endif
 			pwbuf = emalloc(pwbuflen);
-#endif
-			length = s - (path_info + 2);
-			if (length > sizeof(user) - 1) {
-				length = sizeof(user) - 1;
-			}
-			memcpy(user, path_info + 2, length);
-			userlength = '\0';
-#if defined(ZTS) && defined(HAVE_GETPWNAM_R) && defined(_SC_GETPW_R_SIZE_MAX)
-			if (getpwnam_r(user, &pwstruc, pwbuf, pwbuflen, &pw)) {
+
+try_again:
+			err = getpwnam_r(user, &pwstruc, pwbuf, pwbuflen, &pw);
+			if (err) {
+				if (err == ERANGE) {
+					pwbuflen *= 2;
+					pwbuf = erealloc(pwbuf, pwbuflen);
+					goto try_again;
+				}
 				efree(pwbuf);
 				return FAILURE;
 			}
@@ -591,7 +603,13 @@
 		const char *exec_fname = ZSTR_VAL(exec_filename);
 		size_t exec_fname_length = ZSTR_LEN(exec_filename);
 
-		while ((--exec_fname_length < SIZE_MAX) && !IS_SLASH(exec_fnameexec_fname_length));
+		while (exec_fname_length > 0) {
+			--exec_fname_length;
+			if (IS_SLASH(exec_fnameexec_fname_length)) {
+				break;
+			}
+		}
+
 		if (exec_fname_length > 0 &&
 			filename_length < (MAXPATHLEN - 2) &&
 		    exec_fname_length + 1 + filename_length + 1 < MAXPATHLEN) {

php-8.3.7.tar.xz/main/main.c -> php-8.3.21.tar.xz/main/main.c Changed

@@ -1471,12 +1471,25 @@
 		struct passwd *retpwptr = NULL;
 		int pwbuflen = sysconf(_SC_GETPW_R_SIZE_MAX);
 		char *pwbuf;
+		int err;
 
 		if (pwbuflen < 1) {
-			return "";
+			pwbuflen = 1024;
 		}
+# if ZEND_DEBUG
+		/* Test retry logic */
+		pwbuflen = 1;
+# endif
 		pwbuf = emalloc(pwbuflen);
-		if (getpwuid_r(pstat->st_uid, &_pw, pwbuf, pwbuflen, &retpwptr) != 0) {
+
+try_again:
+		err = getpwuid_r(pstat->st_uid, &_pw, pwbuf, pwbuflen, &retpwptr);
+		if (err != 0) {
+			if (err == ERANGE) {
+				pwbuflen *= 2;
+				pwbuf = erealloc(pwbuf, pwbuflen);
+				goto try_again;
+			}
 			efree(pwbuf);
 			return "";
 		}
@@ -2065,8 +2078,9 @@
 		_set_invalid_parameter_handler(old_invalid_parameter_handler);
 	}
 
-	/* Disable the message box for assertions.*/
+	/* Disable the message box for assertions and errors.*/
 	_CrtSetReportMode(_CRT_ASSERT, 0);
+	_CrtSetReportMode(_CRT_ERROR, 0);
 #endif
 
 #ifdef ZTS
@@ -2609,7 +2623,9 @@
 			if (pass) {
 				*pass++ = '\0';
 				SG(request_info).auth_user = estrndup(ZSTR_VAL(user), ZSTR_LEN(user));
-				SG(request_info).auth_password = estrdup(pass);
+				if (strlen(pass) > 0) {
+					SG(request_info).auth_password = estrdup(pass);
+				}
 				ret = 0;
 			}
 			zend_string_free(user);

php-8.3.7.tar.xz/main/network.c -> php-8.3.21.tar.xz/main/network.c Changed

@@ -118,7 +118,9 @@
 		{EAI_NONAME, "Name or service not known"},
 		{EAI_SERVICE, "Servname not supported for ai_socktype"},
 		{EAI_SOCKTYPE, "ai_socktype not supported"},
+#  ifdef EAI_SYSTEM
 		{EAI_SYSTEM, "System error"},
+#  endif
 		{0, NULL}
 	};
 	int i;
@@ -297,6 +299,35 @@
 	 fcntl(sock, F_SETFL, save)
 #endif
 
+#if HAVE_GETTIMEOFDAY
+/* Subtract times */
+static inline void sub_times(struct timeval a, struct timeval b, struct timeval *result)
+{
+	result->tv_usec = a.tv_usec - b.tv_usec;
+	if (result->tv_usec < 0L) {
+		a.tv_sec--;
+		result->tv_usec += 1000000L;
+	}
+	result->tv_sec = a.tv_sec - b.tv_sec;
+	if (result->tv_sec < 0L) {
+		result->tv_sec++;
+		result->tv_usec -= 1000000L;
+	}
+}
+
+static inline void php_network_set_limit_time(struct timeval *limit_time,
+		struct timeval *timeout)
+{
+	gettimeofday(limit_time, NULL);
+	limit_time->tv_sec += timeout->tv_sec;
+	limit_time->tv_usec += timeout->tv_usec;
+	if (limit_time->tv_usec >= 1000000) {
+		limit_time->tv_usec -= 1000000;
+		limit_time->tv_sec++;
+	}
+}
+#endif
+
 /* Connect to a socket using an interruptible connect with optional timeout.
  * Optionally, the connect can be made asynchronously, which will implicitly
  * enable non-blocking mode on the socket.
@@ -349,25 +380,53 @@
 	 * expected when a connection is actively refused. This way,
 	 * php_pollfd_for will return a mask with POLLOUT if the connection
 	 * is successful and with POLLPRI otherwise. */
-	if ((n = php_pollfd_for(sockfd, POLLOUT|POLLPRI, timeout)) == 0) {
+	int events = POLLOUT|POLLPRI;
 #else
-	if ((n = php_pollfd_for(sockfd, PHP_POLLREADABLE|POLLOUT, timeout)) == 0) {
+	int events = PHP_POLLREADABLE|POLLOUT;
+#endif
+	struct timeval working_timeout;
+#if HAVE_GETTIMEOFDAY
+	struct timeval limit_time, time_now;
+#endif
+	if (timeout) {
+		memcpy(&working_timeout, timeout, sizeof(working_timeout));
+#if HAVE_GETTIMEOFDAY
+		php_network_set_limit_time(&limit_time, &working_timeout);
 #endif
-		error = PHP_TIMEOUT_ERROR_VALUE;
 	}
 
-	if (n > 0) {
-		len = sizeof(error);
-		/*
-		   BSD-derived systems set errno correctly
-		   Solaris returns -1 from getsockopt in case of error
-		   */
-		if (getsockopt(sockfd, SOL_SOCKET, SO_ERROR, (char*)&error, &len) != 0) {
+	while (true) {
+		n = php_pollfd_for(sockfd, events, timeout ? &working_timeout : NULL);
+		if (n < 0) {
+			if (errno == EINTR) {
+#if HAVE_GETTIMEOFDAY
+				if (timeout) {
+					gettimeofday(&time_now, NULL);
+
+					if (!timercmp(&time_now, &limit_time, <)) {
+						/* time limit expired; no need for another poll */
+						error = PHP_TIMEOUT_ERROR_VALUE;
+						break;
+					} else {
+						/* work out remaining time */
+						sub_times(limit_time, time_now, &working_timeout);
+					}
+				}
+#endif
+				continue;
+			}
 			ret = -1;
+		} else if (n == 0) {
+			error = PHP_TIMEOUT_ERROR_VALUE;
+		} else {
+			len = sizeof(error);
+			/* BSD-derived systems set errno correctly.
+			 * Solaris returns -1 from getsockopt in case of error. */
+			if (getsockopt(sockfd, SOL_SOCKET, SO_ERROR, (char*)&error, &len) != 0) {
+				ret = -1;
+			}
 		}
-	} else {
-		/* whoops: sockfd has disappeared */
-		ret = -1;
+		break;
 	}
 
 ok:
@@ -390,22 +449,6 @@
 }
 /* }}} */
 
-/* {{{ sub_times */
-static inline void sub_times(struct timeval a, struct timeval b, struct timeval *result)
-{
-	result->tv_usec = a.tv_usec - b.tv_usec;
-	if (result->tv_usec < 0L) {
-		a.tv_sec--;
-		result->tv_usec += 1000000L;
-	}
-	result->tv_sec = a.tv_sec - b.tv_sec;
-	if (result->tv_sec < 0L) {
-		result->tv_sec++;
-		result->tv_usec -= 1000000L;
-	}
-}
-/* }}} */
-
 /* Bind to a local IP address.
  * Returns the bound socket, or -1 on failure.
  * */
@@ -775,7 +818,6 @@
 }
 /* }}} */
 
-
 /* Connect to a remote host using an interruptible connect with optional timeout.
  * Optionally, the connect can be made asynchronously, which will implicitly
  * enable non-blocking mode on the socket.
@@ -807,13 +849,7 @@
 	if (timeout) {
 		memcpy(&working_timeout, timeout, sizeof(working_timeout));
 #if HAVE_GETTIMEOFDAY
-		gettimeofday(&limit_time, NULL);
-		limit_time.tv_sec += working_timeout.tv_sec;
-		limit_time.tv_usec += working_timeout.tv_usec;
-		if (limit_time.tv_usec >= 1000000) {
-			limit_time.tv_usec -= 1000000;
-			limit_time.tv_sec++;
-		}
+		php_network_set_limit_time(&limit_time, &working_timeout);
 #endif
 	}
 
@@ -861,7 +897,7 @@
 #if HAVE_IPV6 && HAVE_INET_PTON
 				struct sockaddr_in6 in6;
 #endif
-			} local_address;
+			} local_address = {0};
 			int local_address_len = 0;
 
 			if (sa->sa_family == AF_INET) {
@@ -873,7 +909,6 @@
 					local_address_len = sizeof(struct sockaddr_in);
 					local_address.in4.sin_family = sa->sa_family;
 					local_address.in4.sin_port = htons(bindport);
-					memset(&(local_address.in4.sin_zero), 0, sizeof(local_address.in4.sin_zero));
 				}
 			}
 #if HAVE_IPV6 && HAVE_INET_PTON

php-8.3.7.tar.xz/main/output.c -> php-8.3.21.tar.xz/main/output.c Changed

php-8.3.7.tar.xz/main/php_config.h.in -> php-8.3.21.tar.xz/main/php_config.h.in Changed

@@ -336,13 +336,13 @@
 /* */
 #undef GDBM_INCLUDE_FILE
 
-/* Define to 1 if 'TIOCGWINSZ' requires <sys/ioctl.h>. */
+/* Define to 1 if `TIOCGWINSZ' requires <sys/ioctl.h>. */
 #undef GWINSZ_IN_SYS_IOCTL
 
 /* Whether 3 arg set_rebind_proc() */
 #undef HAVE_3ARG_SETREBINDPROC
 
-/* Define when aarch64 CRC32 API is available. */
+/* Define to 1 when aarch64 CRC32 API is available. */
 #undef HAVE_AARCH64_CRC32
 
 /* */
@@ -366,7 +366,7 @@
 /* Define to 1 if <alloca.h> works. */
 #undef HAVE_ALLOCA_H
 
-/* Define to 1 if you have the 'alphasort' function. */
+/* Define to 1 if you have the `alphasort' function. */
 #undef HAVE_ALPHASORT
 
 /* AppArmor confinement available */
@@ -381,16 +381,16 @@
 /* Define to 1 if you have the <arpa/nameser.h> header file. */
 #undef HAVE_ARPA_NAMESER_H
 
-/* Define to 1 if you have the 'asctime_r' function. */
+/* Define to 1 if you have the `asctime_r' function. */
 #undef HAVE_ASCTIME_R
 
 /* Define if asm goto support */
 #undef HAVE_ASM_GOTO
 
-/* Define to 1 if you have the 'asprintf' function. */
+/* Define to 1 if you have the `asprintf' function. */
 #undef HAVE_ASPRINTF
 
-/* Define to 1 if you have the 'atoll' function. */
+/* Define to 1 if you have the `atoll' function. */
 #undef HAVE_ATOLL
 
 /* whether the compiler supports __attribute__ ((__aligned__)) */
@@ -429,10 +429,10 @@
 /* Capstone is available */
 #undef HAVE_CAPSTONE
 
-/* Define to 1 if you have the 'chroot' function. */
+/* Define to 1 if you have the `chroot' function. */
 #undef HAVE_CHROOT
 
-/* Define to 1 if you have the 'clearenv' function. */
+/* Define to 1 if you have the `clearenv' function. */
 #undef HAVE_CLEARENV
 
 /* */
@@ -471,7 +471,7 @@
 /* Define to 1 if you have the <cpuid.h> header file. */
 #undef HAVE_CPUID_H
 
-/* Define to 1 if you have the 'CreateProcess' function. */
+/* Define to 1 if you have the `CreateProcess' function. */
 #undef HAVE_CREATEPROCESS
 
 /* */
@@ -483,10 +483,10 @@
 /* */
 #undef HAVE_CRYPT_R
 
-/* Define to 1 if you have the 'ctermid' function. */
+/* Define to 1 if you have the `ctermid' function. */
 #undef HAVE_CTERMID
 
-/* Define to 1 if you have the 'ctime_r' function. */
+/* Define to 1 if you have the `ctime_r' function. */
 #undef HAVE_CTIME_R
 
 /* */
@@ -507,15 +507,15 @@
 /* */
 #undef HAVE_DCNGETTEXT
 
-/* Define to 1 if you have the declaration of 'arc4random_buf', and to 0 if
+/* Define to 1 if you have the declaration of `arc4random_buf', and to 0 if
    you don't. */
 #undef HAVE_DECL_ARC4RANDOM_BUF
 
-/* Define to 1 if you have the declaration of 'strerror_r', and to 0 if you
+/* Define to 1 if you have the declaration of `strerror_r', and to 0 if you
    don't. */
 #undef HAVE_DECL_STRERROR_R
 
-/* Define to 1 if you have the declaration of 'tzname', and to 0 if you don't.
+/* Define to 1 if you have the declaration of `tzname', and to 0 if you don't.
    */
 #undef HAVE_DECL_TZNAME
 
@@ -558,7 +558,7 @@
 /* Whether to enable DTrace support */
 #undef HAVE_DTRACE
 
-/* Define to 1 if you have the 'eaccess' function. */
+/* Define to 1 if you have the `eaccess' function. */
 #undef HAVE_EACCESS
 
 /* */
@@ -585,19 +585,19 @@
 /* Whether you want EXIF (metadata from images) support */
 #undef HAVE_EXIF
 
-/* Define to 1 if you have the 'explicit_bzero' function. */
+/* Define to 1 if you have the `explicit_bzero' function. */
 #undef HAVE_EXPLICIT_BZERO
 
-/* Define to 1 if you have the 'explicit_memset' function. */
+/* Define to 1 if you have the `explicit_memset' function. */
 #undef HAVE_EXPLICIT_MEMSET
 
-/* Define to 1 if you have the 'fabsf' function. */
+/* Define to 1 if you have the `fabsf' function. */
 #undef HAVE_FABSF
 
 /* Define to 1 if you have the <fcntl.h> header file. */
 #undef HAVE_FCNTL_H
 
-/* Define to 1 if you have the 'fdatasync' function. */
+/* Define to 1 if you have the `fdatasync' function. */
 #undef HAVE_FDATASYNC
 
 /* Have ffi support */
@@ -624,28 +624,28 @@
 /* Whether libffi supports thiscall calling convention */
 #undef HAVE_FFI_THISCALL
 
-/* Define to 1 if you have the 'flock' function. */
+/* Define to 1 if you have the `flock' function. */
 #undef HAVE_FLOCK
 
-/* Define to 1 if you have the 'floorf' function. */
+/* Define to 1 if you have the `floorf' function. */
 #undef HAVE_FLOORF
 
 /* Define if flush should be called explicitly after a buffered io. */
 #undef HAVE_FLUSHIO
 
-/* Define to 1 if your system has a working POSIX 'fnmatch' function. */
+/* Define to 1 if your system has a working POSIX `fnmatch' function. */
 #undef HAVE_FNMATCH
 
 /* */
 #undef HAVE_FOPENCOOKIE
 
-/* Define to 1 if you have the 'fork' function. */
+/* Define to 1 if you have the `fork' function. */
 #undef HAVE_FORK
 
-/* Define to 1 if you have the 'forkx' function. */
+/* Define to 1 if you have the `forkx' function. */
 #undef HAVE_FORKX
 
-/* Define to 1 if you have the 'fpathconf' function. */
+/* Define to 1 if you have the `fpathconf' function. */
 #undef HAVE_FPATHCONF
 
 /* do we have acl support? */
@@ -657,7 +657,7 @@
 /* whether FPU control word can be manipulated by inline assembler */
 #undef HAVE_FPU_INLINE_ASM_X86
 
-/* Define to 1 if you have the 'ftok' function. */
+/* Define to 1 if you have the `ftok' function. */
 #undef HAVE_FTOK
 
 /* Whether you want FTP support */
@@ -681,10 +681,10 @@
 /* Define to 1 if you have the six-argument form of gethostbyname_r(). */
 #undef HAVE_FUNC_GETHOSTBYNAME_R_6
 
-/* Define to 1 if you have the 'funopen' function. */
+/* Define to 1 if you have the `funopen' function. */
 #undef HAVE_FUNOPEN
 
-/* Define to 1 if you have the 'gai_strerror' function. */
+/* Define to 1 if you have the `gai_strerror' function. */
 #undef HAVE_GAI_STRERROR
 
 /* Define if the target system has support for global register variables */
@@ -729,16 +729,16 @@
 /* Define if you have the getaddrinfo function */
 #undef HAVE_GETADDRINFO
 
-/* Define to 1 if you have the 'getcwd' function. */
+/* Define to 1 if you have the `getcwd' function. */
 #undef HAVE_GETCWD
 
-/* Define to 1 if you have the 'getgrgid_r' function. */
+/* Define to 1 if you have the `getgrgid_r' function. */
 #undef HAVE_GETGRGID_R
 
-/* Define to 1 if you have the 'getgrnam_r' function. */
+/* Define to 1 if you have the `getgrnam_r' function. */
 #undef HAVE_GETGRNAM_R
 
-/* Define to 1 if you have the 'getgroups' function. */
+/* Define to 1 if you have the `getgroups' function. */
 #undef HAVE_GETGROUPS
 
 /* */
@@ -753,70 +753,73 @@
 /* whether getifaddrs is present and usable */
 #undef HAVE_GETIFADDRS
 
-/* Define to 1 if you have the 'getloadavg' function. */
+/* Define to 1 if you have the `getloadavg' function. */
 #undef HAVE_GETLOADAVG
 
-/* Define to 1 if you have the 'getlogin' function. */
+/* Define to 1 if you have the `getlogin' function. */
 #undef HAVE_GETLOGIN
 
-/* Define to 1 if you have the 'getopt' function. */
+/* Define to 1 if you have the `getopt' function. */
 #undef HAVE_GETOPT
 
-/* Define to 1 if you have the 'getpgid' function. */
+/* Define to 1 if you have the `getpgid' function. */
 #undef HAVE_GETPGID
 
-/* Define to 1 if you have the 'getpid' function. */
+/* Define to 1 if you have the `getpid' function. */
 #undef HAVE_GETPID
 
-/* Define to 1 if you have the 'getpriority' function. */
+/* Define to 1 if you have the `getpriority' function. */
 #undef HAVE_GETPRIORITY
 
-/* Define to 1 if you have the 'getprotobyname' function. */
+/* Define to 1 if you have the `getprotobyname' function. */
 #undef HAVE_GETPROTOBYNAME
 
-/* Define to 1 if you have the 'getprotobynumber' function. */
+/* Define to 1 if you have the `getprotobynumber' function. */
 #undef HAVE_GETPROTOBYNUMBER
 
-/* Define to 1 if you have the 'getpwnam_r' function. */
+/* Define to 1 if you have the `getpwnam_r' function. */
 #undef HAVE_GETPWNAM_R
 
-/* Define to 1 if you have the 'getpwuid_r' function. */
+/* Define to 1 if you have the `getpwuid_r' function. */
 #undef HAVE_GETPWUID_R
 
-/* Define to 1 if you have the 'getrlimit' function. */
+/* Define to 1 if you have the `getrandom' function. */
+#undef HAVE_GETRANDOM
+
+/* Define to 1 if you have the `getrlimit' function. */
 #undef HAVE_GETRLIMIT
 
-/* Define to 1 if you have the 'getrusage' function. */
+/* Define to 1 if you have the `getrusage' function. */
 #undef HAVE_GETRUSAGE
 
-/* Define to 1 if you have the 'getservbyname' function. */
+/* Define to 1 if you have the `getservbyname' function. */
 #undef HAVE_GETSERVBYNAME
 
-/* Define to 1 if you have the 'getservbyport' function. */
+/* Define to 1 if you have the `getservbyport' function. */
 #undef HAVE_GETSERVBYPORT
 
-/* Define to 1 if you have the 'getsid' function. */
+/* Define to 1 if you have the `getsid' function. */
 #undef HAVE_GETSID
 
-/* Define to 1 if you have the 'gettid' function. */
+/* Define to 1 if you have the `gettid' function. */
 #undef HAVE_GETTID
 
-/* Define to 1 if you have the 'gettimeofday' function. */
+/* Define to 1 if you have the `gettimeofday' function. */
 #undef HAVE_GETTIMEOFDAY
 
-/* Define to 1 if you have the 'getwd' function. */
+/* Define to 1 if you have the `getwd' function. */
 #undef HAVE_GETWD
 
 /* glibc's iconv implementation */
 #undef HAVE_GLIBC_ICONV
 
-/* Define to 1 if you have the 'glob' function. */
+/* Define to 1 if you have the `glob' function. */
 #undef HAVE_GLOB
 
 /* */
 #undef HAVE_GMP
 
-/* Define to 1 if you have the 'gmtime_r' function. */
+/* Define to 1 if you have the `gmtime_r' function. */
 #undef HAVE_GMTIME_R
 
 /* Define to 1 if you have the <grp.h> header file. */
@@ -825,7 +828,7 @@
 /* */
 #undef HAVE_HISTORY_LIST
 
-/* Define to 1 if you have the 'hstrerror' function. */
+/* Define to 1 if you have the `hstrerror' function. */
 #undef HAVE_HSTRERROR
 
 /* */
@@ -846,10 +849,10 @@
 /* Define to 1 if you have the <ieeefp.h> header file. */
 #undef HAVE_IEEEFP_H
 
-/* Define to 1 if you have the 'if_indextoname' function. */
+/* Define to 1 if you have the `if_indextoname' function. */
 #undef HAVE_IF_INDEXTONAME
 
-/* Define to 1 if you have the 'if_nametoindex' function. */
+/* Define to 1 if you have the `if_nametoindex' function. */
 #undef HAVE_IF_NAMETOINDEX
 
 /* */
@@ -882,16 +885,16 @@
 /* */
 #undef HAVE_INET_ATON
 
-/* Define to 1 if you have the 'inet_ntoa' function. */
+/* Define to 1 if you have the `inet_ntoa' function. */
 #undef HAVE_INET_NTOA
 
-/* Define to 1 if you have the 'inet_ntop' function. */
+/* Define to 1 if you have the `inet_ntop' function. */
 #undef HAVE_INET_NTOP
 
-/* Define to 1 if you have the 'inet_pton' function. */
+/* Define to 1 if you have the `inet_pton' function. */
 #undef HAVE_INET_PTON
 
-/* Define to 1 if you have the 'initgroups' function. */
+/* Define to 1 if you have the `initgroups' function. */
 #undef HAVE_INITGROUPS
 
 /* Whether intmax_t is available */
@@ -924,7 +927,7 @@
 /* whether to enable JavaScript Object Serialization support */
 #undef HAVE_JSON
 
-/* Define to 1 if you have the 'kill' function. */
+/* Define to 1 if you have the `kill' function. */
 #undef HAVE_KILL
 
 /* do we have kqueue? */
@@ -933,43 +936,43 @@
 /* Define to 1 if you have the <langinfo.h> header file. */
 #undef HAVE_LANGINFO_H
 
-/* Define to 1 if you have the 'lchown' function. */
+/* Define to 1 if you have the `lchown' function. */
 #undef HAVE_LCHOWN
 
 /* */
 #undef HAVE_LDAP
 
-/* Define to 1 if you have the 'ldap_control_find' function. */
+/* Define to 1 if you have the `ldap_control_find' function. */
 #undef HAVE_LDAP_CONTROL_FIND
 
-/* Define to 1 if you have the 'ldap_extended_operation' function. */
+/* Define to 1 if you have the `ldap_extended_operation' function. */
 #undef HAVE_LDAP_EXTENDED_OPERATION
 
-/* Define to 1 if you have the 'ldap_extended_operation_s' function. */
+/* Define to 1 if you have the `ldap_extended_operation_s' function. */
 #undef HAVE_LDAP_EXTENDED_OPERATION_S
 
-/* Define to 1 if you have the 'ldap_parse_extended_result' function. */
+/* Define to 1 if you have the `ldap_parse_extended_result' function. */
 #undef HAVE_LDAP_PARSE_EXTENDED_RESULT
 
-/* Define to 1 if you have the 'ldap_parse_reference' function. */
+/* Define to 1 if you have the `ldap_parse_reference' function. */
 #undef HAVE_LDAP_PARSE_REFERENCE
 
-/* Define to 1 if you have the 'ldap_parse_result' function. */
+/* Define to 1 if you have the `ldap_parse_result' function. */
 #undef HAVE_LDAP_PARSE_RESULT
 
-/* Define to 1 if you have the 'ldap_passwd' function. */
+/* Define to 1 if you have the `ldap_passwd' function. */
 #undef HAVE_LDAP_PASSWD
 
-/* Define to 1 if you have the 'ldap_refresh_s' function. */
+/* Define to 1 if you have the `ldap_refresh_s' function. */
 #undef HAVE_LDAP_REFRESH_S
 
 /* LDAP SASL support */
 #undef HAVE_LDAP_SASL
 
-/* Define to 1 if you have the 'ldap_start_tls_s' function. */
+/* Define to 1 if you have the `ldap_start_tls_s' function. */
 #undef HAVE_LDAP_START_TLS_S
 
-/* Define to 1 if you have the 'ldap_whoami_s' function. */
+/* Define to 1 if you have the `ldap_whoami_s' function. */
 #undef HAVE_LDAP_WHOAMI_S
 
 /* */
@@ -1011,7 +1014,7 @@
 /* */
 #undef HAVE_LIBJPEG
 
-/* Define to 1 if you have the 'm' library (-lm). */
+/* Define to 1 if you have the `m' library (-lm). */
 #undef HAVE_LIBM
 
 /* Whether you have libmm */
@@ -1029,7 +1032,7 @@
 /* */
 #undef HAVE_LIBPNG
 
-/* Define to 1 if you have the 'pq' library (-lpq). */
+/* Define to 1 if you have the `pq' library (-lpq). */
 #undef HAVE_LIBPQ
 
 /* */
@@ -1071,10 +1074,10 @@
 /* Define to 1 if you have the <linux/sock_diag.h> header file. */
 #undef HAVE_LINUX_SOCK_DIAG_H
 
-/* Define to 1 if you have the 'localtime_r' function. */
+/* Define to 1 if you have the `localtime_r' function. */
 #undef HAVE_LOCALTIME_R
 
-/* Define to 1 if the system has the type 'long double'. */
+/* Define to 1 if the system has the type `long double'. */
 #undef HAVE_LONG_DOUBLE
 
 /* do we have SO_LISTENQxxx? */
@@ -1089,7 +1092,7 @@
 /* do we have mach_vm_read? */
 #undef HAVE_MACH_VM_READ
 
-/* Define to 1 if you have the 'makedev' function. */
+/* Define to 1 if you have the `makedev' function. */
 #undef HAVE_MAKEDEV
 
 /* Define to 1 if you have the <malloc.h> header file. */
@@ -1101,19 +1104,19 @@
 /* whether to have multibyte string support */
 #undef HAVE_MBSTRING
 
-/* Define to 1 if you have the 'memcntl' function. */
+/* Define to 1 if you have the `memcntl' function. */
 #undef HAVE_MEMCNTL
 
-/* Define to 1 if you have the 'memfd_create' function. */
+/* Define to 1 if you have the `memfd_create' function. */
 #undef HAVE_MEMFD_CREATE
 
-/* Define to 1 if you have the 'memmem' function. */
+/* Define to 1 if you have the `memmem' function. */
 #undef HAVE_MEMMEM
 
-/* Define to 1 if you have the 'memmove' function. */
+/* Define to 1 if you have the `memmove' function. */
 #undef HAVE_MEMMOVE
 
-/* Define to 1 if you have the 'memrchr' function. */
+/* Define to 1 if you have the `memrchr' function. */
 #undef HAVE_MEMRCHR
 
 /* Libzip >= 1.7.0 with zip_*_method_supported functions */
@@ -1122,22 +1125,22 @@
 /* Define to 1 if you have the <minix/config.h> header file. */
 #undef HAVE_MINIX_CONFIG_H
 
-/* Define to 1 if you have the 'mkfifo' function. */
+/* Define to 1 if you have the `mkfifo' function. */
 #undef HAVE_MKFIFO
 
-/* Define to 1 if you have the 'mknod' function. */
+/* Define to 1 if you have the `mknod' function. */
 #undef HAVE_MKNOD
 
-/* Define to 1 if you have the 'mkstemp' function. */
+/* Define to 1 if you have the `mkstemp' function. */
 #undef HAVE_MKSTEMP
 
-/* Define to 1 if you have the 'mmap' function. */
+/* Define to 1 if you have the `mmap' function. */
 #undef HAVE_MMAP
 
-/* Define to 1 if you have the 'mprotect' function. */
+/* Define to 1 if you have the `mprotect' function. */
 #undef HAVE_MPROTECT
 
-/* Define to 1 if you have the 'mremap' function. */
+/* Define to 1 if you have the `mremap' function. */
 #undef HAVE_MREMAP
 
 /* Whether you have MySQL */
@@ -1161,10 +1164,10 @@
 /* */
 #undef HAVE_NGETTEXT
 
-/* Define to 1 if you have the 'nice' function. */
+/* Define to 1 if you have the `nice' function. */
 #undef HAVE_NICE
 
-/* Define to 1 if you have the 'nl_langinfo' function. */
+/* Define to 1 if you have the `nl_langinfo' function. */
 #undef HAVE_NL_LANGINFO
 
 /* Define to 1 if you have the <nmmintrin.h> header file. */
@@ -1216,7 +1219,7 @@
 /* Define to 1 if you have the <os/signpost.h> header file. */
 #undef HAVE_OS_SIGNPOST_H
 
-/* Define to 1 if you have the 'pathconf' function. */
+/* Define to 1 if you have the `pathconf' function. */
 #undef HAVE_PATHCONF
 
 /* */
@@ -1258,7 +1261,7 @@
 /* */
 #undef HAVE_PHP_SESSION
 
-/* Define to 1 if you have the 'poll' function. */
+/* Define to 1 if you have the `poll' function. */
 #undef HAVE_POLL
 
 /* Define to 1 if you have the <poll.h> header file. */
@@ -1291,22 +1294,22 @@
 /* Define to 1 if the PS_STRINGS thing exists. */
 #undef HAVE_PS_STRINGS
 
-/* Define to 1 if you have the 'pthread_attr_getstack' function. */
+/* Define to 1 if you have the `pthread_attr_getstack' function. */
 #undef HAVE_PTHREAD_ATTR_GETSTACK
 
-/* Define to 1 if you have the 'pthread_attr_get_np' function. */
+/* Define to 1 if you have the `pthread_attr_get_np' function. */
 #undef HAVE_PTHREAD_ATTR_GET_NP
 
-/* Define to 1 if you have the 'pthread_getattr_np' function. */
+/* Define to 1 if you have the `pthread_getattr_np' function. */
 #undef HAVE_PTHREAD_GETATTR_NP
 
-/* Define to 1 if you have the 'pthread_get_stackaddr_np' function. */
+/* Define to 1 if you have the `pthread_get_stackaddr_np' function. */
 #undef HAVE_PTHREAD_GET_STACKADDR_NP
 
-/* Define to 1 if you have the 'pthread_jit_write_protect_np' function. */
+/* Define to 1 if you have the `pthread_jit_write_protect_np' function. */
 #undef HAVE_PTHREAD_JIT_WRITE_PROTECT_NP
 
-/* Define to 1 if you have the 'pthread_stackseg_np' function. */
+/* Define to 1 if you have the `pthread_stackseg_np' function. */
 #undef HAVE_PTHREAD_STACKSEG_NP
 
 /* do we have ptrace? */
@@ -1318,7 +1321,7 @@
 /* Define to 1 if you have the <pty.h> header file. */
 #undef HAVE_PTY_H
 
-/* Define to 1 if you have the 'putenv' function. */
+/* Define to 1 if you have the `putenv' function. */
 #undef HAVE_PUTENV
 
 /* Define to 1 if you have the <pwd.h> header file. */
@@ -1327,7 +1330,7 @@
 /* */
 #undef HAVE_PWRITE
 
-/* Define to 1 if you have the 'RAND_egd' function. */
+/* Define to 1 if you have the `RAND_egd' function. */
 #undef HAVE_RAND_EGD
 
 /* Define to 1 if you have the <resolv.h> header file. */
@@ -1345,7 +1348,7 @@
 /* */
 #undef HAVE_RFC822_OUTPUT_ADDRESS_LIST
 
-/* Define to 1 if you have the 'rfork' function. */
+/* Define to 1 if you have the `rfork' function. */
 #undef HAVE_RFORK
 
 /* */
@@ -1363,7 +1366,7 @@
 /* Whether you have sockaddr_storage.ss_family */
 #undef HAVE_SA_SS_FAMILY
 
-/* Define to 1 if you have the 'scandir' function. */
+/* Define to 1 if you have the `scandir' function. */
 #undef HAVE_SCANDIR
 
 /* do we have select? */
@@ -1378,34 +1381,34 @@
 /* */
 #undef HAVE_SEMUN
 
-/* Define to 1 if you have the 'setegid' function. */
+/* Define to 1 if you have the `setegid' function. */
 #undef HAVE_SETEGID
 
-/* Define to 1 if you have the 'setenv' function. */
+/* Define to 1 if you have the `setenv' function. */
 #undef HAVE_SETENV
 
-/* Define to 1 if you have the 'seteuid' function. */
+/* Define to 1 if you have the `seteuid' function. */
 #undef HAVE_SETEUID
 
-/* Define to 1 if you have the 'setitimer' function. */
+/* Define to 1 if you have the `setitimer' function. */
 #undef HAVE_SETITIMER
 
 /* do we have setpflags? */
 #undef HAVE_SETPFLAGS
 
-/* Define to 1 if you have the 'setpriority' function. */
+/* Define to 1 if you have the `setpriority' function. */
 #undef HAVE_SETPRIORITY
 
-/* Define to 1 if you have the 'setproctitle' function. */
+/* Define to 1 if you have the `setproctitle' function. */
 #undef HAVE_SETPROCTITLE
 
-/* Define to 1 if you have the 'setproctitle_fast' function. */
+/* Define to 1 if you have the `setproctitle_fast' function. */
 #undef HAVE_SETPROCTITLE_FAST
 
-/* Define to 1 if you have the 'setrlimit' function. */
+/* Define to 1 if you have the `setrlimit' function. */
 #undef HAVE_SETRLIMIT
 
-/* Define to 1 if you have the 'setsid' function. */
+/* Define to 1 if you have the `setsid' function. */
 #undef HAVE_SETSID
 
 /* */
@@ -1429,25 +1432,25 @@
 /* */
 #undef HAVE_SHM_OPEN
 
-/* Define to 1 if you have the 'shutdown' function. */
+/* Define to 1 if you have the `shutdown' function. */
 #undef HAVE_SHUTDOWN
 
 /* */
 #undef HAVE_SHUTDOWN_SNMP_LOGGING
 
-/* Define to 1 if you have the 'sigaction' function. */
+/* Define to 1 if you have the `sigaction' function. */
 #undef HAVE_SIGACTION
 
-/* Define to 1 if you have the 'sigprocmask' function. */
+/* Define to 1 if you have the `sigprocmask' function. */
 #undef HAVE_SIGPROCMASK
 
-/* Define to 1 if you have the 'sigsetjmp' function. */
+/* Define to 1 if you have the `sigsetjmp' function. */
 #undef HAVE_SIGSETJMP
 
-/* Define to 1 if you have the 'sigtimedwait' function. */
+/* Define to 1 if you have the `sigtimedwait' function. */
 #undef HAVE_SIGTIMEDWAIT
 
-/* Define to 1 if you have the 'sigwaitinfo' function. */
+/* Define to 1 if you have the `sigwaitinfo' function. */
 #undef HAVE_SIGWAITINFO
 
 /* */
@@ -1477,7 +1480,7 @@
 /* Define if sockaddr_un in sys/un.h contains a sun_len component */
 #undef HAVE_SOCKADDR_UN_SUN_LEN
 
-/* Define to 1 if you have the 'sockatmark' function. */
+/* Define to 1 if you have the `sockatmark' function. */
 #undef HAVE_SOCKATMARK
 
 /* */
@@ -1489,7 +1492,7 @@
 /* */
 #undef HAVE_SOCKETS
 
-/* Define to 1 if the system has the type 'socklen_t'. */
+/* Define to 1 if the system has the type `socklen_t'. */
 #undef HAVE_SOCKLEN_T
 
 /* */
@@ -1540,10 +1543,10 @@
 /* Whether ssize_t is available */
 #undef HAVE_SSIZE_T
 
-/* Define to 1 if you have the 'statfs' function. */
+/* Define to 1 if you have the `statfs' function. */
 #undef HAVE_STATFS
 
-/* Define to 1 if you have the 'statvfs' function. */
+/* Define to 1 if you have the `statvfs' function. */
 #undef HAVE_STATVFS
 
 /* Define to 1 if you have the <stdint.h> header file. */
@@ -1555,13 +1558,13 @@
 /* Define to 1 if you have the <stdlib.h> header file. */
 #undef HAVE_STDLIB_H
 
-/* Define to 1 if you have the 'std_syslog' function. */
+/* Define to 1 if you have the `std_syslog' function. */
 #undef HAVE_STD_SYSLOG
 
-/* Define to 1 if you have the 'strcasecmp' function. */
+/* Define to 1 if you have the `strcasecmp' function. */
 #undef HAVE_STRCASECMP
 
-/* Define if you have 'strerror_r'. */
+/* Define if you have `strerror_r'. */
 #undef HAVE_STRERROR_R
 
 /* Define to 1 if you have the <strings.h> header file. */
@@ -1570,53 +1573,53 @@
 /* Define to 1 if you have the <string.h> header file. */
 #undef HAVE_STRING_H
 
-/* Define to 1 if you have the 'strlcat' function. */
+/* Define to 1 if you have the `strlcat' function. */
 #undef HAVE_STRLCAT
 
-/* Define to 1 if you have the 'strlcpy' function. */
+/* Define to 1 if you have the `strlcpy' function. */
 #undef HAVE_STRLCPY
 
-/* Define to 1 if you have the 'strndup' function. */
+/* Define to 1 if you have the `strndup' function. */
 #undef HAVE_STRNDUP
 
-/* Define to 1 if you have the 'strnlen' function. */
+/* Define to 1 if you have the `strnlen' function. */
 #undef HAVE_STRNLEN
 
-/* Define to 1 if you have the 'strptime' function. */
+/* Define to 1 if you have the `strptime' function. */
 #undef HAVE_STRPTIME
 
 /* whether strptime() declaration fails */
 #undef HAVE_STRPTIME_DECL_FAILS
 
-/* Define to 1 if you have the 'strtok_r' function. */
+/* Define to 1 if you have the `strtok_r' function. */
 #undef HAVE_STRTOK_R
 
-/* Define to 1 if you have the 'strtoll' function. */
+/* Define to 1 if you have the `strtoll' function. */
 #undef HAVE_STRTOLL
 
 /* whether you have struct flock */
 #undef HAVE_STRUCT_FLOCK
 
-/* Define to 1 if 'st_blksize' is a member of 'struct stat'. */
+/* Define to 1 if `st_blksize' is a member of `struct stat'. */
 #undef HAVE_STRUCT_STAT_ST_BLKSIZE
 
-/* Define to 1 if 'st_blocks' is a member of 'struct stat'. */
+/* Define to 1 if `st_blocks' is a member of `struct stat'. */
 #undef HAVE_STRUCT_STAT_ST_BLOCKS
 
-/* Define to 1 if 'st_rdev' is a member of 'struct stat'. */
+/* Define to 1 if `st_rdev' is a member of `struct stat'. */
 #undef HAVE_STRUCT_STAT_ST_RDEV
 
-/* Define to 1 if 'tm_gmtoff' is a member of 'struct tm'. */
+/* Define to 1 if `tm_gmtoff' is a member of `struct tm'. */
 #undef HAVE_STRUCT_TM_TM_GMTOFF
 
-/* Define to 1 if 'tm_zone' is a member of 'struct tm'. */
+/* Define to 1 if `tm_zone' is a member of `struct tm'. */
 #undef HAVE_STRUCT_TM_TM_ZONE
 
-/* Define to 1 if your 'struct stat' has 'st_blocks'. Deprecated, use
-   'HAVE_STRUCT_STAT_ST_BLOCKS' instead. */
+/* Define to 1 if your `struct stat' has `st_blocks'. Deprecated, use
+   `HAVE_STRUCT_STAT_ST_BLOCKS' instead. */
 #undef HAVE_ST_BLOCKS
 
-/* Define to 1 if you have the 'symlink' function. */
+/* Define to 1 if you have the `symlink' function. */
 #undef HAVE_SYMLINK
 
 /* do we have sysconf? */
@@ -1763,18 +1766,18 @@
 /* Define to 1 if you have the <tmmintrin.h> header file. */
 #undef HAVE_TMMINTRIN_H
 
-/* Define to 1 if your 'struct tm' has 'tm_zone'. Deprecated, use
-   'HAVE_STRUCT_TM_TM_ZONE' instead. */
+/* Define to 1 if your `struct tm' has `tm_zone'. Deprecated, use
+   `HAVE_STRUCT_TM_TM_ZONE' instead. */
 #undef HAVE_TM_ZONE
 
 /* Whether you have a working ttyname_r */
 #undef HAVE_TTYNAME_R
 
-/* Define to 1 if you don't have 'tm_zone' but do have the external array
-   'tzname'. */
+/* Define to 1 if you don't have `tm_zone' but do have the external array
+   `tzname'. */
 #undef HAVE_TZNAME
 
-/* Define to 1 if you have the 'tzset' function. */
+/* Define to 1 if you have the `tzset' function. */
 #undef HAVE_TZSET
 
 /* */
@@ -1789,10 +1792,10 @@
 /* Define to 1 if you have the <unix.h> header file. */
 #undef HAVE_UNIX_H
 
-/* Define to 1 if you have the 'unsetenv' function. */
+/* Define to 1 if you have the `unsetenv' function. */
 #undef HAVE_UNSETENV
 
-/* Define to 1 if you have the 'unshare' function. */
+/* Define to 1 if you have the `unshare' function. */
 #undef HAVE_UNSHARE
 
 /* */
@@ -1802,13 +1805,13 @@
    userfaultfd */
 #undef HAVE_USERFAULTFD_WRITEFAULT
 
-/* Define to 1 if you have the 'usleep' function. */
+/* Define to 1 if you have the `usleep' function. */
 #undef HAVE_USLEEP
 
-/* Define to 1 if you have the 'utime' function. */
+/* Define to 1 if you have the `utime' function. */
 #undef HAVE_UTIME
 
-/* Define to 1 if you have the 'utimes' function. */
+/* Define to 1 if you have the `utimes' function. */
 #undef HAVE_UTIMES
 
 /* Define to 1 if you have the <utime.h> header file. */
@@ -1820,16 +1823,16 @@
 /* */
 #undef HAVE_VALGRIND
 
-/* Define to 1 if you have the 'vasprintf' function. */
+/* Define to 1 if you have the `vasprintf' function. */
 #undef HAVE_VASPRINTF
 
-/* Define to 1 if you have the 'wait3' function. */
+/* Define to 1 if you have the `wait3' function. */
 #undef HAVE_WAIT3
 
-/* Define to 1 if you have the 'wait4' function. */
+/* Define to 1 if you have the `wait4' function. */
 #undef HAVE_WAIT4
 
-/* Define to 1 if you have the 'waitpid' function. */
+/* Define to 1 if you have the `waitpid' function. */
 #undef HAVE_WAITPID
 
 /* Define to 1 if you have the <wchar.h> header file. */
@@ -2093,28 +2096,28 @@
 /* */
 #undef SHADOW_STACK_SYSCALL
 
-/* The size of 'int', as computed by sizeof. */
+/* The size of `int', as computed by sizeof. */
 #undef SIZEOF_INT
 
 /* Size of intmax_t */
 #undef SIZEOF_INTMAX_T
 
-/* The size of 'long', as computed by sizeof. */
+/* The size of `long', as computed by sizeof. */
 #undef SIZEOF_LONG
 
-/* The size of 'long long', as computed by sizeof. */
+/* The size of `long long', as computed by sizeof. */
 #undef SIZEOF_LONG_LONG
 
-/* The size of 'off_t', as computed by sizeof. */
+/* The size of `off_t', as computed by sizeof. */
 #undef SIZEOF_OFF_T
 
 /* Size of ptrdiff_t */
 #undef SIZEOF_PTRDIFF_T
 
-/* The size of 'short', as computed by sizeof. */
+/* The size of `short', as computed by sizeof. */
 #undef SIZEOF_SHORT
 
-/* The size of 'size_t', as computed by sizeof. */
+/* The size of `size_t', as computed by sizeof. */
 #undef SIZEOF_SIZE_T
 
 /* Size of ssize_t */
@@ -2137,7 +2140,7 @@
 	STACK_DIRECTION = 0 => direction of growth unknown */
 #undef STACK_DIRECTION
 
-/* Define to 1 if all of the C89 standard headers exist (not just the ones
+/* Define to 1 if all of the C90 standard headers exist (not just the ones
    required in a freestanding environment). This macro is provided for
    backward compatibility; new code need not use it. */
 #undef STDC_HEADERS
@@ -2148,7 +2151,7 @@
 /* */
 #undef TCADB_INCLUDE_FILE
 
-/* Define to 1 if your <sys/time.h> declares 'struct tm'. */
+/* Define to 1 if your <sys/time.h> declares `struct tm'. */
 #undef TM_IN_SYS_TIME
 
 /* */
@@ -2160,7 +2163,7 @@
 /* Use system default cipher list instead of hardcoded value */
 #undef USE_OPENSSL_SYSTEM_CIPHERS
 
-/* Enable extensions on AIX, Interix, z/OS.  */
+/* Enable extensions on AIX 3, Interix.  */
 #ifndef _ALL_SOURCE
 # undef _ALL_SOURCE
 #endif
@@ -2221,15 +2224,11 @@
 #ifndef __STDC_WANT_IEC_60559_DFP_EXT__
 # undef __STDC_WANT_IEC_60559_DFP_EXT__
 #endif
-/* Enable extensions specified by C23 Annex F.  */
-#ifndef __STDC_WANT_IEC_60559_EXT__
-# undef __STDC_WANT_IEC_60559_EXT__
-#endif
 /* Enable extensions specified by ISO/IEC TS 18661-4:2015.  */
 #ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__
 # undef __STDC_WANT_IEC_60559_FUNCS_EXT__
 #endif
-/* Enable extensions specified by C23 Annex H and ISO/IEC TS 18661-3:2015.  */
+/* Enable extensions specified by ISO/IEC TS 18661-3:2015.  */
 #ifndef __STDC_WANT_IEC_60559_TYPES_EXT__
 # undef __STDC_WANT_IEC_60559_TYPES_EXT__
 #endif
@@ -2291,22 +2290,22 @@
 /* Define when using musl libc */
 #undef __MUSL__
 
-/* Define to 'int' if <sys/types.h> doesn't define. */
+/* Define to `int' if <sys/types.h> doesn't define. */
 #undef gid_t
 
 /* */
 #undef in_addr_t
 
-/* Define to '__inline__' or '__inline' if that's what the C compiler
+/* Define to `__inline__' or `__inline' if that's what the C compiler
    calls it, or to nothing if 'inline' is not supported under any name.  */
 #ifndef __cplusplus
 #undef inline
 #endif
 
-/* Define to 'unsigned int' if <sys/types.h> does not define. */
+/* Define to `unsigned int' if <sys/types.h> does not define. */
 #undef size_t
 
-/* Define to 'int' if <sys/types.h> doesn't define. */
+/* Define to `int' if <sys/types.h> doesn't define. */
 #undef uid_t

php-8.3.7.tar.xz/main/php_network.h -> php-8.3.21.tar.xz/main/php_network.h Changed

php-8.3.7.tar.xz/main/php_scandir.c -> php-8.3.21.tar.xz/main/php_scandir.c Changed

php-8.3.7.tar.xz/main/php_variables.c -> php-8.3.21.tar.xz/main/php_variables.c Changed

php-8.3.7.tar.xz/main/php_version.h -> php-8.3.21.tar.xz/main/php_version.h Changed

php-8.3.7.tar.xz/main/rfc1867.c -> php-8.3.21.tar.xz/main/rfc1867.c Changed

@@ -174,6 +174,7 @@
 	} ZEND_HASH_FOREACH_END();
 	zend_hash_destroy(SG(rfc1867_uploaded_files));
 	FREE_HASHTABLE(SG(rfc1867_uploaded_files));
+	SG(rfc1867_uploaded_files) = NULL;
 }
 /* }}} */
 
@@ -317,8 +318,8 @@
 		}
 		/* return entire buffer as a partial line */
 		lineself->bufsize = 0;
-		self->buf_begin = ptr;
 		self->bytes_in_buffer = 0;
+		/* Let fill_buffer() handle the reset of self->buf_begin */
 	}
 
 	return line;
@@ -728,6 +729,13 @@
 		boundary_len = boundary_end-boundary;
 	}
 
+	/* Boundaries larger than FILLUNIT-strlen("\r\n--") characters lead to
+	 * erroneous parsing */
+	if (boundary_len > FILLUNIT-strlen("\r\n--")) {
+		sapi_module.sapi_error(E_WARNING, "Boundary too large in multipart/form-data POST data");
+		return;
+	}
+
 	/* Initialize the buffer */
 	if (!(mbuff = multipart_buffer_new(boundary, boundary_len))) {
 		sapi_module.sapi_error(E_WARNING, "Unable to initialize the input buffer");
@@ -1134,7 +1142,7 @@
 			register_http_post_files_variable(lbuf, s, &PG(http_globals)TRACK_VARS_FILES, 0);
 			s = NULL;
 
-			/* Add full path of supplied file for folder uploads via 
+			/* Add full path of supplied file for folder uploads via
 			 * <input type="file" name="files" multiple webkitdirectory>
 			 */
 			/* Add $foofull_path */

php-8.3.7.tar.xz/main/streams/cast.c -> php-8.3.21.tar.xz/main/streams/cast.c Changed

php-8.3.7.tar.xz/main/streams/glob_wrapper.c -> php-8.3.21.tar.xz/main/streams/glob_wrapper.c Changed

@@ -225,10 +225,32 @@
 			*opened_path = zend_string_init(path, strlen(path), 0);
 		}
 	}
+	const char *pattern = path;
+#ifdef ZTS
+	char cwdMAXPATHLEN;
+	char work_patternMAXPATHLEN;
+	char *result;
+	size_t cwd_skip = 0;
+	if (!IS_ABSOLUTE_PATH(path, strlen(path))) {
+		result = VCWD_GETCWD(cwd, MAXPATHLEN);
+		if (!result) {
+			cwd0 = '\0';
+		}
+# ifdef PHP_WIN32
+		if (IS_SLASH(*path)) {
+			cwd2 = '\0';
+		}
+# endif
+		cwd_skip = strlen(cwd)+1;
+
+		snprintf(work_pattern, MAXPATHLEN, "%s%c%s", cwd, DEFAULT_SLASH, path);
+		pattern = work_pattern;
+	}
+#endif
 
 	pglob = ecalloc(1, sizeof(*pglob));
 
-	if (0 != (ret = glob(path, pglob->flags & GLOB_FLAGMASK, NULL, &pglob->glob))) {
+	if (0 != (ret = glob(pattern, pglob->flags & GLOB_FLAGMASK, NULL, &pglob->glob))) {
 #ifdef GLOB_NOMATCH
 		if (GLOB_NOMATCH != ret)
 #endif
@@ -238,6 +260,21 @@
 		}
 	}
 
+#ifdef ZTS
+	if (cwd_skip > 0) {
+		/* strip prepended CWD */
+		for (i = 0; i < pglob->glob.gl_pathc; i++) {
+			char *p = pglob->glob.gl_pathvi;
+			char *q = p + cwd_skip;
+			char *e = p + strlen(pglob->glob.gl_pathvi) - 1;
+			while (q <= e) {
+				*p++ = *q++;
+			}
+			*p = '\0';
+		}
+	}
+#endif
+
 	/* if open_basedir in use, check and filter restricted paths */
 	if ((options & STREAM_DISABLE_OPEN_BASEDIR) == 0) {
 		pglob->open_basedir_used = true;

php-8.3.7.tar.xz/main/streams/memory.c -> php-8.3.21.tar.xz/main/streams/memory.c Changed

php-8.3.7.tar.xz/main/streams/plain_wrapper.c -> php-8.3.21.tar.xz/main/streams/plain_wrapper.c Changed

@@ -349,14 +349,15 @@
 static ssize_t php_stdiop_write(php_stream *stream, const char *buf, size_t count)
 {
 	php_stdio_stream_data *data = (php_stdio_stream_data*)stream->abstract;
+	ssize_t bytes_written;
 
 	assert(data != NULL);
 
 	if (data->fd >= 0) {
 #ifdef PHP_WIN32
-		ssize_t bytes_written = _write(data->fd, buf, PLAIN_WRAP_BUF_SIZE(count));
+		bytes_written = _write(data->fd, buf, PLAIN_WRAP_BUF_SIZE(count));
 #else
-		ssize_t bytes_written = write(data->fd, buf, count);
+		bytes_written = write(data->fd, buf, count);
 #endif
 		if (bytes_written < 0) {
 			if (PHP_IS_TRANSIENT_ERROR(errno)) {
@@ -370,7 +371,6 @@
 				php_error_docref(NULL, E_NOTICE, "Write of %zu bytes failed with errno=%d %s", count, errno, strerror(errno));
 			}
 		}
-		return bytes_written;
 	} else {
 
 #ifdef HAVE_FLUSHIO
@@ -380,8 +380,15 @@
 		data->last_op = 'w';
 #endif
 
-		return (ssize_t) fwrite(buf, 1, count, data->file);
+		bytes_written = (ssize_t) fwrite(buf, 1, count, data->file);
 	}
+
+	if (EG(active)) {
+		/* clear stat cache as mtime and ctime got changed */
+		php_clear_stat_cache(0, NULL, 0);
+	}
+
+	return bytes_written;
 }
 
 static ssize_t php_stdiop_read(php_stream *stream, char *buf, size_t count)
@@ -460,6 +467,12 @@
 
 		stream->eof = feof(data->file);
 	}
+
+	if (EG(active)) {
+		/* clear stat cache as atime got changed */
+		php_clear_stat_cache(0, NULL, 0);
+	}
+
 	return ret;
 }
 
@@ -540,6 +553,10 @@
 	 * something completely different.
 	 */
 	if (data->file) {
+		if (EG(active)) {
+			/* clear stat cache as there might be a write so mtime and ctime might have changed */
+			php_clear_stat_cache(0, NULL, 0);
+		}
 		return fflush(data->file);
 	}
 	return 0;
@@ -1154,6 +1171,12 @@
 			ret = php_stream_fopen_from_fd_rel(fd, mode, persistent_id, (open_flags & O_APPEND) == 0);
 		}
 
+		if (EG(active)) {
+			/* clear stat cache as mtime and ctime might got changed - phar can use stream before
+			 * cache is initialized so we need to check if the execution is active. */
+			php_clear_stat_cache(0, NULL, 0);
+		}
+
 		if (ret)	{
 			if (opened_path) {
 				*opened_path = zend_string_init(realpath, strlen(realpath), 0);

php-8.3.7.tar.xz/main/streams/streams.c -> php-8.3.21.tar.xz/main/streams/streams.c Changed

@@ -1382,9 +1382,18 @@
 
 		switch(whence) {
 			case SEEK_CUR:
-				offset = stream->position + offset;
-				whence = SEEK_SET;
+				ZEND_ASSERT(stream->position >= 0);
+				if (UNEXPECTED(offset > ZEND_LONG_MAX - stream->position)) {
+					offset = ZEND_LONG_MAX;
+				} else {
+					offset = stream->position + offset;
+				}
+ 				whence = SEEK_SET;
 				break;
+			case SEEK_SET:
+				if (offset < 0) {
+					return -1;
+				}
 		}
 		ret = stream->ops->seek(stream, offset, whence, &stream->position);
 
@@ -2211,6 +2220,9 @@
 			options &= ~USE_PATH;
 		}
 		if (EG(exception)) {
+			if (resolved_path) {
+				zend_string_release_ex(resolved_path, false);
+			}
 			return NULL;
 		}
 	}
@@ -2461,25 +2473,19 @@
 				vector_size = 10;
 			} else {
 				if(vector_size*2 < vector_size) {
-					/* overflow */
-					php_stream_closedir(stream);
-					efree(vector);
-					return -1;
+					goto overflow;
 				}
 				vector_size *= 2;
 			}
-			vector = (zend_string **) safe_erealloc(vector, vector_size, sizeof(char *), 0);
+			vector = (zend_string **) safe_erealloc(vector, vector_size, sizeof(zend_string *), 0);
 		}
 
 		vectornfiles = zend_string_init(sdp.d_name, strlen(sdp.d_name), 0);
 
-		nfiles++;
-		if(vector_size < 10 || nfiles == 0) {
-			/* overflow */
-			php_stream_closedir(stream);
-			efree(vector);
-			return -1;
+		if(vector_size < 10 || nfiles + 1 == 0) {
+			goto overflow;
 		}
+		nfiles++;
 	}
 	php_stream_closedir(stream);
 
@@ -2489,5 +2495,13 @@
 		qsort(*namelist, nfiles, sizeof(zend_string *), (int(*)(const void *, const void *))compare);
 	}
 	return nfiles;
+
+overflow:
+	php_stream_closedir(stream);
+	for (unsigned int i = 0; i < nfiles; i++) {
+		zend_string_efree(vectori);
+	}
+	efree(vector);
+	return -1;
 }
 /* }}} */

php-8.3.7.tar.xz/main/streams/xp_socket.c -> php-8.3.21.tar.xz/main/streams/xp_socket.c Changed

@@ -586,18 +586,23 @@
 	memset(unix_addr, 0, sizeof(*unix_addr));
 	unix_addr->sun_family = AF_UNIX;
 
+	/* Abstract namespace does not need to be NUL-terminated, while path-based
+	 * sockets should be. */
+	bool is_abstract_ns = xparam->inputs.namelen > 0 && xparam->inputs.name0 == '\0';
+	unsigned long max_length = is_abstract_ns ? sizeof(unix_addr->sun_path) : sizeof(unix_addr->sun_path) - 1;
+
 	/* we need to be binary safe on systems that support an abstract
 	 * namespace */
-	if (xparam->inputs.namelen >= sizeof(unix_addr->sun_path)) {
+	if (xparam->inputs.namelen > max_length) {
 		/* On linux, when the path begins with a NUL byte we are
 		 * referring to an abstract namespace.  In theory we should
 		 * allow an extra byte below, since we don't need the NULL.
 		 * BUT, to get into this branch of code, the name is too long,
 		 * so we don't care. */
-		xparam->inputs.namelen = sizeof(unix_addr->sun_path) - 1;
+		xparam->inputs.namelen = max_length;
 		php_error_docref(NULL, E_NOTICE,
 			"socket path exceeded the maximum allowed length of %lu bytes "
-			"and was truncated", (unsigned long)sizeof(unix_addr->sun_path));
+			"and was truncated", max_length);
 	}
 
 	memcpy(unix_addr->sun_path, xparam->inputs.name, xparam->inputs.namelen);

php-8.3.7.tar.xz/pear/install-pear-nozlib.phar -> php-8.3.21.tar.xz/pear/install-pear-nozlib.phar Changed

php-8.3.7.tar.xz/run-tests.php -> php-8.3.21.tar.xz/run-tests.php Changed

@@ -611,7 +611,7 @@
                     $show_progress = false;
                     break;
                 case '--version':
-                    echo '$Id: 71a8fdc80fe5f1e2b35790f564122648735cbcf1 $' . "\n";
+                    echo '$Id: d51ab99a205a313e0e88894fca82b3b274d71b69 $' . "\n";
                     exit(1);
 
                 default:
@@ -1177,7 +1177,7 @@
     // and on Windows quotes are discarded, this is a fix to honor the quotes and allow values containing
     // spaces like '"C:\Program Files\PHP\php.exe"' to be passed as 1 argument correctly
     if (IS_WINDOWS) {
-        $commandline = 'start "" /b /wait ' . $commandline;
+        $commandline = 'start "" /b /wait ' . $commandline . ' & exit';
     }
 
     $data = '';
@@ -2218,6 +2218,9 @@
         } elseif (!strncasecmp('xleak', $output, 5)) {
             // Pretend we have an XLEAK section
             $test->setSection('XLEAK', ltrim(substr($output, 5)));
+        } elseif (!strncasecmp('flaky', $output, 5)) {
+            // Pretend we have a FLAKY section
+            $test->setSection('FLAKY', ltrim(substr($output, 5)));
         } elseif ($output !== '') {
             show_result("BORK", $output, $tested_file, 'reason: invalid output from SKIPIF', $temp_filenames);
             $PHP_FAILED_TESTS'BORKED' = 
@@ -3141,18 +3144,6 @@
         $failed_test_summary .= "=====================================================================\n";
     }
 
-    if (count($PHP_FAILED_TESTS'XFAILED')) {
-        $failed_test_summary .= '
-=====================================================================
-EXPECTED FAILED TEST SUMMARY
----------------------------------------------------------------------
-';
-        foreach ($PHP_FAILED_TESTS'XFAILED' as $failed_test_data) {
-            $failed_test_summary .= $failed_test_data'test_name' . $failed_test_data'info' . "\n";
-        }
-        $failed_test_summary .= "=====================================================================\n";
-    }
-
     if (count($PHP_FAILED_TESTS'BORKED')) {
         $failed_test_summary .= '
 =====================================================================
@@ -3200,19 +3191,6 @@
             $failed_test_summary .= $failed_test_data'test_name' . $failed_test_data'info' . "\n";
         }
 
-        $failed_test_summary .= "=====================================================================\n";
-    }
-
-    if (count($PHP_FAILED_TESTS'XLEAKED')) {
-        $failed_test_summary .= '
-=====================================================================
-EXPECTED LEAK TEST SUMMARY
----------------------------------------------------------------------
-';
-        foreach ($PHP_FAILED_TESTS'XLEAKED' as $failed_test_data) {
-            $failed_test_summary .= $failed_test_data'test_name' . $failed_test_data'info' . "\n";
-        }
-
         $failed_test_summary .= "=====================================================================\n";
     }

php-8.3.7.tar.xz/sapi/cgi/cgi_main.c -> php-8.3.21.tar.xz/sapi/cgi/cgi_main.c Changed

@@ -486,9 +486,9 @@
 	while (read_bytes < count_bytes) {
 #ifdef PHP_WIN32
 		size_t diff = count_bytes - read_bytes;
-		unsigned int to_read = (diff > UINT_MAX) ? UINT_MAX : (unsigned int)diff;
+		unsigned int to_read = (diff > INT_MAX) ? INT_MAX : (unsigned int)diff;
 
-		tmp_read_bytes = read(STDIN_FILENO, buffer + read_bytes, to_read);
+		tmp_read_bytes = _read(STDIN_FILENO, buffer + read_bytes, to_read);
 #else
 		tmp_read_bytes = read(STDIN_FILENO, buffer + read_bytes, count_bytes - read_bytes);
 #endif
@@ -1746,7 +1746,6 @@
 	int status = 0;
 #endif
 	char *query_string;
-	char *decoded_query_string;
 	int skip_getopt = 0;
 
 #if defined(SIGPIPE) && defined(SIG_IGN)
@@ -1796,10 +1795,20 @@
 		}
 	}
 
+	/* Apache CGI will pass the query string to the command line if it doesn't contain a '='.
+	 * This can create an issue where a malicious request can pass command line arguments to
+	 * the executable. Ideally we skip argument parsing when we're in cgi or fastcgi mode,
+	 * but that breaks PHP scripts on Linux with a hashbang: `#!/php-cgi -d option=value`.
+	 * Therefore, this code only prevents passing arguments if the query string starts with a '-'.
+	 * Similarly, scripts spawned in subprocesses on Windows may have the same issue.
+	 * However, Windows has lots of conversion rules and command line parsing rules that
+	 * are too difficult and dangerous to reliably emulate. */
 	if((query_string = getenv("QUERY_STRING")) != NULL && strchr(query_string, '=') == NULL) {
-		/* we've got query string that has no = - apache CGI will pass it to command line */
+#ifdef PHP_WIN32
+		skip_getopt = cgi || fastcgi;
+#else
 		unsigned char *p;
-		decoded_query_string = strdup(query_string);
+		char *decoded_query_string = strdup(query_string);
 		php_url_decode(decoded_query_string, strlen(decoded_query_string));
 		for (p = (unsigned char *)decoded_query_string; *p &&  *p <= ' '; p++) {
 			/* skip all leading spaces */
@@ -1807,7 +1816,9 @@
 		if(*p == '-') {
 			skip_getopt = 1;
 		}
+
 		free(decoded_query_string);
+#endif
 	}
 
 	php_ini_builder_init(&ini_builder);
@@ -1874,18 +1885,17 @@
 
 	/* check force_cgi after startup, so we have proper output */
 	if (cgi && CGIG(force_redirect)) {
-		/* Apache will generate REDIRECT_STATUS,
-		 * Netscape and redirect.so will generate HTTP_REDIRECT_STATUS.
-		 * redirect.so and installation instructions available from
-		 * http://www.koehntopp.de/php.
-		 *   -- kk@netuse.de
-		 */
-		if (!getenv("REDIRECT_STATUS") &&
-			!getenv ("HTTP_REDIRECT_STATUS") &&
-			/* this is to allow a different env var to be configured
-			 * in case some server does something different than above */
-			(!CGIG(redirect_status_env) || !getenv(CGIG(redirect_status_env)))
-		) {
+		/* This is to allow a different environment variable to be configured
+		 * in case the we cannot auto-detect which environment variable to use.
+		 * Checking this first to allow user overrides in case the environment
+		 * variable can be set by an untrusted party. */
+		const char *redirect_status_env = CGIG(redirect_status_env);
+		if (!redirect_status_env) {
+			/* Apache will generate REDIRECT_STATUS. */
+			redirect_status_env = "REDIRECT_STATUS";
+		}
+
+		if (!getenv(redirect_status_env)) {
 			zend_try {
 				SG(sapi_headers).http_response_code = 400;
 				PUTS("<b>Security Alert!</b> The PHP CGI cannot be accessed directly.\n\n\

php-8.3.21.tar.xz/sapi/cgi/tests/ghsa-3qgc-jrrr-25jv.phpt Added

php-8.3.7.tar.xz/sapi/cli/php_cli.c -> php-8.3.21.tar.xz/sapi/cli/php_cli.c Changed

php-8.3.7.tar.xz/sapi/cli/php_cli_server.c -> php-8.3.21.tar.xz/sapi/cli/php_cli_server.c Changed

@@ -1688,14 +1688,33 @@
 {
 	/* Wrap header value in a zval to add is to the HashTable which acts as an array */
 	zval tmp;
-	ZVAL_STR(&tmp, client->current_header_value);
 	/* strip off the colon */
 	zend_string *lc_header_name = zend_string_tolower_ex(client->current_header_name, /* persistent */ true);
 	GC_MAKE_PERSISTENT_LOCAL(lc_header_name);
 
-	/* Add the wrapped zend_string to the HashTable */
-	zend_hash_add(&client->request.headers, lc_header_name, &tmp);
-	zend_hash_add(&client->request.headers_original_case, client->current_header_name, &tmp);
+	zval *entry = zend_hash_find(&client->request.headers, lc_header_name);
+	bool with_comma = !zend_string_equals_literal(lc_header_name, "set-cookie");
+
+	/**
+	 * `Set-Cookie` HTTP header being the exception, they can have 1 or more values separated
+	 * by a comma while still possibly be set separately by the client.
+	 **/
+	if (!with_comma || entry == NULL) {
+		ZVAL_STR(&tmp, client->current_header_value);
+	} else {
+		zend_string *curval = Z_STR_P(entry);
+		zend_string *newval = zend_string_safe_alloc(1, ZSTR_LEN(curval),  ZSTR_LEN(client->current_header_value) + 2, /* persistent */true);
+
+		memcpy(ZSTR_VAL(newval), ZSTR_VAL(curval), ZSTR_LEN(curval));
+		memcpy(ZSTR_VAL(newval) + ZSTR_LEN(curval), ", ", 2);
+		memcpy(ZSTR_VAL(newval) + ZSTR_LEN(curval) + 2, ZSTR_VAL(client->current_header_value), ZSTR_LEN(client->current_header_value) + 1);
+
+		ZVAL_STR(&tmp, newval);
+	}
+
+	/* Add/Update the wrapped zend_string to the HashTable */
+	zend_hash_update(&client->request.headers, lc_header_name, &tmp);
+	zend_hash_update(&client->request.headers_original_case, client->current_header_name, &tmp);
 
 	zend_string_release_ex(lc_header_name, /* persistent */ true);
 	zend_string_release_ex(client->current_header_name, /* persistent */ true);
@@ -1935,6 +1954,8 @@
 	request_info->auth_user = request_info->auth_password = request_info->auth_digest = NULL;
 	if (NULL != (val = zend_hash_str_find(&client->request.headers, "content-type", sizeof("content-type")-1))) {
 		request_info->content_type = Z_STRVAL_P(val);
+	} else {
+		request_info->content_type = NULL;
 	}
 } /* }}} */
 
@@ -2261,6 +2282,7 @@
 		}
 
 		ZVAL_UNDEF(&retval);
+		CG(skip_shebang) = true;
 		if (SUCCESS == zend_execute_scripts(ZEND_REQUIRE, &retval, 1, &zfd)) {
 			if (Z_TYPE(retval) != IS_UNDEF) {
 				decline = Z_TYPE(retval) == IS_FALSE;

php-8.3.21.tar.xz/sapi/cli/tests/gh14189.phpt Added

php-8.3.21.tar.xz/sapi/cli/tests/gh16137.phpt Added

php-8.3.21.tar.xz/sapi/cli/tests/ghsa-4w77-75f9-2c8w.phpt Added

php-8.3.7.tar.xz/sapi/embed/README.md -> php-8.3.21.tar.xz/sapi/embed/README.md Changed

php-8.3.7.tar.xz/sapi/embed/config.m4 -> php-8.3.21.tar.xz/sapi/embed/config.m4 Changed

php-8.3.7.tar.xz/sapi/fpm/fpm/fpm_atomic.h -> php-8.3.21.tar.xz/sapi/fpm/fpm/fpm_atomic.h Changed

php-8.3.7.tar.xz/sapi/fpm/fpm/fpm_conf.c -> php-8.3.21.tar.xz/sapi/fpm/fpm/fpm_conf.c Changed

php-8.3.7.tar.xz/sapi/fpm/fpm/fpm_config.h -> php-8.3.21.tar.xz/sapi/fpm/fpm/fpm_config.h Changed

php-8.3.7.tar.xz/sapi/fpm/fpm/fpm_main.c -> php-8.3.21.tar.xz/sapi/fpm/fpm/fpm_main.c Changed

@@ -1153,6 +1153,7 @@
 							}
 
 							if (tflag) {
+								char *decoded_path_info = NULL;
 								if (orig_path_info) {
 									char old;
 
@@ -1174,7 +1175,6 @@
 									 * As we can extract PATH_INFO from PATH_TRANSLATED
 									 * it is probably also in SCRIPT_NAME and need to be removed
 									 */
-									char *decoded_path_info = NULL;
 									size_t decoded_path_info_len = 0;
 									if (strchr(path_info, '%')) {
 										decoded_path_info = estrdup(path_info);
@@ -1197,11 +1197,13 @@
 										env_script_nameenv_script_file_info_start = 0;
 										SG(request_info).request_uri = FCGI_PUTENV(request, "SCRIPT_NAME", env_script_name);
 									}
-									if (decoded_path_info) {
-										efree(decoded_path_info);
-									}
 								}
-								env_path_info = FCGI_PUTENV(request, "PATH_INFO", path_info);
+								if (decoded_path_info) {
+									env_path_info = FCGI_PUTENV(request, "PATH_INFO", decoded_path_info);
+									efree(decoded_path_info);
+								} else {
+									env_path_info = FCGI_PUTENV(request, "PATH_INFO", path_info);
+								}
 							}
 							if (!orig_script_filename ||
 								strcmp(orig_script_filename, pt) != 0) {

php-8.3.7.tar.xz/sapi/fpm/fpm/fpm_php.c -> php-8.3.21.tar.xz/sapi/fpm/fpm/fpm_php.c Changed

php-8.3.7.tar.xz/sapi/fpm/fpm/fpm_scoreboard.c -> php-8.3.21.tar.xz/sapi/fpm/fpm/fpm_scoreboard.c Changed

@@ -73,6 +73,22 @@
 	return 0;
 }
 
+static inline void fpm_scoreboard_readers_decrement(struct fpm_scoreboard_s *scoreboard)
+{
+	fpm_spinlock(&scoreboard->lock, 1);
+	if (scoreboard->reader_count > 0) {
+		scoreboard->reader_count -= 1;
+	}
+#ifdef PHP_FPM_ZLOG_TRACE
+	unsigned int current_reader_count = scoreboard->reader_count;
+#endif
+	fpm_unlock(scoreboard->lock);
+#ifdef PHP_FPM_ZLOG_TRACE
+	/* this is useful for debugging but currently needs to be hidden as external logger would always log it */
+	zlog(ZLOG_DEBUG, "scoreboard: for proc %d reader decremented to value %u", getpid(), current_reader_count);
+#endif
+}
+
 static struct fpm_scoreboard_s *fpm_scoreboard_get_for_update(struct fpm_scoreboard_s *scoreboard) /* {{{ */
 {
 	if (!scoreboard) {
@@ -93,7 +109,33 @@
 		return;
 	}
 
-	fpm_spinlock(&scoreboard->lock, 0);
+	int retries = 0;
+	while (1) {
+		fpm_spinlock(&scoreboard->lock, 1);
+		if (scoreboard->reader_count == 0) {
+			if (!fpm_spinlock_with_max_retries(&scoreboard->writer_active, FPM_SCOREBOARD_SPINLOCK_MAX_RETRIES)) {
+				/* in this case the writer might have crashed so just warn and continue as the lock was acquired */
+				zlog(ZLOG_WARNING, "scoreboard: writer %d waited too long for another writer to release lock.", getpid());
+			}
+#ifdef PHP_FPM_ZLOG_TRACE
+			else {
+				zlog(ZLOG_DEBUG, "scoreboard: writer lock acquired by writer %d", getpid());
+			}
+#endif
+			fpm_unlock(scoreboard->lock);
+			break;
+		}
+		fpm_unlock(scoreboard->lock);
+
+		if (++retries > FPM_SCOREBOARD_SPINLOCK_MAX_RETRIES) {
+			/* decrement reader count by 1 (assuming a killed or crashed reader) */
+			fpm_scoreboard_readers_decrement(scoreboard);
+			zlog(ZLOG_WARNING, "scoreboard: writer detected a potential crashed reader, decrementing reader count.");
+			retries = 0;
+		}
+
+		sched_yield();
+	}
 }
 /* }}} */
 
@@ -170,7 +212,10 @@
 		scoreboard->active_max = scoreboard->active;
 	}
 
-	fpm_unlock(scoreboard->lock);
+	fpm_unlock(scoreboard->writer_active);
+#ifdef PHP_FPM_ZLOG_TRACE
+	zlog(ZLOG_DEBUG, "scoreboard: writer lock released by writer %d", getpid());
+#endif
 }
 /* }}} */
 
@@ -234,16 +279,37 @@
 
 struct fpm_scoreboard_s *fpm_scoreboard_acquire(struct fpm_scoreboard_s *scoreboard, int nohang) /* {{{ */
 {
-	struct fpm_scoreboard_s *s;
-
-	s = scoreboard ? scoreboard : fpm_scoreboard;
+	struct fpm_scoreboard_s *s = scoreboard ? scoreboard : fpm_scoreboard;
 	if (!s) {
 		return NULL;
 	}
 
-	if (!fpm_spinlock(&s->lock, nohang)) {
-		return NULL;
+	int retries = 0;
+	while (1) {
+		/* increment reader if no writer active */
+		fpm_spinlock(&s->lock, 1);
+		if (!s->writer_active) {
+			s->reader_count += 1;
+#ifdef PHP_FPM_ZLOG_TRACE
+			unsigned int current_reader_count = s->reader_count;
+#endif
+			fpm_unlock(s->lock);
+#ifdef PHP_FPM_ZLOG_TRACE
+			zlog(ZLOG_DEBUG, "scoreboard: for proc %d reader incremented to value %u", getpid(), current_reader_count);
+#endif
+			break;
+		}
+		fpm_unlock(s->lock);
+
+		sched_yield();
+
+        if (++retries > FPM_SCOREBOARD_SPINLOCK_MAX_RETRIES) {
+            zlog(ZLOG_WARNING, "scoreboard: reader waited too long for writer to release lock.");
+			fpm_scoreboard_readers_decrement(s);
+			return NULL;
+        }
 	}
+
 	return s;
 }
 /* }}} */
@@ -253,7 +319,7 @@
 		return;
 	}
 
-	scoreboard->lock = 0;
+	fpm_scoreboard_readers_decrement(scoreboard);
 }
 
 struct fpm_scoreboard_s *fpm_scoreboard_copy(struct fpm_scoreboard_s *scoreboard, int copy_procs)

php-8.3.7.tar.xz/sapi/fpm/fpm/fpm_scoreboard.h -> php-8.3.21.tar.xz/sapi/fpm/fpm/fpm_scoreboard.h Changed

php-8.3.7.tar.xz/sapi/fpm/fpm/fpm_status.c -> php-8.3.21.tar.xz/sapi/fpm/fpm/fpm_status.c Changed

php-8.3.7.tar.xz/sapi/fpm/fpm/fpm_stdio.c -> php-8.3.21.tar.xz/sapi/fpm/fpm/fpm_stdio.c Changed

php-8.3.7.tar.xz/sapi/fpm/fpm/fpm_systemd.c -> php-8.3.21.tar.xz/sapi/fpm/fpm/fpm_systemd.c Changed

php-8.3.7.tar.xz/sapi/fpm/fpm/zlog.c -> php-8.3.21.tar.xz/sapi/fpm/fpm/zlog.c Changed

@@ -153,6 +153,7 @@
 }
 /* }}} */
 
+/* Returns the length if the print were complete, this can be larger than buf_size. */
 static size_t zlog_buf_prefix(
 		const char *function, int line, int flags,
 		char *buf, size_t buf_size, int use_syslog) /* {{{ */
@@ -189,6 +190,7 @@
 		}
 	}
 
+	/* Important: snprintf returns the number of bytes if the print were complete. */
 	return len;
 }
 /* }}} */
@@ -411,6 +413,7 @@
 static inline ssize_t zlog_stream_buf_copy_cstr(
 		struct zlog_stream *stream, const char *str, size_t str_len) /* {{{ */
 {
+	ZEND_ASSERT(stream->len <= stream->buf.size);
 	if (stream->buf.size - stream->len <= str_len &&
 			!zlog_stream_buf_alloc_ex(stream, str_len + stream->len)) {
 		return -1;
@@ -425,6 +428,7 @@
 
 static inline ssize_t zlog_stream_buf_copy_char(struct zlog_stream *stream, char c) /* {{{ */
 {
+	ZEND_ASSERT(stream->len <= stream->buf.size);
 	if (stream->buf.size - stream->len < 1 && !zlog_stream_buf_alloc_ex(stream, 1)) {
 		return -1;
 	}
@@ -681,6 +685,17 @@
 		len = zlog_buf_prefix(
 				function, line, stream->flags,
 				stream->buf.data, stream->buf.size, stream->use_syslog);
+		if (!EXPECTED(len + 1 <= stream->buf.size)) {
+			/* If the buffer was not large enough, try with a larger buffer.
+			 * Note that this may still truncate if the zlog_limit is reached. */
+			len = MIN(len + 1, zlog_limit);
+			if (!zlog_stream_buf_alloc_ex(stream, len)) {
+				return -1;
+			}
+			zlog_buf_prefix(
+				function, line, stream->flags,
+				stream->buf.data, stream->buf.size, stream->use_syslog);
+		}
 		stream->len = stream->prefix_len = len;
 		if (stream->msg_prefix != NULL) {
 			zlog_stream_buf_copy_cstr(stream, stream->msg_prefix, stream->msg_prefix_len);
@@ -692,8 +707,8 @@
 	} else {
 		char sbuf1024;
 		ssize_t written;
-		len = zlog_buf_prefix(function, line, stream->flags, sbuf, 1024, stream->use_syslog);
-		written = zlog_stream_direct_write(stream, sbuf, len);
+		len = zlog_buf_prefix(function, line, stream->flags, sbuf, sizeof(sbuf), stream->use_syslog);
+		written = zlog_stream_direct_write(stream, sbuf, MIN(len, sizeof(sbuf)));
 		if (stream->msg_prefix != NULL) {
 			written += zlog_stream_direct_write(
 					stream, stream->msg_prefix, stream->msg_prefix_len);

php-8.3.7.tar.xz/sapi/fpm/tests/fcgi-env-pif-apache-pp-sn-strip-encoded-plus.phpt -> php-8.3.21.tar.xz/sapi/fpm/tests/fcgi-env-pif-apache-pp-sn-strip-encoded-plus.phpt Changed

php-8.3.7.tar.xz/sapi/fpm/tests/fcgi-env-pif-apache-pp-sn-strip-encoded.phpt -> php-8.3.21.tar.xz/sapi/fpm/tests/fcgi-env-pif-apache-pp-sn-strip-encoded.phpt Changed

php-8.3.21.tar.xz/sapi/fpm/tests/gh15395-php-auth-shutdown.phpt Added

@@ -0,0 +1,61 @@
+--TEST--
+FPM: GH-15335 - PHP_AUTH shutdown  use after free
+--SKIPIF--
+<?php include "skipif.inc"; ?>
+--FILE--
+<?php
+
+require_once "tester.inc";
+
+$cfg = <<<EOT
+global
+error_log = {{FILE:LOG}}
+log_level = notice
+unconfined
+listen = {{ADDR}}
+pm = static
+pm.max_children = 1
+catch_workers_output = yes
+php_admin_valuecgi.fix_pathinfo = no
+EOT;
+
+$code = <<<EOT
+<?php
+echo \$_SERVER"SCRIPT_NAME" . "\n";
+echo \$_SERVER"SCRIPT_FILENAME" . "\n";
+echo \$_SERVER"PHP_SELF";
+EOT;
+
+$tester = new FPM\Tester($cfg, $code);
+$sourceFilePath, $scriptName = $tester->createSourceFileAndScriptName();
+$tester->start();
+$tester->expectLogStartNotices();
+$tester
+    ->request(
+        headers:  "HTTP_AUTHORIZATION" => "Basic Zm9vOg==", "REQUEST_METHOD" => "GET",
+        uri: $scriptName,
+        address: '{{ADDR}}',
+        scriptFilename: __DIR__ . "/__unknown.php",
+        scriptName: "/",
+    )
+    ->expectStatus('404 Not Found');
+$tester
+    ->request(
+        uri: $scriptName,
+        address: '{{ADDR}}',
+        params: ,
+    );
+$tester->expectNoLogPattern("/zend_mm_heap corrupted/");
+$tester->terminate();
+$tester->expectLogTerminatingNotices();
+$tester->close();
+
+?>
+Done
+--EXPECT--
+Done
+--CLEAN--
+<?php
+require_once "tester.inc";
+FPM\Tester::clean();
+?>

php-8.3.21.tar.xz/sapi/fpm/tests/gh16432-status-high-nprocs.phpt Added

php-8.3.21.tar.xz/sapi/fpm/tests/gh16628.phpt Added

@@ -0,0 +1,53 @@
+--TEST--
+GH-16628 (FPM logs are getting corrupted with this log statement)
+--EXTENSIONS--
+zend_test
+--SKIPIF--
+<?php include "skipif.inc"; ?>
+--FILE--
+<?php
+
+require_once "tester.inc";
+
+$cfg = <<<EOT
+global
+error_log = {{FILE:LOG}}
+log_level = debug
+unconfined
+listen = {{ADDR}}
+pm = dynamic
+pm.max_children = 5
+pm.start_servers = 1
+pm.min_spare_servers = 1
+pm.max_spare_servers = 3
+catch_workers_output = yes
+decorate_workers_output = no
+EOT;
+
+$code = <<<'EOT'
+<?php
+for ($i = 1; $i < 100; $i++) {
+	zend_test_log_err_debug(str_repeat("a", $i));
+}
+EOT;
+
+$tester = new FPM\Tester($cfg, $code);
+$tester->start(extensions: 'zend_test');
+$tester->expectLogStartNotices();
+$tester->request()->expectEmptyBody();
+for ($i = 1; $i < 100; $i++) {
+    $tester->expectLogNotice("%sPHP message: " . str_repeat("a", $i));
+}
+$tester->terminate();
+$tester->expectLogTerminatingNotices();
+$tester->close();
+
+?>
+Done
+--EXPECT--
+Done
+--CLEAN--
+<?php
+require_once "tester.inc";
+FPM\Tester::clean();
+?>

php-8.3.21.tar.xz/sapi/fpm/tests/log-bwp-msg-flush-split-sep-pos-end.phpt Added

@@ -0,0 +1,47 @@
+--TEST--
+FPM: Buffered worker output plain log with msg with flush split position towards separator end
+--SKIPIF--
+<?php include "skipif.inc"; ?>
+--FILE--
+<?php
+
+require_once "tester.inc";
+
+$cfg = <<<EOT
+global
+error_log = {{FILE:LOG}}
+unconfined
+listen = {{ADDR}}
+pm = dynamic
+pm.max_children = 5
+pm.start_servers = 1
+pm.min_spare_servers = 1
+pm.max_spare_servers = 3
+catch_workers_output = yes
+decorate_workers_output = no
+EOT;
+
+$code = <<<EOT
+<?php
+file_put_contents('php://stderr', str_repeat('a', 1013) . "Quarkslab\0fscf\0Quarkslab");
+EOT;
+
+$tester = new FPM\Tester($cfg, $code);
+$tester->start();
+$tester->expectLogStartNotices();
+$tester->request()->expectEmptyBody();
+$tester->expectLogLine(str_repeat('a', 1013)  . "Quarkslab", decorated: false);
+$tester->expectLogLine("Quarkslab", decorated: false);
+$tester->terminate();
+$tester->expectLogTerminatingNotices();
+$tester->close();
+
+?>
+Done
+--EXPECT--
+Done
+--CLEAN--
+<?php
+require_once "tester.inc";
+FPM\Tester::clean();
+?>

php-8.3.21.tar.xz/sapi/fpm/tests/log-bwp-msg-flush-split-sep-pos-start.phpt Added

@@ -0,0 +1,47 @@
+--TEST--
+FPM: Buffered worker output plain log with msg with flush split position towards separator start
+--SKIPIF--
+<?php include "skipif.inc"; ?>
+--FILE--
+<?php
+
+require_once "tester.inc";
+
+$cfg = <<<EOT
+global
+error_log = {{FILE:LOG}}
+unconfined
+listen = {{ADDR}}
+pm = dynamic
+pm.max_children = 5
+pm.start_servers = 1
+pm.min_spare_servers = 1
+pm.max_spare_servers = 3
+catch_workers_output = yes
+decorate_workers_output = no
+EOT;
+
+$code = <<<EOT
+<?php
+file_put_contents('php://stderr', str_repeat('a', 1009) . "Quarkslab\0fscf\0Quarkslab");
+EOT;
+
+$tester = new FPM\Tester($cfg, $code);
+$tester->start();
+$tester->expectLogStartNotices();
+$tester->request()->expectEmptyBody();
+$tester->expectLogLine(str_repeat('a', 1009)  . "Quarkslab", decorated: false);
+$tester->expectLogLine("Quarkslab", decorated: false);
+$tester->terminate();
+$tester->expectLogTerminatingNotices();
+$tester->close();
+
+?>
+Done
+--EXPECT--
+Done
+--CLEAN--
+<?php
+require_once "tester.inc";
+FPM\Tester::clean();
+?>

php-8.3.21.tar.xz/sapi/fpm/tests/status-ping.phpt Added

php-8.3.7.tar.xz/sapi/fpm/tests/tester.inc -> php-8.3.21.tar.xz/sapi/fpm/tests/tester.inc Changed

@@ -401,11 +401,15 @@
         bool $debug = null,
         string $clientTransport = 'stream'
     ) {
-        $this->configTemplate  = $configTemplate;
-        $this->code            = $code;
-        $this->options         = $options;
-        $this->fileName        = $fileName ?: self::getCallerFileName();
-        $this->debug           = $debug !== null ? $debug : (bool)getenv('TEST_FPM_DEBUG');
+        $this->configTemplate = $configTemplate;
+        $this->code           = $code;
+        $this->options        = $options;
+        $this->fileName       = $fileName ?: self::getCallerFileName();
+        if (($debugFilter = getenv('TEST_FPM_DEBUG_FILTER')) !== false) {
+            $this->debug = str_contains(basename($this->fileName), $debugFilter);
+        } else {
+            $this->debug = $debug !== null ? $debug : (bool)getenv('TEST_FPM_DEBUG');
+        }
         $this->logReader       = new LogReader($this->debug);
         $this->logTool         = new LogTool($this->logReader, $this->debug);
         $this->clientTransport = $clientTransport;
@@ -848,6 +852,7 @@
         bool $expectError = false,
         int $readLimit = -1,
         int $writeDelay = 0,
+        array $params = null,
     ): Response {
         if ($this->hasError()) {
             return $this->createResponse(expectInvalid: true);
@@ -857,7 +862,7 @@
             $stdin = $this->parseStdin($stdin, $headers);
         }
 
-        $params = $this->getRequestParams($query, $headers, $uri, $scriptFilename, $scriptName, $stdin);
+        $params = $params ?? $this->getRequestParams($query, $headers, $uri, $scriptFilename, $scriptName, $stdin);
         $this->trace('Request params', $params);
 
         try {
@@ -929,6 +934,7 @@
                         $requestData'headers' ?? ,
                         $requestData'uri' ?? null
                     );
+                    $this->trace('Request params', $params);
 
                     if (isset($requestData'delay')) {
                         usleep($requestData'delay');

php-8.3.7.tar.xz/sapi/fuzzer/fuzzer-json.c -> php-8.3.21.tar.xz/sapi/fuzzer/fuzzer-json.c Changed

php-8.3.7.tar.xz/sapi/fuzzer/fuzzer-mbregex.c -> php-8.3.21.tar.xz/sapi/fuzzer/fuzzer-mbregex.c Changed

php-8.3.7.tar.xz/sapi/fuzzer/fuzzer-unserialize.c -> php-8.3.21.tar.xz/sapi/fuzzer/fuzzer-unserialize.c Changed

php-8.3.7.tar.xz/sapi/fuzzer/fuzzer-unserializehash.c -> php-8.3.21.tar.xz/sapi/fuzzer/fuzzer-unserializehash.c Changed

php-8.3.7.tar.xz/sapi/phpdbg/phpdbg.c -> php-8.3.21.tar.xz/sapi/phpdbg/phpdbg.c Changed

@@ -89,11 +89,6 @@
 	efree(brake);
 } /* }}} */
 
-static void php_phpdbg_destroy_registered(zval *data) /* {{{ */
-{
-	zend_function_dtor(data);
-} /* }}} */
-
 static void php_phpdbg_destroy_file_source(zval *data) /* {{{ */
 {
 	phpdbg_file_source *source = (phpdbg_file_source *) Z_PTR_P(data);
@@ -163,7 +158,7 @@
 	zend_hash_init(&PHPDBG_G(bp)PHPDBG_BREAK_MAP, 8, NULL, NULL, 0);
 
 	zend_hash_init(&PHPDBG_G(seek), 8, NULL, NULL, 0);
-	zend_hash_init(&PHPDBG_G(registered), 8, NULL, php_phpdbg_destroy_registered, 0);
+	zend_hash_init(&PHPDBG_G(registered), 8, NULL, NULL, true);
 
 	zend_hash_init(&PHPDBG_G(file_sources), 0, NULL, php_phpdbg_destroy_file_source, 0);
 	phpdbg_setup_watchpoints();
@@ -229,13 +224,13 @@
 
 	if (zend_vm_kind() != ZEND_VM_KIND_HYBRID) {
 		/* phpdbg cannot work JIT-ed code */
-		zend_string *key = zend_string_init(ZEND_STRL("opcache.jit"), 1);
-		zend_string *value = zend_string_init(ZEND_STRL("off"), 1);
+		zend_string *key = zend_string_init(ZEND_STRL("opcache.jit"), false);
+		zend_string *value = zend_string_init(ZEND_STRL("off"), false);
 
-		zend_alter_ini_entry(key, value, ZEND_INI_SYSTEM, ZEND_INI_STAGE_STARTUP);
+		zend_alter_ini_entry_ex(key, value, ZEND_INI_SYSTEM, ZEND_INI_STAGE_STARTUP, false);
 
-		zend_string_release(key);
-		zend_string_release(value);
+		zend_string_release_ex(key, false);
+		zend_string_release_ex(value, false);
 	}
 
 	return SUCCESS;
@@ -369,6 +364,7 @@
 	zend_hash_clean(&PHPDBG_G(bp)PHPDBG_BREAK_FILE_OPLINE);
 	zend_hash_clean(&PHPDBG_G(bp)PHPDBG_BREAK_OPLINE);
 	zend_hash_clean(&PHPDBG_G(bp)PHPDBG_BREAK_METHOD);
+	zend_hash_clean(&PHPDBG_G(bp)PHPDBG_BREAK_MAP);
 	zend_hash_clean(&PHPDBG_G(bp)PHPDBG_BREAK_COND);
 } /* }}} */
 
@@ -845,7 +841,7 @@
 
 static inline size_t php_sapi_phpdbg_ub_write(const char *message, size_t length) /* {{{ */
 {
-	return phpdbg_script(P_STDOUT, "%.*s", (int) length, message);
+	return phpdbg_process_print(PHPDBG_G(io)PHPDBG_STDOUT.fd, P_STDOUT, message, (int) length);
 } /* }}} */
 
 /* beginning of struct, see main/streams/plain_wrapper.c line 111 */

php-8.3.7.tar.xz/sapi/phpdbg/phpdbg.h -> php-8.3.21.tar.xz/sapi/phpdbg/phpdbg.h Changed

php-8.3.7.tar.xz/sapi/phpdbg/phpdbg_cmd.c -> php-8.3.21.tar.xz/sapi/phpdbg/phpdbg_cmd.c Changed

@@ -23,6 +23,10 @@
 #include "phpdbg_prompt.h"
 #include "phpdbg_io.h"
 
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+
 ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
 
 static inline const char *phpdbg_command_name(const phpdbg_command_t *command, char *buffer) {
@@ -746,17 +750,29 @@
 	if ((PHPDBG_G(flags) & (PHPDBG_IS_STOPPING | PHPDBG_IS_RUNNING)) != PHPDBG_IS_STOPPING) {
 		if (buffered == NULL) {
 #ifdef HAVE_PHPDBG_READLINE
-			char *cmd = readline(phpdbg_get_prompt());
-			PHPDBG_G(last_was_newline) = 1;
+# ifdef HAVE_UNISTD_H
+			/* EOF makes readline write prompt again in local console mode and
+			ignored if compiled without readline integration. */
+			if (!isatty(PHPDBG_G(io)PHPDBG_STDIN.fd)) {
+				char bufPHPDBG_MAX_CMD;
+				phpdbg_write("%s", phpdbg_get_prompt());
+				phpdbg_consume_stdin_line(buf);
+				buffer = estrdup(buf);
+			} else
+# endif
+			{
+				char *cmd = readline(phpdbg_get_prompt());
+				PHPDBG_G(last_was_newline) = 1;
+
+				if (!cmd) {
+					PHPDBG_G(flags) |= PHPDBG_IS_QUITTING;
+					zend_bailout();
+				}
 
-			if (!cmd) {
-				PHPDBG_G(flags) |= PHPDBG_IS_QUITTING;
-				zend_bailout();
+				add_history(cmd);
+				buffer = estrdup(cmd);
+				free(cmd);
 			}
-
-			add_history(cmd);
-			buffer = estrdup(cmd);
-			free(cmd);
 #else
 			phpdbg_write("%s", phpdbg_get_prompt());
 			phpdbg_consume_stdin_line(buf);

php-8.3.7.tar.xz/sapi/phpdbg/phpdbg_info.c -> php-8.3.21.tar.xz/sapi/phpdbg/phpdbg_info.c Changed

@@ -399,24 +399,29 @@
 	phpdbg_notice("User Classes (%d)", zend_hash_num_elements(&classes));
 
 	/* once added, assume that classes are stable... until shutdown. */
-	ZEND_HASH_PACKED_FOREACH_PTR(&classes, ce) {
-		phpdbg_print_class_name(ce);
-
-		if (ce->parent) {
-			zend_class_entry *pce;
-			pce = ce->parent;
-			do {
-				phpdbg_out("|-------- ");
-				phpdbg_print_class_name(pce);
-			} while ((pce = pce->parent));
-		}
+	if (HT_IS_INITIALIZED(&classes)) {
+		ZEND_HASH_PACKED_FOREACH_PTR(&classes, ce) {
+			phpdbg_print_class_name(ce);
+
+			if (ce->parent) {
+				if (ce->ce_flags & ZEND_ACC_LINKED) {
+					zend_class_entry *pce = ce->parent;
+					do {
+						phpdbg_out("|-------- ");
+						phpdbg_print_class_name(pce);
+					} while ((pce = pce->parent));
+				} else {
+					phpdbg_writeln("|-------- User Class %s (not yet linked because declaration for parent was not encountered when declaring the class)", ZSTR_VAL(ce->parent_name));
+				}
+			}
 
-		if (ce->info.user.filename) {
-			phpdbg_writeln("|---- in %s on line %u", ZSTR_VAL(ce->info.user.filename), ce->info.user.line_start);
-		} else {
-			phpdbg_writeln("|---- no source code");
-		}
-	} ZEND_HASH_FOREACH_END();
+			if (ce->info.user.filename) {
+				phpdbg_writeln("|---- in %s on line %u", ZSTR_VAL(ce->info.user.filename), ce->info.user.line_start);
+			} else {
+				phpdbg_writeln("|---- no source code");
+			}
+		} ZEND_HASH_FOREACH_END();
+	}
 
 	zend_hash_destroy(&classes);
 
@@ -442,17 +447,19 @@
 
 	phpdbg_notice("User Functions (%d)", zend_hash_num_elements(&functions));
 
-	ZEND_HASH_PACKED_FOREACH_PTR(&functions, zf) {
-		zend_op_array *op_array = &zf->op_array;
+	if (HT_IS_INITIALIZED(&functions)) {
+		ZEND_HASH_PACKED_FOREACH_PTR(&functions, zf) {
+			zend_op_array *op_array = &zf->op_array;
 
-		phpdbg_write("|-------- %s", op_array->function_name ? ZSTR_VAL(op_array->function_name) : "{main}");
+			phpdbg_write("|-------- %s", op_array->function_name ? ZSTR_VAL(op_array->function_name) : "{main}");
 
-		if (op_array->filename) {
-			phpdbg_writeln(" in %s on line %d", ZSTR_VAL(op_array->filename), op_array->line_start);
-		} else {
-			phpdbg_writeln(" (no source code)");
-		}
-	} ZEND_HASH_FOREACH_END();
+			if (op_array->filename) {
+				phpdbg_writeln(" in %s on line %d", ZSTR_VAL(op_array->filename), op_array->line_start);
+			} else {
+				phpdbg_writeln(" (no source code)");
+			}
+		} ZEND_HASH_FOREACH_END();
+	}
 
 	zend_hash_destroy(&functions);

php-8.3.7.tar.xz/sapi/phpdbg/phpdbg_lexer.c -> php-8.3.21.tar.xz/sapi/phpdbg/phpdbg_lexer.c Changed

@@ -1,4 +1,4 @@
-/* Generated by re2c 1.3 */
+/* Generated by re2c 3.0 */
 /*
  * phpdbg_lexer.l
  */
@@ -154,789 +154,780 @@
 		YYFILL(11);
 		yych = *YYCURSOR;
 		if (yybm256+yych & 128) {
-			goto yy7;
+			goto yy5;
 		}
 		switch (yych) {
-		case 0x00:
-		case '\t':
-		case '\n':	goto yy2;
-		case '"':	goto yy10;
-		case '#':	goto yy12;
-		case '\'':	goto yy14;
-		case '-':	goto yy15;
-		case '.':
-		case '1':
-		case '2':
-		case '3':
-		case '4':
-		case '5':
-		case '6':
-		case '7':
-		case '8':
-		case '9':	goto yy16;
-		case '0':	goto yy19;
-		case ':':	goto yy20;
-		case 'D':
-		case 'd':	goto yy21;
-		case 'E':
-		case 'e':	goto yy22;
-		case 'F':
-		case 'f':	goto yy23;
-		case 'I':
-		case 'i':	goto yy24;
-		case 'N':
-		case 'n':	goto yy25;
-		case 'O':
-		case 'o':	goto yy26;
-		case 'T':
-		case 't':	goto yy27;
-		case 'Y':
-		case 'y':	goto yy28;
-		case 'Z':	goto yy29;
-		case 'z':	goto yy30;
-		default:	goto yy4;
-		}
-yy2:
-		YYDEBUG(2, *YYCURSOR);
+			case 0x00:
+			case '\t':
+			case '\n': goto yy1;
+			case '"': goto yy6;
+			case '#': goto yy8;
+			case '\'': goto yy10;
+			case '-': goto yy11;
+			case '.':
+			case '1':
+			case '2':
+			case '3':
+			case '4':
+			case '5':
+			case '6':
+			case '7':
+			case '8':
+			case '9': goto yy12;
+			case '0': goto yy14;
+			case ':': goto yy15;
+			case 'D':
+			case 'd': goto yy16;
+			case 'E':
+			case 'e': goto yy17;
+			case 'F':
+			case 'f': goto yy18;
+			case 'I':
+			case 'i': goto yy19;
+			case 'N':
+			case 'n': goto yy20;
+			case 'O':
+			case 'o': goto yy21;
+			case 'T':
+			case 't': goto yy22;
+			case 'Y':
+			case 'y': goto yy23;
+			case 'Z': goto yy24;
+			case 'z': goto yy25;
+			default: goto yy2;
+		}
+yy1:
+		YYDEBUG(1, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(3, *YYCURSOR);
 		yyleng = (size_t) YYCURSOR - (size_t) yytext;
 		{
 	return 0;
 }
-yy4:
-		YYDEBUG(4, *YYCURSOR);
+yy2:
+		YYDEBUG(2, *YYCURSOR);
 		yyaccept = 0;
 		YYMARKER = ++YYCURSOR;
 		YYFILL(3);
 		yych = *YYCURSOR;
-yy5:
-		YYDEBUG(5, *YYCURSOR);
+yy3:
+		YYDEBUG(3, *YYCURSOR);
 		if (yybm256+yych & 64) {
-			goto yy4;
+			goto yy2;
 		}
-		if (yych <= ' ') goto yy6;
-		if (yych == '#') goto yy6;
-		if (yych <= '\'') goto yy31;
-		goto yy33;
-yy6:
-		YYDEBUG(6, *YYCURSOR);
+		if (yych <= ' ') goto yy4;
+		if (yych == '#') goto yy4;
+		if (yych <= '\'') goto yy26;
+		goto yy28;
+yy4:
+		YYDEBUG(4, *YYCURSOR);
 		yyleng = (size_t) YYCURSOR - (size_t) yytext;
 		{
 	phpdbg_init_param(yylval, STR_PARAM);
-	yylval->str = estrndup(yytext, yyleng - unescape_string(yytext));
-	yylval->len = yyleng;
+	size_t len = yyleng - unescape_string(yytext);
+	yylval->str = estrndup(yytext, len);
+	yylval->len = len;
 	return T_ID;
 }
-yy7:
-		YYDEBUG(7, *YYCURSOR);
+yy5:
+		YYDEBUG(5, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(8, *YYCURSOR);
 		if (yybm256+yych & 128) {
-			goto yy7;
+			goto yy5;
 		}
-		YYDEBUG(9, *YYCURSOR);
 		yyleng = (size_t) YYCURSOR - (size_t) yytext;
 		{
 	/* ignore whitespace */
 
 	goto restart;
 }
-yy10:
-		YYDEBUG(10, *YYCURSOR);
+yy6:
+		YYDEBUG(6, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == '"') goto yy31;
-		goto yy35;
-yy11:
-		YYDEBUG(11, *YYCURSOR);
+		if (yych == '"') goto yy26;
+		goto yy30;
+yy7:
+		YYDEBUG(7, *YYCURSOR);
 		YYCURSOR = YYMARKER;
 		if (yyaccept <= 3) {
 			if (yyaccept <= 1) {
 				if (yyaccept == 0) {
-					goto yy6;
+					goto yy4;
 				} else {
-					goto yy13;
+					goto yy9;
 				}
 			} else {
 				if (yyaccept == 2) {
-					goto yy18;
+					goto yy13;
 				} else {
-					goto yy82;
+					goto yy71;
 				}
 			}
 		} else {
 			if (yyaccept <= 5) {
 				if (yyaccept == 4) {
-					goto yy85;
+					goto yy73;
 				} else {
-					goto yy101;
+					goto yy85;
 				}
 			} else {
-				goto yy118;
+				goto yy100;
 			}
 		}
-yy12:
-		YYDEBUG(12, *YYCURSOR);
+yy8:
+		YYDEBUG(8, *YYCURSOR);
 		yyaccept = 1;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yych <= '.') {
-			if (yych <= ',') goto yy13;
+			if (yych <= ',') goto yy9;
 			if (yych <= '-') {
 				YYCTXMARKER = YYCURSOR;
-				goto yy40;
+				goto yy35;
 			}
 			YYCTXMARKER = YYCURSOR;
-			goto yy41;
+			goto yy36;
 		} else {
-			if (yych <= '/') goto yy13;
+			if (yych <= '/') goto yy9;
 			if (yych <= '9') {
 				YYCTXMARKER = YYCURSOR;
-				goto yy41;
+				goto yy36;
 			}
 		}
-yy13:
-		YYDEBUG(13, *YYCURSOR);
+yy9:
+		YYDEBUG(9, *YYCURSOR);
 		yyleng = (size_t) YYCURSOR - (size_t) yytext;
 		{
 	YYSETCONDITION(INITIAL);
 	return T_SEPARATOR;
 }
-yy14:
-		YYDEBUG(14, *YYCURSOR);
+yy10:
+		YYDEBUG(10, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == '\'') goto yy31;
-		goto yy45;
-yy15:
-		YYDEBUG(15, *YYCURSOR);
+		if (yych == '\'') goto yy26;
+		goto yy39;
+yy11:
+		YYDEBUG(11, *YYCURSOR);
 		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm0+yych & 1) {
-			goto yy16;
+			goto yy12;
 		}
-		if (yych == 'r') goto yy50;
-		goto yy5;
-yy16:
-		YYDEBUG(16, *YYCURSOR);
+		if (yych == 'r') goto yy44;
+		goto yy3;
+yy12:
+		YYDEBUG(12, *YYCURSOR);
 		yyaccept = 2;
 		YYMARKER = ++YYCURSOR;
 		YYFILL(3);
 		yych = *YYCURSOR;
-		YYDEBUG(17, *YYCURSOR);
 		if (yybm0+yych & 1) {
-			goto yy16;
+			goto yy12;
 		}
 		if (yych <= ' ') {
 			if (yych <= '\n') {
-				if (yych <= 0x00) goto yy18;
-				if (yych <= 0x08) goto yy4;
+				if (yych <= 0x00) goto yy13;
+				if (yych <= 0x08) goto yy2;
 			} else {
-				if (yych == '\r') goto yy18;
-				if (yych <= 0x1F) goto yy4;
+				if (yych == '\r') goto yy13;
+				if (yych <= 0x1F) goto yy2;
 			}
 		} else {
 			if (yych <= '&') {
-				if (yych <= '!') goto yy4;
-				if (yych <= '"') goto yy31;
-				if (yych >= '$') goto yy4;
+				if (yych <= '!') goto yy2;
+				if (yych <= '"') goto yy26;
+				if (yych >= '$') goto yy2;
 			} else {
-				if (yych <= '\'') goto yy31;
-				if (yych <= '/') goto yy4;
-				if (yych <= ':') goto yy33;
-				goto yy4;
+				if (yych <= '\'') goto yy26;
+				if (yych <= '/') goto yy2;
+				if (yych <= ':') goto yy28;
+				goto yy2;
 			}
 		}
-yy18:
-		YYDEBUG(18, *YYCURSOR);
+yy13:
+		YYDEBUG(13, *YYCURSOR);
 		yyleng = (size_t) YYCURSOR - (size_t) yytext;
 		{
 	phpdbg_init_param(yylval, NUMERIC_PARAM);
 	yylval->num = atoi(yytext);
 	return T_DIGITS;
 }
-yy19:
-		YYDEBUG(19, *YYCURSOR);
+yy14:
+		YYDEBUG(14, *YYCURSOR);
 		yyaccept = 2;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm0+yych & 1) {
-			goto yy16;
+			goto yy12;
 		}
 		if (yych <= 0x1F) {
 			if (yych <= '\n') {
-				if (yych <= 0x00) goto yy18;
-				if (yych <= 0x08) goto yy5;
-				goto yy18;
+				if (yych <= 0x00) goto yy13;
+				if (yych <= 0x08) goto yy3;
+				goto yy13;
 			} else {
-				if (yych == '\r') goto yy18;
-				goto yy5;
+				if (yych == '\r') goto yy13;
+				goto yy3;
 			}
 		} else {
 			if (yych <= '#') {
-				if (yych <= ' ') goto yy18;
-				if (yych <= '"') goto yy5;
-				goto yy18;
+				if (yych <= ' ') goto yy13;
+				if (yych <= '"') goto yy3;
+				goto yy13;
 			} else {
-				if (yych == 'x') goto yy51;
-				goto yy5;
+				if (yych == 'x') goto yy45;
+				goto yy3;
 			}
 		}
-yy20:
-		YYDEBUG(20, *YYCURSOR);
+yy15:
+		YYDEBUG(15, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == ':') goto yy54;
-		if (yych == '\\') goto yy56;
-		goto yy52;
-yy21:
-		YYDEBUG(21, *YYCURSOR);
+		if (yych == ':') goto yy47;
+		if (yych == '\\') goto yy48;
+		goto yy46;
+yy16:
+		YYDEBUG(16, *YYCURSOR);
 		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'I') goto yy58;
-		if (yych == 'i') goto yy58;
-		goto yy5;
-yy22:
-		YYDEBUG(22, *YYCURSOR);
+		if (yych == 'I') goto yy49;
+		if (yych == 'i') goto yy49;
+		goto yy3;
+yy17:
+		YYDEBUG(17, *YYCURSOR);
 		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'N') goto yy59;
-		if (yych == 'n') goto yy59;
-		goto yy5;
-yy23:
-		YYDEBUG(23, *YYCURSOR);
+		if (yych == 'N') goto yy50;
+		if (yych == 'n') goto yy50;
+		goto yy3;
+yy18:
+		YYDEBUG(18, *YYCURSOR);
 		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'A') goto yy60;
-		if (yych == 'a') goto yy60;
-		goto yy5;
-yy24:
-		YYDEBUG(24, *YYCURSOR);
+		if (yych == 'A') goto yy51;
+		if (yych == 'a') goto yy51;
+		goto yy3;
+yy19:
+		YYDEBUG(19, *YYCURSOR);
 		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'F') goto yy61;
-		if (yych == 'f') goto yy61;
-		goto yy5;
-yy25:
-		YYDEBUG(25, *YYCURSOR);
+		if (yych == 'F') goto yy52;
+		if (yych == 'f') goto yy52;
+		goto yy3;
+yy20:
+		YYDEBUG(20, *YYCURSOR);
 		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'O') goto yy62;
-		if (yych == 'o') goto yy62;
-		goto yy5;
-yy26:
-		YYDEBUG(26, *YYCURSOR);
+		if (yych == 'O') goto yy53;
+		if (yych == 'o') goto yy53;
+		goto yy3;
+yy21:
+		YYDEBUG(21, *YYCURSOR);
 		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yych <= 'N') {
-			if (yych == 'F') goto yy63;
-			if (yych <= 'M') goto yy5;
-			goto yy64;
+			if (yych == 'F') goto yy54;
+			if (yych <= 'M') goto yy3;
+			goto yy55;
 		} else {
 			if (yych <= 'f') {
-				if (yych <= 'e') goto yy5;
-				goto yy63;
+				if (yych <= 'e') goto yy3;
+				goto yy54;
 			} else {
-				if (yych == 'n') goto yy64;
-				goto yy5;
+				if (yych == 'n') goto yy55;
+				goto yy3;
 			}
 		}
-yy27:
-		YYDEBUG(27, *YYCURSOR);
+yy22:
+		YYDEBUG(22, *YYCURSOR);
 		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'R') goto yy65;
-		if (yych == 'r') goto yy65;
-		goto yy5;
-yy28:
-		YYDEBUG(28, *YYCURSOR);
+		if (yych == 'R') goto yy56;
+		if (yych == 'r') goto yy56;
+		goto yy3;
+yy23:
+		YYDEBUG(23, *YYCURSOR);
 		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'E') goto yy66;
-		if (yych == 'e') goto yy66;
-		goto yy5;
-yy29:
-		YYDEBUG(29, *YYCURSOR);
+		if (yych == 'E') goto yy57;
+		if (yych == 'e') goto yy57;
+		goto yy3;
+yy24:
+		YYDEBUG(24, *YYCURSOR);
 		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'E') goto yy67;
-		goto yy5;
-yy30:
-		YYDEBUG(30, *YYCURSOR);
+		if (yych == 'E') goto yy58;
+		goto yy3;
+yy25:
+		YYDEBUG(25, *YYCURSOR);
 		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'e') goto yy68;
-		goto yy5;
-yy31:
-		YYDEBUG(31, *YYCURSOR);
+		if (yych == 'e') goto yy59;
+		goto yy3;
+yy26:
+		YYDEBUG(26, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(3);
 		yych = *YYCURSOR;
-yy32:
-		YYDEBUG(32, *YYCURSOR);
+yy27:
+		YYDEBUG(27, *YYCURSOR);
 		if (yybm0+yych & 2) {
-			goto yy31;
+			goto yy26;
 		}
-		if (yych <= '#') goto yy11;
-		goto yy69;
-yy33:
-		YYDEBUG(33, *YYCURSOR);
+		if (yych <= '#') goto yy7;
+		goto yy60;
+yy28:
+		YYDEBUG(28, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == '/') goto yy70;
-		if (yych == '\\') goto yy56;
-		goto yy11;
-yy34:
-		YYDEBUG(34, *YYCURSOR);
+		if (yych == '/') goto yy61;
+		if (yych == '\\') goto yy48;
+		goto yy7;
+yy29:
+		YYDEBUG(29, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(4);
 		yych = *YYCURSOR;
-yy35:
-		YYDEBUG(35, *YYCURSOR);
+yy30:
+		YYDEBUG(30, *YYCURSOR);
 		if (yybm0+yych & 4) {
-			goto yy34;
+			goto yy29;
 		}
 		if (yych <= ' ') {
-			if (yych <= 0x00) goto yy11;
-			if (yych == '\n') goto yy11;
+			if (yych <= 0x00) goto yy7;
+			if (yych == '\n') goto yy7;
 		} else {
-			if (yych <= '"') goto yy71;
-			if (yych <= '#') goto yy36;
-			if (yych <= ':') goto yy38;
-			goto yy39;
+			if (yych <= '"') goto yy62;
+			if (yych <= '#') goto yy31;
+			if (yych <= ':') goto yy33;
+			goto yy34;
 		}
-yy36:
-		YYDEBUG(36, *YYCURSOR);
+yy31:
+		YYDEBUG(31, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-yy37:
-		YYDEBUG(37, *YYCURSOR);
+yy32:
+		YYDEBUG(32, *YYCURSOR);
 		if (yybm0+yych & 8) {
-			goto yy36;
+			goto yy31;
 		}
-		if (yych <= '\n') goto yy11;
-		if (yych <= '"') goto yy72;
-		goto yy73;
-yy38:
-		YYDEBUG(38, *YYCURSOR);
+		if (yych <= '\n') goto yy7;
+		if (yych <= '"') goto yy63;
+		goto yy64;
+yy33:
+		YYDEBUG(33, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == '/') goto yy74;
-		goto yy37;
-yy39:
-		YYDEBUG(39, *YYCURSOR);
+		if (yych == '/') goto yy65;
+		goto yy32;
+yy34:
+		YYDEBUG(34, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(3);
 		yych = *YYCURSOR;
 		if (yych <= ' ') {
 			if (yych <= '\n') {
-				if (yych <= 0x00) goto yy11;
-				if (yych <= 0x08) goto yy31;
-				goto yy11;
+				if (yych <= 0x00) goto yy7;
+				if (yych <= 0x08) goto yy26;
+				goto yy7;
 			} else {
-				if (yych == '\r') goto yy11;
-				if (yych <= 0x1F) goto yy31;
-				goto yy11;
+				if (yych == '\r') goto yy7;
+				if (yych <= 0x1F) goto yy26;
+				goto yy7;
 			}
 		} else {
 			if (yych <= '9') {
-				if (yych <= '!') goto yy31;
-				if (yych <= '"') goto yy34;
-				if (yych <= '#') goto yy11;
-				goto yy31;
+				if (yych <= '!') goto yy26;
+				if (yych <= '"') goto yy29;
+				if (yych <= '#') goto yy7;
+				goto yy26;
 			} else {
-				if (yych <= ':') goto yy69;
-				if (yych == '\\') goto yy34;
-				goto yy31;
+				if (yych <= ':') goto yy60;
+				if (yych == '\\') goto yy29;
+				goto yy26;
 			}
 		}
-yy40:
-		YYDEBUG(40, *YYCURSOR);
+yy35:
+		YYDEBUG(35, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == '.') goto yy41;
-		if (yych <= '/') goto yy11;
-		if (yych >= ':') goto yy11;
-yy41:
-		YYDEBUG(41, *YYCURSOR);
+		if (yych == '.') goto yy36;
+		if (yych <= '/') goto yy7;
+		if (yych >= ':') goto yy7;
+yy36:
+		YYDEBUG(36, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(42, *YYCURSOR);
-		if (yych == '.') goto yy41;
-		if (yych <= '/') goto yy43;
-		if (yych <= '9') goto yy41;
-yy43:
-		YYDEBUG(43, *YYCURSOR);
+		if (yych == '.') goto yy36;
+		if (yych <= '/') goto yy37;
+		if (yych <= '9') goto yy36;
+yy37:
+		YYDEBUG(37, *YYCURSOR);
 		YYCURSOR = YYCTXMARKER;
 		yyleng = (size_t) YYCURSOR - (size_t) yytext;
 		{
 	return T_POUND;
 }
-yy44:
-		YYDEBUG(44, *YYCURSOR);
+yy38:
+		YYDEBUG(38, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(4);
 		yych = *YYCURSOR;
-yy45:
-		YYDEBUG(45, *YYCURSOR);
+yy39:
+		YYDEBUG(39, *YYCURSOR);
 		if (yybm0+yych & 16) {
-			goto yy44;
+			goto yy38;
 		}
 		if (yych <= '\n') {
-			if (yych <= 0x00) goto yy11;
-			if (yych >= '\n') goto yy11;
+			if (yych <= 0x00) goto yy7;
+			if (yych >= '\n') goto yy7;
 		} else {
-			if (yych <= '#') goto yy46;
-			if (yych <= '\'') goto yy71;
-			if (yych <= ':') goto yy48;
-			goto yy49;
+			if (yych <= '#') goto yy40;
+			if (yych <= '\'') goto yy62;
+			if (yych <= ':') goto yy42;
+			goto yy43;
 		}
-yy46:
-		YYDEBUG(46, *YYCURSOR);
+yy40:
+		YYDEBUG(40, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-yy47:
-		YYDEBUG(47, *YYCURSOR);
+yy41:
+		YYDEBUG(41, *YYCURSOR);
 		if (yybm0+yych & 32) {
-			goto yy46;
+			goto yy40;
 		}
-		if (yych <= '\n') goto yy11;
-		if (yych <= '\'') goto yy72;
-		goto yy75;
-yy48:
-		YYDEBUG(48, *YYCURSOR);
+		if (yych <= '\n') goto yy7;
+		if (yych <= '\'') goto yy63;
+		goto yy66;
+yy42:
+		YYDEBUG(42, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == '/') goto yy76;
-		goto yy47;
-yy49:
-		YYDEBUG(49, *YYCURSOR);
+		if (yych == '/') goto yy67;
+		goto yy41;
+yy43:
+		YYDEBUG(43, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(3);
 		yych = *YYCURSOR;
 		if (yych <= '"') {
 			if (yych <= '\f') {
-				if (yych <= 0x00) goto yy11;
-				if (yych <= 0x08) goto yy31;
-				if (yych <= '\n') goto yy11;
-				goto yy31;
+				if (yych <= 0x00) goto yy7;
+				if (yych <= 0x08) goto yy26;
+				if (yych <= '\n') goto yy7;
+				goto yy26;
 			} else {
-				if (yych <= '\r') goto yy11;
-				if (yych == ' ') goto yy11;
-				goto yy31;
+				if (yych <= '\r') goto yy7;
+				if (yych == ' ') goto yy7;
+				goto yy26;
 			}
 		} else {
 			if (yych <= '9') {
-				if (yych <= '#') goto yy11;
-				if (yych == '\'') goto yy44;
-				goto yy31;
+				if (yych <= '#') goto yy7;
+				if (yych == '\'') goto yy38;
+				goto yy26;
 			} else {
-				if (yych <= ':') goto yy69;
-				if (yych == '\\') goto yy44;
-				goto yy31;
+				if (yych <= ':') goto yy60;
+				if (yych == '\\') goto yy38;
+				goto yy26;
 			}
 		}
-yy50:
-		YYDEBUG(50, *YYCURSOR);
+yy44:
+		YYDEBUG(44, *YYCURSOR);
 		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yych <= ' ') {
 			if (yych <= '\f') {
-				if (yych == '\t') goto yy77;
-				goto yy5;
+				if (yych == '\t') goto yy68;
+				goto yy3;
 			} else {
-				if (yych <= '\r') goto yy77;
-				if (yych <= 0x1F) goto yy5;
-				goto yy77;
+				if (yych <= '\r') goto yy68;
+				if (yych <= 0x1F) goto yy3;
+				goto yy68;
 			}
 		} else {
 			if (yych <= '.') {
-				if (yych <= ',') goto yy5;
-				if (yych <= '-') goto yy79;
-				goto yy80;
+				if (yych <= ',') goto yy3;
+				if (yych <= '-') goto yy69;
+				goto yy70;
 			} else {
-				if (yych <= '/') goto yy5;
-				if (yych <= '9') goto yy80;
-				goto yy5;
+				if (yych <= '/') goto yy3;
+				if (yych <= '9') goto yy70;
+				goto yy3;
 			}
 		}
-yy51:
-		YYDEBUG(51, *YYCURSOR);
+yy45:
+		YYDEBUG(45, *YYCURSOR);
 		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm0+yych & 64) {
-			goto yy83;
+			goto yy72;
 		}
-		goto yy5;
-yy52:
-		YYDEBUG(52, *YYCURSOR);
+		goto yy3;
+yy46:
+		YYDEBUG(46, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(53, *YYCURSOR);
 		YYCURSOR -= 1;
 		yyleng = (size_t) YYCURSOR - (size_t) yytext;
 		{
 	return T_COLON;
 }
-yy54:
-		YYDEBUG(54, *YYCURSOR);
+yy47:
+		YYDEBUG(47, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(55, *YYCURSOR);
 		yyleng = (size_t) YYCURSOR - (size_t) yytext;
 		{
 	return T_DCOLON;
 }
-yy56:
-		YYDEBUG(56, *YYCURSOR);
+yy48:
+		YYDEBUG(48, *YYCURSOR);
 		yyaccept = 0;
 		YYMARKER = ++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(57, *YYCURSOR);
 		if (yych <= ' ') {
 			if (yych <= '\n') {
-				if (yych <= 0x00) goto yy6;
-				if (yych <= 0x08) goto yy56;
-				goto yy6;
+				if (yych <= 0x00) goto yy4;
+				if (yych <= 0x08) goto yy48;
+				goto yy4;
 			} else {
-				if (yych == '\r') goto yy6;
-				if (yych <= 0x1F) goto yy56;
-				goto yy6;
+				if (yych == '\r') goto yy4;
+				if (yych <= 0x1F) goto yy48;
+				goto yy4;
 			}
 		} else {
 			if (yych <= '&') {
-				if (yych <= '!') goto yy56;
-				if (yych <= '#') goto yy6;
-				goto yy56;
+				if (yych <= '!') goto yy48;
+				if (yych <= '#') goto yy4;
+				goto yy48;
 			} else {
-				if (yych <= '\'') goto yy6;
-				if (yych == ':') goto yy86;
-				goto yy56;
+				if (yych <= '\'') goto yy4;
+				if (yych == ':') goto yy74;
+				goto yy48;
 			}
 		}
-yy58:
-		YYDEBUG(58, *YYCURSOR);
+yy49:
+		YYDEBUG(49, *YYCURSOR);
 		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'S') goto yy87;
-		if (yych == 's') goto yy87;
-		goto yy5;
-yy59:
-		YYDEBUG(59, *YYCURSOR);
+		if (yych == 'S') goto yy75;
+		if (yych == 's') goto yy75;
+		goto yy3;
+yy50:
+		YYDEBUG(50, *YYCURSOR);
 		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'A') goto yy88;
-		if (yych == 'a') goto yy88;
-		goto yy5;
-yy60:
-		YYDEBUG(60, *YYCURSOR);
+		if (yych == 'A') goto yy76;
+		if (yych == 'a') goto yy76;
+		goto yy3;
+yy51:
+		YYDEBUG(51, *YYCURSOR);
 		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'L') goto yy89;
-		if (yych == 'l') goto yy89;
-		goto yy5;
-yy61:
-		YYDEBUG(61, *YYCURSOR);
+		if (yych == 'L') goto yy77;
+		if (yych == 'l') goto yy77;
+		goto yy3;
+yy52:
+		YYDEBUG(52, *YYCURSOR);
 		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yych <= '\f') {
-			if (yych == '\t') goto yy90;
-			goto yy5;
+			if (yych == '\t') goto yy78;
+			goto yy3;
 		} else {
-			if (yych <= '\r') goto yy90;
-			if (yych == ' ') goto yy90;
-			goto yy5;
+			if (yych <= '\r') goto yy78;
+			if (yych == ' ') goto yy78;
+			goto yy3;
 		}
-yy62:
-		YYDEBUG(62, *YYCURSOR);
+yy53:
+		YYDEBUG(53, *YYCURSOR);
 		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yych <= '\f') {
-			if (yych <= 0x00) goto yy93;
-			if (yych <= 0x08) goto yy5;
-			if (yych <= '\n') goto yy93;
-			goto yy5;
+			if (yych <= 0x00) goto yy79;
+			if (yych <= 0x08) goto yy3;
+			if (yych <= '\n') goto yy79;
+			goto yy3;
 		} else {
-			if (yych <= '\r') goto yy93;
-			if (yych == ' ') goto yy93;
-			goto yy5;
+			if (yych <= '\r') goto yy79;
+			if (yych == ' ') goto yy79;
+			goto yy3;
 		}
-yy63:
-		YYDEBUG(63, *YYCURSOR);
+yy54:
+		YYDEBUG(54, *YYCURSOR);
 		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'F') goto yy62;
-		if (yych == 'f') goto yy62;
-		goto yy5;
-yy64:
-		YYDEBUG(64, *YYCURSOR);
+		if (yych == 'F') goto yy53;
+		if (yych == 'f') goto yy53;
+		goto yy3;
+yy55:
+		YYDEBUG(55, *YYCURSOR);
 		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yych <= '\f') {
-			if (yych <= 0x00) goto yy95;
-			if (yych <= 0x08) goto yy5;
-			if (yych <= '\n') goto yy95;
-			goto yy5;
+			if (yych <= 0x00) goto yy80;
+			if (yych <= 0x08) goto yy3;
+			if (yych <= '\n') goto yy80;
+			goto yy3;
 		} else {
-			if (yych <= '\r') goto yy95;
-			if (yych == ' ') goto yy95;
-			goto yy5;
+			if (yych <= '\r') goto yy80;
+			if (yych == ' ') goto yy80;
+			goto yy3;
 		}
-yy65:
-		YYDEBUG(65, *YYCURSOR);
+yy56:
+		YYDEBUG(56, *YYCURSOR);
 		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'U') goto yy97;
-		if (yych == 'u') goto yy97;
-		goto yy5;
-yy66:
-		YYDEBUG(66, *YYCURSOR);
+		if (yych == 'U') goto yy81;
+		if (yych == 'u') goto yy81;
+		goto yy3;
+yy57:
+		YYDEBUG(57, *YYCURSOR);
 		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'S') goto yy64;
-		if (yych == 's') goto yy64;
-		goto yy5;
-yy67:
-		YYDEBUG(67, *YYCURSOR);
+		if (yych == 'S') goto yy55;
+		if (yych == 's') goto yy55;
+		goto yy3;
+yy58:
+		YYDEBUG(58, *YYCURSOR);
 		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'N') goto yy98;
-		goto yy5;
-yy68:
-		YYDEBUG(68, *YYCURSOR);
+		if (yych == 'N') goto yy82;
+		goto yy3;
+yy59:
+		YYDEBUG(59, *YYCURSOR);
 		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'n') goto yy99;
-		goto yy5;
-yy69:
-		YYDEBUG(69, *YYCURSOR);
+		if (yych == 'n') goto yy83;
+		goto yy3;
+yy60:
+		YYDEBUG(60, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych != '/') goto yy11;
-yy70:
-		YYDEBUG(70, *YYCURSOR);
+		if (yych != '/') goto yy7;
+yy61:
+		YYDEBUG(61, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == '/') goto yy100;
-		goto yy11;
-yy71:
-		YYDEBUG(71, *YYCURSOR);
+		if (yych == '/') goto yy84;
+		goto yy7;
+yy62:
+		YYDEBUG(62, *YYCURSOR);
 		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yych <= '\r') {
 			if (yych <= 0x08) {
-				if (yych <= 0x00) goto yy6;
-				goto yy32;
+				if (yych <= 0x00) goto yy4;
+				goto yy27;
 			} else {
-				if (yych <= '\n') goto yy6;
-				if (yych <= '\f') goto yy32;
-				goto yy6;
+				if (yych <= '\n') goto yy4;
+				if (yych <= '\f') goto yy27;
+				goto yy4;
 			}
 		} else {
 			if (yych <= ' ') {
-				if (yych <= 0x1F) goto yy32;
-				goto yy6;
+				if (yych <= 0x1F) goto yy27;
+				goto yy4;
 			} else {
-				if (yych == '#') goto yy6;
-				goto yy32;
+				if (yych == '#') goto yy4;
+				goto yy27;
 			}
 		}
-yy72:
-		YYDEBUG(72, *YYCURSOR);
+yy63:
+		YYDEBUG(63, *YYCURSOR);
 		++YYCURSOR;
-		goto yy6;
-yy73:
-		YYDEBUG(73, *YYCURSOR);
+		goto yy4;
+yy64:
+		YYDEBUG(64, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		if (yych == '"') goto yy36;
-		if (yych == '\\') goto yy36;
-		goto yy11;
-yy74:
-		YYDEBUG(74, *YYCURSOR);
+		if (yych == '"') goto yy31;
+		if (yych == '\\') goto yy31;
+		goto yy7;
+yy65:
+		YYDEBUG(65, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == '/') goto yy102;
-		goto yy37;
-yy75:
-		YYDEBUG(75, *YYCURSOR);
+		if (yych == '/') goto yy86;
+		goto yy32;
+yy66:
+		YYDEBUG(66, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		if (yych == '\'') goto yy46;
-		if (yych == '\\') goto yy46;
-		goto yy11;
-yy76:
-		YYDEBUG(76, *YYCURSOR);
+		if (yych == '\'') goto yy40;
+		if (yych == '\\') goto yy40;
+		goto yy7;
+yy67:
+		YYDEBUG(67, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == '/') goto yy103;
-		goto yy47;
-yy77:
-		YYDEBUG(77, *YYCURSOR);
+		if (yych == '/') goto yy87;
+		goto yy41;
+yy68:
+		YYDEBUG(68, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(2);
 		yych = *YYCURSOR;
-		YYDEBUG(78, *YYCURSOR);
 		if (yych <= ' ') {
 			if (yych <= '\f') {
-				if (yych == '\t') goto yy77;
-				goto yy11;
+				if (yych == '\t') goto yy68;
+				goto yy7;
 			} else {
-				if (yych <= '\r') goto yy77;
-				if (yych <= 0x1F) goto yy11;
-				goto yy77;
+				if (yych <= '\r') goto yy68;
+				if (yych <= 0x1F) goto yy7;
+				goto yy68;
 			}
 		} else {
 			if (yych <= '.') {
-				if (yych <= ',') goto yy11;
-				if (yych <= '-') goto yy104;
-				goto yy105;
+				if (yych <= ',') goto yy7;
+				if (yych <= '-') goto yy88;
+				goto yy89;
 			} else {
-				if (yych <= '/') goto yy11;
-				if (yych <= '9') goto yy105;
-				goto yy11;
+				if (yych <= '/') goto yy7;
+				if (yych <= '9') goto yy89;
+				goto yy7;
 			}
 		}
-yy79:
-		YYDEBUG(79, *YYCURSOR);
+yy69:
+		YYDEBUG(69, *YYCURSOR);
 		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == '.') goto yy80;
-		if (yych <= '/') goto yy5;
-		if (yych >= ':') goto yy5;
-yy80:
-		YYDEBUG(80, *YYCURSOR);
+		if (yych == '.') goto yy70;
+		if (yych <= '/') goto yy3;
+		if (yych >= ':') goto yy3;
+yy70:
+		YYDEBUG(70, *YYCURSOR);
 		yyaccept = 3;
 		YYMARKER = ++YYCURSOR;
 		YYFILL(3);
 		yych = *YYCURSOR;
-		YYDEBUG(81, *YYCURSOR);
 		if (yych <= '"') {
 			if (yych <= '\f') {
-				if (yych <= 0x00) goto yy82;
-				if (yych <= 0x08) goto yy4;
-				if (yych >= '\v') goto yy4;
+				if (yych <= 0x00) goto yy71;
+				if (yych <= 0x08) goto yy2;
+				if (yych >= '\v') goto yy2;
 			} else {
 				if (yych <= 0x1F) {
-					if (yych >= 0x0E) goto yy4;
+					if (yych >= 0x0E) goto yy2;
 				} else {
-					if (yych <= ' ') goto yy82;
-					if (yych <= '!') goto yy4;
-					goto yy31;
+					if (yych <= ' ') goto yy71;
+					if (yych <= '!') goto yy2;
+					goto yy26;
 				}
 			}
 		} else {
 			if (yych <= '-') {
-				if (yych <= '#') goto yy82;
-				if (yych == '\'') goto yy31;
-				goto yy4;
+				if (yych <= '#') goto yy71;
+				if (yych == '\'') goto yy26;
+				goto yy2;
 			} else {
 				if (yych <= '/') {
-					if (yych <= '.') goto yy80;
-					goto yy4;
+					if (yych <= '.') goto yy70;
+					goto yy2;
 				} else {
-					if (yych <= '9') goto yy80;
-					if (yych <= ':') goto yy33;
-					goto yy4;
+					if (yych <= '9') goto yy70;
+					if (yych <= ':') goto yy28;
+					goto yy2;
 				}
 			}
 		}
-yy82:
-		YYDEBUG(82, *YYCURSOR);
+yy71:
+		YYDEBUG(71, *YYCURSOR);
 		yyleng = (size_t) YYCURSOR - (size_t) yytext;
 		{
 	char *text = yytext + 2;
@@ -944,95 +935,91 @@
 	yylval->num = atoi(text);
 	return T_REQ_ID;
 }
-yy83:
-		YYDEBUG(83, *YYCURSOR);
+yy72:
+		YYDEBUG(72, *YYCURSOR);
 		yyaccept = 4;
 		YYMARKER = ++YYCURSOR;
 		YYFILL(3);
 		yych = *YYCURSOR;
-		YYDEBUG(84, *YYCURSOR);
 		if (yybm0+yych & 64) {
-			goto yy83;
+			goto yy72;
 		}
 		if (yych <= ' ') {
 			if (yych <= '\n') {
-				if (yych <= 0x00) goto yy85;
-				if (yych <= 0x08) goto yy4;
+				if (yych <= 0x00) goto yy73;
+				if (yych <= 0x08) goto yy2;
 			} else {
-				if (yych == '\r') goto yy85;
-				if (yych <= 0x1F) goto yy4;
+				if (yych == '\r') goto yy73;
+				if (yych <= 0x1F) goto yy2;
 			}
 		} else {
 			if (yych <= '&') {
-				if (yych <= '!') goto yy4;
-				if (yych <= '"') goto yy31;
-				if (yych >= '$') goto yy4;
+				if (yych <= '!') goto yy2;
+				if (yych <= '"') goto yy26;
+				if (yych >= '$') goto yy2;
 			} else {
-				if (yych <= '\'') goto yy31;
-				if (yych <= '/') goto yy4;
-				if (yych <= ':') goto yy33;
-				goto yy4;
+				if (yych <= '\'') goto yy26;
+				if (yych <= '/') goto yy2;
+				if (yych <= ':') goto yy28;
+				goto yy2;
 			}
 		}
-yy85:
-		YYDEBUG(85, *YYCURSOR);
+yy73:
+		YYDEBUG(73, *YYCURSOR);
 		yyleng = (size_t) YYCURSOR - (size_t) yytext;
 		{
 	phpdbg_init_param(yylval, ADDR_PARAM);
 	yylval->addr = strtoul(yytext, 0, 16);
 	return T_ADDR;
 }
-yy86:
-		YYDEBUG(86, *YYCURSOR);
+yy74:
+		YYDEBUG(74, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		if (yych == '\\') goto yy56;
-		goto yy11;
-yy87:
-		YYDEBUG(87, *YYCURSOR);
+		if (yych == '\\') goto yy48;
+		goto yy7;
+yy75:
+		YYDEBUG(75, *YYCURSOR);
 		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'A') goto yy107;
-		if (yych == 'a') goto yy107;
-		goto yy5;
-yy88:
-		YYDEBUG(88, *YYCURSOR);
+		if (yych == 'A') goto yy90;
+		if (yych == 'a') goto yy90;
+		goto yy3;
+yy76:
+		YYDEBUG(76, *YYCURSOR);
 		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'B') goto yy108;
-		if (yych == 'b') goto yy108;
-		goto yy5;
-yy89:
-		YYDEBUG(89, *YYCURSOR);
+		if (yych == 'B') goto yy91;
+		if (yych == 'b') goto yy91;
+		goto yy3;
+yy77:
+		YYDEBUG(77, *YYCURSOR);
 		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'S') goto yy109;
-		if (yych == 's') goto yy109;
-		goto yy5;
-yy90:
-		YYDEBUG(90, *YYCURSOR);
+		if (yych == 'S') goto yy92;
+		if (yych == 's') goto yy92;
+		goto yy3;
+yy78:
+		YYDEBUG(78, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(91, *YYCURSOR);
 		if (yych <= '\f') {
-			if (yych == '\t') goto yy90;
+			if (yych == '\t') goto yy78;
 		} else {
-			if (yych <= '\r') goto yy90;
-			if (yych == ' ') goto yy90;
+			if (yych <= '\r') goto yy78;
+			if (yych == ' ') goto yy78;
 		}
-		YYDEBUG(92, *YYCURSOR);
 		yyleng = (size_t) YYCURSOR - (size_t) yytext;
 		{
 	YYSETCONDITION(RAW);
 	phpdbg_init_param(yylval, EMPTY_PARAM);
 	return T_IF;
 }
-yy93:
-		YYDEBUG(93, *YYCURSOR);
+yy79:
+		YYDEBUG(79, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(94, *YYCURSOR);
 		YYCURSOR -= 1;
 		yyleng = (size_t) YYCURSOR - (size_t) yytext;
 		{
@@ -1040,10 +1027,9 @@
 	yylval->num = 0;
 	return T_FALSY;
 }
-yy95:
-		YYDEBUG(95, *YYCURSOR);
+yy80:
+		YYDEBUG(80, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(96, *YYCURSOR);
 		YYCURSOR -= 1;
 		yyleng = (size_t) YYCURSOR - (size_t) yytext;
 		{
@@ -1051,30 +1037,30 @@
 	yylval->num = 1;
 	return T_TRUTHY;
 }
-yy97:
-		YYDEBUG(97, *YYCURSOR);
+yy81:
+		YYDEBUG(81, *YYCURSOR);
 		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'E') goto yy64;
-		if (yych == 'e') goto yy64;
-		goto yy5;
-yy98:
-		YYDEBUG(98, *YYCURSOR);
+		if (yych == 'E') goto yy55;
+		if (yych == 'e') goto yy55;
+		goto yy3;
+yy82:
+		YYDEBUG(82, *YYCURSOR);
 		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'D') goto yy110;
-		goto yy5;
-yy99:
-		YYDEBUG(99, *YYCURSOR);
+		if (yych == 'D') goto yy93;
+		goto yy3;
+yy83:
+		YYDEBUG(83, *YYCURSOR);
 		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'd') goto yy110;
-		goto yy5;
-yy100:
-		YYDEBUG(100, *YYCURSOR);
+		if (yych == 'd') goto yy93;
+		goto yy3;
+yy84:
+		YYDEBUG(84, *YYCURSOR);
 		++YYCURSOR;
-yy101:
-		YYDEBUG(101, *YYCURSOR);
+yy85:
+		YYDEBUG(85, *YYCURSOR);
 		yyleng = (size_t) YYCURSOR - (size_t) yytext;
 		{
 	phpdbg_init_param(yylval, STR_PARAM);
@@ -1082,130 +1068,128 @@
 	yylval->len = yyleng;
 	return T_PROTO;
 }
-yy102:
-		YYDEBUG(102, *YYCURSOR);
+yy86:
+		YYDEBUG(86, *YYCURSOR);
 		yyaccept = 5;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych <= 0x00) goto yy101;
-		if (yych == '\n') goto yy101;
-		goto yy37;
-yy103:
-		YYDEBUG(103, *YYCURSOR);
+		if (yych <= 0x00) goto yy85;
+		if (yych == '\n') goto yy85;
+		goto yy32;
+yy87:
+		YYDEBUG(87, *YYCURSOR);
 		yyaccept = 5;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych <= 0x00) goto yy101;
-		if (yych == '\n') goto yy101;
-		goto yy47;
-yy104:
-		YYDEBUG(104, *YYCURSOR);
+		if (yych <= 0x00) goto yy85;
+		if (yych == '\n') goto yy85;
+		goto yy41;
+yy88:
+		YYDEBUG(88, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == '.') goto yy105;
-		if (yych <= '/') goto yy11;
-		if (yych >= ':') goto yy11;
-yy105:
-		YYDEBUG(105, *YYCURSOR);
+		if (yych == '.') goto yy89;
+		if (yych <= '/') goto yy7;
+		if (yych >= ':') goto yy7;
+yy89:
+		YYDEBUG(89, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(106, *YYCURSOR);
-		if (yych == '.') goto yy105;
-		if (yych <= '/') goto yy82;
-		if (yych <= '9') goto yy105;
-		goto yy82;
-yy107:
-		YYDEBUG(107, *YYCURSOR);
+		if (yych == '.') goto yy89;
+		if (yych <= '/') goto yy71;
+		if (yych <= '9') goto yy89;
+		goto yy71;
+yy90:
+		YYDEBUG(90, *YYCURSOR);
 		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'B') goto yy111;
-		if (yych == 'b') goto yy111;
-		goto yy5;
-yy108:
-		YYDEBUG(108, *YYCURSOR);
+		if (yych == 'B') goto yy94;
+		if (yych == 'b') goto yy94;
+		goto yy3;
+yy91:
+		YYDEBUG(91, *YYCURSOR);
 		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'L') goto yy112;
-		if (yych == 'l') goto yy112;
-		goto yy5;
-yy109:
-		YYDEBUG(109, *YYCURSOR);
+		if (yych == 'L') goto yy95;
+		if (yych == 'l') goto yy95;
+		goto yy3;
+yy92:
+		YYDEBUG(92, *YYCURSOR);
 		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'E') goto yy62;
-		if (yych == 'e') goto yy62;
-		goto yy5;
-yy110:
-		YYDEBUG(110, *YYCURSOR);
+		if (yych == 'E') goto yy53;
+		if (yych == 'e') goto yy53;
+		goto yy3;
+yy93:
+		YYDEBUG(93, *YYCURSOR);
 		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == '_') goto yy113;
-		goto yy5;
-yy111:
-		YYDEBUG(111, *YYCURSOR);
+		if (yych == '_') goto yy96;
+		goto yy3;
+yy94:
+		YYDEBUG(94, *YYCURSOR);
 		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'L') goto yy114;
-		if (yych == 'l') goto yy114;
-		goto yy5;
-yy112:
-		YYDEBUG(112, *YYCURSOR);
+		if (yych == 'L') goto yy97;
+		if (yych == 'l') goto yy97;
+		goto yy3;
+yy95:
+		YYDEBUG(95, *YYCURSOR);
 		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'E') goto yy115;
-		if (yych == 'e') goto yy115;
-		goto yy5;
-yy113:
-		YYDEBUG(113, *YYCURSOR);
+		if (yych == 'E') goto yy98;
+		if (yych == 'e') goto yy98;
+		goto yy3;
+yy96:
+		YYDEBUG(96, *YYCURSOR);
 		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm0+yych & 128) {
-			goto yy116;
+			goto yy99;
 		}
-		goto yy5;
-yy114:
-		YYDEBUG(114, *YYCURSOR);
+		goto yy3;
+yy97:
+		YYDEBUG(97, *YYCURSOR);
 		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'E') goto yy119;
-		if (yych == 'e') goto yy119;
-		goto yy5;
-yy115:
-		YYDEBUG(115, *YYCURSOR);
+		if (yych == 'E') goto yy101;
+		if (yych == 'e') goto yy101;
+		goto yy3;
+yy98:
+		YYDEBUG(98, *YYCURSOR);
 		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'D') goto yy64;
-		if (yych == 'd') goto yy64;
-		goto yy5;
-yy116:
-		YYDEBUG(116, *YYCURSOR);
+		if (yych == 'D') goto yy55;
+		if (yych == 'd') goto yy55;
+		goto yy3;
+yy99:
+		YYDEBUG(99, *YYCURSOR);
 		yyaccept = 6;
 		YYMARKER = ++YYCURSOR;
 		YYFILL(3);
 		yych = *YYCURSOR;
-		YYDEBUG(117, *YYCURSOR);
 		if (yybm0+yych & 128) {
-			goto yy116;
+			goto yy99;
 		}
 		if (yych <= ' ') {
 			if (yych <= '\n') {
-				if (yych <= 0x00) goto yy118;
-				if (yych <= 0x08) goto yy4;
+				if (yych <= 0x00) goto yy100;
+				if (yych <= 0x08) goto yy2;
 			} else {
-				if (yych == '\r') goto yy118;
-				if (yych <= 0x1F) goto yy4;
+				if (yych == '\r') goto yy100;
+				if (yych <= 0x1F) goto yy2;
 			}
 		} else {
 			if (yych <= '&') {
-				if (yych <= '!') goto yy4;
-				if (yych <= '"') goto yy31;
-				if (yych >= '$') goto yy4;
+				if (yych <= '!') goto yy2;
+				if (yych <= '"') goto yy26;
+				if (yych >= '$') goto yy2;
 			} else {
-				if (yych <= '\'') goto yy31;
-				if (yych == ':') goto yy33;
-				goto yy4;
+				if (yych <= '\'') goto yy26;
+				if (yych == ':') goto yy28;
+				goto yy2;
 			}
 		}
-yy118:
-		YYDEBUG(118, *YYCURSOR);
+yy100:
+		YYDEBUG(100, *YYCURSOR);
 		yyleng = (size_t) YYCURSOR - (size_t) yytext;
 		{
 	phpdbg_init_param(yylval, OP_PARAM);
@@ -1213,13 +1197,13 @@
 	yylval->len = yyleng;
 	return T_OPCODE;
 }
-yy119:
-		YYDEBUG(119, *YYCURSOR);
+yy101:
+		YYDEBUG(101, *YYCURSOR);
 		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'D') goto yy62;
-		if (yych == 'd') goto yy62;
-		goto yy5;
+		if (yych == 'D') goto yy53;
+		if (yych == 'd') goto yy53;
+		goto yy3;
 	}
 /* *********************************** */
 yyc_PRE_RAW:
@@ -1258,23 +1242,22 @@
 			  0,   0,   0,   0,   0,   0,   0,   0, 
 			  0,   0,   0,   0,   0,   0,   0,   0, 
 		};
-		YYDEBUG(120, *YYCURSOR);
+		YYDEBUG(102, *YYCURSOR);
 		YYFILL(2);
 		yych = *YYCURSOR;
 		if (yych <= '\r') {
-			if (yych == '\t') goto yy124;
-			if (yych >= '\r') goto yy124;
+			if (yych == '\t') goto yy104;
+			if (yych >= '\r') goto yy104;
 		} else {
 			if (yych <= ' ') {
-				if (yych >= ' ') goto yy125;
+				if (yych >= ' ') goto yy105;
 			} else {
-				if (yych == '-') goto yy128;
+				if (yych == '-') goto yy106;
 			}
 		}
-		YYDEBUG(122, *YYCURSOR);
 		++YYCURSOR;
-yy123:
-		YYDEBUG(123, *YYCURSOR);
+yy103:
+		YYDEBUG(103, *YYCURSOR);
 		yyleng = (size_t) YYCURSOR - (size_t) yytext;
 		{
 	YYSETCONDITION(RAW);
@@ -1282,73 +1265,68 @@
 	YYCURSOR = LEX(text);
 	goto restart;
 }
-yy124:
-		YYDEBUG(124, *YYCURSOR);
+yy104:
+		YYDEBUG(104, *YYCURSOR);
 		yych = *++YYCURSOR;
 		if (yybm0+yych & 64) {
-			goto yy125;
+			goto yy105;
 		}
-		goto yy123;
-yy125:
-		YYDEBUG(125, *YYCURSOR);
+		goto yy103;
+yy105:
+		YYDEBUG(105, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(126, *YYCURSOR);
 		if (yybm0+yych & 64) {
-			goto yy125;
+			goto yy105;
 		}
-		YYDEBUG(127, *YYCURSOR);
 		yyleng = (size_t) YYCURSOR - (size_t) yytext;
 		{
 	/* ignore whitespace */
 
 	goto restart;
 }
-yy128:
-		YYDEBUG(128, *YYCURSOR);
+yy106:
+		YYDEBUG(106, *YYCURSOR);
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych != 'r') goto yy123;
-yy129:
-		YYDEBUG(129, *YYCURSOR);
+		if (yych != 'r') goto yy103;
+yy107:
+		YYDEBUG(107, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(2);
 		yych = *YYCURSOR;
-		YYDEBUG(130, *YYCURSOR);
 		if (yybm0+yych & 128) {
-			goto yy133;
+			goto yy110;
 		}
 		if (yych <= '\r') {
-			if (yych == '\t') goto yy129;
-			if (yych >= '\r') goto yy129;
+			if (yych == '\t') goto yy107;
+			if (yych >= '\r') goto yy107;
 		} else {
 			if (yych <= ' ') {
-				if (yych >= ' ') goto yy129;
+				if (yych >= ' ') goto yy107;
 			} else {
-				if (yych == '-') goto yy132;
+				if (yych == '-') goto yy109;
 			}
 		}
-yy131:
-		YYDEBUG(131, *YYCURSOR);
+yy108:
+		YYDEBUG(108, *YYCURSOR);
 		YYCURSOR = YYMARKER;
-		goto yy123;
-yy132:
-		YYDEBUG(132, *YYCURSOR);
+		goto yy103;
+yy109:
+		YYDEBUG(109, *YYCURSOR);
 		yych = *++YYCURSOR;
 		if (yybm0+yych & 128) {
-			goto yy133;
+			goto yy110;
 		}
-		goto yy131;
-yy133:
-		YYDEBUG(133, *YYCURSOR);
+		goto yy108;
+yy110:
+		YYDEBUG(110, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(134, *YYCURSOR);
 		if (yybm0+yych & 128) {
-			goto yy133;
+			goto yy110;
 		}
-		YYDEBUG(135, *YYCURSOR);
 		yyleng = (size_t) YYCURSOR - (size_t) yytext;
 		{
 	char *text = yytext + 2;
@@ -1361,74 +1339,72 @@
 yyc_RAW:
 	{
 		static const unsigned char yybm = {
-			  0, 232, 232, 232, 232, 232, 232, 232, 
-			232, 232,   0, 232, 232, 232, 232, 232, 
-			232, 232, 232, 232, 232, 232, 232, 232, 
-			232, 232, 232, 232, 232, 232, 232, 232, 
-			232, 232,  64, 224, 232, 232, 232,  32, 
-			232, 232, 232, 232, 232, 232, 232, 232, 
-			232, 232, 232, 232, 232, 232, 232, 232, 
-			232, 232, 232, 232, 232, 232, 232, 232, 
-			232, 232, 232, 232, 232, 232, 232, 232, 
-			232, 232, 232, 232, 232, 232, 232, 232, 
-			232, 232, 232, 232, 232, 232, 232, 232, 
-			232, 232, 232, 232,  16, 232, 232, 232, 
-			232, 232, 232, 232, 232, 232, 232, 232, 
-			232, 232, 232, 232, 232, 232, 232, 232, 
-			232, 232, 232, 232, 232, 232, 232, 232, 
-			232, 232, 232, 232, 232, 232, 232, 232, 
-			232, 232, 232, 232, 232, 232, 232, 232, 
-			232, 232, 232, 232, 232, 232, 232, 232, 
-			232, 232, 232, 232, 232, 232, 232, 232, 
-			232, 232, 232, 232, 232, 232, 232, 232, 
-			232, 232, 232, 232, 232, 232, 232, 232, 
-			232, 232, 232, 232, 232, 232, 232, 232, 
-			232, 232, 232, 232, 232, 232, 232, 232, 
-			232, 232, 232, 232, 232, 232, 232, 232, 
-			232, 232, 232, 232, 232, 232, 232, 232, 
-			232, 232, 232, 232, 232, 232, 232, 232, 
-			232, 232, 232, 232, 232, 232, 232, 232, 
-			232, 232, 232, 232, 232, 232, 232, 232, 
-			232, 232, 232, 232, 232, 232, 232, 232, 
-			232, 232, 232, 232, 232, 232, 232, 232, 
-			232, 232, 232, 232, 232, 232, 232, 232, 
-			232, 232, 232, 232, 232, 232, 232, 232, 
+			  0, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247,   0, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 148,  70, 247, 247, 247, 162, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247,   8, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
 		};
-		YYDEBUG(136, *YYCURSOR);
+		YYDEBUG(111, *YYCURSOR);
 		YYFILL(1);
 		yych = *YYCURSOR;
-		if (yybm0+yych & 8) {
-			goto yy140;
+		if (yybm0+yych & 1) {
+			goto yy113;
 		}
-		if (yych <= '\n') goto yy138;
-		if (yych <= '"') goto yy143;
-		if (yych <= '#') goto yy145;
-		if (yych <= '\'') goto yy147;
-		goto yy148;
-yy138:
-		YYDEBUG(138, *YYCURSOR);
+		if (yych <= '\n') goto yy112;
+		if (yych <= '"') goto yy115;
+		if (yych <= '#') goto yy117;
+		if (yych <= '\'') goto yy118;
+		goto yy119;
+yy112:
+		YYDEBUG(112, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(139, *YYCURSOR);
 		yyleng = (size_t) YYCURSOR - (size_t) yytext;
 		{
 	return 0;
 }
-yy140:
-		YYDEBUG(140, *YYCURSOR);
+yy113:
+		YYDEBUG(113, *YYCURSOR);
 		YYMARKER = ++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(141, *YYCURSOR);
-		if (yybm0+yych & 8) {
-			goto yy140;
+		if (yybm0+yych & 1) {
+			goto yy113;
 		}
-		if (yych <= '\n') goto yy142;
-		if (yych <= '"') goto yy143;
-		if (yych <= '#') goto yy142;
-		if (yych <= '\'') goto yy147;
-		goto yy148;
-yy142:
-		YYDEBUG(142, *YYCURSOR);
+		if (yych <= '\n') goto yy114;
+		if (yych <= '"') goto yy115;
+		if (yych <= '#') goto yy114;
+		if (yych <= '\'') goto yy118;
+		goto yy119;
+yy114:
+		YYDEBUG(114, *YYCURSOR);
 		yyleng = (size_t) YYCURSOR - (size_t) yytext;
 		{
 	phpdbg_init_param(yylval, STR_PARAM);
@@ -1436,358 +1412,175 @@
 	yylval->len = yyleng;
 	return T_INPUT;
 }
-yy143:
-		YYDEBUG(143, *YYCURSOR);
+yy115:
+		YYDEBUG(115, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		if (yybm0+yych & 32) {
-			goto yy150;
+		if (yybm0+yych & 2) {
+			goto yy115;
 		}
-		if (yych >= '#') goto yy152;
-yy144:
-		YYDEBUG(144, *YYCURSOR);
+		if (yych <= '\n') goto yy116;
+		if (yych <= '"') goto yy113;
+		goto yy120;
+yy116:
+		YYDEBUG(116, *YYCURSOR);
 		YYCURSOR = YYMARKER;
-		goto yy142;
-yy145:
-		YYDEBUG(145, *YYCURSOR);
+		goto yy114;
+yy117:
+		YYDEBUG(117, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(146, *YYCURSOR);
 		yyleng = (size_t) YYCURSOR - (size_t) yytext;
 		{
 	YYSETCONDITION(INITIAL);
 	return T_SEPARATOR;
 }
-yy147:
-		YYDEBUG(147, *YYCURSOR);
+yy118:
+		YYDEBUG(118, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		if (yybm0+yych & 64) {
-			goto yy154;
+		if (yybm0+yych & 4) {
+			goto yy118;
 		}
-		if (yych <= '\'') goto yy144;
-		goto yy156;
-yy148:
-		YYDEBUG(148, *YYCURSOR);
+		if (yych <= '\n') goto yy116;
+		if (yych <= '\'') goto yy113;
+		goto yy121;
+yy119:
+		YYDEBUG(119, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(149, *YYCURSOR);
-		if (yybm0+yych & 16) {
-			goto yy148;
+		if (yybm0+yych & 8) {
+			goto yy119;
 		}
 		if (yych <= '!') {
-			if (yych <= 0x00) goto yy142;
-			if (yych == '\n') goto yy142;
-			goto yy140;
+			if (yych <= 0x00) goto yy114;
+			if (yych == '\n') goto yy114;
+			goto yy113;
 		} else {
-			if (yych <= '"') goto yy158;
-			if (yych == '\'') goto yy159;
-			goto yy140;
-		}
-yy150:
-		YYDEBUG(150, *YYCURSOR);
-		++YYCURSOR;
-		YYFILL(1);
-		yych = *YYCURSOR;
-		YYDEBUG(151, *YYCURSOR);
-		if (yybm0+yych & 32) {
-			goto yy150;
+			if (yych <= '"') goto yy122;
+			if (yych == '\'') goto yy123;
+			goto yy113;
 		}
-		if (yych <= '\n') goto yy144;
-		if (yych <= '"') goto yy140;
-yy152:
-		YYDEBUG(152, *YYCURSOR);
-		++YYCURSOR;
-		YYFILL(1);
-		yych = *YYCURSOR;
-		YYDEBUG(153, *YYCURSOR);
-		if (yybm0+yych & 32) {
-			goto yy150;
-		}
-		if (yych <= '\n') goto yy144;
-		if (yych <= '"') goto yy160;
-		goto yy152;
-yy154:
-		YYDEBUG(154, *YYCURSOR);
+yy120:
+		YYDEBUG(120, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(155, *YYCURSOR);
-		if (yybm0+yych & 64) {
-			goto yy154;
+		if (yybm0+yych & 2) {
+			goto yy115;
 		}
-		if (yych <= '\n') goto yy144;
-		if (yych <= '\'') goto yy140;
-yy156:
-		YYDEBUG(156, *YYCURSOR);
+		if (yych <= '\n') goto yy116;
+		if (yych <= '"') goto yy122;
+		goto yy120;
+yy121:
+		YYDEBUG(121, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(157, *YYCURSOR);
-		if (yybm0+yych & 64) {
-			goto yy154;
-		}
-		if (yych <= '\n') goto yy144;
-		if (yych <= '\'') goto yy162;
-		goto yy156;
-yy158:
-		YYDEBUG(158, *YYCURSOR);
-		YYMARKER = ++YYCURSOR;
-		YYFILL(1);
-		yych = *YYCURSOR;
-		if (yych <= '"') {
-			if (yych <= '\t') {
-				if (yych <= 0x00) goto yy142;
-				goto yy160;
-			} else {
-				if (yych <= '\n') goto yy142;
-				if (yych <= '!') goto yy160;
-				goto yy143;
-			}
-		} else {
-			if (yych <= '\'') {
-				if (yych <= '#') goto yy150;
-				if (yych <= '&') goto yy160;
-				goto yy164;
-			} else {
-				if (yych == '\\') goto yy165;
-				goto yy160;
-			}
-		}
-yy159:
-		YYDEBUG(159, *YYCURSOR);
-		YYMARKER = ++YYCURSOR;
-		YYFILL(1);
-		yych = *YYCURSOR;
-		if (yych <= '"') {
-			if (yych <= '\t') {
-				if (yych <= 0x00) goto yy142;
-				goto yy162;
-			} else {
-				if (yych <= '\n') goto yy142;
-				if (yych <= '!') goto yy162;
-				goto yy167;
-			}
-		} else {
-			if (yych <= '\'') {
-				if (yych <= '#') goto yy154;
-				if (yych <= '&') goto yy162;
-				goto yy147;
-			} else {
-				if (yych == '\\') goto yy168;
-				goto yy162;
-			}
+		if (yybm0+yych & 4) {
+			goto yy118;
 		}
-yy160:
-		YYDEBUG(160, *YYCURSOR);
+		if (yych <= '\n') goto yy116;
+		if (yych <= '\'') goto yy123;
+		goto yy121;
+yy122:
+		YYDEBUG(122, *YYCURSOR);
 		YYMARKER = ++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(161, *YYCURSOR);
-		if (yych <= '"') {
-			if (yych <= '\t') {
-				if (yych <= 0x00) goto yy142;
-				goto yy160;
-			} else {
-				if (yych <= '\n') goto yy142;
-				if (yych <= '!') goto yy160;
-				goto yy158;
-			}
-		} else {
-			if (yych <= '\'') {
-				if (yych <= '#') goto yy150;
-				if (yych <= '&') goto yy160;
-				goto yy164;
-			} else {
-				if (yych == '\\') goto yy165;
-				goto yy160;
-			}
+		if (yybm0+yych & 16) {
+			goto yy122;
 		}
-yy162:
-		YYDEBUG(162, *YYCURSOR);
+		if (yych <= '\n') goto yy114;
+		if (yych <= '#') goto yy115;
+		if (yych <= '\'') goto yy124;
+		goto yy125;
+yy123:
+		YYDEBUG(123, *YYCURSOR);
 		YYMARKER = ++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(163, *YYCURSOR);
-		if (yych <= '"') {
-			if (yych <= '\t') {
-				if (yych <= 0x00) goto yy142;
-				goto yy162;
-			} else {
-				if (yych <= '\n') goto yy142;
-				if (yych <= '!') goto yy162;
-				goto yy167;
-			}
-		} else {
-			if (yych <= '\'') {
-				if (yych <= '#') goto yy154;
-				if (yych <= '&') goto yy162;
-				goto yy159;
-			} else {
-				if (yych == '\\') goto yy168;
-				goto yy162;
-			}
+		if (yybm0+yych & 32) {
+			goto yy123;
 		}
-yy164:
-		YYDEBUG(164, *YYCURSOR);
+		if (yych <= '\n') goto yy114;
+		if (yych <= '"') goto yy124;
+		if (yych <= '#') goto yy118;
+		goto yy126;
+yy124:
+		YYDEBUG(124, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		if (yybm0+yych & 128) {
-			goto yy170;
-		}
-		if (yych <= '\n') goto yy144;
-		if (yych <= '"') goto yy162;
-		if (yych <= '\'') goto yy150;
-		goto yy172;
-yy165:
-		YYDEBUG(165, *YYCURSOR);
+		if (yybm0+yych & 64) {
+			goto yy124;
+		}
+		if (yych <= '\n') goto yy116;
+		if (yych <= '"') goto yy123;
+		if (yych <= '\'') goto yy122;
+		goto yy127;
+yy125:
+		YYDEBUG(125, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(166, *YYCURSOR);
 		if (yych <= '&') {
-			if (yych <= 0x00) goto yy142;
-			if (yych == '\n') goto yy142;
-			goto yy160;
+			if (yych <= 0x00) goto yy114;
+			if (yych == '\n') goto yy114;
+			goto yy122;
 		} else {
-			if (yych <= '\'') goto yy174;
-			if (yych == '\\') goto yy165;
-			goto yy160;
+			if (yych <= '\'') goto yy128;
+			if (yych == '\\') goto yy125;
+			goto yy122;
 		}
-yy167:
-		YYDEBUG(167, *YYCURSOR);
-		++YYCURSOR;
-		YYFILL(1);
-		yych = *YYCURSOR;
-		if (yybm0+yych & 128) {
-			goto yy170;
-		}
-		if (yych <= '\n') goto yy144;
-		if (yych <= '"') goto yy154;
-		if (yych <= '\'') goto yy160;
-		goto yy172;
-yy168:
-		YYDEBUG(168, *YYCURSOR);
+yy126:
+		YYDEBUG(126, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(169, *YYCURSOR);
 		if (yych <= '!') {
-			if (yych <= 0x00) goto yy142;
-			if (yych == '\n') goto yy142;
-			goto yy162;
+			if (yych <= 0x00) goto yy114;
+			if (yych == '\n') goto yy114;
+			goto yy123;
 		} else {
-			if (yych <= '"') goto yy175;
-			if (yych == '\\') goto yy168;
-			goto yy162;
+			if (yych <= '"') goto yy128;
+			if (yych == '\\') goto yy126;
+			goto yy123;
 		}
-yy170:
-		YYDEBUG(170, *YYCURSOR);
-		++YYCURSOR;
-		YYFILL(1);
-		yych = *YYCURSOR;
-		YYDEBUG(171, *YYCURSOR);
-		if (yybm0+yych & 128) {
-			goto yy170;
-		}
-		if (yych <= '\n') goto yy144;
-		if (yych <= '"') goto yy162;
-		if (yych <= '\'') goto yy160;
-yy172:
-		YYDEBUG(172, *YYCURSOR);
+yy127:
+		YYDEBUG(127, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(173, *YYCURSOR);
-		if (yybm0+yych & 128) {
-			goto yy170;
-		}
-		if (yych <= '\n') goto yy144;
-		if (yych <= '\'') goto yy176;
-		goto yy172;
-yy174:
-		YYDEBUG(174, *YYCURSOR);
-		YYMARKER = ++YYCURSOR;
-		YYFILL(1);
-		yych = *YYCURSOR;
-		if (yych <= '"') {
-			if (yych <= '\t') {
-				if (yych <= 0x00) goto yy142;
-				goto yy176;
-			} else {
-				if (yych <= '\n') goto yy142;
-				if (yych <= '!') goto yy176;
-			}
-		} else {
-			if (yych <= '\'') {
-				if (yych <= '#') goto yy170;
-				if (yych <= '&') goto yy176;
-				goto yy164;
-			} else {
-				if (yych == '\\') goto yy178;
-				goto yy176;
-			}
-		}
-yy175:
-		YYDEBUG(175, *YYCURSOR);
-		YYMARKER = ++YYCURSOR;
-		YYFILL(1);
-		yych = *YYCURSOR;
-		if (yych <= '"') {
-			if (yych <= '\t') {
-				if (yych <= 0x00) goto yy142;
-			} else {
-				if (yych <= '\n') goto yy142;
-				if (yych >= '"') goto yy167;
-			}
-		} else {
-			if (yych <= '\'') {
-				if (yych <= '#') goto yy170;
-				if (yych >= '\'') goto yy174;
-			} else {
-				if (yych == '\\') goto yy178;
-			}
+		if (yybm0+yych & 64) {
+			goto yy124;
 		}
-yy176:
-		YYDEBUG(176, *YYCURSOR);
+		if (yych <= '\n') goto yy116;
+		if (yych >= '(') goto yy127;
+yy128:
+		YYDEBUG(128, *YYCURSOR);
 		YYMARKER = ++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(177, *YYCURSOR);
-		if (yych <= '"') {
-			if (yych <= '\t') {
-				if (yych <= 0x00) goto yy142;
-				goto yy176;
-			} else {
-				if (yych <= '\n') goto yy142;
-				if (yych <= '!') goto yy176;
-				goto yy175;
-			}
-		} else {
-			if (yych <= '\'') {
-				if (yych <= '#') goto yy170;
-				if (yych <= '&') goto yy176;
-				goto yy174;
-			} else {
-				if (yych != '\\') goto yy176;
-			}
+		if (yybm0+yych & 128) {
+			goto yy128;
 		}
-yy178:
-		YYDEBUG(178, *YYCURSOR);
+		if (yych <= '\n') goto yy114;
+		if (yych <= '#') goto yy124;
+yy129:
+		YYDEBUG(129, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(179, *YYCURSOR);
 		if (yych <= '\n') {
-			if (yych <= 0x00) goto yy142;
-			if (yych <= '\t') goto yy176;
-			goto yy142;
+			if (yych <= 0x00) goto yy114;
+			if (yych <= '\t') goto yy128;
+			goto yy114;
 		} else {
-			if (yych == '\\') goto yy178;
-			goto yy176;
+			if (yych == '\\') goto yy129;
+			goto yy128;
 		}
 	}
 /* *********************************** */
@@ -1827,36 +1620,36 @@
 			  0,   0,   0,   0,   0,   0,   0,   0, 
 			  0,   0,   0,   0,   0,   0,   0,   0, 
 		};
-		YYDEBUG(180, *YYCURSOR);
+		YYDEBUG(130, *YYCURSOR);
 		YYFILL(4);
 		yych = *YYCURSOR;
 		if (yych <= 'E') {
 			if (yych <= '\r') {
-				if (yych == '\t') goto yy184;
-				if (yych >= '\r') goto yy184;
+				if (yych == '\t') goto yy133;
+				if (yych >= '\r') goto yy133;
 			} else {
-				if (yych == ' ') goto yy185;
-				if (yych >= 'E') goto yy188;
+				if (yych == ' ') goto yy134;
+				if (yych >= 'E') goto yy135;
 			}
 		} else {
 			if (yych <= 'd') {
-				if (yych <= 'Q') goto yy182;
-				if (yych <= 'R') goto yy189;
-				if (yych <= 'S') goto yy190;
+				if (yych <= 'Q') goto yy131;
+				if (yych <= 'R') goto yy136;
+				if (yych <= 'S') goto yy137;
 			} else {
 				if (yych <= 'q') {
-					if (yych <= 'e') goto yy188;
+					if (yych <= 'e') goto yy135;
 				} else {
-					if (yych <= 'r') goto yy191;
-					if (yych <= 's') goto yy190;
+					if (yych <= 'r') goto yy138;
+					if (yych <= 's') goto yy137;
 				}
 			}
 		}
-yy182:
-		YYDEBUG(182, *YYCURSOR);
+yy131:
+		YYDEBUG(131, *YYCURSOR);
 		++YYCURSOR;
-yy183:
-		YYDEBUG(183, *YYCURSOR);
+yy132:
+		YYDEBUG(132, *YYCURSOR);
 		yyleng = (size_t) YYCURSOR - (size_t) yytext;
 		{
 	YYSETCONDITION(NORMAL);
@@ -1864,160 +1657,152 @@
 	YYCURSOR = LEX(text);
 	goto restart;
 }
-yy184:
-		YYDEBUG(184, *YYCURSOR);
+yy133:
+		YYDEBUG(133, *YYCURSOR);
 		yych = *++YYCURSOR;
 		if (yybm0+yych & 128) {
-			goto yy185;
+			goto yy134;
 		}
-		goto yy183;
-yy185:
-		YYDEBUG(185, *YYCURSOR);
+		goto yy132;
+yy134:
+		YYDEBUG(134, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(186, *YYCURSOR);
 		if (yybm0+yych & 128) {
-			goto yy185;
+			goto yy134;
 		}
-		YYDEBUG(187, *YYCURSOR);
 		yyleng = (size_t) YYCURSOR - (size_t) yytext;
 		{
 	/* ignore whitespace */
 
 	goto restart;
 }
-yy188:
-		YYDEBUG(188, *YYCURSOR);
+yy135:
+		YYDEBUG(135, *YYCURSOR);
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'V') goto yy192;
-		if (yych == 'v') goto yy192;
-		goto yy183;
-yy189:
-		YYDEBUG(189, *YYCURSOR);
+		if (yych == 'V') goto yy139;
+		if (yych == 'v') goto yy139;
+		goto yy132;
+yy136:
+		YYDEBUG(136, *YYCURSOR);
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'U') goto yy194;
-		if (yych == 'u') goto yy194;
-		goto yy183;
-yy190:
-		YYDEBUG(190, *YYCURSOR);
+		if (yych == 'U') goto yy141;
+		if (yych == 'u') goto yy141;
+		goto yy132;
+yy137:
+		YYDEBUG(137, *YYCURSOR);
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'H') goto yy195;
-		if (yych == 'h') goto yy195;
-		goto yy183;
-yy191:
-		YYDEBUG(191, *YYCURSOR);
+		if (yych == 'H') goto yy142;
+		if (yych == 'h') goto yy142;
+		goto yy132;
+yy138:
+		YYDEBUG(138, *YYCURSOR);
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yych <= 0x1F) {
 			if (yych <= '\t') {
-				if (yych <= 0x08) goto yy183;
-				goto yy196;
+				if (yych <= 0x08) goto yy132;
+				goto yy143;
 			} else {
-				if (yych == '\r') goto yy196;
-				goto yy183;
+				if (yych == '\r') goto yy143;
+				goto yy132;
 			}
 		} else {
 			if (yych <= 'U') {
-				if (yych <= ' ') goto yy196;
-				if (yych <= 'T') goto yy183;
-				goto yy194;
+				if (yych <= ' ') goto yy143;
+				if (yych <= 'T') goto yy132;
+				goto yy141;
 			} else {
-				if (yych == 'u') goto yy194;
-				goto yy183;
+				if (yych == 'u') goto yy141;
+				goto yy132;
 			}
 		}
-yy192:
-		YYDEBUG(192, *YYCURSOR);
+yy139:
+		YYDEBUG(139, *YYCURSOR);
 		yych = *++YYCURSOR;
 		if (yych <= '\f') {
-			if (yych == '\t') goto yy199;
+			if (yych == '\t') goto yy144;
 		} else {
-			if (yych <= '\r') goto yy199;
-			if (yych == ' ') goto yy199;
+			if (yych <= '\r') goto yy144;
+			if (yych == ' ') goto yy144;
 		}
-yy193:
-		YYDEBUG(193, *YYCURSOR);
+yy140:
+		YYDEBUG(140, *YYCURSOR);
 		YYCURSOR = YYMARKER;
-		goto yy183;
-yy194:
-		YYDEBUG(194, *YYCURSOR);
+		goto yy132;
+yy141:
+		YYDEBUG(141, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'N') goto yy202;
-		if (yych == 'n') goto yy202;
-		goto yy193;
-yy195:
-		YYDEBUG(195, *YYCURSOR);
+		if (yych == 'N') goto yy145;
+		if (yych == 'n') goto yy145;
+		goto yy140;
+yy142:
+		YYDEBUG(142, *YYCURSOR);
 		yych = *++YYCURSOR;
 		if (yych <= '\f') {
-			if (yych == '\t') goto yy203;
-			goto yy193;
+			if (yych == '\t') goto yy146;
+			goto yy140;
 		} else {
-			if (yych <= '\r') goto yy203;
-			if (yych == ' ') goto yy203;
-			goto yy193;
+			if (yych <= '\r') goto yy146;
+			if (yych == ' ') goto yy146;
+			goto yy140;
 		}
-yy196:
-		YYDEBUG(196, *YYCURSOR);
+yy143:
+		YYDEBUG(143, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(197, *YYCURSOR);
 		if (yych <= '\f') {
-			if (yych == '\t') goto yy196;
+			if (yych == '\t') goto yy143;
 		} else {
-			if (yych <= '\r') goto yy196;
-			if (yych == ' ') goto yy196;
+			if (yych <= '\r') goto yy143;
+			if (yych == ' ') goto yy143;
 		}
-		YYDEBUG(198, *YYCURSOR);
 		yyleng = (size_t) YYCURSOR - (size_t) yytext;
 		{
 	YYSETCONDITION(PRE_RAW);
 	phpdbg_init_param(yylval, EMPTY_PARAM);
 	return T_RUN;
 }
-yy199:
-		YYDEBUG(199, *YYCURSOR);
+yy144:
+		YYDEBUG(144, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(200, *YYCURSOR);
 		if (yych <= '\f') {
-			if (yych == '\t') goto yy199;
+			if (yych == '\t') goto yy144;
 		} else {
-			if (yych <= '\r') goto yy199;
-			if (yych == ' ') goto yy199;
+			if (yych <= '\r') goto yy144;
+			if (yych == ' ') goto yy144;
 		}
-		YYDEBUG(201, *YYCURSOR);
 		yyleng = (size_t) YYCURSOR - (size_t) yytext;
 		{
 	YYSETCONDITION(PRE_RAW);
 	phpdbg_init_param(yylval, EMPTY_PARAM);
 	return T_EVAL;
 }
-yy202:
-		YYDEBUG(202, *YYCURSOR);
+yy145:
+		YYDEBUG(145, *YYCURSOR);
 		yych = *++YYCURSOR;
 		if (yych <= '\f') {
-			if (yych == '\t') goto yy196;
-			goto yy193;
+			if (yych == '\t') goto yy143;
+			goto yy140;
 		} else {
-			if (yych <= '\r') goto yy196;
-			if (yych == ' ') goto yy196;
-			goto yy193;
+			if (yych <= '\r') goto yy143;
+			if (yych == ' ') goto yy143;
+			goto yy140;
 		}
-yy203:
-		YYDEBUG(203, *YYCURSOR);
+yy146:
+		YYDEBUG(146, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(204, *YYCURSOR);
 		if (yych <= '\f') {
-			if (yych == '\t') goto yy203;
+			if (yych == '\t') goto yy146;
 		} else {
-			if (yych <= '\r') goto yy203;
-			if (yych == ' ') goto yy203;
+			if (yych <= '\r') goto yy146;
+			if (yych == ' ') goto yy146;
 		}
-		YYDEBUG(205, *YYCURSOR);
 		yyleng = (size_t) YYCURSOR - (size_t) yytext;
 		{
 	YYSETCONDITION(PRE_RAW);

php-8.3.7.tar.xz/sapi/phpdbg/phpdbg_lexer.l -> php-8.3.21.tar.xz/sapi/phpdbg/phpdbg_lexer.l Changed

php-8.3.7.tar.xz/sapi/phpdbg/phpdbg_out.c -> php-8.3.21.tar.xz/sapi/phpdbg/phpdbg_out.c Changed

php-8.3.7.tar.xz/sapi/phpdbg/phpdbg_out.h -> php-8.3.21.tar.xz/sapi/phpdbg/phpdbg_out.h Changed

php-8.3.7.tar.xz/sapi/phpdbg/phpdbg_parser.c -> php-8.3.21.tar.xz/sapi/phpdbg/phpdbg_parser.c Changed

php-8.3.7.tar.xz/sapi/phpdbg/phpdbg_parser.h -> php-8.3.21.tar.xz/sapi/phpdbg/phpdbg_parser.h Changed

php-8.3.7.tar.xz/sapi/phpdbg/phpdbg_parser.output -> php-8.3.21.tar.xz/sapi/phpdbg/phpdbg_parser.output Changed

@@ -1,7 +1,7 @@
 Terminals unused in grammar
 
-   "string (some input, perhaps)"
-   "input"
+    "string (some input, perhaps)"
+    "input"
 
 
 Grammar
@@ -10,7 +10,7 @@
 
     1 input: command
     2      | input "# (pound sign)" command
-    3      | %empty
+    3      | ε
 
     4 command: parameters
     5        | full_expression
@@ -36,7 +36,7 @@
    23          | "identifier (command or function name)"
 
    24 req_id: "request id (-r %d)"
-   25       | %empty
+   25       | ε
 
    26 full_expression: "eval" req_id "input (input string or data)"
    27                | "shell" req_id "input (input string or data)"
@@ -46,52 +46,57 @@
 
 Terminals, with rules where they appear
 
-"end of command" (0) 0
-error (256)
-"eval" (258) 26
-"run" (259) 28 29
-"shell" (260) 27
-"if (condition)" (261) 16
-"truthy (true, on, yes or enabled)" (262) 20
-"falsy (false, off, no or disabled)" (263) 21
-"string (some input, perhaps)" (264)
-": (colon)" (265) 9 10 11 12
-":: (double colon)" (266) 13 14
-"# (pound sign followed by digits)" (267) 10 12 14 15
-"# (pound sign)" (268) 2
-"protocol (file://)" (269) 11 12
-"digits (numbers)" (270) 9 10 11 12 14 15 22
-"literal (string)" (271) 19
-"address" (272) 18
-"opcode" (273) 17
-"identifier (command or function name)" (274) 9 10 11 12 13 14 15 23
-"input (input string or data)" (275) 16 26 27 29
-"input" (276)
-"request id (-r %d)" (277) 8 24
+    "end of command" (0) 0
+    error (256)
+    "eval" (258) 26
+    "run" (259) 28 29
+    "shell" (260) 27
+    "if (condition)" (261) 16
+    "truthy (true, on, yes or enabled)" (262) 20
+    "falsy (false, off, no or disabled)" (263) 21
+    "string (some input, perhaps)" (264)
+    ": (colon)" (265) 9 10 11 12
+    ":: (double colon)" (266) 13 14
+    "# (pound sign followed by digits)" (267) 10 12 14 15
+    "# (pound sign)" (268) 2
+    "protocol (file://)" (269) 11 12
+    "digits (numbers)" (270) 9 10 11 12 14 15 22
+    "literal (string)" (271) 19
+    "address" (272) 18
+    "opcode" (273) 17
+    "identifier (command or function name)" (274) 9 10 11 12 13 14 15 23
+    "input (input string or data)" (275) 16 26 27 29
+    "input" (276)
+    "request id (-r %d)" (277) 8 24
 
 
 Nonterminals, with rules where they appear
 
-$accept (23)
-    on left: 0
-input (24)
-    on left: 1 2 3, on right: 0 2
-command (25)
-    on left: 4 5, on right: 1 2
-parameters (26)
-    on left: 6 7 8, on right: 4 7 8
-parameter (27)
-    on left: 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23, on right:
-    6 7
-req_id (28)
-    on left: 24 25, on right: 26 27 28 29
-full_expression (29)
-    on left: 26 27 28 29, on right: 5
+    $accept (23)
+        on left: 0
+    input (24)
+        on left: 1 2 3
+        on right: 0 2
+    command (25)
+        on left: 4 5
+        on right: 1 2
+    parameters (26)
+        on left: 6 7 8
+        on right: 4 7 8
+    parameter (27)
+        on left: 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23
+        on right: 6 7
+    req_id (28)
+        on left: 24 25
+        on right: 26 27 28 29
+    full_expression (29)
+        on left: 26 27 28 29
+        on right: 5
 
 
 State 0
 
-    0 $accept: . input "end of command"
+    0 $accept: • input "end of command"
 
     "eval"                                   shift, and go to state 1
     "run"                                    shift, and go to state 2
@@ -117,7 +122,7 @@
 
 State 1
 
-   26 full_expression: "eval" . req_id "input (input string or data)"
+   26 full_expression: "eval" • req_id "input (input string or data)"
 
     "request id (-r %d)"  shift, and go to state 18
 
@@ -128,8 +133,8 @@
 
 State 2
 
-   28 full_expression: "run" . req_id
-   29                | "run" . req_id "input (input string or data)"
+   28 full_expression: "run" • req_id
+   29                | "run" • req_id "input (input string or data)"
 
     "request id (-r %d)"  shift, and go to state 18
 
@@ -140,7 +145,7 @@
 
 State 3
 
-   27 full_expression: "shell" . req_id "input (input string or data)"
+   27 full_expression: "shell" • req_id "input (input string or data)"
 
     "request id (-r %d)"  shift, and go to state 18
 
@@ -151,69 +156,69 @@
 
 State 4
 
-   16 parameter: "if (condition)" . "input (input string or data)"
+   16 parameter: "if (condition)" • "input (input string or data)"
 
     "input (input string or data)"  shift, and go to state 22
 
 
 State 5
 
-   20 parameter: "truthy (true, on, yes or enabled)" .
+   20 parameter: "truthy (true, on, yes or enabled)" •
 
     $default  reduce using rule 20 (parameter)
 
 
 State 6
 
-   21 parameter: "falsy (false, off, no or disabled)" .
+   21 parameter: "falsy (false, off, no or disabled)" •
 
     $default  reduce using rule 21 (parameter)
 
 
 State 7
 
-   11 parameter: "protocol (file://)" . "identifier (command or function name)" ": (colon)" "digits (numbers)"
-   12          | "protocol (file://)" . "identifier (command or function name)" ": (colon)" "# (pound sign followed by digits)" "digits (numbers)"
+   11 parameter: "protocol (file://)" • "identifier (command or function name)" ": (colon)" "digits (numbers)"
+   12          | "protocol (file://)" • "identifier (command or function name)" ": (colon)" "# (pound sign followed by digits)" "digits (numbers)"
 
     "identifier (command or function name)"  shift, and go to state 23
 
 
 State 8
 
-   22 parameter: "digits (numbers)" .
+   22 parameter: "digits (numbers)" •
 
     $default  reduce using rule 22 (parameter)
 
 
 State 9
 
-   19 parameter: "literal (string)" .
+   19 parameter: "literal (string)" •
 
     $default  reduce using rule 19 (parameter)
 
 
 State 10
 
-   18 parameter: "address" .
+   18 parameter: "address" •
 
     $default  reduce using rule 18 (parameter)
 
 
 State 11
 
-   17 parameter: "opcode" .
+   17 parameter: "opcode" •
 
     $default  reduce using rule 17 (parameter)
 
 
 State 12
 
-    9 parameter: "identifier (command or function name)" . ": (colon)" "digits (numbers)"
-   10          | "identifier (command or function name)" . ": (colon)" "# (pound sign followed by digits)" "digits (numbers)"
-   13          | "identifier (command or function name)" . ":: (double colon)" "identifier (command or function name)"
-   14          | "identifier (command or function name)" . ":: (double colon)" "identifier (command or function name)" "# (pound sign followed by digits)" "digits (numbers)"
-   15          | "identifier (command or function name)" . "# (pound sign followed by digits)" "digits (numbers)"
-   23          | "identifier (command or function name)" .
+    9 parameter: "identifier (command or function name)" • ": (colon)" "digits (numbers)"
+   10          | "identifier (command or function name)" • ": (colon)" "# (pound sign followed by digits)" "digits (numbers)"
+   13          | "identifier (command or function name)" • ":: (double colon)" "identifier (command or function name)"
+   14          | "identifier (command or function name)" • ":: (double colon)" "identifier (command or function name)" "# (pound sign followed by digits)" "digits (numbers)"
+   15          | "identifier (command or function name)" • "# (pound sign followed by digits)" "digits (numbers)"
+   23          | "identifier (command or function name)" •
 
     ": (colon)"                          shift, and go to state 24
     ":: (double colon)"                  shift, and go to state 25
@@ -224,8 +229,8 @@
 
 State 13
 
-    0 $accept: input . "end of command"
-    2 input: input . "# (pound sign)" command
+    0 $accept: input • "end of command"
+    2 input: input • "# (pound sign)" command
 
     "end of command"  shift, and go to state 27
     "# (pound sign)"  shift, and go to state 28
@@ -233,16 +238,16 @@
 
 State 14
 
-    1 input: command .
+    1 input: command •
 
     $default  reduce using rule 1 (input)
 
 
 State 15
 
-    4 command: parameters .
-    7 parameters: parameters . parameter
-    8           | parameters . "request id (-r %d)"
+    4 command: parameters •
+    7 parameters: parameters • parameter
+    8           | parameters • "request id (-r %d)"
 
     "if (condition)"                         shift, and go to state 4
     "truthy (true, on, yes or enabled)"      shift, and go to state 5
@@ -262,36 +267,36 @@
 
 State 16
 
-    6 parameters: parameter .
+    6 parameters: parameter •
 
     $default  reduce using rule 6 (parameters)
 
 
 State 17
 
-    5 command: full_expression .
+    5 command: full_expression •
 
     $default  reduce using rule 5 (command)
 
 
 State 18
 
-   24 req_id: "request id (-r %d)" .
+   24 req_id: "request id (-r %d)" •
 
     $default  reduce using rule 24 (req_id)
 
 
 State 19
 
-   26 full_expression: "eval" req_id . "input (input string or data)"
+   26 full_expression: "eval" req_id • "input (input string or data)"
 
     "input (input string or data)"  shift, and go to state 31
 
 
 State 20
 
-   28 full_expression: "run" req_id .
-   29                | "run" req_id . "input (input string or data)"
+   28 full_expression: "run" req_id •
+   29                | "run" req_id • "input (input string or data)"
 
     "input (input string or data)"  shift, and go to state 32
 
@@ -300,30 +305,30 @@
 
 State 21
 
-   27 full_expression: "shell" req_id . "input (input string or data)"
+   27 full_expression: "shell" req_id • "input (input string or data)"
 
     "input (input string or data)"  shift, and go to state 33
 
 
 State 22
 
-   16 parameter: "if (condition)" "input (input string or data)" .
+   16 parameter: "if (condition)" "input (input string or data)" •
 
     $default  reduce using rule 16 (parameter)
 
 
 State 23
 
-   11 parameter: "protocol (file://)" "identifier (command or function name)" . ": (colon)" "digits (numbers)"
-   12          | "protocol (file://)" "identifier (command or function name)" . ": (colon)" "# (pound sign followed by digits)" "digits (numbers)"
+   11 parameter: "protocol (file://)" "identifier (command or function name)" • ": (colon)" "digits (numbers)"
+   12          | "protocol (file://)" "identifier (command or function name)" • ": (colon)" "# (pound sign followed by digits)" "digits (numbers)"
 
     ": (colon)"  shift, and go to state 34
 
 
 State 24
 
-    9 parameter: "identifier (command or function name)" ": (colon)" . "digits (numbers)"
-   10          | "identifier (command or function name)" ": (colon)" . "# (pound sign followed by digits)" "digits (numbers)"
+    9 parameter: "identifier (command or function name)" ": (colon)" • "digits (numbers)"
+   10          | "identifier (command or function name)" ": (colon)" • "# (pound sign followed by digits)" "digits (numbers)"
 
     "# (pound sign followed by digits)"  shift, and go to state 35
     "digits (numbers)"                   shift, and go to state 36
@@ -331,29 +336,29 @@
 
 State 25
 
-   13 parameter: "identifier (command or function name)" ":: (double colon)" . "identifier (command or function name)"
-   14          | "identifier (command or function name)" ":: (double colon)" . "identifier (command or function name)" "# (pound sign followed by digits)" "digits (numbers)"
+   13 parameter: "identifier (command or function name)" ":: (double colon)" • "identifier (command or function name)"
+   14          | "identifier (command or function name)" ":: (double colon)" • "identifier (command or function name)" "# (pound sign followed by digits)" "digits (numbers)"
 
     "identifier (command or function name)"  shift, and go to state 37
 
 
 State 26
 
-   15 parameter: "identifier (command or function name)" "# (pound sign followed by digits)" . "digits (numbers)"
+   15 parameter: "identifier (command or function name)" "# (pound sign followed by digits)" • "digits (numbers)"
 
     "digits (numbers)"  shift, and go to state 38
 
 
 State 27
 
-    0 $accept: input "end of command" .
+    0 $accept: input "end of command" •
 
     $default  accept
 
 
 State 28
 
-    2 input: input "# (pound sign)" . command
+    2 input: input "# (pound sign)" • command
 
     "eval"                                   shift, and go to state 1
     "run"                                    shift, and go to state 2
@@ -376,43 +381,43 @@
 
 State 29
 
-    8 parameters: parameters "request id (-r %d)" .
+    8 parameters: parameters "request id (-r %d)" •
 
     $default  reduce using rule 8 (parameters)
 
 
 State 30
 
-    7 parameters: parameters parameter .
+    7 parameters: parameters parameter •
 
     $default  reduce using rule 7 (parameters)
 
 
 State 31
 
-   26 full_expression: "eval" req_id "input (input string or data)" .
+   26 full_expression: "eval" req_id "input (input string or data)" •
 
     $default  reduce using rule 26 (full_expression)
 
 
 State 32
 
-   29 full_expression: "run" req_id "input (input string or data)" .
+   29 full_expression: "run" req_id "input (input string or data)" •
 
     $default  reduce using rule 29 (full_expression)
 
 
 State 33
 
-   27 full_expression: "shell" req_id "input (input string or data)" .
+   27 full_expression: "shell" req_id "input (input string or data)" •
 
     $default  reduce using rule 27 (full_expression)
 
 
 State 34
 
-   11 parameter: "protocol (file://)" "identifier (command or function name)" ": (colon)" . "digits (numbers)"
-   12          | "protocol (file://)" "identifier (command or function name)" ": (colon)" . "# (pound sign followed by digits)" "digits (numbers)"
+   11 parameter: "protocol (file://)" "identifier (command or function name)" ": (colon)" • "digits (numbers)"
+   12          | "protocol (file://)" "identifier (command or function name)" ": (colon)" • "# (pound sign followed by digits)" "digits (numbers)"
 
     "# (pound sign followed by digits)"  shift, and go to state 40
     "digits (numbers)"                   shift, and go to state 41
@@ -420,22 +425,22 @@
 
 State 35
 
-   10 parameter: "identifier (command or function name)" ": (colon)" "# (pound sign followed by digits)" . "digits (numbers)"
+   10 parameter: "identifier (command or function name)" ": (colon)" "# (pound sign followed by digits)" • "digits (numbers)"
 
     "digits (numbers)"  shift, and go to state 42
 
 
 State 36
 
-    9 parameter: "identifier (command or function name)" ": (colon)" "digits (numbers)" .
+    9 parameter: "identifier (command or function name)" ": (colon)" "digits (numbers)" •
 
     $default  reduce using rule 9 (parameter)
 
 
 State 37
 
-   13 parameter: "identifier (command or function name)" ":: (double colon)" "identifier (command or function name)" .
-   14          | "identifier (command or function name)" ":: (double colon)" "identifier (command or function name)" . "# (pound sign followed by digits)" "digits (numbers)"
+   13 parameter: "identifier (command or function name)" ":: (double colon)" "identifier (command or function name)" •
+   14          | "identifier (command or function name)" ":: (double colon)" "identifier (command or function name)" • "# (pound sign followed by digits)" "digits (numbers)"
 
     "# (pound sign followed by digits)"  shift, and go to state 43
 
@@ -444,55 +449,55 @@
 
 State 38
 
-   15 parameter: "identifier (command or function name)" "# (pound sign followed by digits)" "digits (numbers)" .
+   15 parameter: "identifier (command or function name)" "# (pound sign followed by digits)" "digits (numbers)" •
 
     $default  reduce using rule 15 (parameter)
 
 
 State 39
 
-    2 input: input "# (pound sign)" command .
+    2 input: input "# (pound sign)" command •
 
     $default  reduce using rule 2 (input)
 
 
 State 40
 
-   12 parameter: "protocol (file://)" "identifier (command or function name)" ": (colon)" "# (pound sign followed by digits)" . "digits (numbers)"
+   12 parameter: "protocol (file://)" "identifier (command or function name)" ": (colon)" "# (pound sign followed by digits)" • "digits (numbers)"
 
     "digits (numbers)"  shift, and go to state 44
 
 
 State 41
 
-   11 parameter: "protocol (file://)" "identifier (command or function name)" ": (colon)" "digits (numbers)" .
+   11 parameter: "protocol (file://)" "identifier (command or function name)" ": (colon)" "digits (numbers)" •
 
     $default  reduce using rule 11 (parameter)
 
 
 State 42
 
-   10 parameter: "identifier (command or function name)" ": (colon)" "# (pound sign followed by digits)" "digits (numbers)" .
+   10 parameter: "identifier (command or function name)" ": (colon)" "# (pound sign followed by digits)" "digits (numbers)" •
 
     $default  reduce using rule 10 (parameter)
 
 
 State 43
 
-   14 parameter: "identifier (command or function name)" ":: (double colon)" "identifier (command or function name)" "# (pound sign followed by digits)" . "digits (numbers)"
+   14 parameter: "identifier (command or function name)" ":: (double colon)" "identifier (command or function name)" "# (pound sign followed by digits)" • "digits (numbers)"
 
     "digits (numbers)"  shift, and go to state 45
 
 
 State 44
 
-   12 parameter: "protocol (file://)" "identifier (command or function name)" ": (colon)" "# (pound sign followed by digits)" "digits (numbers)" .
+   12 parameter: "protocol (file://)" "identifier (command or function name)" ": (colon)" "# (pound sign followed by digits)" "digits (numbers)" •
 
     $default  reduce using rule 12 (parameter)
 
 
 State 45
 
-   14 parameter: "identifier (command or function name)" ":: (double colon)" "identifier (command or function name)" "# (pound sign followed by digits)" "digits (numbers)" .
+   14 parameter: "identifier (command or function name)" ":: (double colon)" "identifier (command or function name)" "# (pound sign followed by digits)" "digits (numbers)" •
 
     $default  reduce using rule 14 (parameter)

php-8.3.7.tar.xz/sapi/phpdbg/phpdbg_prompt.c -> php-8.3.21.tar.xz/sapi/phpdbg/phpdbg_prompt.c Changed

@@ -189,6 +189,9 @@
 
 			zval_ptr_dtor_str(&fci.function_name);
 			efree(lc_name);
+			if (fci.named_params) {
+				zend_array_destroy(fci.named_params);
+			}
 
 			return SUCCESS;
 		}
@@ -906,7 +909,7 @@
 				}
 			} zend_end_try();
 
-			if (EG(exception)) {
+			if (EG(exception) && !zend_is_unwind_exit(EG(exception))) {
 				phpdbg_handle_exception();
 			}
 		}
@@ -1424,7 +1427,6 @@
 	if (!zend_hash_str_exists(&PHPDBG_G(registered), lcname, lcname_len)) {
 		if ((function = zend_hash_str_find_ptr(EG(function_table), lcname, lcname_len))) {
 			zend_hash_str_update_ptr(&PHPDBG_G(registered), lcname, lcname_len, function);
-			function_add_ref(function);
 
 			phpdbg_notice("Registered %s", lcname);
 		} else {
@@ -1549,6 +1551,8 @@
 				ret = phpdbg_stack_execute(&stack, allow_async_unsafe);
 			} zend_catch {
 				phpdbg_stack_free(&stack);
+				phpdbg_destroy_input(&input);
+				/* TODO: should use proper unwinding instead of bailing out */
 				zend_bailout();
 			} zend_end_try();

php-8.3.7.tar.xz/sapi/phpdbg/phpdbg_watch.c -> php-8.3.21.tar.xz/sapi/phpdbg/phpdbg_watch.c Changed

@@ -315,7 +315,7 @@
 
 	struct uffd_msg fault_msg = {0};
 	while (read(globals->watch_userfaultfd, &fault_msg, sizeof(fault_msg)) == sizeof(fault_msg)) {
-    	void *page = phpdbg_get_page_boundary((char *)(uintptr_t) fault_msg.arg.pagefault.address);
+		void *page = phpdbg_get_page_boundary((char *)(uintptr_t) fault_msg.arg.pagefault.address);
 		zend_hash_index_add_empty_element(globals->watchlist_mem, (zend_ulong) page);
 		struct uffdio_writeprotect unprotect = {
 			.mode = 0,
@@ -516,7 +516,9 @@
 		phpdbg_watch_element *old_element;
 		watch = res->ptr;
 		if ((old_element = zend_hash_find_ptr(&watch->elements, element->str))) {
-			phpdbg_free_watch_element(element);
+			if (element != old_element) {
+				phpdbg_free_watch_element(element);
+			}
 			return old_element;
 		}
 	}
@@ -668,7 +670,7 @@
 }
 
 void phpdbg_unwatch_parent_ht(phpdbg_watch_element *element) {
-	if (element->watch->type == WATCH_ON_BUCKET) {
+	if (element->watch && element->watch->type == WATCH_ON_BUCKET) {
 		phpdbg_btree_result *res = phpdbg_btree_find(&PHPDBG_G(watch_HashTables), (zend_ulong) element->parent_container);
 		ZEND_ASSERT(element->parent_container);
 		if (res) {
@@ -969,11 +971,14 @@
 }
 
 void phpdbg_clean_watch_element(phpdbg_watch_element *element) {
-	HashTable *elements = &element->watch->elements;
 	phpdbg_unwatch_parent_ht(element);
-	zend_hash_del(elements, element->str);
-	if (zend_hash_num_elements(elements) == 0) {
-		phpdbg_remove_watchpoint(element->watch);
+
+	if (element->watch) {
+		HashTable *elements = &element->watch->elements;
+		zend_hash_del(elements, element->str);
+		if (zend_hash_num_elements(elements) == 0) {
+			phpdbg_remove_watchpoint(element->watch);
+		}
 	}
 }
 
@@ -1468,11 +1473,13 @@
 
 	/* put these on a separate page, to avoid conflicts with other memory */
 	PHPDBG_G(watchlist_mem) = malloc(phpdbg_pagesize > sizeof(HashTable) ? phpdbg_pagesize : sizeof(HashTable));
+	PHPDBG_G(original_watchlist_mem) = PHPDBG_G(watchlist_mem);
 	zend_hash_init(PHPDBG_G(watchlist_mem), phpdbg_pagesize / (sizeof(Bucket) + sizeof(uint32_t)), NULL, NULL, 1);
 	PHPDBG_G(watchlist_mem_backup) = malloc(phpdbg_pagesize > sizeof(HashTable) ? phpdbg_pagesize : sizeof(HashTable));
 	zend_hash_init(PHPDBG_G(watchlist_mem_backup), phpdbg_pagesize / (sizeof(Bucket) + sizeof(uint32_t)), NULL, NULL, 1);
 
 	PHPDBG_G(watch_tmp) = NULL;
+	PHPDBG_G(watchpoint_hit) = false;
 
 #ifdef HAVE_USERFAULTFD_WRITEFAULT
 	PHPDBG_G(watch_userfaultfd) = syscall(SYS_userfaultfd, O_CLOEXEC);
@@ -1514,8 +1521,8 @@
 	zend_hash_destroy(&PHPDBG_G(watch_recreation));
 	zend_hash_destroy(&PHPDBG_G(watch_free));
 	zend_hash_destroy(&PHPDBG_G(watch_collisions));
-	zend_hash_destroy(PHPDBG_G(watchlist_mem));
-	free(PHPDBG_G(watchlist_mem));
+	zend_hash_destroy(PHPDBG_G(original_watchlist_mem));
+	free(PHPDBG_G(original_watchlist_mem));
 	zend_hash_destroy(PHPDBG_G(watchlist_mem_backup));
 	free(PHPDBG_G(watchlist_mem_backup));
 }

php-8.3.7.tar.xz/sapi/phpdbg/tests/gh10715.phpt -> php-8.3.21.tar.xz/sapi/phpdbg/tests/gh10715.phpt Changed

php-8.3.21.tar.xz/sapi/phpdbg/tests/gh13681.phpt Added

php-8.3.21.tar.xz/sapi/phpdbg/tests/gh14553.phpt Added

php-8.3.21.tar.xz/sapi/phpdbg/tests/gh15208.phpt Added

php-8.3.21.tar.xz/sapi/phpdbg/tests/gh15210_001.phpt Added

php-8.3.21.tar.xz/sapi/phpdbg/tests/gh15210_002.phpt Added

php-8.3.21.tar.xz/sapi/phpdbg/tests/gh15268.phpt Added

php-8.3.21.tar.xz/sapi/phpdbg/tests/gh15901.phpt Added

php-8.3.21.tar.xz/sapi/phpdbg/tests/gh16174.phpt Added

php-8.3.21.tar.xz/sapi/phpdbg/tests/gh16181.phpt Added

php-8.3.21.tar.xz/sapi/phpdbg/tests/register_function.phpt Added

php-8.3.21.tar.xz/sapi/phpdbg/tests/register_function_leak.phpt Added

php-8.3.7.tar.xz/scripts/dev/credits -> php-8.3.21.tar.xz/scripts/dev/credits Changed

php-8.3.7.tar.xz/scripts/dev/genfiles -> php-8.3.21.tar.xz/scripts/dev/genfiles Changed

php-8.3.7.tar.xz/scripts/dev/makedist -> php-8.3.21.tar.xz/scripts/dev/makedist Changed

php-8.3.7.tar.xz/scripts/phpize.m4 -> php-8.3.21.tar.xz/scripts/phpize.m4 Changed

php-8.3.21.tar.xz/tests/basic/GHSA-9pqp-7h25-4f32.inc Added

php-8.3.21.tar.xz/tests/basic/GHSA-9pqp-7h25-4f32.phpt Added

@@ -0,0 +1,103 @@
+--TEST--
+GHSA-9pqp-7h25-4f32
+--SKIPIF--
+<?php
+if (!getenv('TEST_PHP_CGI_EXECUTABLE')) {
+    die("skip php-cgi not available");
+}
+if (substr(PHP_OS, 0, 3) == 'WIN') {
+    die("skip not for Windows in CI - probably resource issue");
+}
+?>
+--FILE--
+<?php
+
+const FILLUNIT = 5 * 1024;
+
+function test($boundaryLen) {
+    printf("Boundary len: %d\n", $boundaryLen);
+
+    $cmd = 
+        getenv('TEST_PHP_CGI_EXECUTABLE'),
+        '-C',
+        '-n',
+        __DIR__ . '/GHSA-9pqp-7h25-4f32.inc',
+    ;
+
+    $boundary = str_repeat('A', $boundaryLen);
+    $body = ""
+        . "--$boundary\r\n"
+        . "Content-Disposition: form-data; name=\"koko\"\r\n"
+        . "\r\n"
+        . "BBB\r\n--" . substr($boundary, 0, -1) . "CCC\r\n"
+        . "--$boundary--\r\n"
+        ;
+
+    $env = array_merge($_ENV, 
+        'REDIRECT_STATUS' => '1',
+        'CONTENT_TYPE' => "multipart/form-data; boundary=$boundary",
+        'CONTENT_LENGTH' => strlen($body),
+        'REQUEST_METHOD' => 'POST',
+        'SCRIPT_FILENAME' => __DIR__ . '/GHSA-9pqp-7h25-4f32.inc',
+    );
+
+    $spec = 
+        0 => 'pipe', 'r',
+        1 => STDOUT,
+        2 => STDOUT,
+    ;
+
+    $pipes = ;
+
+    print "Starting...\n";
+
+    $handle = proc_open($cmd, $spec, $pipes, getcwd(), $env);
+
+    fwrite($pipes0, $body);
+
+    $status = proc_close($handle);
+
+    print "\n";
+}
+
+for ($offset = -1; $offset <= 1; $offset++) {
+    test(FILLUNIT - strlen("\r\n--") + $offset);
+}
+
+?>
+--EXPECTF--
+Boundary len: 5115
+Starting...
+X-Powered-By: %s
+Content-type: text/html; charset=UTF-8
+
+Hello world
+array(1) {
+  "koko"=>
+  string(5124) "BBB
+--AAA%sCCC"
+}
+
+Boundary len: 5116
+Starting...
+X-Powered-By: %s
+Content-type: text/html; charset=UTF-8
+
+Hello world
+array(1) {
+  "koko"=>
+  string(5125) "BBB
+--AAA%sCCC"
+}
+
+Boundary len: 5117
+Starting...
+X-Powered-By: %s
+Content-type: text/html; charset=UTF-8
+
+<br />
+<b>Warning</b>:  Boundary too large in multipart/form-data POST data in <b>Unknown</b> on line <b>0</b><br />
+Hello world
+array(0) {
+}
+

php-8.3.21.tar.xz/tests/basic/gh15905.phpt Added

php-8.3.21.tar.xz/tests/basic/gh16998.phpt Added

@@ -0,0 +1,49 @@
+--TEST--
+GH-16998 (UBSAN warning in rfc1867)
+--SKIPIF--
+<?php
+if (!getenv('TEST_PHP_CGI_EXECUTABLE')) {
+    die("skip php-cgi not available");
+}
+?>
+--FILE--
+<?php
+const FILLUNIT = 5 * 1024;
+$cmd = 
+    getenv('TEST_PHP_CGI_EXECUTABLE'),
+    '-C',
+    '-n',
+    __DIR__ . '/GHSA-9pqp-7h25-4f32.inc',
+;
+$boundary = str_repeat('A', FILLUNIT);
+$body = ""
+    . "--$boundary\r\n"
+    . "Content-Disposition: form-data; name=\"koko\"\r\n"
+    . "\r\n"
+    . "BBB\r\n--" . substr($boundary, 0, -1) . "CCC\r\n"
+    . "--$boundary--\r\n"
+    ;
+$env = array_merge($_ENV, 
+    'REDIRECT_STATUS' => '1',
+    'CONTENT_TYPE' => "multipart/form-data; boundary=",
+    'CONTENT_LENGTH' => strlen($body),
+    'REQUEST_METHOD' => 'POST',
+    'SCRIPT_FILENAME' => __DIR__ . '/GHSA-9pqp-7h25-4f32.inc',
+);
+$spec = 
+    0 => 'pipe', 'r',
+    1 => STDOUT,
+    2 => STDOUT,
+;
+$pipes = ;
+$handle = proc_open($cmd, $spec, $pipes, getcwd(), $env);
+fwrite($pipes0, $body);
+proc_close($handle);
+?>
+--EXPECTF--
+X-Powered-By: PHP/%s
+Content-type: text/html; charset=UTF-8
+
+Hello world
+array(0) {
+}

php-8.3.7.tar.xz/tests/lang/bug38579.phpt -> php-8.3.21.tar.xz/tests/lang/bug38579.phpt Changed

php-8.3.21.tar.xz/tests/output/gh14808.phpt Added

php-8.3.21.tar.xz/tests/output/gh15179.phpt Added

php-8.3.7.tar.xz/win32/build/Makefile -> php-8.3.21.tar.xz/win32/build/Makefile Changed

php-8.3.7.tar.xz/win32/build/config.w32.h.in -> php-8.3.21.tar.xz/win32/build/config.w32.h.in Changed

php-8.3.7.tar.xz/win32/build/confutils.js -> php-8.3.21.tar.xz/win32/build/confutils.js Changed

php-8.3.7.tar.xz/win32/build/default.manifest -> php-8.3.21.tar.xz/win32/build/default.manifest Changed

php-8.3.7.tar.xz/win32/build/phpize.js.in -> php-8.3.21.tar.xz/win32/build/phpize.js.in Changed

php-8.3.7.tar.xz/win32/winutil.c -> php-8.3.21.tar.xz/win32/winutil.c Changed

php-8.3.7.tar.xz.asc Deleted

php-8.3.7.tar.xz/.cirrus.yml Deleted

@@ -1,29 +0,0 @@
-env:
-  CIRRUS_CLONE_DEPTH: 1
-
-freebsd_task:
-  name: FREEBSD_DEBUG_NTS
-  freebsd_instance:
-    image_family: freebsd-13-3
-  env:
-    ARCH: amd64
-  install_script:
-    #- sed -i -e 's/quarterly/latest/g' /etc/pkg/FreeBSD.conf
-    #- pkg upgrade -y
-    - kldload accf_http
-    - pkg install -y autoconf bison gmake re2c icu libiconv png freetype2 enchant2 bzip2 krb5 t1lib gmp tidyp libsodium libzip libxml2 libxslt openssl oniguruma pkgconf webp libavif
-  script:
-    - ./buildconf -f
-    - ./configure --prefix=/usr/local --enable-debug --enable-option-checking=fatal --enable-fpm --with-pdo-sqlite --without-pear --with-bz2 --with-avif --with-jpeg --with-webp --with-freetype --enable-gd --enable-exif --with-zip --with-zlib --enable-soap --enable-xmlreader --with-xsl --with-libxml --enable-shmop --enable-pcntl --enable-mbstring --with-curl --enable-sockets --with-openssl --with-iconv=/usr/local --enable-bcmath --enable-calendar --enable-ftp --with-kerberos --with-ffi --enable-zend-test --enable-dl-test=shared --enable-intl --with-mhash --with-sodium --with-config-file-path=/etc --with-config-file-scan-dir=/etc/php.d
-    - gmake -j2
-    - mkdir /etc/php.d
-    - gmake install
-    - echo opcache.enable_cli=1 > /etc/php.d/opcache.ini
-    - echo opcache.protect_memory=1 >> /etc/php.d/opcache.ini
-    # Specify opcache.preload_user as we're running as root.
-    - echo opcache.preload_user=root >> /etc/php.d/opcache.ini
-  tests_script:
-    - export SKIP_IO_CAPTURE_TESTS=1
-    - export CI_NO_IPV6=1
-    - export STACK_LIMIT_DEFAULTS_CHECK=1
-    - sapi/cli/php run-tests.php -P -q -j2 -g FAIL,BORK,LEAK,XLEAK --no-progress --offline --show-diff --show-slow 1000 --set-timeout 120 -d zend_extension=opcache.so

php-8.3.7.tar.xz/ext/filter/tests/PMOPB45.phpt Deleted

php-8.3.7.tar.xz/ext/standard/tests/http/http_response_header_05.phpt Deleted

php-8.3.7.tar.xz/ext/standard/tests/streams/bug60106.phpt Deleted

php-8.3.7.tar.xz/ext/standard/tests/strings/wordwrap_memory_limit_win32.phpt Deleted